bundler 1.13.7 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 917c871afe7de2fbbfcc0e0a8181025aa76a134d
-  data.tar.gz: 30a806e961d33a9c8e02a0d2466f9697982138e7
+  metadata.gz: 9fd205fc1cb2fcb2aa0ae6f4d14ee1d6ebc1a5c1
+  data.tar.gz: 56d68ae2bd26d45a34181835181595f44b043746
 SHA512:
-  metadata.gz: 8eb69a4cb6714426aa8c18963e94a8bba44820b0e1c83041cb460361287f59ea3e2f4087c4ceacd36500ce0d9b3ed72e718cf4f9ee2da119b148b7fdf0046cc1
-  data.tar.gz: 4a781a0b5e880e60f37174880adc36181bce9700a12deb29f938aecc53eff315e8ba6fadc7ce3024f706cdce7fe6ccdf14bb068495fbc806c10681c4a1733bcd
+  metadata.gz: 0572fe44979b1cf17f839a2d9985908016d8396d3b93fff5e2ed26ed47ee4205f81a1b82137aff6362f8f396a66868c605ee4e392c15eb5665b12059eb264892
+  data.tar.gz: 57682341e70a82c295e421412cada7890cf4fb54b8ae218c5f999062574e833e43665c79adde8846d5540fb3ccf2e6c2784058a2ef24f2a9b0d2d84f891e961d

data/.gitignore

@@ -11,6 +11,8 @@
 
 # output from ronn
 /lib/bundler/man/
+man/*
+!man/*.ronn
 
 # rspec failure tracking
 .rspec_status

data/.rubocop_todo.yml

@@ -1,11 +1,17 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-07-27 12:41:39 -0500 using RuboCop version 0.41.2.
+# on 2016-11-19 11:43:45 -0600 using RuboCop version 0.45.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 2
+Lint/EmptyWhen:
+  Exclude:
+    - 'lib/bundler/friendly_errors.rb'
+    - 'spec/support/builders.rb'
+
 # Offense count: 4
 Lint/Eval:
   Exclude:
@@ -41,6 +47,7 @@ Lint/RescueException:
     - 'lib/bundler/worker.rb'
 
 # Offense count: 1
+# Configuration parameters: ContextCreatingMethods.
 Lint/UselessAccessModifier:
   Exclude:
     - 'lib/bundler/fetcher.rb'
@@ -51,17 +58,17 @@ Lint/UselessAssignment:
     - 'lib/bundler/index.rb'
     - 'lib/bundler/installer.rb'
 
-# Offense count: 1686
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# Offense count: 7
+# Configuration parameters: CountComments.
+Metrics/BlockLength:
+  Max: 46
+
+# Offense count: 1855
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 207
 
-# Offense count: 3
-# Configuration parameters: CountKeywordArgs.
-Metrics/ParameterLists:
-  Max: 6
-
 # Offense count: 6
 # Cop supports --auto-correct.
 Performance/RedundantBlockCall:
@@ -79,20 +86,19 @@ Performance/RedundantMatch:
     - 'lib/bundler/definition.rb'
     - 'lib/bundler/lockfile_parser.rb'
 
-# Offense count: 6
+# Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: MaxKeyValuePairs.
 Performance/RedundantMerge:
   Exclude:
     - 'lib/bundler/cli/gem.rb'
-    - 'spec/support/helpers.rb'
 
 # Offense count: 1
 Style/AccessorMethodName:
   Exclude:
     - 'lib/bundler/source/git.rb'
 
-# Offense count: 3
+# Offense count: 4
 Style/CaseEquality:
   Exclude:
     - 'lib/bundler/dsl.rb'
@@ -105,7 +111,7 @@ Style/CaseEquality:
 Style/ClassAndModuleChildren:
   Enabled: false
 
-# Offense count: 10
+# Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly.
 # SupportedStyles: assign_to_condition, assign_inside_condition
@@ -113,7 +119,6 @@ Style/ConditionalAssignment:
   Exclude:
     - 'lib/bundler/cli.rb'
     - 'lib/bundler/cli/gem.rb'
-    - 'lib/bundler/cli/lock.rb'
     - 'lib/bundler/cli/platform.rb'
     - 'lib/bundler/dsl.rb'
     - 'lib/bundler/lazy_specification.rb'
@@ -122,7 +127,7 @@ Style/ConditionalAssignment:
     - 'lib/bundler/source/git.rb'
     - 'lib/bundler/source/rubygems.rb'
 
-# Offense count: 138
+# Offense count: 148
 Style/Documentation:
   Enabled: false
 
@@ -133,13 +138,32 @@ Style/ExtraSpacing:
   Exclude:
     - 'lib/bundler/cli.rb'
 
-# Offense count: 4
+# Offense count: 2
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:
   Exclude:
     - 'lib/bundler/cli.rb'
     - 'spec/spec_helper.rb'
-    - 'spec/support/helpers.rb'
+
+# Offense count: 19
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/bundler/cli/cache.rb'
+    - 'lib/bundler/cli/clean.rb'
+    - 'lib/bundler/cli/install.rb'
+    - 'lib/bundler/cli/outdated.rb'
+    - 'lib/bundler/cli/package.rb'
+    - 'lib/bundler/definition.rb'
+    - 'lib/bundler/dsl.rb'
+    - 'lib/bundler/installer.rb'
+    - 'lib/bundler/lockfile_parser.rb'
+    - 'lib/bundler/runtime.rb'
+    - 'lib/bundler/shared_helpers.rb'
+    - 'lib/bundler/source/path/installer.rb'
+    - 'lib/bundler/source_list.rb'
+    - 'spec/commands/newgem_spec.rb'
+    - 'spec/support/sometimes.rb'
 
 # Offense count: 1
 Style/IfInsideElse:
@@ -151,13 +175,23 @@ Style/IfUnlessModifierOfIfUnless:
   Exclude:
     - 'spec/support/helpers.rb'
 
-# Offense count: 4
+# Offense count: 10
 # Cop supports --auto-correct.
 # Configuration parameters: SupportedStyles, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_brackets
 Style/IndentArray:
   EnforcedStyle: consistent
 
+# Offense count: 6
+Style/MethodMissing:
+  Exclude:
+    - 'lib/bundler/dep_proxy.rb'
+    - 'lib/bundler/dsl.rb'
+    - 'lib/bundler/lazy_specification.rb'
+    - 'lib/bundler/plugin/dsl.rb'
+    - 'lib/bundler/remote_specification.rb'
+    - 'spec/support/builders.rb'
+
 # Offense count: 2
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: module_function, extend_self
@@ -166,6 +200,17 @@ Style/ModuleFunction:
     - 'lib/bundler/shared_helpers.rb'
     - 'spec/support/path.rb'
 
+# Offense count: 11
+# Cop supports --auto-correct.
+Style/MultilineIfModifier:
+  Exclude:
+    - 'bin/with_rubygems'
+    - 'lib/bundler/installer.rb'
+    - 'lib/bundler/psyched_yaml.rb'
+    - 'lib/bundler/rubygems_ext.rb'
+    - 'lib/bundler/runtime.rb'
+    - 'lib/bundler/source/rubygems.rb'
+
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
@@ -183,6 +228,18 @@ Style/NestedParenthesizedCalls:
     - 'spec/commands/lock_spec.rb'
     - 'spec/runtime/setup_spec.rb'
 
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/bundler/gem_helper.rb'
+    - 'lib/bundler/mirror.rb'
+    - 'lib/bundler/source/git/git_proxy.rb'
+    - 'lib/bundler/source/path.rb'
+
 # Offense count: 9
 # Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
 # NamePrefix: is_, has_, have_
@@ -219,6 +276,23 @@ Style/SpaceAroundOperators:
   Exclude:
     - 'lib/bundler/retry.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
+# SupportedStyles: space, no_space
+Style/SpaceInsideBlockBraces:
+  Exclude:
+    - 'lib/bundler/installer/parallel_installer.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowSafeAssignment.
+# SupportedStyles: require_parentheses, require_no_parentheses
+Style/TernaryParentheses:
+  Exclude:
+    - 'lib/bundler/cli/common.rb'
+    - 'lib/bundler/gem_version_promoter.rb'
+
 # Offense count: 10
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
@@ -245,4 +319,12 @@ Style/UnneededInterpolation:
     - 'spec/commands/exec_spec.rb'
     - 'spec/support/artifice/endpoint.rb'
     - 'spec/support/artifice/endpoint_500.rb'
-    - 'spec/support/fakeweb/windows.rb'
+
+# Offense count: 2
+# Configuration parameters: SupportedStyles.
+# SupportedStyles: snake_case, normalcase, non_integer
+Style/VariableNumber:
+  EnforcedStyle: normalcase
+  Exclude:
+    - 'spec/commands/help_spec.rb'
+    - 'spec/other/ext_spec.rb'

data/.travis.yml

@@ -13,11 +13,6 @@ branches:
     - /.+-stable$/
 
 notifications:
-  email:
-    # andre
-    - secure: "bCcvqJT7YrBawtkXXwHhT+jOFth7r2Qv/30PkkbhQxk6Jb3xambjCOJ3U6vJ\ngYmiL50exi5lUp3oc3SEbHN5t2CrZqOZDQ6o7P8EAmB5c0oH2RrYaFOkI5Gt\nul/jGH/96A9sj0aMwG7JfdMSfhqj1DUKAm2PnnbXPL853VfmT24="
-    # terence
-    - secure: "MQ8eA5Jb8YzEpAo58DRGfVJklAPcEbAulpBZnTxp0am6ldneDtJHbQk21w6R\nj5GsDHlzr/lMp/GHIimtUZ7rLohfND8fj/W7fs1Dkd4eN02/ERt98x3pHlqv\nvZgSnZ39uVYv+OcphraE24QaRaGWLhWZAMYQTVe/Yz50NyG8g1U="
   slack:
     on_success: change
     on_failure: always
@@ -30,9 +25,10 @@ addons:
       secure: "TrzIv116JLGUxm6PAUskCYrv8KTDguncKROVwbnjVPKTGDAgoDderd8JUdDEXrKoZ9qGLD2TPYKExt9/QDl71E+qHdWnVqWv4HKCUk2P9z/VLKzHuggOUBkCXiJUhjywUieCJhI3N92bfq2EjSBbu2/OFHqWOjLQ+QCooTEBjv8="
 
 rvm:
-  - 2.3.1
-  - 2.2
-  - 2.1
+  - 2.4.0
+  - 2.3.3
+  - 2.2.6
+  - 2.1.9
   - 2.0.0
   - 1.9.3
   - 1.8.7
@@ -43,14 +39,19 @@ env:
   # We need to know if changes to rubygems will break bundler on release
   - RGV=master
   # Test the latest rubygems release with all of our supported rubies
-  - RGV=v2.6.4
-  - RGV=v2.4.8
+  - RGV=v2.6.8
 
 matrix:
   include:
-    # Ruby 2.2, Rubygems 2.4.5 and up (included by RGV above)
+    # Ruby 2.4, Rubygems 2.6.8 and up
+    # Ruby 2.3, Rubygems 2.5.1 and up
+    - rvm: 2.2.6
+      env: RGV=v2.5.2
+    # Ruby 2.2, Rubygems 2.4.5 and up
+    - rvm: 2.2.6
+      env: RGV=v2.4.8
     # Ruby 2.1, Rubygems 2.2.2 and up
-    - rvm: 2.1
+    - rvm: 2.1.9
       env: RGV=v2.2.5
     # Ruby 2.0.0, Rubygems 2.0.0 and up
     - rvm: 2.0.0
@@ -74,9 +75,12 @@ matrix:
       env: RGV=v1.6.2
     - rvm: 1.9.3
       env: RGV=v1.5.3
+
     # Ruby 1.8.7, Rubygems 1.3.6 and up
     - rvm: 1.8.7
       env: RGV=v2.2.5
+    # ALLOWED FAILURES
+    # since the great Travis image outage, frequent random segfaults :'(
     - rvm: 1.8.7
       env: RGV=v2.0.14
     - rvm: 1.8.7
@@ -93,16 +97,26 @@ matrix:
       env: RGV=v1.3.7
     - rvm: 1.8.7
       env: RGV=v1.3.6
-
-    # ALLOWED FAILURES
-    # For no apparent reason, this often goes over the Travis limit
-    - rvm: 1.8.7
-      env: RGV=v2.1.11
     # Ruby-head (we want to know how we're doing, but not fail the build)
     - rvm: ruby-head
       env: RGV=master
 
   allow_failures:
     - rvm: 1.8.7
-      env: RGV=v2.1.11
+      env: RGV=v2.0.14
+    - rvm: 1.8.7
+      env: RGV=v1.8.29
+    - rvm: 1.8.7
+      env: RGV=v1.7.2
+    - rvm: 1.8.7
+      env: RGV=v1.6.2
+    - rvm: 1.8.7
+      env: RGV=v1.5.3
+    - rvm: 1.8.7
+      env: RGV=v1.4.2
+    - rvm: 1.8.7
+      env: RGV=v1.3.7
+    - rvm: 1.8.7
+      env: RGV=v1.3.6
     - rvm: ruby-head
+      env: RGV=master

data/CHANGELOG.md

@@ -1,3 +1,77 @@
+## 1.14.0 (2017-01-20)
+
+Bugfixes:
+
+  - ensure `Settings::Mirror` is autoloaded under the `Settings` namespace
+    (#5238, @segiddins)
+  - fix `bundler/inline` when `BUNDLE_GEMFILE=""` (#5079, @segiddins)
+
+## 1.14.0.pre.2 (2017-01-11)
+
+Bugfixes:
+
+  - allow not selecting a gem when running `bundle open` (#5301, @segiddins)
+  - support installing gems from git branches that contain shell metacharacters (#5295, @segiddins)
+  - fix a resolver error that could leave dependencies unresolved (#5294, @segiddins)
+  - fix a stack overflow error when invoking commands (#5296, @segiddins)
+
+## 1.14.0.pre.1 (2016-12-29)
+
+Features:
+
+  - `bundle doctor` first runs `bundle check` (@segiddins)
+  - the bundler trampoline is automatically enabled when the target version is greater than bundler 2 (@segiddins)
+  - gem checksums returned by rubygems.org are validated when installing gems (#4464, @segiddins)
+  - use the git username as a github username when running `bundle gem` (@JuanitoFatas)
+  - show more context when the resolver conflicts on required ruby and rubygems versions (@segiddins)
+  - improve platform support by allowing bundler to pick the best platform match during dependency resolution, enabled with the `specific_platform` setting (#4295, #4896, @segiddins)
+  - always prompt the user for a password when using `sudo` (#3006, @segiddins)
+  - support running without a home directory (#4778, @segiddins)
+  - print a warning when the gemfile uses a platform conditional that will exclude the gem from all lockfile platforms (@segiddins)
+  - add the `force_ruby_platform` setting to force bundler to install ruby-platform gems, even on other platforms (#4813, @segiddins)
+  - add conservative update options to `bundle lock` (#4912, @chrismo)
+  - improve `bundle outdated` output to group gems by group (@ryanfox1985)
+  - add conservative update options to `bundle update` (#5065, #5076, @chrismo)
+  - print the output of `bundle env` as github-flavored markdown, making it easier to preserve formatting when copy-pasting into a new issue (@segiddins)
+  - configure the persistence file when using `bundle gem` with `rspec` (@segiddins)
+  - add support for the `ruby_25` gemfile filter (@amatsuda)
+  - when installing with a lockfile that is missing dependencies, allow installation to proceed (but without parallelism) (@segiddins)
+
+Performance:
+
+  - improve `require "bundler"` performance by ~5x (@segiddins)
+  - allow install gems in parallel when running on rubygems 2+
+
+Bugfixes:
+
+  - config files with CRLF line endings can be read (#4435, @segiddins)
+  - `bundle lock` activates gems for the current platform even if they were activated under a different platform for a separate dependency (#4896, @segiddins)
+  - running `bundle env` in a directory without a gemfile no longer crashes (@segiddins)
+  - fail gracefully when attempting to use a source with an unknown URI scheme (#4953, @segiddins)
+  - store paths in the lockfile relative to the root gemfile directory when using `eval_gemfile` (#4966, @segiddins)
+  - `bundle lock` will not update without the `--update` flag (#4957, @segiddins)
+  - the `console` binstub generated by `bundle gem` will load `.irbrc` files (@mattbrictson)
+  - print friendly filesystem access errors in the new index (@segiddins)
+  - print a helpful error when running out of memory on jruby (#4673, @segiddins)
+  - load all rubygems plugins when installing gems (#2824, @segiddins)
+  - `bundle clean --dry-run` prints the list of gems without the `--force` option when no path is set (#5027, @hmistry)
+  - local installs no longer print "this gem may have been yanked" (#5022, @hmistry)
+  - avoid leaking `which` output when running `bundle doctor` (@colby-swandale)
+  - print a warning when attempting to `bundle exec` an empty program (#5084, @bronzdoc)
+  - ensure `bundle outdated` lists all outdated gems (#4979, @chrismo)
+  - fail gracefully when attempting to `bundle gem` with an invalid constant name (#5185, @segiddins)
+  - allow `bundler/inline` to work in a directory that contains a gemfile (#5117, @colby-swandale)
+  - ensure that the new index is thread-safe, allowing installation on rbx (#5142, @segiddins)
+  - remove deprecated `rspec` syntax in `bundle gem` output (@gearnode)
+    - fail gracefully when any system error is encountered when touching the filesystem (#5134, @segiddins)
+  - fix compatibility with a machine running with FIPS mode enabled (#4989, @segiddins)
+  - fix `bundle lock --add-platform ruby` (#5230, @segiddins)
+  - print gem post-install messages when running `bundle update` (@smathy)
+  - ensure errors due to a retries are all separated by a newline (@segiddins)
+  - print out the bundle path in gem not found errors (#4854, @diegosteiner)
+  - fail gracefully when creating threads fails (@segiddins)
+  - avoid downloading metadata for gems that are only development dependencies (@Paxa)
+
 ## 1.13.7 (2016-12-25)
 
 Features:
@@ -41,7 +115,7 @@ Bugfixes:
   - ensure redefined methods have the same visibility as the one they're replacing, fixing `Kernel.require` failing on JRuby (#4975, @segiddins)
   - ensure that Bundler won't complain about a corrupt lockfile when no lockfile exists when using `gemspec` in the Gemfile (#5006, @segiddins)
   - fail gracefully when parsing the metadata for a gemspec from the compact index fails (@segiddins)
-  - fix invoking bundler with binstubs generated by RubyGems 2.6.2+ (#4974, @chrismo)
+  - fix system gems not being copied to --path on bundle install (e.g. --deployment) (#4974, @chrismo)
 
 Performance:
 
@@ -71,7 +145,7 @@ Features:
   - print gem installation errors after other install output (#4834, @segiddins)
   - add `lock --remove-platform` flag to remove platforms from the lock (#4877, @segiddins)
   - add `only_update_to_newer_versions` setting to prevent downgrades during `update` (@segiddins)
-  - expanded expirimental plugin support to include hooks and sources (@asutoshpalai)
+  - expanded experimental plugin support to include hooks and sources (@asutoshpalai)
 
 Bugfixes:
 
@@ -149,6 +223,11 @@ Bugfixes:
   - allow running `bundle install --deployment` after `bundle package --all` with path gems (#2175, @allenzhao)
   - add support for patchlevels in ruby versions in the gemfile and gemspecs (#4593, @chalkos)
 
+## 1.12.6 (2016-10-10)
+
+Bugfixes:
+  - add support for weak etags to the new index (@segiddins)
+
 ## 1.12.5 (2016-05-25)
 
 Bugfixes:

data/DEVELOPMENT.md

@@ -12,7 +12,7 @@ If you have any questions after reading this page, please feel free to contact e
 
 ## How you can help
 
-We track [small bugs and features](https://github.com/bundler/bundler/issues?labels=small) so that anyone who wants to help can start with something that's not too overwhelming. We also keep a [list of things anyone can help with, any time](https://github.com/bundler/bundler/blob/master/CONTRIBUTING.md#contributing). If nothing on those lists looks good, talk to us, and we'll figure out what you can help with. We can absolutely use your help, no matter what level of programming skill you have at the moment.
+We track [small bugs and features](https://github.com/bundler/bundler/labels/contribution%3A%20small) so that anyone who wants to help can start with something that's not too overwhelming. We also keep a [list of things anyone can help with, any time](https://github.com/bundler/bundler/blob/master/CONTRIBUTING.md#contributing). If nothing on those lists looks good, talk to us, and we'll figure out what you can help with. We can absolutely use your help, no matter what level of programming skill you have at the moment.
 
 # Development setup
 
@@ -36,9 +36,11 @@ Bundler doesn't use a Gemfile to list development dependencies, because when we
 
   4. Set up a shell alias to run Bundler from your clone, e.g. a Bash alias:
 
-        $ alias dbundle='BUNDLE_DISABLE_POSTIT=1 ruby -I /path/to/bundler/lib /path/to/bundler/exe/bundle'
+        $ alias dbundle='BUNDLE_TRAMPOLINE_DISABLE=1 ruby -I /path/to/bundler/lib /path/to/bundler/exe/bundle'
 
-     The `BUNDLE_DISABLE_POSTIT` environment variable ensures that the version of Bundler in `/path/to/bundler/lib` will be used. Without that environment setting, Bundler will automatically download, install, and run the version of Bundler listed in `Gemfile.lock`. With that set up, you can test changes you've made to Bundler by running `dbundle`, without interfering with the regular `bundle` command.
+     The `BUNDLE_TRAMPOLINE_DISABLE` environment variable ensures that the version of Bundler in `/path/to/bundler/lib` will be used. Without that environment setting, Bundler will automatically download, install, and run the version of Bundler listed in `Gemfile.lock`. With that set up, you can test changes you've made to Bundler by running `dbundle`, without interfering with the regular `bundle` command.
+
+To dive into the code with Pry: `RUBYOPT=-rpry dbundle` to require pry and then run commands.
 
 # Submitting Pull Requests
 

data/ISSUES.md

@@ -10,6 +10,23 @@ Detailed information about each Bundler command, including help with common prob
 
 ## Troubleshooting
 
+### Permission denied when installing bundler
+
+Certain operating systems such as MacOS and Ubuntu have versions of Ruby that require evelated privileges to install gems.
+
+    ERROR:  While executing gem ... (Gem::FilePermissionError)
+      You don't have write permissions for the /Library/Ruby/Gems/2.0.0 directory.
+
+There are multiple ways to solve this issue. You can install bundler with elevated privilges using `sudo` or `su`.
+
+    sudo gem install bundler
+
+If you cannot elevated your privileges or do not want to globally install Bundler, you can use the `--user-install` option.
+
+    gem install bundler --user-install
+
+This will install Bundler into your home directory. Note that you will need to append `~/.gem/ruby/<ruby version>/bin` to your `$PATH` variable to use `bundle`.
+
 ### Heroku errors
 
 Please open a ticket with [Heroku](https://www.heroku.com) if you're having trouble deploying. They have a professional support team who can help you resolve Heroku issues far better than the Bundler team can. If the problem that you are having turns out to be a bug in Bundler itself, [Heroku support](https://www.heroku.com/support) can get the exact details to us.

data/README.md

@@ -19,12 +19,19 @@ bundle install
 bundle exec rspec
 ```
 
+For help with installation issues, see [ISSUES](https://github.com/bundler/bundler/blob/master/ISSUES.md)
+
 See [bundler.io](http://bundler.io) for the full documentation.
 
 ### Troubleshooting
 
 For help with common problems, see [ISSUES](https://github.com/bundler/bundler/blob/master/ISSUES.md).
 
+### Supporting
+
+<a href="https://rubytogether.org/"><img src="https://rubytogether.org/images/rubies.svg" width=200></a><br/>
+Bundler is maintained by <a href="https://rubytogether.org/">Ruby Together</a>, a grassroots initiative committed to supporting the critical Ruby infrastructure you rely on. Contribute today <a href="https://rubytogether.org/developers">as an individual</a> or even better, <a href="https://rubytogether.org/companies">as a company</a>, and ensure that Bundler, RubyGems, and other shared tooling is around for years to come.
+
 ### Other questions
 
 To see what has changed in recent versions of Bundler, see the [CHANGELOG](https://github.com/bundler/bundler/blob/master/CHANGELOG.md).

data/Rakefile

@@ -39,7 +39,7 @@ namespace :spec do
     deps = Hash[BUNDLER_SPEC.development_dependencies.map do |d|
       [d.name, d.requirement.to_s]
     end]
-    deps["rubocop"] ||= "= 0.41.2" if RUBY_VERSION >= "1.9.3" # can't go in the gemspec because of the ruby version requirement
+    deps["rubocop"] ||= "= 0.45.0" if RUBY_VERSION >= "2.0.0" # can't go in the gemspec because of the ruby version requirement
 
     # JRuby can't build ronn or rdiscount, so we skip that
     if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
@@ -47,10 +47,10 @@ namespace :spec do
       deps.delete("rdiscount")
     end
 
-    deps.sort_by {|name, _| name }.each do |name, version|
-      sh %(#{Gem.ruby} -S gem list -i "^#{name}$" -v "#{version}" || ) +
-        %(#{Gem.ruby} -S gem install #{name} -v "#{version}" --no-ri --no-rdoc)
-    end
+    gem_install_command = "install --no-ri --no-rdoc --conservative " + deps.sort_by {|name, _| name }.map do |name, version|
+      "'#{name}:#{version}'"
+    end.join(" ")
+    sh %(#{Gem.ruby} -S gem #{gem_install_command})
 
     # Download and install gems used inside tests
     $LOAD_PATH.unshift("./spec")
@@ -74,7 +74,7 @@ namespace :spec do
 
       $LOAD_PATH.unshift("./spec")
       require "support/rubygems_ext"
-      Spec::Rubygems::DEPS["codeclimate-test-reporter"] = nil if RUBY_VERSION >= "2.2.0"
+      Spec::Rubygems::DEPS["codeclimate-test-reporter"] = "~> 0.6.0" if RUBY_VERSION >= "2.2.0"
 
       # Install the other gem deps, etc
       Rake::Task["spec:deps"].invoke
@@ -91,9 +91,9 @@ begin
   RSpec::Core::RakeTask.new
   task :spec => "man:build"
 
-  if RUBY_VERSION >= "1.9.3"
+  if RUBY_VERSION >= "2.0.0"
     # can't go in the gemspec because of the ruby version requirement
-    gem "rubocop", "= 0.41.2"
+    gem "rubocop", "= 0.45.0"
     require "rubocop/rake_task"
     RuboCop::RakeTask.new
   end
@@ -127,7 +127,7 @@ begin
       rubyopt = ENV["RUBYOPT"]
       # When editing this list, also edit .travis.yml!
       branches = %w(master)
-      releases = %w(v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.29 v2.0.14 v2.1.11 v2.2.5 v2.4.8 v2.6.4)
+      releases = %w(v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.29 v2.0.14 v2.1.11 v2.2.5 v2.4.8 v2.5.2 v2.6.8)
       (branches + releases).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
@@ -190,7 +190,7 @@ begin
     task :travis do
       rg = ENV["RGV"] || raise("Rubygems version is required on Travis!")
 
-      if RUBY_VERSION > "1.9.3"
+      if RUBY_VERSION >= "2.0.0"
         puts "\n\e[1;33m[Travis CI] Running bundler linter\e[m\n\n"
         Rake::Task["rubocop"].invoke
       end
@@ -238,14 +238,15 @@ begin
   require "ronn"
 
   namespace :man do
-    directory "lib/bundler/man"
+    directory "man"
 
     sources = Dir["man/*.ronn"].map {|f| File.basename(f, ".ronn") }
     sources.map do |basename|
       ronn = "man/#{basename}.ronn"
-      roff = "lib/bundler/man/#{basename}"
+      manual_section = ".1" unless basename =~ /.*(\d+)\Z/
+      roff = "man/#{basename}#{manual_section}"
 
-      file roff => ["lib/bundler/man", ronn] do
+      file roff => ["man", ronn] do
         sh "#{Gem.ruby} -S ronn --roff --pipe #{ronn} > #{roff}"
       end
 
@@ -257,9 +258,8 @@ begin
     end
 
     task :clean do
-      leftovers = Dir["lib/bundler/man/*"].reject do |f|
-        basename = File.basename(f).sub(/\.(txt|ronn)/, "")
-        sources.include?(basename)
+      leftovers = Dir["man/*"].reject do |f|
+        File.extname(f) == ".ronn" || f == "man/index.txt"
       end
       rm leftovers if leftovers.any?
     end
@@ -285,13 +285,6 @@ end
 begin
   require "automatiek"
 
-  Automatiek::RakeTask.new("compact_index_client") do |lib|
-    lib.download = { :github => "https://github.com/bundler/compact_index_client" }
-    lib.namespace = "CompactIndexClient"
-    lib.prefix = "Bundler"
-    lib.vendor_lib = "lib/bundler/vendor/compact_index_client"
-  end
-
   Automatiek::RakeTask.new("molinillo") do |lib|
     lib.download = { :github => "https://github.com/CocoaPods/Molinillo" }
     lib.namespace = "Molinillo"
@@ -312,11 +305,29 @@ begin
     lib.prefix = "BundlerVendoredPostIt"
     lib.vendor_lib = "lib/bundler/vendor/postit"
   end
+
+  Automatiek::RakeTask.new("net-http-persistent") do |lib|
+    lib.download = { :github => "https://github.com/drbrain/net-http-persistent" }
+    lib.namespace = "Net::HTTP::Persistent"
+    lib.prefix = "Bundler::Persistent"
+    lib.vendor_lib = "lib/bundler/vendor/net-http-persistent"
+
+    mixin = Module.new do
+      def namespace_files
+        super
+        require_target = vendor_lib.sub(%r{^(.+?/)?lib/}, "") << "/lib"
+        relative_files = files.map {|f| Pathname.new(f).relative_path_from(Pathname.new(vendor_lib) / "lib").sub_ext("").to_s }
+        process_files(/require (['"])(#{Regexp.union(relative_files)})/, "require \\1#{require_target}/\\2")
+      end
+    end
+    lib.send(:extend, mixin)
+  end
 rescue LoadError
   namespace :vendor do
     task(:molinillo) { abort "Install the automatiek gem to be able to vendor gems." }
     task(:thor) { abort "Install the automatiek gem to be able to vendor gems." }
     task(:postit) { abort "Install the automatiek gem to be able to vendor gems." }
+    task("net-http-persistent") { abort "Install the automatiek gem to be able to vendor gems." }
   end
 end
 

data/bin/rubocop

@@ -10,7 +10,7 @@ bundler_spec.dependencies.each do |dep|
   gem dep.name, dep.requirement
 end
 
-gem "rubocop", "= 0.41.2"
+gem "rubocop", "= 0.45.0"
 
 Gem.finish_resolve if Gem.respond_to?(:finish_resolve)