summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [CompactIndexClient::Updater] Use filesystem_access when copying filessegiddins/updater-use-more-filesystem-accessSamuel Giddins2018-03-101-1/+3
|
* Auto merge of #6333 - hmistry:fix/contrib-link, r=colby-swandaleThe Bundler Bot2018-03-101-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link to contributing doc ### What was the end-user problem that led to this PR? Broken link to contributing doc in bot response ### What is your fix for the problem, implemented in this PR? Corrected the link Fixes #6332
| * Fix link to contributing dochmistry2018-03-081-1/+1
| |
* | Auto merge of #6282 - bundler:indirect/policies-doc, r=colby-swandaleThe Bundler Bot2018-03-092-1/+78
|\ \ | |/ |/| | | | | | | Add a POLICIES document This isn't intended to be authoritative, but it's a start!
| * Address additional feedback.indirect/policies-docAndre Arko2018-03-042-10/+16
| |
| * Fix unclear bits h/t @deivid-rodriguezAndre Arko2018-02-021-3/+3
| |
| * Add a POLICIES documentAndre Arko2018-01-312-1/+72
| |
* | Wrote out full Bundler.io URLStephanie Morillo2018-03-081-3/+3
| | | | | | The links to bundler.io were leading to a 404 error in GitHub because the full URL hadn't been written out.
* | Auto merge of #6326 - bundler:seg-disable-expectations-on-nil, r=colby-swandaleThe Bundler Bot2018-03-071-0/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raise an error when attempting to set an expectation on nil Thanks so much for the contribution! To make reviewing this PR a bit easier, please fill out answers to the following questions. ### What was the end-user problem that led to this PR? The problem was we could accidentally set an expectation on `nil`, leading to an RSpec warning ### What was your diagnosis of the problem? My diagnosis was we should just error when we do so
| * | Raise an error when attempting to set an expectation on nilseg-disable-expectations-on-nilSamuel Giddins2018-03-051-0/+4
| | |
* | | Auto merge of #6328 - bundler:seg-spec-lock-no-download, r=colby-swandaleThe Bundler Bot2018-03-071-0/+13
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a spec for bundle lock not downloading gems ### What was the end-user problem that led to this PR? The problem was we were unsure (in https://github.com/bundler/bundler/issues/6312) whether lock had this behavior. ### What was your diagnosis of the problem? My diagnosis was it did, and I came to that conclusion via this test!
| * | Add a spec for bundle lock not downloading gemsseg-spec-lock-no-downloadSamuel Giddins2018-03-061-0/+13
|/ /
* | Auto merge of #6323 - MSP-Greg:fix_fbb1ff7_pr6237, r=hsbtThe Bundler Bot2018-03-051-1/+1
|\ \ | | | | | | | | | | | | | | | Fix source_location call in PR 6237 and commit fbb1ff7 Thanks to @nobu for pointing out the error (which was mine). `source_location` returns an array, not a string.
| * | Fix error in PR 6237 and commit fbb1ff7MSP-Greg2018-03-041-1/+1
| | | | | | | | | | | | Thanks to @nobu for pointing out the error.
* | | Auto merge of #6320 - koic:deprecate_safe_level_of_erb_new_in_ruby_2_6, ↵The Bundler Bot2018-03-051-2/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r=indirect Deprecate safe_level of `ERB.new` in Ruby 2.6 ### What was the end-user problem that led to this PR? The interface of `ERB.new` will change from Ruby 2.6. > 2nd, 3rd and 4th arguments of ERB.new are deprecated. 2nd > argument (safe_level) will be dropped in the future and > some of those arguments (trim_mode, eoutvar) are changed to > keyword arguments. [Feature #14256] https://github.com/ruby/ruby/blob/v2_6_0_preview1/NEWS#stdlib-updates-outstanding-ones-only The following addresses are related commits. - ruby/ruby@cc777d0 - ruby/ruby@8b9a3ea This change will cause the users to see a warning as described below. ### What was your diagnosis of the problem? In Ruby 2.6, a warning is displayed when using the interface of Ruby 2.5 or lower. This warning can also be confirmed in Travis CI. ```console /home/travis/.rvm/gems/ruby-head/gems/rspec-core-3.7.1/lib/rspec/core/configuration_options.rb:171: warning: Passing safe_level with the 2nd argument of ERB.new is deprecated. Do not use it, and specify other arguments as keyword arguments. /home/travis/.rvm/gems/ruby-head/gems/rspec-core-3.7.1/lib/rspec/core/configuration_options.rb:171: warning: Passing trim_mode with the 3rd argument of ERB.new is deprecated. Use keyword argument like ERB.new(str, trim_mode: ...) instead. ``` https://travis-ci.org/bundler/bundler/jobs/348560176#L1137-L1138 ### What is your fix for the problem, implemented in this PR? This PR suppresses the above deprecation warnings of ruby-head (Ruby 2.6) . ### Why did you choose this fix out of the possible options? Switch `ERB.new` interface using `RUBY_VERSION`. Because Bundler supports multiple Ruby versions, it need to use the appropriate interface.
| * | | Deprecate safe_level of `ERB.new` in Ruby 2.6Koichi ITO2018-03-031-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ### What was the end-user problem that led to this PR? The interface of `ERB.new` will change from Ruby 2.6. > 2nd, 3rd and 4th arguments of ERB.new are deprecated. 2nd > argument (safe_level) will be dropped in the future and > some of those arguments (trim_mode, eoutvar) are changed to > keyword arguments. [Feature #14256] https://github.com/ruby/ruby/blob/v2_6_0_preview1/NEWS#stdlib-updates-outstanding-ones-only The following addresses are related commits. - ruby/ruby@cc777d0 - ruby/ruby@8b9a3ea This change will cause the users to see a warning as described below. ### What was your diagnosis of the problem? In Ruby 2.6, a warning is displayed when using the interface of Ruby 2.5 or lower. This warning can also be confirmed in Travis CI. ```console /home/travis/.rvm/gems/ruby-head/gems/rspec-core-3.7.1/lib/rspec/core/configuration_options.rb:171: warning: Passing safe_level with the 2nd argument of ERB.new is deprecated. Do not use it, and specify other arguments as keyword arguments. /home/travis/.rvm/gems/ruby-head/gems/rspec-core-3.7.1/lib/rspec/core/configuration_options.rb:171: warning: Passing trim_mode with the 3rd argument of ERB.new is deprecated. Use keyword argument like ERB.new(str, trim_mode: ...) instead. ``` https://travis-ci.org/bundler/bundler/jobs/348560176#L1137-L1138 ### What is your fix for the problem, implemented in this PR? This PR suppresses the above deprecation warnings of ruby-head (Ruby 2.6) . ### Why did you choose this fix out of the possible options? Switch `ERB.new` interface using `RUBY_VERSION`. Because Bundler supports multiple Ruby versions, it need to use the appropriate interface.
* | | | Auto merge of #6307 - alyssais:yanked_message, r=indirectThe Bundler Bot2018-03-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve yanked gem error message The problem was that the error message for a yanked Gem told the user to: > update your bundle to a different version of foo (1.0) This is slightly misleading because in this example, foo 1.0 is the version that has been yanked. They should use any verion of foo **other** than 1.0. My diagnosis was that the error message interpolated the gem specification (which converts to a string as "NAME (VERSION)") rather than just the name of the gem in this instance. My fix was to change that occurrence of the gem specification to just the gem name. I chose this fix because it was the only way that occurred to me to do it.
| * | | | Further tweak yanked gem error messageAlyssa Ross2018-03-021-1/+1
| | | | |
| * | | | Improve yanked gem error messageAlyssa Ross2018-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It makes more sense to say > update your bundle to a different version of foo than > update your bundle to a different version of foo (1.0)
* | | | | Auto merge of #6302 - 315tky:master, r=indirectThe Bundler Bot2018-03-041-0/+11
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document `# frozen_string_literal` in `bundle init` Gemfile Thanks so much for the contribution! To make reviewing this PR a bit easier, please fill out answers to the following questions. ### What was the end-user problem that led to this PR? An enhancement request to bundle-init docu as per - issue 6140 ### What was your diagnosis of the problem? n/a ### What is your fix for the problem, implemented in this PR? Updated the man/bundle-init.ronn file to include brief description of frozen string literal, and added a SEE ALSO section with link to Gemfile(5) webpage ### Why did you choose this fix out of the possible options? File edited to try and reflect the previous discussion regarding what was required.
| * | | | removed reference to ruby 3saigo2018-03-041-1/+0
| | | | |
| * | | | minor change to literal string related text and moved under FILES sectionsaigo2018-03-041-6/+8
| | | | |
| * | | | corrected for 80 character width limitsaigo2018-02-221-1/+5
| | | | |
| * | | | issue 6140 updated bundle init docusaigo2018-02-211-0/+6
| | | | |
* | | | | Auto merge of #6319 - bundler:rubymorillo-patch-2, r=colby-swandaleThe Bundler Bot2018-03-031-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link out directly to contributor guidelines Hey team, The "Contributing" section confusingly sends contributors over to the "Documentation" README, and from there, contributors have to click on "Overview" to actually get to the guidelines. Since it's easier to cut out those two steps, I've rephrased a sentence and provide the direct link to the contributor guidelines here. Thanks so much for the contribution! To make reviewing this PR a bit easier, please fill out answers to the following questions. ### What was the end-user problem that led to this PR? The problem was... ...that it wasn't clear why contributors had to complete two steps to get to the contributor guidelines. And because it isn't clear once they get to "Documentation" which link is the actual guideline, it's much simpler to link out to it directly from the Bundler README. ### What was your diagnosis of the problem? My diagnosis was... ....to cut out the middle man, so to speak. ### What is your fix for the problem, implemented in this PR? My fix... 1. rephrase a sentence 2. link out directly to the contributor guidelines README ### Why did you choose this fix out of the possible options? I chose this fix because... ...it's easy to implement and makes the most sense from the user's POV.
| * | | | | Link out directly to contributor guidelinesStephanie Morillo2018-03-021-1/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | Hey team, The "Contributing" section confusingly sends contributors over to the "Documentation" README, and from there, contributors have to click on "Overview" to actually get to the guidelines. Since it's easier to cut out those two steps, I've rephrased a sentence and provide the direct link to the contributor guidelines here.
* | | | | Auto merge of #6313 - bundler:rubymorillo-patch-2, r=colby-swandaleThe Bundler Bot2018-03-021-27/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Bundler Contributor Guidelines README Thanks so much for the contribution! To make reviewing this PR a bit easier, please fill out answers to the following questions. ### What was the end-user problem that led to this PR? The problem was... ...the contributor guide was is too long and too confusing. It was difficult to determine what information needed to be reviewed in what sequence. We wanted to make the guidelines easy to read and easy to follow. ### What was your diagnosis of the problem? My diagnosis was... ...to condense the information ### What is your fix for the problem, implemented in this PR? My fix... to condense the information presented and truncate the number of sections. See changes: ![Before](https://user-images.githubusercontent.com/3386562/36821134-7c261d02-1cbf-11e8-9114-ea301da9d91f.png) ![After](https://user-images.githubusercontent.com/3386562/36821143-87472528-1cbf-11e8-884b-5c1334322d56.png) ### Why did you choose this fix out of the possible options? I chose this fix because... ...it's a quick win!
| * | | | | Updated a bullet and a sentenceStephanie Morillo2018-03-011-4/+5
| | | | | | | | | | | | | | | | | | Per @hmistry's suggestions, I've moved the development instructions outside of the bulleted list and made it its own sentence. And I've shortened the copy under the "Contributing to Bundler" header.
| * | | | | Update Bundler Contributor Guidelines READMEStephanie Morillo2018-02-281-27/+16
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Hey team, As part of an ongoing effort to revamp the docs, I've been working with @indirect to rewrite the contributor guidelines README. We wanted to streamline the way the information was laid out, and make it more explicit to potential contributors how they can contribute and what next steps they needed to take. We condensed everything down to three sections (a general guidelines section, contributor section, and a new, supporting Bundler section). Everything links out to existing documentation.
* | | | | Auto merge of #6309 - agrim123:disable_platform_warnings, r=colby-swandaleThe Bundler Bot2018-03-014-1/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add config variable and check for platform warnings Thanks so much for the contribution! To make reviewing this PR a bit easier, please fill out answers to the following questions. ### What was the end-user problem that led to this PR? The user needed a way to turn off platform warnings. ### What was your diagnosis of the problem? Creating a config variable to solve the above problem. ### What is your fix for the problem, implemented in this PR? Added a key `disable_platform_warnings` in settings and placed check at the relevant place to disable warnings. ### Why did you choose this fix out of the possible options? We will by default show warnings but the user might want to disable them, so using a config variable looked a good option. Fixes #6124
| * | | | | Update documentation for disable_platform_warningsAgrim Mittal2018-03-011-1/+1
| | | | | |
| * | | | | Fixed test when disable_platform_warnings is trueAgrim Mittal2018-03-011-19/+13
| | | | | |
| * | | | | Add documentation and tests for disable_platform_warningsAgrim Mittal2018-02-262-11/+38
| | | | | |
| * | | | | Add config variable and check for platform warningsAgrim Mittal2018-02-262-1/+2
| | | | | |
* | | | | | Auto merge of #6314 - bundler:update-deprecated-methods, r=hsbtThe Bundler Bot2018-03-016-8/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Gem::Util.inflate instead of Gem.inflate ### What was the end-user problem that led to this PR? When I released RubyGems 3.0, users can not use bundler with it. ### What was your diagnosis of the problem? bundler still uses deprecated methods with https://github.com/rubygems/rubygems/pull/2214 ### What is your fix for the problem, implemented in this PR? Replace `Gem.inflate` to `Gem::Util.inflate`
| * | | | | Use Gem::Util.inflate instead of Gem.inflateupdate-deprecated-methodsSHIBATA Hiroshi2018-03-016-8/+8
|/ / / / /
* | | | | Auto merge of #6306 - alyssais:gpg_test, r=colby-swandaleThe Bundler Bot2018-02-232-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't GPG-sign test setup commits Running `bin/rake spec` in the Bundler repository causes a bunch of failures if `commit.gpgsign` is set in the global Git configuration. Bundler's tests were making Git commits and trying to GPG sign them. Set `commit.gpgsign` to `false` when initializing a Git repository in the tests. I chose this fix because the alternative would be to pass `--no-gpg-sign` every time a commit is made in the tests, which would have a bigger maintenance impact.
| * | | | Don't GPG-sign test setup commitsAlyssa Ross2018-02-232-0/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | This is extremely inconvenient (or sometimes plain broken) when the person running the tests has `commit.gpgsign` enabled in their global Git configuration.
* | | | Auto merge of #6304 - deivid-rodriguez:fix/new_gem_generation_crash, ↵The Bundler Bot2018-02-222-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r=colby-swandale Fix `bundle gem` generating unparsable ruby ### What was the end-user problem that led to this PR? The problem was that the main file in a gem generated by `bundle gem` can't be inspected via `rubocop`. ### What was your diagnosis of the problem? My diagnosis was `bundler` was generating unparsable ruby in the generated gem. ### What is your fix for the problem, implemented in this PR? My fix was to change the offending template to generate valid ruby code. ### Why did you choose this fix out of the possible options? I chose this fix because it's the only one, really.
| * | | Fix unparsable ruby generated by `bundle gem`David Rodríguez2018-02-222-2/+2
|/ / / | | | | | | | | | Introduced in https://github.com/bundler/bundler/pull/6267.
* | | Auto merge of #6300 - cpgo:remove-add-timestamp-comment, r=colby-swandaleThe Bundler Bot2018-02-201-3/+0
|\ \ \ | |/ / |/| | | | | | | | | | | Remove comment with timestamp on `bundle add` As discussed on #6193 this PR simply removes the comment timestamp when adding a gem via command line.
| * | remove timestamp commentCassio Godinho2018-02-191-3/+0
| | |
* | | Auto merge of #6184 - arbonap:pa-check-in-gemfile-docs, r=indirectThe Bundler Bot2018-02-131-2/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs to reflect revised guidance to check in locks for gems Thanks so much for the contribution! To make reviewing this PR a bit easier, please fill out answers to the following questions. ### What was the end-user problem that led to this PR? The problem was... - Bundler stopped gitignoring gem locks. The change was merged in but we need to reflect that change in documentation. ### What was your diagnosis of the problem? My diagnosis was... - To add in documentation explaining why Bunder now does _not_ gitignore gem locks. ### What is your fix for the problem, implemented in this PR? My fix... - Update the `gemfile.lock` section of `bundle install` man pages as well as the `gemfile` man page. ### Why did you choose this fix out of the possible options? I chose this fix because... - This addresses open issue https://github.com/bundler/bundler/issues/5879
| * | | Tweak language, remove lock info from Gemfile doc.Andre Arko2018-02-122-17/+8
| | | | | | | | | | | | | | | | | | | | | | | | After reviewing, I think the question and answer is a bad fit for the `gemfile` man page. It does seem like a good fit for the FAQ page on the Bundler documentation site, though, and I'll add it over there.
| * | | Update docs to reflect revised guidance to check in locks for gemsPatricia Arbona2017-11-222-2/+20
| | | |
* | | | Auto merge of #6283 - bundler:indirect/add-coc-enforcement, r=indirectThe Bundler Bot2018-02-081-23/+117
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add enforcement steps and examples to the CoC. package.community has done a terrific job with their clear explanation of what enforcing a CoC looks like. Bundler is a better place when everyone knows what kind of behavior is expected, and what will happen if those expectations are not met, for whatever reason.
| * | | | Provide the team-wide email address for contact.indirect/add-coc-enforcementAndre Arko2018-02-081-1/+1
| | | | |
| * | | | Replace trailing instances of package.communityAndre Arko2018-02-081-2/+2
| | | | |
| * | | | Add enforcement steps and examples to the CoC.Andre Arko2018-01-311-23/+117
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | package.community has done a terrific job with their clear explanation of what enforcing a CoC looks like. Bundler is a better place when everyone knows what kind of behavior is expected, and what will happen if those expectations are not met, for whatever reason.
* | | | Auto merge of #6288 - bundler:seg-lockfile-missing-platform-specific-specs, ↵The Bundler Bot2018-02-035-5/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r=indirect Gracefully handle when the lockfile is missing spec entries for the current platform ### What was the end-user problem that led to this PR? The problem was users could get `Unable to find a spec satisfying ... perhaps the lockfile is corrupted?` error messages, particularly when they use multiple platforms. Fixes #6079. ### What was your diagnosis of the problem? My diagnosis was the lockfile _was_ indeed corrupted, because it was missing `spec_name (version)` entries, but resolution could still be skipped (preventing those gems from being added back in). ### What is your fix for the problem, implemented in this PR? My fix checks whether all specs are present _in the lockfile_ (e.g. not locally) for the current platform, and considers that a "change" that forces the resolver to run, allowing those missing specs to be added back to the bundle. ### Why did you choose this fix out of the possible options? I chose this fix because it was a way to force re-resolution in a way that ties into our existing `#change_reason` infrastructure. Additionally, it shouldn't have much of a performance overhead, since the calculation is only made when we're converging locked specs anyways.