summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add --shebang option to binstubs commandseg-binstubs-shebangDimitris Zorbas2017-06-133-0/+16
| | | | | | | | bundle install `--binstubs` option is to be removed from Bundler 2.0 but currently supports setting the shebang using the `--shebang` option. See #1467 introducing the `--shebang` option, which with this commit is ported to the binstubs command.
* Auto merge of #5704 - bundler:colby/init-new-gemfile-format, r=segiddinsThe Bundler Bot2017-06-137-7/+86
|\ | | | | | | | | | | generate gems.rb in bundle init with feature flag This PR adds a feature flag to generate a new `gems.rb` with `bundle init`.
| * fix the order of the boolean setting keyscolby/init-new-gemfile-formatColby Swandale2017-06-061-2/+2
| |
| * rename feature flag to `init_gems_rb` and PR feedbackColby Swandale2017-06-055-9/+22
| |
| * dont run template gems.rb through eval quality specColby Swandale2017-06-041-0/+1
| |
| * generate gems.rb in bundle init with feature flagColby Swandale2017-06-046-6/+71
| |
* | Auto merge of #5703 - bundler:seg-environment-shebang-mismatch, r=indirectThe Bundler Bot2017-06-121-19/+44
|\ \ | | | | | | | | | | | | | | | | | | | | | [Env] Print shebang when it doesnt match Gem.ruby Closes #5616. Prints out `Gem.ruby` and the `bundle` binstub shebang when they don't match, which should help us pinpoint when ruby installation shenanigans are the root cause of an issue
| * | [Env] Extract table formatting into a methodseg-environment-shebang-mismatchSamuel Giddins2017-06-121-8/+14
| | |
| * | [Env] Refactor to ensure the environment is always properly alignedSamuel Giddins2017-06-121-23/+34
| | |
| * | [Env] Print shebang when it doesnt match Gem.rubySamuel Giddins2017-06-121-0/+8
| | |
* | | Auto merge of #5713 - bundler:seg-viz-other-gem, r=indirectThe Bundler Bot2017-06-123-4/+48
|\ \ \ | |/ / |/| | | | | | | | | | | [Viz] Work correctly when another gem with a graphviz file is present Closes #5706 by ensuring we always have the correct gem that contains a requirable `graphviz` file loaded (`ruby-graphviz` is the one we test against and suggest installing)
| * | [Viz] Work correctly when another gem with a graphviz file is presentseg-viz-other-gemSamuel Giddins2017-06-123-4/+48
| | |
* | | Auto merge of #5707 - bundler:seg-sort-by-name-spec-set, r=indirectThe Bundler Bot2017-06-062-10/+37
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | [SpecSet] Sort by name in #tsort Closes #5696 This is required for backwards compatibility, see issue #5696 for an example. The issue is that previous versions of bundler would have the load path in one (correct) order, and master has them in another (correct) order. So some projects depend on the load path ordering when multiple gems have the same requirable file. - [x] Test case
| * | Add a spec for sorting loaded specs by name on the $LOAD_PATHseg-sort-by-name-spec-setSamuel Giddins2017-06-061-9/+35
| | |
| * | [SpecSet] Sort by name in #tsortSamuel Giddins2017-06-061-1/+2
|/ / | | | | | | | | This is required for backwards compatibility, see issue #5696 for an example
* | Merge tag 'v1.15.1'Samuel Giddins2017-06-022-1/+10
|\ \ | |/ |/| | | Version 1.15.1
| * Version 1.15.1 with changelogv1.15.1Samuel Giddins2017-06-022-1/+10
| |
| * Auto merge of #5694 - bundler:seg-lock-update-missing, r=colby-swandaleThe Bundler Bot2017-06-014-7/+21
| | | | | | | | | | | | | | | | [CLI::Lock] Fail gracefully when updating a missing gem Closes #5693 by behaving the same way `bundle update` handles gems that aren't in the lockfile (cherry picked from commit 2e46e6705770e5a4685b1f3d3fbbe60f957599ae)
| * Auto merge of #5690 - bundler:colby/bundler-init-invalid-gemspec, r=segiddinsThe Bundler Bot2017-06-012-23/+51
| | | | | | | | | | | | | | | | Fix `bundle init --gemspec` breaking when gemspec is invalid Also added some specs to init what wasn't being tested. (cherry picked from commit d2d669746bc4e7f55c50f730e5fc965874ab1161)
| * Auto merge of #5680 - bundler:seg-git-force-no-git-ops, r=segiddinsThe Bundler Bot2017-06-013-2/+33
| | | | | | | | | | | | | | | | | | | | Allow bundle install --force to work with git specs This allows `bundle install --force` to work when the gemfile includes a git spec, previously it would error nonsensically. This happened because sources needed to be `remote!`ed for installation to succeed, and this wouldn't happen when `--force` was called with no other changes to the gemfile. Closes #5678 (cherry picked from commit 7f1411cdb3279c25e8e8f2a8e3c1f8acf3dbe8f2)
| * Auto merge of #5689 - tejasbubane:bundle-add-command-main-man, r=segiddinsThe Bundler Bot2017-06-011-0/+3
| | | | | | | | | | | | | | | | Add `bundle add` command to the main man page This command added in `v1.15` was not present in the main man page. (cherry picked from commit 3fea088b78ba31607f34e3bc62f26041c8c5fe92)
| * Auto merge of #5679 - bundler:seg-env-no-settings, r=indirectThe Bundler Bot2017-06-011-6/+8
| | | | | | | | | | | | | | | | [Env] Print well-formed markdown when there are no settings Closes #5677 (cherry picked from commit c37ede0a2a233eca23f5dfb121260f13eea3541c)
| * Auto merge of #5673 - bundler:seg-force-submodule-deinit, r=indirectThe Bundler Bot2017-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [GitProxy] Force deinitializing submodules Fixes the following test under newer git versions ``` bundle update git sources with submodules unlocks the source when submodules are removed from git source ``` (cherry picked from commit 54c51729e4776c3d07992deaedb8ec2788cb35ae)
* | Auto merge of #5694 - bundler:seg-lock-update-missing, r=colby-swandaleThe Bundler Bot2017-06-014-7/+21
|\ \ | | | | | | | | | | | | | | | [CLI::Lock] Fail gracefully when updating a missing gem Closes #5693 by behaving the same way `bundle update` handles gems that aren't in the lockfile
| * | [CLI::Common] Extract update lockfile checking logicseg-lock-update-missingSamuel Giddins2017-06-013-12/+9
| | |
| * | [CLI::Lock] Fail gracefully when updating a missing gemSamuel Giddins2017-06-012-1/+18
|/ /
* | Auto merge of #5690 - bundler:colby/bundler-init-invalid-gemspec, r=segiddinsThe Bundler Bot2017-06-012-23/+51
|\ \ | | | | | | | | | | | | | | | Fix `bundle init --gemspec` breaking when gemspec is invalid Also added some specs to init what wasn't being tested.
| * | use Bundler.load_gemspec_uncached for reading gemspeccolby/bundler-init-invalid-gemspecColby Swandale2017-06-012-6/+2
| | |
| * | handle invalid gemspec and add specs for untested behaviour in bundle init ↵Colby Swandale2017-06-012-22/+54
| | | | | | | | | | | | --gemspec
* | | Auto merge of #5680 - bundler:seg-git-force-no-git-ops, r=segiddinsThe Bundler Bot2017-06-013-2/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow bundle install --force to work with git specs This allows `bundle install --force` to work when the gemfile includes a git spec, previously it would error nonsensically. This happened because sources needed to be `remote!`ed for installation to succeed, and this wouldn't happen when `--force` was called with no other changes to the gemfile. Closes #5678
| * | | Add specs for install --force with git specsseg-git-force-no-git-opsSamuel Giddins2017-05-292-1/+32
| | | |
| * | | [GitProxy] Don't declare Git as a subclass twiceSamuel Giddins2017-05-291-1/+1
| | | |
* | | | Auto merge of #5688 - bundler:seg-doc-header-spacing, r=segiddinsThe Bundler Bot2017-06-011-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown headers in doc/development/readme GH now requires a space between `#` and the header
| * | | | Fix markdown headers in doc/development/readmeseg-doc-header-spacingSamuel Giddins2017-05-301-4/+4
| | |/ / | |/| |
* | | | Auto merge of #5695 - mdeering:master, r=segiddinsThe Bundler Bot2017-06-011-7/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | List the remote host correctly in rake task desc. When using the `allowed_push_host` metadata in a gems gemspec along with `bundler/gem_tasks` `rake release` shows that the gem will be pushed to rubygems.org rather then showing the configured `allowed_push_host` if that has been set. This resolves that confusion by showing the correct host that `rake release` will attempt to push to. * [x] `bin/rspec` * [x] `rubocop -a`
| * | | | List the remote host correctly in rake task desc.Michael Deering2017-05-311-7/+11
|/ / / /
* | | | Auto merge of #5692 - pkuczynski:patch-1, r=segiddinsThe Bundler Bot2017-05-311-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Minor links refactoring in README.md Fixed "Writing" heading and converted "here" into links for clarity
| * | | | Minor links refactoring in README.mdPiotr Kuczynski2017-05-311-3/+3
|/ / / / | | | | | | | | Fixed "Writing" heading and converted "here" into links for clarity
* | | | Auto merge of #5689 - tejasbubane:bundle-add-command-main-man, r=segiddinsThe Bundler Bot2017-05-311-0/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | Add `bundle add` command to the main man page This command added in `v1.15` was not present in the main man page.
| * | | Add `bundle add` command to the main manpageTejas Bubane2017-05-311-0/+3
|/ / /
* | | Auto merge of #5686 - koic:update_rubocop_0_49_1, r=segiddinsThe Bundler Bot2017-05-304-78/+91
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [RuboCop] Update to 0.49.1 This PR will bump RuboCop to 0.49.1. The following is a change in this PR. ## Change department from Style to Layout Some Cop's departments have changed as follows in RuboCop 0.49.0. It is a change related to this PR. ### .rubocop.yml Prior Name | New Name --- | --- Style/AccessModifierIndentation | Layout/AccessModifierIndentation Style/AlignParameters | Layout/AlignParameters Style/MultilineOperationIndentation | Layout/MultilineOperationIndentation Style/SpaceInsideBlockBraces | Layout/SpaceInsideBlockBraces Style/DotPosition | Layout/DotPosition ### .rubocop_todo.yml Prior Name | New Name --- | --- Style/EmptyLineAfterMagicComment | Layout/EmptyLineAfterMagicComment Style/EmptyLinesAroundExceptionHandlingKeywords | Layout/EmptyLinesAroundExceptionHandlingKeywords Style/ExtraSpacing | Layout/ExtraSpacing Style/IndentArray | Layout/IndentArray Style/IndentHeredoc | Layout/IndentHeredoc Style/MultilineMethodCallIndentation | Layout/MultilineMethodCallIndentation Style/SpaceAroundOperators | Layout/SpaceAroundOperators Style/SpaceInsideBlockBraces | Layout/SpaceInsideBlockBraces cf. https://github.com/bbatsov/rubocop/commit/54166bf76ba76b14f1bbc8a34165f175dbc3f227 ## New Cops The following are a new Cops added in RuboCop 0.49.0. - [Performance/Caller](http://rubocop.readthedocs.io/en/latest/cops_performance/#performancecaller) - [Style/FormatStringToken](http://rubocop.readthedocs.io/en/latest/cops_style/#styleformatstringtoken) Thanks.
| * | | [RuboCop] Update to 0.49.1Koichi ITO2017-05-304-78/+91
| |/ /
* | | Auto merge of #5683 - HippoDippo:master, r=segiddinsThe Bundler Bot2017-05-301-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | Fixed broken link in docs fixed broken link within the HOW_YOU_CAN_HELP.md file in the docs. The link is located at the bottom of the file. It is on the second to last item in the unordered list. The words to the link are: "these instructions".
| * | | Fixed link('these instructions') in HOW_YOU_CAN_HELP.md fileHippoDippo2017-05-291-1/+1
| |/ / | | | | | | | | | used relative path instead of full url
* | | Auto merge of #5635 - koic:tweak_newgem_template_for_rspec, r=indirectThe Bundler Bot2017-05-302-2/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tweak a newgem template for RSpec `--require spec_helper` is contained in .rspec by default when running `rspec --init` on RSpec 3. ```sh % rspec --version 3.5.4 % rspec --init create .rspec create spec/spec_helper.rb % cat .rspec --color --require spec_helper ``` It seems that the code of template premise the RSpec 3, so I think that it was reasonable to adjust to it. Related PR #5634
| * | | Tweak a newgem template for RSpecKoichi ITO2017-05-032-2/+1
| | | |
* | | | Auto merge of #5634 - koic:specify_require_spec_helper_in_dot_rspec, r=indirectThe Bundler Bot2017-05-30147-146/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify `--require spec_helper` in .rspec Specifying `--require spec_helper` in .rspec will automatically require spec_helper in *_spec.rb. It isn't necessary to specify `require "spec_helper"` in individual *_spec.rb. I think that it's a [DRY](https://en.wikipedia.org/wiki/Don't_repeat_yourself) way. Refer: https://github.com/rspec/rspec/wiki#rspec
| * | | | Specify `--require spec_helper` in .rspecKoichi ITO2017-05-03147-146/+1
| |/ / /
* | | | Auto merge of #5679 - bundler:seg-env-no-settings, r=indirectThe Bundler Bot2017-05-291-6/+8
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | [Env] Print well-formed markdown when there are no settings Closes #5677
| * | | [Env] Print well-formed markdown when there are no settingsseg-env-no-settingsSamuel Giddins2017-05-251-6/+8
| | | |
View Lorry Controller Status