summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [RuboCop] Double quotesseg-resolve-ruby-versionSamuel Giddins2015-10-021-2/+2
|
* [Resolver] Add spec for taking ruby version into accountSamuel Giddins2015-10-021-0/+29
|
* Add support for building a spec with a required_ruby_versionSamuel Giddins2015-10-021-0/+4
|
* [Resolver] Banish uninitialized ivar warningSamuel Giddins2015-10-021-1/+1
|
* [Path] Update spec for wrapping path in backticksSamuel Giddins2015-10-021-1/+1
|
* [Definition] Handle when there is no ruby_versionSamuel E. Giddins2015-10-021-1/+2
|
* [Resolver] Resolve for a given ruby versionSamuel Giddins2015-10-014-9/+17
|
* Auto merge of #4020 - simplybusiness:error_on_missing_dependency, r=segiddinsHomu2015-09-303-22/+33
|\ | | | | | | | | | | | | | | | | | | Error on missing dependency - partial fix for #3692 (alternative) This pull request implements the strategy suggested in the comments for https://github.com/bundler/bundler/pull/4012, namely to raise an error when dependencies are not present (due to a corrupted `Gemfile.lock`). This also removes the `install_sequentially` option. I wasn't totally sure about the error message formatting.
| * Change error type to LockfileErrorLukas Oberhuber2015-09-292-2/+2
| |
| * remove newline from error message.Lukas Oberhuber2015-09-292-2/+2
| |
| * Fix rubocop offenseLukas Oberhuber2015-09-291-1/+0
| |
| * Merge branch 'error_on_missing_dependency' of ↵Lukas Oberhuber2015-09-290-0/+0
| |\ | | | | | | | | | github.com:simplybusiness/bundler into error_on_missing_dependency
| | * Raises an error if there are missing dependenciesLukas Oberhuber2015-09-283-22/+34
| | | | | | | | | | | | Also forces all installs through the parallel_installer to ensure consistency.
| * | Raises an error if there are missing dependenciesLukas Oberhuber2015-09-293-22/+34
|/ / | | | | | | Also forces all installs through the parallel_installer to ensure consistency.
* | Auto merge of #4016 - agis-:friendly-permission-errors, r=segiddinsHomu2015-09-2811-29/+97
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Friendly filesystem permission errors This introduces `SharedHelpers#filesystem_access` which can wrap any piece of code that makes a modification to the file system (eg. creating a directory). Doing so, results in user-friendly errors instead of the original ones (ie `Errno:EACCES`). In the future we could (and probably should) handle more error types within `#filesystem_access`. Closes #4009. Closes #3988. https://trello.com/c/OicgrmDd/102-improve-permissions-error-messages.
| * | Add test case for friendly permission errorsRobin Böning2015-09-271-0/+18
| | | | | | | | | | | | Cherry-picked from #4019.
| * | Wrap filesystem operations with #filesystem_accessAgis Anastasopoulos2015-09-279-23/+49
| | |
| * | Introduce SharedHelpers#filesystem_accessAgis Anastasopoulos2015-09-271-0/+24
| | |
| * | Make PermissionError more genericAgis Anastasopoulos2015-09-271-6/+6
|/ / | | | | | | | | We also want to display helpful error messages for paths, not just files.
* | Auto merge of #4018 - philnash:removing_duplication, r=segiddinsHomu2015-09-271-36/+23
|\ \ | |/ |/| | | | | | | Removes duplication from bundle clean command I was not feeling inspired, but I do like to delete code! Here's a small simplification as reported [in Code Climate](https://codeclimate.com/github/bundler/bundler/Bundler::Runtime).
| * Removes duplication from bundle clean commandPhil Nash2015-09-261-36/+23
|/
* Auto merge of #3997 - jrafanie:less_strings_index_search, r=segiddinsHomu2015-09-251-1/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allocate the "ruby" and "\0" Strings once. Index#search is called many times so this change is worth it. With a single gem in your Gemfile, this change drops the string allocations by nearly 30,000. Script: ```ruby require 'allocation_tracer' ObjectSpace::AllocationTracer.setup(%i{path line type}) result = ObjectSpace::AllocationTracer.trace do begin require 'bundler/inline' rescue LoadError => e $stderr.puts 'Bundler version 1.10 or later is required. Please update your Bundler' raise e end gemfile(true) do source 'https://rubygems.org' gem 'benchmark-ips' end end result.sort_by{|k, v| k}.each{|k, v| puts ([v[0]]+k).join("\t") } ``` **String allocations before**: ``` $ruby benchmark_allocations.rb | grep T_STRING | sort -nr | head -n 10 65461 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/core_ext/kernel_require.rb 54 T_STRING 64982 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/version.rb 163 T_STRING 29986 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/index.rb 71 T_STRING 22142 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/spec_set.rb 111 T_STRING 20457 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/version.rb 225 T_STRING 5280 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/index.rb 87 T_STRING 4848 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/requirement.rb 92 T_STRING 4708 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/lockfile_parser.rb 54 T_STRING 4608 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/version.rb 282 T_STRING 4561 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/index.rb 19 T_STRING ``` **String allocations after**: ``` $ ruby benchmark_allocations.rb | grep T_STRING | sort -nr | head -n 10 65479 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/core_ext/kernel_require.rb 54 T_STRING 64143 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/version.rb 163 T_STRING 22142 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/spec_set.rb 111 T_STRING 20407 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/version.rb 225 T_STRING 5280 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/index.rb 90 T_STRING 4916 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/requirement.rb 92 T_STRING 4730 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/lockfile_parser.rb 54 T_STRING 4608 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/version.rb 282 T_STRING 4561 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/index.rb 22 T_STRING 3334 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/spec_set.rb 134 T_STRING ```
| * Allocate the "ruby" and "\0" Strings once.Joe Rafaniello2015-09-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Index#search is called many times so this change is worth it. With a single gem in your Gemfile, this change drops the string allocations by nearly 30,000. Script: ```ruby require 'allocation_tracer' ObjectSpace::AllocationTracer.setup(%i{path line type}) result = ObjectSpace::AllocationTracer.trace do begin require 'bundler/inline' rescue LoadError => e $stderr.puts 'Bundler version 1.10 or later is required. Please update your Bundler' raise e end gemfile(true) do source 'https://rubygems.org' gem 'benchmark-ips' end end result.sort_by{|k, v| k}.each{|k, v| puts ([v[0]]+k).join("\t") } ``` **String allocations before**: ``` $ruby benchmark_allocations.rb | grep T_STRING | sort -nr | head -n 10 65461 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/core_ext/kernel_require.rb 54 T_STRING 64982 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/version.rb 163 T_STRING 29986 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/index.rb 71 T_STRING 22142 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/spec_set.rb 111 T_STRING 20457 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/version.rb 225 T_STRING 5280 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/index.rb 87 T_STRING 4848 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/requirement.rb 92 T_STRING 4708 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/lockfile_parser.rb 54 T_STRING 4608 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/version.rb 282 T_STRING 4561 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/index.rb 19 T_STRING ``` **String allocations after**: ``` $ ruby benchmark_allocations.rb | grep T_STRING | sort -nr | head -n 10 65479 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/core_ext/kernel_require.rb 54 T_STRING 64143 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/version.rb 163 T_STRING 22142 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/spec_set.rb 111 T_STRING 20407 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/version.rb 225 T_STRING 5280 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/index.rb 90 T_STRING 4916 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/requirement.rb 92 T_STRING 4730 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/lockfile_parser.rb 54 T_STRING 4608 /Users/joerafaniello/.rubies/ruby-2.2.3/lib/ruby/2.2.0/rubygems/version.rb 282 T_STRING 4561 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/index.rb 22 T_STRING 3334 /Users/joerafaniello/.gem/ruby/2.2.3/gems/bundler-1.10.6/lib/bundler/spec_set.rb 134 T_STRING ```
* | Merge pull request #4010 from heliocola/updated-cocAndré Arko2015-09-221-3/+3
|\ \ | | | | | | Integrate new wording from version 1.2.0 of Code of Covenant
| * | Integrate new wording from version 1.2.0 of Code of CovenantHelio Rodrigues2015-09-211-3/+3
|/ / | | | | | | | | Reference: http://contributor-covenant.org/version/1/2/0/code_of_conduct.md
* | Auto merge of #4002 - agis-:3982-clean-rubylib, r=indirectHomu2015-09-202-6/+20
|\ \ | |/ |/| | | | | | | Clean RUBYLIB as well in `with_clean_env` Fixes #3982.
| * Clean RUBYLIB as well in `with_clean_env`Andre Arko2015-09-192-6/+11
| | | | | | | | refs #3982
| * Add test for #3982Agis Anastasopoulos2015-09-191-0/+9
|/
* Merge pull request #3991 from agis-/issue-3678André Arko2015-09-152-1/+14
|\ | | | | Ignore ENV["BUNDLE_GEMFILE"] if it's empty
| * Ignore ENV["BUNDLE_GEMFILE"] if it's emptyAgis-2015-09-152-1/+14
| | | | | | | | Fixes #3678.
* | Merge pull request #3987 from masarakki/add-http-schemeAndré Arko2015-09-122-3/+3
|\ \ | |/ |/| add http://
| * add http://masarakki2015-09-132-3/+3
|/
* Merge pull request #3977 from seanlinsley/update-conflict-error-messageAndré Arko2015-09-071-1/+3
|\ | | | | Improve hint on conflict error message
| * Improve hint on conflict error messageSean Linsley2015-09-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given this previous configuration: ```ruby gem 'rails', '~> 4.1.11' gem 'sass-rails', '~> 4.0.3' ``` When changing both gem versions: ```ruby gem 'rails', '~> 4.2.4' gem 'sass-rails', '~> 5.0.0' ``` And running `bundle update rails`, you see this error message: ``` You have requested: sass-rails ~> 5.0.0 The bundle currently has sass-rails locked at 4.0.3. Try running `bundle update sass-rails` ``` This commit adds a hint to run `bundle update rails sass-rails`: ``` You have requested: sass-rails ~> 5.0.0 The bundle currently has sass-rails locked at 4.0.3. Try running `bundle update sass-rails` If you are updating multiple gems in your Gemfile at once, try passing them all to `bundle update` ```
* | Auto merge of #3978 - agis-:issue-3974, r=indirectHomu2015-09-072-1/+18
|\ \ | |/ |/| | | | | | | Dsl#with_source should restore the previous source Fixes #3974.
| * Dsl#with_source should restore the previous sourceAgis-2015-09-062-1/+18
|/ | | | | | | | | | | | | | | | | | | | Before this change, a gem inside a rubygems source block that also defined a custom source, would cause subsequent gems inside that same block to be fetched from rubygems.org. For example: source "https://rubygems.org" source "https://foo.bar" do gem "rails", git: "git@github.com/rails/rails.git" gem "i18n" end In that case, i18n would be fetched from rubygems.org instead of foo.bar. Fixes #3974.
* Auto merge of #3971 - agis-:issue-3783, r=indirectHomu2015-09-035-2/+16
|\ | | | | | | | | | | Distinguish Gemfile syntax and evaluation errors Fixes #3783.
| * Distinguish Gemfile syntax and evaluation errorsAgis-2015-09-025-2/+16
| | | | | | | | Fixes #3783.
* | Auto merge of #3969 - agis-:issue-3895, r=segiddinsHomu2015-08-312-1/+28
|\ \ | | | | | | | | | | | | | | | Output gemspec validation errors on exec commands Fixes #3895.
| * | Output gemspec validation errors on exec commandsAgis-2015-08-302-1/+28
| | | | | | | | | | | | Fixes #3895.
* | | Auto merge of #3970 - agis-:various-test-cleanups, r=segiddinsHomu2015-08-312-2/+2
|\ \ \ | |_|/ |/| | | | | | | | Various test cleanups
| * | Silence expected yet noisy error output in testAgis-2015-08-301-1/+1
| | |
| * | Specify the actual exception to test forAgis-2015-08-301-1/+1
|/ / | | | | | | Follow-up to 0b49696285e3c45.
* | Auto merge of #3907 - bundler:fix-path-caching-3900, r=segiddinsHomu2015-08-302-1/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | make sure intersecting gem paths are cached When a gem has the same path prefix as the application that is being bundled, the gem will not be added to vendor/cache. For example: a gem with a path /home/test/src/bundled_gem and an application with a path /home/test/src/bundled that references it.
| * | quotable rubocopfix-path-caching-3900Andre Arko2015-08-132-2/+2
| | |
| * | make sure intersecting gem paths are cachedSteven Davidovitz2015-08-132-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | When a gem has the same path prefix as the application that is being bundled, the gem will not be added to vendor/cache. For example: a gem with a path /home/test/src/bundled_gem and an application with a path /home/test/src/bundled that references it.
* | | Auto merge of #3906 - bundler:fix-fix-3862, r=segiddinsHomu2015-08-301-1/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | Use locked_requirement platform to print it out None
| * | | Use locked_requirement platform to print it outfix-fix-3862Andre Arko2015-08-021-1/+9
| | | |
* | | | Auto merge of #3968 - pmenglund:gem_push_host, r=indirectHomu2015-08-301-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make it able to specify gem host with GEM_HOST env when you in your `.gemspec` specify ``` if spec.respond_to?(:metadata) spec.metadata['allowed_push_host'] = 'https://gems.example.com' end ``` you can't use the `bundler` rake tasks, as it can't specify the alternate host. This change picks up the `allowed_push_host` and uses it when pushing.
| * | | | guard against old gemspecMartin Englund2015-08-291-2/+5
| | | | |
View Lorry Controller Status