summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Include revision hash in Source::Git#to_sshow-git-revAgis Anastasopoulos2015-10-254-5/+29
| | | | | | | | | This effectively changes the output of commands that use Source::Git#to_s (ie. `bundle install`). For example: Using rack 1.0.0 from git@github.com:rack/rack.git (at master@574b147) Closes #3433.
* Merge pull request #4040 from bundler/original-source-headerAndré Arko2015-10-2110-4/+172
|\ | | | | Send X-Gemfile-Source header to source mirrors
| * Set X-Gemfile-Source when fetching gemsoriginal-source-headerAgis Anastasopoulos2015-10-204-1/+79
| | | | | | | | | | Since gemstash will only support RubyGems >= 2.4 (bundler/gemstash#32), we only set this header in RubyGems 2.0+.
| * Introduce GemRemoteFetcherAgis Anastasopoulos2015-10-202-0/+42
| | | | | | | | | | This is essentially Gem::RemoteFetcher with added support for setting extra HTTP headers to be sent when fetching the gems.
| * Set X-Gemfile-Source when fetching dependenciesAgis Anastasopoulos2015-10-202-1/+32
| |
| * Save original URIs in Rubygems remotesAgis Anastasopoulos2015-10-202-2/+19
|/ | | | | Using `Source::Rubygems::Remote#original_uri` we can now retrieve the original, unmirrored rubygem source URI.
* Auto merge of #4035 - bundler:seg-update-rubocop, r=segiddinsHomu2015-10-198-63/+147
|\ | | | | | | | | [RuboCop] Update to 0.34.2
| * [RuboCop] Autocorrect offenses after rebaseSamuel Giddins2015-10-182-4/+2
| |
| * [RuboCop] Regenerate todo file with new file excludesSamuel Giddins2015-10-183-53/+140
| |
| * [RuboCop] Update to 0.34.1Samuel Giddins2015-10-185-9/+8
|/
* Auto merge of #4026 - bundler:seg-resolve-ruby-version, r=indirectHomu2015-10-187-10/+52
|\ | | | | | | | | | | [Resolver] Resolve for a given ruby version Take the definition's ruby version into account when resolving, to try and avoid conflicts with incompatible `required_ruby_version`s. This will mostly help once the compact index is in use.
| * [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 #4061 - bundler:seg-dir-no-gemspec, r=indirectHomu2015-10-172-1/+19
|\ \ | | | | | | | | | | | | | | | [Index] Handle when comparing against an index with no gemspec Closes #4004.
| * | [Index] Handle when comparing against an index with no gemspecseg-dir-no-gemspecSamuel Giddins2015-10-162-1/+19
|/ /
* | Auto merge of #4052 - bundler:excessive-dots, r=segiddinsHomu2015-10-131-6/+6
|\ \ | | | | | | | | | | | | | | | | | | Remove excessive periods from DSL error messages Apparently, a period is already added when interpolating those messages, some lines below.
| * | Remove excessive periods from DSL error messagesexcessive-dotsAgis Anastasopoulos2015-10-121-6/+6
| | | | | | | | | | | | | | | Apparently, a period is already added when interpolating those messages, some lines below.
* | | Auto merge of #4051 - backus:fix/autoloading-nonexistant-constant, r=segiddinsHomu2015-10-121-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | Remove `autoload :Specification` This constant isn't defined anymore
| * | | Remove `autoload :Specification`John Backus2015-10-111-1/+0
| | | | | | | | | | | | | | | | | | | | - This class was removed in 2010 but the autoload was neglected 64b8b5 - Closes #4050
* | | | Auto merge of #4047 - A5308Y:master, r=indirectHomu2015-10-121-58/+70
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring config.rb My main goal was to show the structure of the run method: 1. Guard Clauses 2. Message to user 3. Save new settings and to separate the message texts from the rest of the logic. So the class and methods are easier to understand read. While doing that I reduced the complexity of the run method by extracting methods. This should improve the Code Climate rating of Bundler::CLI::Config substantially.
| * | | Refactoring config.rbAndreas Hellwig2015-10-101-58/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My main goal was to show the structure of the run method: 1. Guard Clauses 2. Message to user 3. Save new settings and to separate the message texts from the rest of the logic. So the class and methods are easier to understand read. While doing that I reduced the complexity of the run method by extracting methods. This should improve the Code Climate rating of Bundler::CLI::Config substantially.
* | | | Auto merge of #4049 - bundler:more-env-specs, r=segiddinsHomu2015-10-121-3/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add more `Env` tests
| * | | | Add more `Env` testsmore-env-specsAgis Anastasopoulos2015-10-111-3/+46
| |/ / /
* | | | Auto merge of #4039 - Zorbash:typo-gem-helper, r=segiddinsHomu2015-10-101-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Add missing backtick in Bundler::GemHelper#sh Since across the codebase and documentation shell commands are displayed wrapped in backticks, the command included in the error output of Bundler::GemHelper#sh should also be displayed in the same format.
| * | | Add missing backtick in Bundler::GemHelper#shDimitris Zorbas2015-10-061-1/+1
| |/ / | | | | | | | | | | | | | | | Since across the codebase and documentation shell commands are displayed wrapped in backticks, the command included in the error output of Bundler::GemHelper#sh should also be displayed in the same format.
* | | Auto merge of #4038 - Sirupsen:test-ext-fix, r=indirectHomu2015-10-071-0/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clean: add test for not removing git extensions artifacts Unfortunately https://github.com/bundler/bundler/pull/4030 was merged before I had a chance to write a test. I confirmed that the test did not pass before my patch. Any ETA of 1.10.7 which includes #4030? :heart: @indirect @segiddins @andremedeiros @skottler
| * | | clean: add test for not removing git extensions artifactsSimon Eskildsen2015-10-061-0/+22
| |/ /
* | | appease rubocopAndre Arko2015-10-061-1/+1
| | |
* | | update edge cases to only lock if possibleAndre Arko2015-10-062-17/+27
| | | | | | | | | | | | this speeds up these tests by a huge amount, since we stop downloading and installing a crapton of gems live over the internet
* | | force a rack-cache version that works on ruby 1.9Andre Arko2015-10-061-0/+2
|/ /
* | Auto merge of #4032 - esasse:rubocop-fix, r=indirectHomu2015-10-053-9/+4
|\ \ | | | | | | | | | | | | Fix Style/SpaceInsideStringInterpolation
| * | Fix Style/SpaceInsideStringInterpolationErick Sasse2015-10-033-9/+4
| | |
* | | Auto merge of #4033 - bundler:bundle-env-gemspecs, r=segiddinsHomu2015-10-054-2/+47
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also print gemspecs in `bundle env` This change has the nice side-effect that `bundle env` will throw an error for Gemfiles with invalid DSLs. Closes https://trello.com/c/QOX9jyYN.
| * | | Also print gemspecs in `bundle env`bundle-env-gemspecsAgis Anastasopoulos2015-10-054-2/+47
| |/ / | | | | | | | | | | | | | | | | | | This change has the nice side-effect that `bundle env` will throw an error for Gemfiles with invalid DSLs. Closes https://trello.com/c/QOX9jyYN.
* | | Auto merge of #4017 - A5308Y:master, r=segiddinsHomu2015-10-052-39/+50
|\ \ \ | | | | | | | | | | | | | | | | | | | | Show ruby engine and version instead of a static string.
| * | | There's no flat_map in 1.8.7Andreas Hellwig2015-10-031-2/+2
| | | |
| * | | Rubocop adjustmentAndreas Hellwig2015-09-301-1/+1
| | | | | | | | | | | | | | | | Outdent access modifiers like private
| * | | Extract class StandaloneAndreas Hellwig2015-09-302-39/+50
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I wanted to fix some minor Rubocop issues and got confused by '#{ruby_engine}/#{ruby_version}'. I managed to confuse two other people working on bundler as well, so I decided to refactor the part around it. I wanted to encapsulate the file creation, so it's (even) more obvious from the context that another ruby file is created. So having an uninterpolated string with interpolation syntax in it isn't so unusual. To be extra sure I added a comment here as Rubocop might lead others to the same spot. I found that Standalone works quite well as its own object. While extracting the class I shortened some expressions and extracted methods that made sense as a unit to me. I ended up with a generate method that only deals with file output. What I think might be controversial: * The tendency to use methods instead of variables for small things like version_dir and bundler_path: I think it's easier to understand because methdos are "read_only", while values of variables might change during code execution. * Array(spec.require_paths) instead of "next if spec.require_paths.nil? # builtin gems". We lose the comment here, but I thought Array was more concise and that the information about the type of gems isn't crucial here. * flat_map { map { ... } } instead of "collecting" in paths My perspective is that paths is the result of a transformation of @specs and that's best expressed by using map. It's also shorter.
* | | Auto merge of #4022 - jasonkarns:rake-clobber, r=segiddinsHomu2015-10-052-0/+10
|\ \ \ | |_|/ |/| | | | | | | | | | | include 'pkg/' in rake/clean's CLOBBER array closes #3676
| * | include 'pkg/' in rake/clean's CLOBBER arrayJason Karns2015-09-302-0/+10
| | | | | | | | | | | | | | | | | | rake's built-in clean and clobber tasks are now included test that 'pkg' is added to CLOBBER filelist
* | | Auto merge of #4027 - esasse:rubocop-fix, r=segiddinsHomu2015-10-042-5/+3
|\ \ \ | | | | | | | | | | | | | | | | Fix Style/TrailingUnderscoreVariable
| * | | Moves TrailingUnderscoreVariable to main rubocop fileErick Sasse2015-10-032-5/+3
|/ / /
* | | Auto merge of #4031 - Zorbash:binstubs-description, r=segiddinsHomu2015-10-041-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update binstubs command description for multiple gems The current long description or the `binstubs` command does not provide any hint that it can accept multiple gems as arguments and generate binstubs for all of them. This PR enhances the description using similar phrasing for usage with multiple gem arguments, to the `outdated` command.
| * | | Update binstubs command description for multiple gemsDimitris Zorbas2015-10-031-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | The current long description or the `binstubs` command does not provide any hint that it can accept multiple gems as arguments and generate binstubs for all of them. This commit enhances the description using similar phrasing for usage with multiple gem arguments, to the `outdated` command.
* | | Merge pull request #4030 from Sirupsen/dont-clean-extensionsAndré Medeiros2015-10-031-1/+1
|\ \ \ | |/ / |/| | runtime: avoid cleaning up extensions directory