summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [Settings] Support the ! added on 1.9.3seg-settings-load-config-testsSamuel Giddins2016-03-291-0/+1
|
* [Settings] Add specs for #load_configSamuel Giddins2016-03-281-0/+37
|
* [Settings] Use an improved regexp to read config fileSamuel Giddins2016-03-281-2/+14
| | | | | | This will improve support for long values that get split across multiple lines. h/t to @jbodah for coming up with the crux of the changes
* Auto merge of #4401 - yuuki1224:patch-1, r=segiddinsHomu2016-03-291-1/+1
|\ | | | | | | | | | | Fix typo in bundler/cli_spec.rb Fixed typo.
| * Fix typo in bundler/cli_spec.rbYuki Asano2016-03-261-1/+1
| |
* | Auto merge of #4403 - ↵Homu2016-03-282-48/+86
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | RochesterinNYC:fix-patch-minor-major-flags-bundle-outdated, r=indirect Fix `bundle outdated` behavior with combinations of `--major`, `--minor`, and `--patch` flags - Allow `bundle outdated` to handle all combinations of `--major`, `--minor`, and `--patch` flags - Related to discussion at #4249
| * | Allow `bundle outdated` to handle all combinations of `--major`,James Wen2016-03-272-4/+36
| | | | | | | | | | | | | | | | | | | | | `--minor`, and `--patch` flags - Add test coverage for these combination sets - Fixes #4396
| * | Create shared examples for major, minor, patch version detection inJames Wen2016-03-261-46/+52
| |/ | | | | | | `bundle outdated` specs
* | Auto merge of #4393 - ↵Homu2016-03-282-23/+59
|\ \ | |/ |/| | | | | | | | | | | | | | | RochesterinNYC:fix-recursive-copy-bundle-package-diff-name, r=indirect Prevent endless recursive copy for `bundle package --all` - prevents endless recursive copy regardless of gemspec file name (and whether it matches the name of the gem) - Fixes #4392
| * Prevent endless recursive copy for `bundle package --all` andJames Wen2016-03-252-23/+59
|/ | | | | | differently named gemspecs and gems - Fixes #4392
* Auto merge of #4388 - sj26:bundle-open-clean-env, r=segiddinsHomu2016-03-232-1/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Open editor with clean env Editors which have ruby embedded may be confused by bundler's environment, so strip it before launching the editor process. Here's what happens when I try to `bundle open activesupport` within a rails app using homebrew-installed vim (which embeds ruby by default) but using a different version of ruby in my app: ``` $ bundle open activesupport dyld: lazy symbol binding failed: Symbol not found: _rb_str_new_static Referenced from: /usr/local/rbenv/versions/2.2.3/lib/ruby/gems/2.2.0/gems/json-1.8.3/lib/json/ext/parser.bundle Expected in: flat namespace dyld: Symbol not found: _rb_str_new_static Referenced from: /usr/local/rbenv/versions/2.2.3/lib/ruby/gems/2.2.0/gems/json-1.8.3/lib/json/ext/parser.bundle Expected in: flat namespace Vim: Caught deadly signal TRAP Vim: Finished. Could not run 'vim /usr/local/rbenv/versions/2.2.3/lib/ruby/gems/2.2.0/gems/activesupport-4.2.6' ``` Vim is linked against OS X's ruby which is a different version, but is booting within a bundler environment with a GEM_PATH set to my application's ruby's gem directories. Running the editor with a clean env fixes the problem and I can successfully open gems with vim. Sidenote: I can't run the test suite locally. Following DEVELOPMENT.md I have graphviz and groff installed with homebrew, using ruby 2.3.0 via rbenv, and I run `rake spec:deps` then `rake spec` with the following result: ``` $ rake spec:deps /usr/local/rbenv/versions/2.3.0/bin/ruby -S gem list -i "^automatiek$" -v "~> 0.1.0" || /usr/local/rbenv/versions/2.3.0/bin/ruby -S gem install automatiek -v "~> 0.1.0" --no-ri --no-rdoc true /usr/local/rbenv/versions/2.3.0/bin/ruby -S gem list -i "^mustache$" -v "= 0.99.6" || /usr/local/rbenv/versions/2.3.0/bin/ruby -S gem install mustache -v "= 0.99.6" --no-ri --no-rdoc true /usr/local/rbenv/versions/2.3.0/bin/ruby -S gem list -i "^rake$" -v "~> 10.0" || /usr/local/rbenv/versions/2.3.0/bin/ruby -S gem install rake -v "~> 10.0" --no-ri --no-rdoc true /usr/local/rbenv/versions/2.3.0/bin/ruby -S gem list -i "^rdiscount$" -v "~> 2.1.8" || /usr/local/rbenv/versions/2.3.0/bin/ruby -S gem install rdiscount -v "~> 2.1.8" --no-ri --no-rdoc true /usr/local/rbenv/versions/2.3.0/bin/ruby -S gem list -i "^ronn$" -v "~> 0.7.3" || /usr/local/rbenv/versions/2.3.0/bin/ruby -S gem install ronn -v "~> 0.7.3" --no-ri --no-rdoc true /usr/local/rbenv/versions/2.3.0/bin/ruby -S gem list -i "^rspec$" -v "~> 3.0" || /usr/local/rbenv/versions/2.3.0/bin/ruby -S gem install rspec -v "~> 3.0" --no-ri --no-rdoc true /usr/local/rbenv/versions/2.3.0/bin/ruby -S gem list -i "^rubocop$" -v "= 0.38.0" || /usr/local/rbenv/versions/2.3.0/bin/ruby -S gem install rubocop -v "= 0.38.0" --no-ri --no-rdoc true installing gems for the tests to use... Successfully installed fakeweb-1.3.0 Successfully installed artifice-0.6 Successfully installed rack-1.6.4 Successfully installed compact_index-0.10.0 4 gems installed Successfully installed sinatra-1.2.7 1 gem installed Successfully installed rake-10.0.2 1 gem installed Successfully installed builder-2.1.2 1 gem installed You need to install GraphViz (http://graphviz.org/) to use this Gem. For more information about Ruby-Graphviz : * Doc : http://rdoc.info/projects/glejeune/Ruby-Graphviz * Sources : http://github.com/glejeune/Ruby-Graphviz * Mailing List : http://groups.google.com/group/ruby-graphviz Last (important) changes : Ruby-Graphviz no longer supports Ruby < 1.9.3 Successfully installed ruby-graphviz-1.2.2 1 gem installed spec:deps ran for 0.010000 0.020000 10.020000 ( 24.491881) $ rake spec mkdir -p lib/bundler/man /usr/local/rbenv/versions/2.3.0/bin/ruby -S ronn --roff --pipe man/bundle-config.ronn > lib/bundler/man/bundle-config groff -Wall -mtty-char -mandoc -Tascii lib/bundler/man/bundle-config | col -b > lib/bundler/man/bundle-config.txt # [... more groff ...] /usr/local/rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/rspec-core-3.4.4/exe/rspec --pattern spec/\*\*\{,/\*/\*\*\}/\*_spec.rb /usr/local/rbenv/gems/2.3.0/gems/rspec-support-3.4.1/lib/rspec/support/warnings.rb:7: warning: method redefined; discarding old deprecate /usr/local/rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/rspec-support-3.4.1/lib/rspec/support/warnings.rb:7: warning: previous definition of deprecate was here # [... more rspec warnings ...] /usr/local/rbenv/versions/2.3.0/lib/ruby/site_ruby/2.3.0/rubygems/core_ext/kernel_require.rb:55:in `require': cannot load such file -- rake (LoadError) from /usr/local/rbenv/versions/2.3.0/lib/ruby/site_ruby/2.3.0/rubygems/core_ext/kernel_require.rb:55:in `require' from /Users/sj26/Projects/bundler/spec/bundler/gem_helper_spec.rb:3:in `<top (required)>' from /usr/local/rbenv/gems/2.3.0/gems/rspec-core-3.4.4/lib/rspec/core/configuration.rb:1361:in `load' from /usr/local/rbenv/gems/2.3.0/gems/rspec-core-3.4.4/lib/rspec/core/configuration.rb:1361:in `block in load_spec_files' from /usr/local/rbenv/gems/2.3.0/gems/rspec-core-3.4.4/lib/rspec/core/configuration.rb:1359:in `each' from /usr/local/rbenv/gems/2.3.0/gems/rspec-core-3.4.4/lib/rspec/core/configuration.rb:1359:in `load_spec_files' from /usr/local/rbenv/gems/2.3.0/gems/rspec-core-3.4.4/lib/rspec/core/runner.rb:106:in `setup' from /usr/local/rbenv/gems/2.3.0/gems/rspec-core-3.4.4/lib/rspec/core/runner.rb:92:in `run' from /usr/local/rbenv/gems/2.3.0/gems/rspec-core-3.4.4/lib/rspec/core/runner.rb:78:in `run' from /usr/local/rbenv/gems/2.3.0/gems/rspec-core-3.4.4/lib/rspec/core/runner.rb:45:in `invoke' from /usr/local/rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/rspec-core-3.4.4/exe/rspec:4:in `<main>' /usr/local/rbenv/versions/2.3.0/bin/ruby -I/usr/local/rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/rspec-support-3.4.1/lib:/usr/local/rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/rspec-core-3.4.4/lib /usr/local/rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/rspec-core-3.4.4/exe/rspec --pattern spec/\*\*\{,/\*/\*\*\}/\*_spec.rb failed ``` I can't follow what the spec suite is doing with the load and gem paths closely enough to figure out what's gone wrong.
| * Open editor with clean envSamuel Cochran2016-03-232-1/+8
|/ | | | | Editors which have ruby embedded may be confused by bundler's environment, so strip it before launching the editor process.
* Auto merge of #4274 - glennpratt:standalone-bundler-path, r=segiddinsHomu2016-03-232-177/+146
|\ | | | | | | | | | | | | | | Create standalone bundler/setup.rb at a consistent path. While chasing a threading / chdir bug in #4264, I discovered `bundler/setup.rb` isn't written to a proper directory when run in a subdirectory and binstubs don't work (https://github.com/bundler/bundler/pull/4264#issuecomment-179506385). This changes that so `bundler/setup.rb` is written relative to `Bundler.root` instead of `cwd` and expands test coverage a bit.
| * Create standalone bundler/setup.rb at a consistent path.Glenn Pratt2016-03-222-177/+146
| | | | | | | | Fixes #4274
* | Auto merge of #4335 - cllns:upgrade-contributor-covenant, r=segiddinsHomu2016-03-231-29/+54
|\ \ | |/ |/| | | | | | | Upgrade template Code of Conduct to Contributor Covenant 1.4 🐙
| * Upgrade template Code of Conduct to Covenant 1.4Sean Collins2016-03-041-29/+54
| |
* | Auto merge of #4377 - ↵Homu2016-03-232-3/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | RochesterinNYC:create-local-invalid-gemspec-error-spec, r=segiddins Create invalid gemspec error message spec that runs locally - Move invalid gemspec spec involving `resque-scheduler 2.2.0` created in #4283 to realworld specs - Related to [comments here](https://github.com/bundler/bundler/commit/a753d0182e6d4d91d7e401e40482c6cec5baadae#commitcomment-16716088)
| * | Create invalid gemspec error message spec that runs locallyJames Wen2016-03-172-3/+28
| | | | | | | | | | | | | | | - Move invalid gemspec spec involving resque-scheduler 2.2.0 created in #4283 to realworld specs
* | | Auto merge of #4369 - bundler:RochesterinNYC-alias-size-to-length-spec-set, ↵Homu2016-03-222-1/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | r=segiddins Add alias `Bundler::SpecSet#size` for `Bundler::SpecSet#length` - Closes #4368
| * | | [SpecSet] Add basic specsRochesterinNYC-alias-size-to-length-spec-setSamuel Giddins2016-03-162-3/+44
| | | |
| * | | Add alias `Bundler::SpecSet#size` for `Bundler::SpecSet#length`James Wen2016-03-141-0/+2
| | | | | | | | | | | | - Closes #4368
* | | | Auto merge of #4380 - bundler:simplify-certs, r=indirectHomu2016-03-2211-109/+28
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | Update HTTPS certificates Remove the certs we don't need, add the new cert for index.rubygems.org, and stop checking for equality with RubyGems certs because they're out of date now.
| * | | Fix `Bundler::SSLCerts::CertificateManager` specs to use newsimplify-certsJames Wen2016-03-221-6/+6
| | | | | | | | | | | | | | | | subdirectory structure for ssl certs
| * | | use the certs from their new subdirectoriesAndre Arko2016-03-171-1/+1
| | | |
| * | | only one level of directories here...Andre Arko2016-03-171-1/+1
| | | |
| * | | stop requiring that we have every rubygems certAndre Arko2016-03-171-6/+0
| | | | | | | | | | | | | | | | | | | | RubyGems seems to be full of legacy certs, we should clean them up sometime.
| * | | test connecting to index.rubygems.orgAndre Arko2016-03-171-1/+2
| | | |
| * | | remove certs that aren't needed anymoreAndre Arko2016-03-178-95/+19
|/ / /
* | | Auto merge of #4357 - asutoshpalai:master, r=segiddinsHomu2016-03-173-1/+33
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking out missing git repos (but not being installed) - Fixing #3981 Fixes #3981. As far as I investigated the problem is, being in `without` group, it is not marked in missing_spec and so it is not resolved while resolving specs at https://github.com/bundler/bundler/blob/master/lib/bundler/installer.rb#L183 and https://github.com/bundler/bundler/blob/master/lib/bundler/installer.rb#L195 but it is in the definition's index at https://github.com/bundler/bundler/blob/master/lib/bundler/definition.rb#L209 leading to https://github.com/bundler/bundler/blob/master/lib/bundler/source/git.rb#L150 where it checks for the presence of the folder at https://github.com/bundler/bundler/blob/master/lib/bundler/source/path.rb#L135 Possible solutions are : - add it to the list of missing_specs - check while building the index in Definition class and don't add it.
| * | Checking that the repo is has been checked outAsutosh Palai2016-03-141-0/+1
| | |
| * | Minor typo fixAsutosh Palai2016-03-111-1/+1
| | |
| * | bundle install resolves all current dependencies Fixes #3981Asutosh Palai2016-03-112-1/+7
| | |
| * | Added failing test for #3981Asutosh Palai2016-03-111-0/+25
| | |
* | | Auto merge of #4361 - bundler:aa-1-12-backports, r=segiddinsHomu2016-03-120-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | Backport docs and domain changes from master to prep for 1.12 final None
| * | | [Fetcher] Switch from bundler.rubygems.org to index.rubygems.orgSamuel Giddins2016-03-112-3/+3
| | | |
| * | | Document change in --without behavior Richard Schneeman2016-03-111-0/+1
| | | | | | | | | | | | close #4351
* | | | Auto merge of #4358 - bundler:seg-index-rubygems-org, r=indirectHomu2016-03-122-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [Fetcher] Switch from bundler.rubygems.org to index.rubygems.org @dwradcliffe @indirect by my understanding, this is what we need to do to get the new index behind fastly?
| * | | | [Fetcher] Switch from bundler.rubygems.org to index.rubygems.orgseg-index-rubygems-orgSamuel Giddins2016-03-112-3/+3
| | |/ / | |/| |
* | | | Auto merge of #4342 - bronzdoc:colorize_gem_updates, r=segiddinsHomu2016-03-124-2/+9
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Colorize gem updates closes https://github.com/bundler/bundler/issues/4334 ![alt tag](http://i.imgur.com/djHFR95.png)
| * | | Adding add_color to silent UIbronzdoc2016-03-081-0/+3
| | | |
| * | | Update specbronzdoc2016-03-071-1/+1
| | | |
| * | | Adding add_color methodbronzdoc2016-03-073-6/+6
| | | |
| * | | Add color to locked versionbronzdoc2016-03-051-1/+1
| | | |
| * | | Make version_message configurablebronzdoc2016-03-051-1/+5
| | |/ | |/|
* | | Auto merge of #4354 - RochesterinNYC:fix-test-suite-warning, r=segiddinsHomu2016-03-101-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the `Bundler::Fetcher::Downloader` rspec warning in test suite Fixes the following warning in the test suite: ``` Bundler::Fetcher::Downloader fetch when the # requests counter is greater than the redirect limit WARNING: An expectation of `:body` was set on `nil`. To allow expectations on `nil` and suppress this message, set `config.allow_expectations_on_nil` to `true`. To disallow expectations on `nil`, set `config.allow_expectations_on_nil` to `false`. Called from /home/travis/build/bundler/bundler/spec/bundler/fetcher/downloader_spec.rb:19:in `block (3 levels) in <top (required)>'. ```
| * | | Fix the following warning in the test suite:James Wen2016-03-101-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` Bundler::Fetcher::Downloader fetch when the # requests counter is greater than the redirect limit WARNING: An expectation of `:body` was set on `nil`. To allow expectations on `nil` and suppress this message, set `config.allow_expectations_on_nil` to `true`. To disallow expectations on `nil`, set `config.allow_expectations_on_nil` to `false`. Called from /home/travis/build/bundler/bundler/spec/bundler/fetcher/downloader_spec.rb:19:in `block (3 levels) in <top (required)>'. ```
* | | Auto merge of #4350 - bundler:seg-rubocop-0.38, r=segiddinsHomu2016-03-105-21/+17
|\ \ \ | | | | | | | | | | | | [RuboCop] Update to 0.38.0
| * | | [RuboCop] Update to 0.38.0seg-rubocop-0.38Samuel Giddins2016-03-095-21/+17
| | | |
* | | | Auto merge of #4352 - schneems:patch-1, r=segiddinsHomu2016-03-101-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | Document change in --without behavior close #4351
| * | | Document change in --without behavior Richard Schneeman2016-03-091-0/+1
|/ / / | | | | | | close #4351