summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix 1.x specscheck_out_only_in_specsDavid Rodríguez2019-02-1420-72/+72
|
* Remove now unnecessary `lack_errors` matcherDavid Rodríguez2019-02-1412-38/+31
| | | | | Since the errors are checked on their own stream, no filtering is needed.
* Split stderr and stdout in specsDavid Rodríguez2019-02-1455-304/+287
|
* Fix show command output/error streamsDavid Rodríguez2019-02-141-1/+1
| | | | Before it was printing half a sentence to stderr and half to stdout.
* Print git errors to a consistent streamDavid Rodríguez2019-02-141-1/+1
|
* Print to correct stream when setup on a ttyDavid Rodríguez2019-02-142-5/+6
|
* Fix typoDavid Rodríguez2019-02-141-1/+1
|
* Merge #6964Bundlerbot2019-02-131-13/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6964: Dependency review r=segiddins a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that we were using some outdated test dependencies. ### What was your diagnosis of the problem? My diagnosis was that we can upgrade them, since the comments justifying them being pinned are no longer relevant. ### What is your fix for the problem, implemented in this PR? My fix is to unpin the dependencies, and remove the comments no longer applying. ### Why did you choose this fix out of the possible options? I chose this fix because it was the only fix I could think of. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * Remove exception since MRI 1.9.3 is no longer supporteddependency_reviewDavid Rodríguez2019-02-131-4/+3
| |
| * Bump builder gem since we no longer support MRI 1.9.2David Rodríguez2019-02-131-2/+1
| |
| * Bump rack-test since we no longer support MRI 1.8.7David Rodríguez2019-02-131-3/+1
| |
| * Fix TODO note since linked issue seems closedDavid Rodríguez2019-02-131-3/+1
| |
| * Remove no longer relevant commentDavid Rodríguez2019-02-131-1/+0
| | | | | | | | Ruby 2.2.2 is no longer supported.
* | Merge #6962Bundlerbot2019-02-135-29/+22
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6962: Don't leak to system rubygems during specs r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that sometimes one get warnings on the system rubygems files, or maybe when modifying the `tmp` copy of rubygems, the changes seem not applied. ### What was your diagnosis of the problem? My diagnosis was our specs sometimes use the system rubygems version, not the one controlled by the `RVG` environment variable. ### What is your fix for the problem, implemented in this PR? My fix is to remove most occurrences of `:env => { :RUBYOPT => "-r#{spec_dir.join("support/hax")}" }` when spawning subprocesses. The reason is that in order to use the tmp copy of rubygems, our specs need to include `-I tmp/rubygems/lib` in the `RUBYOPT` environment variable. If we overwrite it in subprocesses, it won't use it. We can remove those however, since the "hax file" is already included in the main spec helper, while also keeping the previous value of `RUBYOPT`. https://github.com/bundler/bundler/blob/189d56f2341d64ec5440242f42dbf84002be1238/spec/spec_helper.rb#L47 ### Why did you choose this fix out of the possible options? I chose this fix because it simplifies the spec setup while also making it more correct. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * Remove now unnecessary stuff from helper methodrubygems_leakageDavid Rodríguez2019-02-121-5/+2
| |
| * Spec behaves consistenly across OS's apparentlyDavid Rodríguez2019-02-121-1/+1
| |
| * Stop leaking to system rubygems on subprocessesDavid Rodríguez2019-02-125-24/+20
| | | | | | | | | | | | | | | | | | | | | | In order to be able to test against different versions of rubygems, we prepend our local copy of rubygems to the $LOAD_PATH. This is done as early as possible, inside each binstubs through [this helper file]. However, some subprocesses overwrite the `RUBYOPT` env variable, thus leaking to the system copy of rubygems again. Since we already [prepend the hacks file] to `RUBYOPT` in the main helper, while also preserving the previous value, this "customized environments" are not needed.
* | Merge #6958Bundlerbot2019-02-132-6/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6958: Remove rdiscount indirect development dependency r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that I was confused about the `rdiscount` dependency since I didn't see it used anywhere. ### What was your diagnosis of the problem? My diagnosis was that it's just an indirect dependency (through ronn). ### What is your fix for the problem, implemented in this PR? My fix is to remove the dependency. ### Why did you choose this fix out of the possible options? I chose this fix because it will no longer confuse devs into thinking we're actually using it directly. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * Remove rdiscount indirect dependencyremove_rdiscount_indirect_dependencyDavid Rodríguez2019-02-112-6/+2
| | | | | | | | | | | | We don't use this dependency directly so this is not needed. We put it there at some point because we needed to pin to a specific version, but that's no longer the case.
* | Merge #6959Bundlerbot2019-02-121-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6959: Bump base rubygems version to 3.0.2 r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that we are using old rubygems versions internally. ### What was your diagnosis of the problem? My diagnosis was that we should use the newest version of our own software. ### What is your fix for the problem, implemented in this PR? My fix is to upgrade the rubygems version used in the Rakefile for development tasks. ### Why did you choose this fix out of the possible options? I chose this fix because it's good for us. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * Bump base rubygems version to 3.0.2bump_base_rubygems_versionDavid Rodríguez2019-02-121-1/+1
|/
* Merge #6950Bundlerbot2019-02-111-8/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6950: Clean up first `bin/rake spec:deps` output r=deivid-rodriguez a=deivid-rodriguez 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 on a fresh ruby install (docker, I'm looking at you), running `bin/rake spec:deps` prints the following errors, even if nothing end up going wrong and the dependencies get installed: ``` Could not find 'automatiek' (~> 0.1.0) among 17 total gem(s) Checked in 'GEM_PATH=/usr/local/rvm/gems/ruby-2.3.7:/usr/local/rvm/gems/ruby-2.3.7@global', execute `gem env` for more information (Gem::MissingSpecError) Could not find 'mustache' (= 0.99.6) among 17 total gem(s) Checked in 'GEM_PATH=/usr/local/rvm/gems/ruby-2.3.7:/usr/local/rvm/gems/ruby-2.3.7@global', execute `gem env` for more information (Gem::MissingSpecError) Could not find 'rake' (~> 12.0) - did find: [rake-10.4.2] Checked in 'GEM_PATH=/usr/local/rvm/gems/ruby-2.3.7:/usr/local/rvm/gems/ruby-2.3.7@global', execute `gem env` for more information (Gem::MissingSpecVersionError) Could not find 'rdiscount' (~> 2.2) among 17 total gem(s) Checked in 'GEM_PATH=/usr/local/rvm/gems/ruby-2.3.7:/usr/local/rvm/gems/ruby-2.3.7@global', execute `gem env` for more information (Gem::MissingSpecError) Could not find 'ronn' (~> 0.7.3) among 17 total gem(s) Checked in 'GEM_PATH=/usr/local/rvm/gems/ruby-2.3.7:/usr/local/rvm/gems/ruby-2.3.7@global', execute `gem env` for more information (Gem::MissingSpecError) Could not find 'rspec' (~> 3.6) among 17 total gem(s) Checked in 'GEM_PATH=/usr/local/rvm/gems/ruby-2.3.7:/usr/local/rvm/gems/ruby-2.3.7@global', execute `gem env` for more information (Gem::MissingSpecError) Could not find 'rubocop' (= 0.50.0) among 17 total gem(s) Checked in 'GEM_PATH=/usr/local/rvm/gems/ruby-2.3.7:/usr/local/rvm/gems/ruby-2.3.7@global', execute `gem env` for more information (Gem::MissingSpecError) ``` ### What was your diagnosis of the problem? My diagnosis was that the rake's binstub tries to activate the development depedencies even in the case when we're installing them. In that case, they will most likely not be installed, and give errors. ### What is your fix for the problem, implemented in this PR? My fix is to exclude development dependency activation in this specific case. ### Why did you choose this fix out of the possible options? I chose this fix because it's simple and fixes the problem. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * Clean up first `bin/rake spec:deps` outputclean_rake_spec_depsDavid Rodríguez2019-02-091-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the first time you run `bin/rake spec:deps` on a fresh installation, you get the following output: ``` Could not find 'automatiek' (~> 0.1.0) among 17 total gem(s) Checked in 'GEM_PATH=/usr/local/rvm/gems/ruby-2.3.7:/usr/local/rvm/gems/ruby-2.3.7@global', execute `gem env` for more information (Gem::MissingSpecError) Could not find 'mustache' (= 0.99.6) among 17 total gem(s) Checked in 'GEM_PATH=/usr/local/rvm/gems/ruby-2.3.7:/usr/local/rvm/gems/ruby-2.3.7@global', execute `gem env` for more information (Gem::MissingSpecError) Could not find 'rake' (~> 12.0) - did find: [rake-10.4.2] Checked in 'GEM_PATH=/usr/local/rvm/gems/ruby-2.3.7:/usr/local/rvm/gems/ruby-2.3.7@global', execute `gem env` for more information (Gem::MissingSpecVersionError) Could not find 'rdiscount' (~> 2.2) among 17 total gem(s) Checked in 'GEM_PATH=/usr/local/rvm/gems/ruby-2.3.7:/usr/local/rvm/gems/ruby-2.3.7@global', execute `gem env` for more information (Gem::MissingSpecError) Could not find 'ronn' (~> 0.7.3) among 17 total gem(s) Checked in 'GEM_PATH=/usr/local/rvm/gems/ruby-2.3.7:/usr/local/rvm/gems/ruby-2.3.7@global', execute `gem env` for more information (Gem::MissingSpecError) Could not find 'rspec' (~> 3.6) among 17 total gem(s) Checked in 'GEM_PATH=/usr/local/rvm/gems/ruby-2.3.7:/usr/local/rvm/gems/ruby-2.3.7@global', execute `gem env` for more information (Gem::MissingSpecError) Could not find 'rubocop' (= 0.50.0) among 17 total gem(s) Checked in 'GEM_PATH=/usr/local/rvm/gems/ruby-2.3.7:/usr/local/rvm/gems/ruby-2.3.7@global', execute `gem env` for more information (Gem::MissingSpecError) ``` Nothing has gone wrong but the user might think the opposite. So, avoid printing these errors.
* | Merge #6954Bundlerbot2019-02-104-10/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6954: Bump test MRI 2.3 version in TravisCI r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that we don't know whether bundler works against the latest patch level version of MRI 2.3. ### What was your diagnosis of the problem? My diagnosis was that we should test it. ### What is your fix for the problem, implemented in this PR? My fix is to bump the 2.3 matrix entries in TravisCI config to 2.3.8. This MRI version comes with rubygems 2.7.8, so bump that too. ### Why did you choose this fix out of the possible options? I chose this fix because it's the only one, given the CI setup we currently have. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | Bump Travis entries to use rubygems 2.7.8bump_base_rubygems_and_ruby_2.3_in_travisDavid Rodríguez2019-02-102-5/+5
| | |
| * | Bump Travis entries to use MRI 2.3.8David Rodríguez2019-02-101-3/+3
| | |
| * | Properly restrict rubygems version for failing specsDavid Rodríguez2019-02-102-2/+2
|/ / | | | | | | | | These specs need https://github.com/rubygems/rubygems/pull/1527 to pass, so restrict them to rubygems version containing that.
* | Merge #6948Bundlerbot2019-02-102-5/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6948: Bump rubygems to 3.0.2 and ruby to 2.6.1 in TravisCI r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that I have some spec failures locally, and they don't seem to be reproduced in TravisCI. ### What was your diagnosis of the problem? My diagnosis was that either my environment is messed up or there's some issues with the latest rubygems + ruby combination. ### What is your fix for the problem, implemented in this PR? My fix is to use latest rubygems and ruby in Travis, so I can double check whether the problem is just my environment or a real problem. ### Why did you choose this fix out of the possible options? I chose this fix because it's always good practice to test against the latest versions of your dependencies. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | Bump main tested rubygems to 3.0.2travis_experimentsDavid Rodríguez2019-02-082-2/+2
| | |
| * | Bump main tested ruby to 2.6.1David Rodríguez2019-02-082-3/+10
| |/
* | Merge #6952Bundlerbot2019-02-091-0/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6952: Bump TravisCI build to Xenial r=colby-swandale a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that CI in #6938 is failing, and I'm not sure why. ### What was your diagnosis of the problem? My diagnosis was that I should split the two changes made in that PR to find out the culprit. ### What is your fix for the problem, implemented in this PR? My fix is to split the TravisCI update to xenial, because my guess is that this is not the culprit, so if the build is green, we can merge this and upgrade :tada: ### Why did you choose this fix out of the possible options? I chose this fix because it means no work for me, just delegate to TravisCI. :) Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * Bump TravisCI build to XenialxenialDavid Rodríguez2019-02-091-0/+1
|/
* Merge #6941Bundlerbot2019-02-052-1/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6941: Ignore to add bundler lib direcotry if it is same as rubylibdir r=hsbt a=hsbt ### What was the end-user problem that led to this PR? In ruby core, the bundled bundler was located same as rubylibdir. When user used the specific version of default gems like json, Bundler uses default gems under the rubylibdir, not a specific version. Fixed https://bugs.ruby-lang.org/issues/15469 ### What was your diagnosis of the problem? See the details: https://bugs.ruby-lang.org/issues/15469#note-4 ### What is your fix for the problem, implemented in this PR? I avoid adding bundler directory from RUBYLIB environmental variable Because its directory was already added $LOAD_PATH. Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
| * Added explicitly loading for RbConfig.SHIBATA Hiroshi2019-02-051-0/+1
| |
| * Ignore to add bundler lib direcotry if it is same as ↵ignore-bundler-lib-ruby-libSHIBATA Hiroshi2019-02-042-1/+10
|/ | | | | | | | | | | | | RbConfig::CONFIG["rubylibdir"]. https://bugs.ruby-lang.org/issues/15469 In ruby core, the bundled bundler was located same as rubylibdir. When user used the specific version of default gems like json, Bundler uses default gems under the rubylibdir, not specific version. I avoid to add bundler directory from RUBYLIB enviromental variable, Because its directory was already added $LOAD_PATH.
* Merge #6931Bundlerbot2019-01-294-0/+15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6931: Add patch option in bundle config r=greysteil a=ankitkataria ### What was the end-user problem that led to this PR? Issue #5994 ### What was your diagnosis of the problem? As mentioned by @indirect I added a `patch` option in the bundler config, which by default is false. If set to true, patch level update are preferred if no update levels are specified. ### What is your fix for the problem, implemented in this PR? A patch level config option which can be opted into. Co-authored-by: Ankit Kataria <ankitkataria28@gmail.com>
| * resolve compatibility issuesAnkit Kataria2019-01-271-1/+1
| |
| * change prefer to patch_prefer and updated help textAnkit Kataria2019-01-274-7/+7
| |
| * update bundle config man pageAnkit Kataria2019-01-242-2/+4
| |
| * add patch option in bundle configAnkit Kataria2019-01-243-0/+13
| |
* | Merge #6935Bundlerbot2019-01-2817-26/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6935: Make URLs in document consistent and secure r=greysteil a=aeroastro ### What was the end-user problem that led to this PR? There are 3 documentation problems * End-users experience 301 redirect when visiting http://www.bundler.io and http://bundler.io * End-users might accidentally send email addresses via http version of https://slack.bundler.io, which is not redirected automatically. * Partially fixing this is O.K., but consistent URLs throughout the documentation are easy to use. ### What was your diagnosis of the problem? I have manually visited the Slack invitation URL on https://bundler.io/ and noticed the problem. Following are the simple curl command to explain this problem. ``` $ curl -I http://slack.bundler.io HTTP/1.1 200 OK Server: Cowboy Connection: keep-alive X-Powered-By: Express Content-Type: text/html; charset=utf-8 Content-Length: 3726 Etag: W/"QPm3qygnJrqeFm+KK+VifA==" Date: Mon, 28 Jan 2019 07:32:02 GMT Via: 1.1 vegur ``` ``` $ curl -I http://www.bundler.io HTTP/1.1 301 Moved Permanently Content-Type: text/html; charset=utf-8 Location: https://bundler.io X-Redirector-Version: 84a0a5c Date: Mon, 28 Jan 2019 07:32:28 GMT ``` ``` $ curl -I http://bundler.io HTTP/1.1 301 Moved Permanently Server: GitHub.com Content-Type: text/html Location: https://bundler.io/ X-GitHub-Request-Id: FF7E:37F3:4DD47F:595032:5C4EB012 Content-Length: 178 Accept-Ranges: bytes Date: Mon, 28 Jan 2019 07:32:35 GMT Via: 1.1 varnish Age: 0 Connection: keep-alive X-Served-By: cache-nrt6127-NRT X-Cache: MISS X-Cache-Hits: 0 X-Timer: S1548660755.461639,VS0,VE91 Vary: Accept-Encoding X-Fastly-Request-ID: 8c832766ee3154dc26abd3e1adcd1258a243e4ce ``` ### What is your fix for the problem, implemented in this PR? My fix is to replace old URLs with new URLs. * Replace Slack invitation URLs with safe https ones * Replace http://www.bundler.io with https://bundler.io * Replace http://bundler.io with https://bundler.io ### Why did you choose this fix out of the possible options? Because rewriting URLs on document is easy and simple. Optionally, if someone could implement 301 redirect on Slack invitation URL, it would further help the issue. Co-authored-by: Takumasa Ochi <aeroastro007@gmail.com>
| * | Replace unsafe http URLs with https URLsTakumasa Ochi2019-01-2816-23/+23
| | |
| * | Replace 301 www.bundler.io with bundler.ioTakumasa Ochi2019-01-281-3/+3
|/ /
* | Merge #6924Bundlerbot2019-01-2411-18/+18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6924: Bump rake version to 12.0 on gemspec template r=hsbt a=hsbt ### What was the end-user problem that led to this PR? Related with https://github.com/bundler/bundler/pull/6923 ### What was your diagnosis of the problem? rake-10.x displayed the warnings of `Object =~` with Ruby 2.7.0-dev. ### What is your fix for the problem, implemented in this PR? Rake 10.0 is EOL. I'm a maintainer of Rake. I have no plan to avoid `Object =~` warnings with Rake 10.x. Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
| * | Update the additional versions of rake in rspec examples.update-default-version-of-templateSHIBATA Hiroshi2019-01-248-13/+13
| | |
| * | Fixed failing examples.SHIBATA Hiroshi2019-01-242-4/+4
| | |
| * | Bump rake version to 12.0 on gemspec template. Because rake-10.0 is EOL now.SHIBATA Hiroshi2019-01-241-1/+1
| | |
* | | Merge #6926Bundlerbot2019-01-242-8/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6926: Move Rubocop development dependency into gemspec r=hsbt a=alyssais ### What was the end-user problem that led to this PR? The problem was that tools like RubyGems.org or Bundix that use the gemspec as the source of truth for dependencies didn't pick up on the development dependency on Rubocop. ### What was your diagnosis of the problem? My diagnosis was that the reason for this, which was that Rubocop had a minimum Ruby version of 2.0.0, was no longer an issue, since Bundler 2 doesn't support Rubies that old anyway. ### What is your fix for the problem, implemented in this PR? My fix was to move the Rubocop requirement into the gemspec. ### Why did you choose this fix out of the possible options? I chose this fix because it addresses the problem I was having, feels right, and the old workaround doesn't look like it's necessary any more. Co-authored-by: Alyssa Ross <hi@alyssa.is>
| * | Move Rubocop development dependency into gemspecAlyssa Ross2019-01-232-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Now that Bundler no longer supports Ruby <2.3, the Ruby minimum version requirement that prevented Rubocop from being specified as a development dependency in the gemspec no longer applies. Having Rubocop in the gemspec is useful for tools like RubyGems.org or Bundix that use it as the source of truth for dependencies.
* | | Merge #6923Bundlerbot2019-01-232-2/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6923: Ignore `Object =~` warnings. r=segiddins a=hsbt ### What was the end-user problem that led to this PR? We faced a lot of warnings with `rake spec` of bundler repository. ### What was your diagnosis of the problem? Ruby 2.7.0-dev added the warnings for `Object =~` comparison. ### What is your fix for the problem, implemented in this PR? I added the additional condition and bump a version of the development dependency. Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
View Lorry Controller Status