summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| | |
* | | Auto merge of #5684 - bundler:colby/setup-doc-formatting, r=segiddinsThe Bundler Bot2017-05-291-5/+5
|\ \ \ | | | | | | | | | | | | SETUP.md: add markdown code blocks to shell commands
| * | | SETUP.md: add markdown code blocks to shell commandscolby/setup-doc-formattingColby Swandale2017-05-291-5/+5
| | | |
* | | | Auto merge of #5675 - bundler:seg-specs-resilient-against-rubylib-shims, ↵The Bundler Bot2017-05-291-2/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | r=segiddins Make the setup specs resilient agains ruby shims setting RUBYLIB Rbenv in particular does this
| * | | Make the setup specs resilient agains ruby shims setting RUBYLIBseg-specs-resilient-against-rubylib-shimsSamuel Giddins2017-05-231-2/+4
| | | | | | | | | | | | | | | | Rbenv in particular does this
* | | | Auto merge of #5645 - koic:update_rubocop_0_48_1, r=indirectThe Bundler Bot2017-05-2856-219/+215
|\ \ \ \ | | | | | | | | | | | | | | | [RuboCop] Update to 0.48.1
| * | | | [RuboCop] Enable Style/PercentLiteralDelimitersKoichi ITO2017-05-2855-210/+204
| | | | | | | | | | | | | | | | | | | | Run `rubocop -a --only Style/PercentLiteralDelimiters` and `rubocop --auto-gen-config`.
| * | | | [RuboCop] Update to 0.48.1Koichi ITO2017-05-283-16/+18
|/ / / /
* | | | Auto merge of #5665 - bundler:colby/stderr-feature, r=indirectThe Bundler Bot2017-05-275-2/+62
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print errors to stderr As we discussed, i'm going to start porting over features from the 2-0-dev branch into feature flags. This PR adds the feature to print bundler errors to `stderr` instead of `stdout`. I had a look to see how feature flags worked and i think i have the idea down but let me know if i missed something. Thanks! \cc @segiddins @indirect
| * | | use Settings.temporary to set error_on_stderr feature flag in rspeccolby/stderr-featureColby Swandale2017-05-231-1/+1
| | | |
| * | | remove colors if printing errors to stderr without a tty availableColby Swandale2017-05-232-2/+4
| | | |
| * | | fix newline not being added correctly when printing to stderrColby Swandale2017-05-212-1/+4
| | | |
| * | | Merge remote-tracking branch 'origin/master' into colby/stderr-featureColby Swandale2017-05-175-19/+37
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: Avoid Rack 1.6.7 in specs for now Avoid re-building manpages each spec run [Travis] Use RubyGems 2.6.12 Ensure that manpages are always built when running specs [Rakefile] Generate man/index in man:build
| * | | | stderr feature flag is notw error_on_stderrColby Swandale2017-05-175-5/+5
| | | | |
| * | | | fix not checking error level before printing to stderrColby Swandale2017-05-172-1/+6
| | | | |
| * | | | document stderr configColby Swandale2017-05-161-0/+2
| | | | |
| * | | | add print error to stderr featureColby Swandale2017-05-164-0/+48
| | | | |
* | | | | Auto merge of #5673 - bundler:seg-force-submodule-deinit, r=indirectThe Bundler Bot2017-05-231-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 ```
| * | | | [GitProxy] Force deinitializing submodulesseg-force-submodule-deinitSamuel Giddins2017-05-231-1/+1
|/ / / /
* | | | Auto merge of #5671 - bundler:seg-release-no-changes, r=segiddinsThe Bundler Bot2017-05-191-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [Rakefile] Allow making a patch release with no changes i.e. going from a pre to a .0
View Lorry Controller Status