summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* add feature flag to use https for :git in the dslcolby/git-https-defaultColby Swandale2018-11-253-1/+19
|
* Merge #6790Bundlerbot2018-11-172-9/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6790: Fix multiple source warning messages from `error` to `warn` r=greysteil a=jlw ### What was the end-user problem that led to this PR? I've been working on a few repos for most of this year that use a privately-hosted gem with the same name (but completely different purpose) as a gem hosted at rubygems.org - whenever I start with a clean copy and `bundle install` for the first time, I am presented with a warning in red that the gem was found in multiple sources. The red text makes me think that something went wrong, even though bundler did exactly what I wanted it to do. The user experience is wrong - a warning should not be red. ### What was your diagnosis of the problem? When I looked at the source, I saw immediately that the warning was using `Bundler.ui.error` instead of `Bundler.ui.warn`. This is a bug fix with a limited lifespan - after setting up a local copy of bundler I see that 2.0's handling of multiple sources A) is smarter and bypasses the error in most of the repos where I saw it with bundler 1.x; and B) fails early with a different error message in the remaining repos. ### What is your fix for the problem, implemented in this PR? The fix is simply switching to `Bundler.ui.warn` in this case. ### Why did you choose this fix out of the possible options? _I didn't see any other possible options._ Co-authored-by: Jeremy Weathers <jeremy@codekindly.com>
| * Fix multiple source warning messages from `error` to `warn`Jeremy Weathers2018-11-162-9/+10
| |
* | Merge #6786Bundlerbot2018-11-162-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6786: Followed up #6743 r=hsbt a=hsbt ### What was the end-user problem that led to this PR? #6743 was failed with ruby core repository and ignored working example. I fixed them. Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
| * | Followed up https://github.com/bundler/bundler/pull/6743SHIBATA Hiroshi2018-11-162-5/+5
|/ / | | | | | | | | #6743 was failed with ruby core repository and ignored working example. Fixed them.
* | Merge #6775Bundlerbot2018-11-162-1/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6775: [Plugin::Index] Only register each plugin once for a given hook r=colby-swandale a=segiddins ### What was the end-user problem that led to this PR? The problem was running `plugin install` twice for a plugin withs hooks would cause that hook to be registered twice. Closes #6771. ### What was your diagnosis of the problem? My diagnosis was a plugin's hooks should only be run once per event. ### What is your fix for the problem, implemented in this PR? My fix is to `uniq` the list of plugins registered for each event. Co-authored-by: Samuel Giddins <segiddins@segiddins.me> Co-authored-by: Olle Jonsson <olle.jonsson@gmail.com> Co-authored-by: Colby Swandale <me@colby.fyi>
| * | fix rubocopColby Swandale2018-11-161-5/+5
| | |
| * | Double-register hook in spec segiddins/6771-uniq-hook-registrationOlle Jonsson2018-11-101-1/+6
| | | | | | | | | | | | | | | To make it clear the list is uniq’d Co-Authored-By: segiddins <segiddins@segiddins.me>
| * | [Plugin::Index] Only register each plugin once for a given hookSamuel Giddins2018-11-052-1/+10
| | |
* | | Merge #6743Bundlerbot2018-11-1630-65/+131
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6743: Support file structure of ruby core repository. r=hsbt a=hsbt ### What was the end-user problem that led to this PR? In the ruby core repository, I put bundler executable and bundler libraries under the `bin` and `lib` directories. It breaks the current behavior. ### What is your fix for the problem, implemented in this PR? Support the structure of ruby core repository. Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
| * | Revert File.file? conditioon on gemspec, Because it break ↵support-structure-of-ruby-coreSHIBATA Hiroshi2018-11-071-4/+4
| | | | | | | | | | | | spec/runtime/setup_spec.rb:896
| * | rubocop -aSHIBATA Hiroshi2018-11-071-1/+0
| | |
| * | expand version path for rspec examples.SHIBATA Hiroshi2018-11-071-3/+2
| | |
| * | Added extnameSHIBATA Hiroshi2018-11-071-2/+2
| | |
| * | To use around hook instead of before suite.SHIBATA Hiroshi2018-11-061-4/+3
| | |
| * | To use helper method instead of env variables.SHIBATA Hiroshi2018-11-061-2/+2
| | |
| * | To use File.file? instead of handling LoadError.SHIBATA Hiroshi2018-11-061-3/+4
| | |
| * | Support old versions of Ruby on platform_spec.rbSHIBATA Hiroshi2018-11-021-7/+7
| | |
| * | Partly reverted 09bfdfa31ad5ae34d29745344493f6a63d355804.SHIBATA Hiroshi2018-11-021-4/+4
| | |
| * | To use helper method instead of env variables.SHIBATA Hiroshi2018-11-011-1/+1
| | |
| * | rubocop -aSHIBATA Hiroshi2018-11-011-1/+1
| | |
| * | Fixed typoSHIBATA Hiroshi2018-11-011-1/+1
| | |
| * | Backport from ruby coreSHIBATA Hiroshi2018-11-0120-72/+83
| | |
| * | rubocop -aSHIBATA Hiroshi2018-10-206-16/+14
| | |
| * | Restore rubygems certificates. Current bundler examples will removeSHIBATA Hiroshi2018-10-201-1/+7
| | | | | | | | | | | | them after finished bundler rspec.
| * | Added ruby_core filtering condition with some examples.SHIBATA Hiroshi2018-10-2021-57/+58
| | | | | | | | | | | | The ruby core repository couldn't invoke its examples.
| * | Added to support BUNDLE_RUBY and BUNDLE_GEM environmental variables.SHIBATA Hiroshi2018-10-206-10/+50
| | | | | | | | | | | | They are replaced build binary on ruby core repository.
| * | Fixed existence example.SHIBATA Hiroshi2018-10-201-1/+1
| | |
| * | rubocop -aSHIBATA Hiroshi2018-10-201-6/+4
| | |
| * | Support file structure of ruby core repository.SHIBATA Hiroshi2018-10-202-5/+19
| | |
* | | Merge #6714Bundlerbot2018-11-067-46/+78
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6714: Spec reset state and refactorings r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that while working on #6713, I noticed several issues like order dependent failures, situations hard to debug, or specs doing too much and taking longer than they should. ### What was your diagnosis of the problem? My diagnosis was that: * Sometimes specs leak settings and env variable modifications. * When a hang happens inside a subprocess, it's hard to debug because logging is not printed out anywhere. * Some specs create unnecessary gemfiles and run `bundle install` multiple times unnecessarily. ### What is your fix for the problem, implemented in this PR? My fix for state leaks is to reset state after each spec, for the hangs is to reorder some lines in the `sys_exec` helper (https://github.com/bundler/bundler/commit/b305a5b2524a6457b05a9d39e9526f75c98a0752), and for the unnecessary operations, to refactor the specs to avoid them. ### Why did you choose this fix out of the possible options? I chose this fix because it seems like the best way to alleviate the issues found. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | | Remove unnecessary installs from git specsspec_reset_state_and_refactoringsDavid Rodríguez2018-10-031-4/+0
| | | |
| * | | Remove commented out codeDavid Rodríguez2018-10-031-4/+0
| | | |
| * | | Hangs in specs improvedDavid Rodríguez2018-10-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When working on a bug, I was getting a hang inside the subprocess of a specs, and it was hard to debug because any logging I added was not visible. This reording makes logging visible and can make it easier to troubleshoot these cases.
| * | | Reuse `install_gemfile` helperDavid Rodríguez2018-10-032-17/+6
| | | |
| * | | Move gemfile write to the specs that need itDavid Rodríguez2018-10-031-12/+47
| | | | | | | | | | | | | | | | | | | | | | | | If a set of specs need the Gemfile, they also need to `bundle install` it, so it's more readable to move those together, and also more efficient since we don't create Gemfiles that are not necessary.
| * | | Cleanup after ourselves when changing settingsDavid Rodríguez2018-10-033-22/+38
| | | | | | | | | | | | | | | | To make sure we don't leak modified global state.
| * | | Reword spec so it reads betterDavid Rodríguez2018-10-031-1/+1
| | | |
* | | | Merge #6773Bundlerbot2018-11-061-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6773: Fix indentation of bundler executable r=segiddins a=meganemura 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? `bundle binstubs bundler` generates the file like followings. ```ruby require "rubygems" m = Module.new do module_function def invoked_as_script? File.expand_path($0) == File.expand_path(__FILE__) end (snip) end ``` ### What was your diagnosis of the problem? My diagnosis was... the template's `module_function` line is not match to other lines. ### What is your fix for the problem, implemented in this PR? I fix the template. ### Why did you choose this fix out of the possible options? no other options. Co-authored-by: meganemura <meganemura@users.noreply.github.com>
| * | | Fix indentation of bundler executablemeganemura2018-11-061-1/+1
|/ / /
* | | Merge #6770Bundlerbot2018-11-011-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6770: delete merged branches automatically r=hsbt a=indirect Use a fancy new Bors feature to delete merged branches automatically, hooray. Co-authored-by: Andre Arko <andre@arko.net>
| * | | delete merged branches automaticallyindirect/delete-merged-branchesAndre Arko2018-10-311-1/+2
|/ / /
* | | Merge #6769Bundlerbot2018-10-302-7/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6769: Fix `remove` when block method appears in gem name r=segiddins a=dduugg 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? https://github.com/bundler/bundler/issues/6768 ### What was your diagnosis of the problem? `remove_nested_blocks` considers any appearance of text matching a block method (`group source env install_if`) to be an occurrence of a nested block. ### What is your fix for the problem, implemented in this PR? `remove_nested_blocks` should only reduce the scope of where a nested block method can occur. ### Why did you choose this fix out of the possible options? Another approach would use word delimiters rather than `starts_with?` to find nested block methods, but this is probably fine. Co-authored-by: Douglas Eichelberger <dduugg@gmail.com>
| * | | Add testDouglas Eichelberger2018-10-291-0/+24
| | | |
| * | | Fix error when gem name includes block method nameDouglas Eichelberger2018-10-291-7/+7
| | | |
* | | | Merge remote-tracking branch 'origin/1-17-stable'Colby Swandale2018-10-301-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * origin/1-17-stable: Version 1.17.1 with changelog Merge #6761
| * | | | Version 1.17.1 with changelogv1.17.1Andre Arko2018-10-252-1/+5
| | | | |
| * | | | Merge #6761Bundlerbot2018-10-252-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6761: fix error with path objects in array r=greysteil a=alexggordon Thanks so much for the contribution! To make reviewing this PR a bit easier, please fill out answers to the following questions. The problem was that `Pathname` instances in an array can not be sorted when there are string instances in the array also. Because of this, calling `.sort` before `.to_s` resulted in the error ``` [!] There was an error parsing `Gemfile`: comparison of Pathname with String failed. Bundler cannot continue. ``` you can easily see this issue doing ``` > require 'rails' => true > [Pathname.new("/tmp/bundle")] => [#<Pathname:/tmp/bundle>] > [Pathname.new("/tmp/bundle"), "test"] => [#<Pathname:/tmp/bundle>, "test"] > [Pathname.new("/tmp/bundle"), "test"].sort ArgumentError: comparison of Pathname with String failed ``` `sort` was called before `map` in the warn message. We should call `map(&:to_s)` before calling sort, and add a test case for this scenario. Because it broke our production deploys. Co-authored-by: Alex Gordon <agordon@sessionm.com>
* | | | | Merge #6764Bundlerbot2018-10-298-80/+17
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6764: Remove unnecessary stuff from specs r=colby-swandale a=deivid-rodriguez I wrote this patch a while ago but I didn't propose it because I didn't think it would be accepted. Now I think we're ready. ### What was the end-user problem that led to this PR? The problem was that the specs have a lot of conditional behavior on `Gem::VERSION`. ### What was your diagnosis of the problem? My diagnosis was that this was necessary because of testing against a big range of rubygems versions on the latest stable branch. ### What is your fix for the problem, implemented in this PR? My fix is to remove all the conditionals since we'll no longer test against rubygems versions that old on the latest stable, once #6763 lands. ### Why did you choose this fix out of the possible options? I chose this fix because it makes test code simpler. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | | | Remove more unnecessary stuffremove_old_rubygems_stuff_from_specsDavid Rodríguez2018-10-262-13/+4
| | | | |