summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | [Rakefile] Allow making a patch release with no changesseg-release-no-changesSamuel Giddins2017-05-191-1/+2
| | |/ / | |/| | | | | | | | | | i.e. going from a pre to a .0
* | | | Merge tag 'v1.15.0'Samuel Giddins2017-05-192-1/+5
|\ \ \ \ | |/ / / |/| | | | | | | Version 1.15.0
| * | | Version 1.15.0 with changelogv1.15.0Samuel Giddins2017-05-192-1/+5
| | | |
* | | | Auto merge of #5667 - bundler:seg-spec-rack-avoid-1.6.7, r=colby-swandaleThe Bundler Bot2017-05-161-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid Rack 1.6.7 in specs for now See https://github.com/rack/rack/issues/1168 The above issue broke rack on 1.9.3 \c @colby-swandale
| * | | | Avoid Rack 1.6.7 in specs for nowseg-spec-rack-avoid-1.6.7Samuel Giddins2017-05-161-1/+3
|/ / / / | | | | | | | | | | | | | | | | See https://github.com/rack/rack/issues/1168 The above issue broke rack on 1.9.3
* | | | Auto merge of #5660 - bundler:seg-ensure-man, r=colby-swandaleThe Bundler Bot2017-05-144-18/+34
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Ensure that manpages are always built when running specs Fixes #5657 by ensuring manpages are always built, much like how `Spec::Rubygems.setup` ensures gem dependencies are always installed \c @colby-swandale
| * | | Avoid re-building manpages each spec runseg-ensure-manSamuel Giddins2017-05-131-1/+1
| | | |
| * | | [Travis] Use RubyGems 2.6.12Samuel Giddins2017-05-131-1/+1
| | | |
| * | | Ensure that manpages are always built when running specsSamuel Giddins2017-05-122-0/+14
| | | |
| * | | [Rakefile] Generate man/index in man:buildSamuel Giddins2017-05-122-17/+19
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Results in the following: ``` Gemfile(5) gemfile.5 bundle(1) bundle.1 bundle-add(1) bundle-add.1 bundle-binstubs(1) bundle-binstubs.1 bundle-check(1) bundle-check.1 bundle-clean(1) bundle-clean.1 bundle-config(1) bundle-config.1 bundle-exec(1) bundle-exec.1 bundle-gem(1) bundle-gem.1 bundle-info(1) bundle-info.1 bundle-init(1) bundle-init.1 bundle-inject(1) bundle-inject.1 bundle-install(1) bundle-install.1 bundle-lock(1) bundle-lock.1 bundle-open(1) bundle-open.1 bundle-outdated(1) bundle-outdated.1 bundle-package(1) bundle-package.1 bundle-platform(1) bundle-platform.1 bundle-pristine(1) bundle-pristine.1 bundle-show(1) bundle-show.1 bundle-update(1) bundle-update.1 bundle-viz(1) bundle-viz.1 ```
* | | Merge tag 'v1.15.0.pre.4'Samuel Giddins2017-05-102-1/+8
|\ \ \ | |/ / | | | | | | Version 1.15.0.pre.4
| * | Version 1.15.0.pre.4 with changelogv1.15.0.pre.4Samuel Giddins2017-05-102-1/+8
| | |
| * | Auto merge of #5637 - bundler:seg-gem-finish-resolve, r=indirectThe Bundler Bot2017-05-102-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [RubygemsIntegration] Stub out Gem.finish_resolve Fixes https://github.com/rubygems/rubygems/issues/1911 Small novel: In RubyGems 2.6.11, I changed `Gem.finish_resolve` to respect all of the currently resolved (i.e. `Gem.loaded_specs`) gems. This fixed some bugs that would lead `Gem.finish_resolve` to incorrectly raise gem incompatibility exceptions. That's great, except Bundler's resolver doesn't always resolve the same thing as RG's. In particular, `Source::Gemspec` gems that come from the `gemspec` DSL method are allowed to have conflicts. It appears projects, such as rails, were taking advantage of that fact. Since `stub_entrypoints` is called whenever `Bundler.setup` is run, this is essentially us 'activating' all of the gems in the bundle. Since everything is eagerly activated, it should be impossible for there to ever be any unresolved dependencies, and thus `Gem.finish_resolve` should always be a no-op anyways. We can save CPU cycles and keep our special resolution behavior for `Source::Gemspec` by just acknowledging that `Gem.finish_resolve` should always be a no-op once the bundle has been setup. (cherry picked from commit a1925cb18c58232ba009df01478b65dfe43d51ba)
View Lorry Controller Status