rubygems-update 2.6.7 → 2.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f8ebff1d7a817d5be825280b5c587a09bc84ea5
-  data.tar.gz: 8dfc361737e408f6291f7d670b1e9a7b6b9900f3
+  metadata.gz: a8082ce6742459dfd41daaa9e9db86de202e0d00
+  data.tar.gz: 624be9cee606a2b69eecf9cbdcb1bb4daab38570
 SHA512:
-  metadata.gz: 76309ac79a71bc0d35a962741ebd39aec07c33d37eae5e5593cedc0d645970a0f26bc8a4f868897ed5d5f06d8ecc3a830b1694d8a3a9ee5df2ead8c934c14164
-  data.tar.gz: 3b4b9d5aaeedfc0c58b7e1418ddef65402044f0bf1cb948d5028ad8c70dccc10ac6c2e652670d24b577136ac8684cd2b744f4ffca0af0b6f6a19da590c6b343f
+  metadata.gz: 77e2d16b0f65465870f2299c00df2386c9e4a3b46a86a9d4abefb4ad574f7c4055226bbfed856866d97d1f128faff5c4ae4133a01f3ae63e359823497fed303d
+  data.tar.gz: 2ce00b6e68e28a69cfa1aa688787dc695cdd6d6504570a241a1b13f49a0a48ebfe85dafdd6cea49231a73431239df8be0e6666f77a9b4747495391d34274987f

data/History.txt

@@ -1,5 +1,16 @@
 # coding: UTF-8
 
+=== 2.6.8 / 2016-10-29
+
+Bug fixes:
+
+* Improve SSL verification failure message. Pull request #1751
+  by Eric Hodel.
+* Ensure `to_spec` falls back on prerelease specs. Pull request
+  #1755 by André Arko.
+* Update vendored Molinillo to 0.5.3. Pull request #1763 by
+  Samuel Giddins.
+
 === 2.6.7 / 2016-09-26
 
 Bug fixes:

data/Manifest.txt

@@ -38,6 +38,7 @@ bundler/lib/bundler/cli/clean.rb
 bundler/lib/bundler/cli/common.rb
 bundler/lib/bundler/cli/config.rb
 bundler/lib/bundler/cli/console.rb
+bundler/lib/bundler/cli/doctor.rb
 bundler/lib/bundler/cli/exec.rb
 bundler/lib/bundler/cli/gem.rb
 bundler/lib/bundler/cli/init.rb
@@ -52,6 +53,9 @@ bundler/lib/bundler/cli/plugin.rb
 bundler/lib/bundler/cli/show.rb
 bundler/lib/bundler/cli/update.rb
 bundler/lib/bundler/cli/viz.rb
+bundler/lib/bundler/compact_index_client.rb
+bundler/lib/bundler/compact_index_client/cache.rb
+bundler/lib/bundler/compact_index_client/updater.rb
 bundler/lib/bundler/constants.rb
 bundler/lib/bundler/current_ruby.rb
 bundler/lib/bundler/definition.rb
@@ -62,9 +66,9 @@ bundler/lib/bundler/deprecate.rb
 bundler/lib/bundler/dsl.rb
 bundler/lib/bundler/endpoint_specification.rb
 bundler/lib/bundler/env.rb
-bundler/lib/bundler/environment.rb
 bundler/lib/bundler/environment_preserver.rb
 bundler/lib/bundler/errors.rb
+bundler/lib/bundler/feature_flag.rb
 bundler/lib/bundler/fetcher.rb
 bundler/lib/bundler/fetcher/base.rb
 bundler/lib/bundler/fetcher/compact_index.rb
@@ -76,6 +80,8 @@ bundler/lib/bundler/gem_helper.rb
 bundler/lib/bundler/gem_helpers.rb
 bundler/lib/bundler/gem_remote_fetcher.rb
 bundler/lib/bundler/gem_tasks.rb
+bundler/lib/bundler/gem_version_promoter.rb
+bundler/lib/bundler/gemdeps.rb
 bundler/lib/bundler/graph.rb
 bundler/lib/bundler/index.rb
 bundler/lib/bundler/injector.rb
@@ -90,6 +96,7 @@ bundler/lib/bundler/match_platform.rb
 bundler/lib/bundler/mirror.rb
 bundler/lib/bundler/plugin.rb
 bundler/lib/bundler/plugin/api.rb
+bundler/lib/bundler/plugin/api/source.rb
 bundler/lib/bundler/plugin/dsl.rb
 bundler/lib/bundler/plugin/index.rb
 bundler/lib/bundler/plugin/installer.rb
@@ -156,10 +163,6 @@ bundler/lib/bundler/ui/rg_proxy.rb
 bundler/lib/bundler/ui/shell.rb
 bundler/lib/bundler/ui/silent.rb
 bundler/lib/bundler/uri_credentials_filter.rb
-bundler/lib/bundler/vendor/compact_index_client/lib/compact_index_client.rb
-bundler/lib/bundler/vendor/compact_index_client/lib/compact_index_client/cache.rb
-bundler/lib/bundler/vendor/compact_index_client/lib/compact_index_client/updater.rb
-bundler/lib/bundler/vendor/compact_index_client/lib/compact_index_client/version.rb
 bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb
 bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
 bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb
@@ -227,6 +230,7 @@ bundler/lib/bundler/version.rb
 bundler/lib/bundler/vlad.rb
 bundler/lib/bundler/worker.rb
 bundler/lib/bundler/yaml_serializer.rb
+bundler/man/bundle-binstubs.ronn
 bundler/man/bundle-config.ronn
 bundler/man/bundle-exec.ronn
 bundler/man/bundle-gem.ronn
@@ -360,6 +364,7 @@ lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb
 lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb
 lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
 lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
+lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
 lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
 lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb
 lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb

data/bundler/CHANGELOG.md

@@ -1,3 +1,106 @@
+## 1.13.6 (2016-10-22)
+
+Bugfixes:
+
+  - make the `gem` method public again, fixing a regression in 1.13.4 (#5102, @segiddins)
+
+## 1.13.5 (2016-10-15)
+
+Bugfixes:
+
+  - Ensure a locked pre-release spec can always be re-resolved (#5089, @segiddins)
+
+## 1.13.4 (2016-10-11)
+
+Bugfixes:
+
+ - stop printing warning when compact index versions file is rewritten (#5064, @indirect)
+ - fix `parent directory is world writable but not sticky` error on install (#5043, @indirect)
+ - fix for `uninitialized constant Bundler::Plugin::API::Source` error (#5010, @hsbt, @aycabta)
+ - make `update` options for major, minor, and patch updates consistent (#4934, @chrismo)
+
+## 1.13.3 (2016-10-10)
+
+Bugfixes:
+
+  - add support for weak etags to the new index (@segiddins)
+
+## 1.13.2 (2016-09-30)
+
+Bugfixes:
+
+  - allow `Settings` to be initialized without a root directory (@m1k3)
+  - allow specifying ruby engines in the gemfile as a symbol (#4919, @JuanitoFatas)
+  - avoid an execption when using `bundler/deployment` with Vlad (@srbaker)
+  - 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 system gems not being copied to --path on bundle install (e.g. --deployment) (#4974, @chrismo)
+
+Performance:
+
+  - avoid parsing the lockfile twice when evaluating gemfiles (@segiddins)
+
+## 1.13.1 (2016-09-13)
+
+Bugfixes:
+
+  - ensure that `Gem::Source` is available, fixing several exceptions (#4944, @dekellum)
+  - ensure that dependency resolution works when multiple gems have the same dependency (#4961, @segiddins)
+
+## 1.13.0 (2016-09-05)
+
+This space deliberately left blank.
+
+## 1.13.0.rc.2 (2016-08-21)
+
+Features:
+
+  - add setting `exec_disable_load` to force `exec` to spawn a new Ruby process (@segiddins)
+  - add `doctor` command to help with issues like unlinked compiled gems (#4765, @mistydemeo)
+  - rework the `update` command, providing fine-grained control via flags (#4676, @chrismo)
+  - add URI to http response output in debug mode (#4808, @NickLaMuro)
+  - add manpage for `binstubs` command (#4847, @Zorbash)
+  - support `mirror` settings for sources by hostname, not only full URL (@opiethehokie)
+  - 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 experimental plugin support to include hooks and sources (@asutoshpalai)
+
+Bugfixes:
+
+  - retry gem downloads (#4846, @jkeiser)
+  - improve the CompactIndex to handle capitalized legacy gems (#4867, @segiddins)
+  - re-use persistent HTTP connections for CompactIndex (@NickLaMuro)
+  - respect `required_ruby_version` when Gemfile contains `ruby` version (@indirect)
+  - allow `rake release` to sign git tags (#4743, @eagletmt)
+  - set process titles when using `#load` during `exec` (@yob)
+  - recognize JRuby shebangs for using `#load` during `exec` (@ojab)
+  - handle world-writable home directories (#4726, @allenzhao)
+  - support multi-platform gems via the `gemspec` Gemfile method (#4798, @segiddins)
+  - print dots correctly for CompactIndex fetcher (@NickLaMuro)
+  - set an `open_timeout` when requesting gem data via HTTP (@NickLaMuro)
+  - rename the BUNDLE\_ORIG\_ENV variable so it no longer shows up in `config` (@indirect)
+  - show help only when `-h` or `--help` is passed to Bundler, not to `exec` (#4801, @segiddins)
+  - handle symlinks to binstubs created by `--standalone` (#4782, @terinjokes)
+
+## 1.13.0.rc.1 (2016-06-27)
+
+Features:
+
+  - when `bundle config major_deprecations` or `BUNDLE_MAJOR_DEPRECATIONS` is set, deprecation warnings for bundler 2 will be printed (@segiddins)
+  - when running with `--verbose`, bundler will print the reason it is re-resolving a gemfile (@segiddins)
+
+Bugfixes:
+
+  - fix support for running RubyGems 1.x on Ruby 2.3 (#4698, @segiddins)
+  - fix bundle exec'ing to a ruby file when gems are installed into a path (#4592, @chrismo)
+  - when multiple specs in a bundle have the same executable, prefer activating the one from the requested gem (#4705, @segiddins)
+  - stop changing the load path to require the vendored postit when trampolining (@segiddins)
+  - ensure relative paths are properly printed after completing an installation (@jenseng)
+  - fix re-resolving when there are multiple unchanged path sources (@segiddins)
+  - de-init submodules when running git 2.9 and requesting a git gem without submodules (@segiddins)
+
 ## 1.13.0.pre.1 (2016-06-20)
 
 Performance:
@@ -40,6 +143,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/bundler/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='ruby -I /path/to/bundler/lib /path/to/bundler/exe/bundle'
+        $ alias dbundle='BUNDLE_DISABLE_POSTIT=1 ruby -I /path/to/bundler/lib /path/to/bundler/exe/bundle'
 
-     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_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.
+
+To dive into the code with Pry: `RUBYOPT=-rpry dbundle` to require pry and then run commands.
 
 # Submitting Pull Requests
 
@@ -102,7 +104,7 @@ Finally, the ticket may be a duplicate of another older ticket. If you notice a
 
 If you would like to add a new feature to Bundler, please follow these steps:
 
-  1. [Create an issue](https://github.com/bundler/bundler/issues/new) with the [`feature-request` label](https://github.com/bundler/bundler/labels/feature-request) to discuss your feature.
+  1. [Create an issue](https://github.com/bundler/bundler/issues/new) with the [`feature-request` label](https://github.com/bundler/bundler/labels/type:%20feature-request) to discuss your feature.
   2. Base your commits on the master branch, since we follow [SemVer](http://semver.org) and don't add new features to old releases.
   3. Commit the code and at least one test covering your changes to a feature branch in your fork.
   4. Send us a [pull request](https://help.github.com/articles/using-pull-requests) from your feature branch.

data/bundler/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/bundler/README.md

@@ -19,6 +19,8 @@ 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

data/bundler/exe/bundle

@@ -4,12 +4,10 @@
 # Exit cleanly from an early interrupt
 Signal.trap("INT") { exit 1 }
 
-unless ENV["BUNDLE_DISABLE_POSTIT"]
-  update = "update".start_with?(ARGV.first || " ") && ARGV.find {|a| a.start_with?("--bundler") }
-  update &&= update =~ /--bundler(?:=(.+))?/ && $1 || "> 0.a"
-  ENV["BUNDLER_VERSION"] = update if update
-  require "bundler/postit_trampoline"
-end
+update = "update".start_with?(ARGV.first || " ") && ARGV.find {|a| a.start_with?("--bundler") }
+update &&= update =~ /--bundler(?:=(.+))?/ && $1 || "> 0.a"
+ENV["BUNDLER_VERSION"] = update if update
+require "bundler/postit_trampoline"
 
 require "bundler"
 # Check if an older version of bundler is installed

data/bundler/exe/bundle_ruby

@@ -3,14 +3,12 @@
 
 Signal.trap("INT") { exit 1 }
 
+require "bundler/errors"
 require "bundler/ruby_version"
 require "bundler/ruby_dsl"
 require "bundler/shared_helpers"
 
 module Bundler
-  class GemfileError < RuntimeError; end
-  class GemfileEvalError < GemfileError; end
-
   class Dsl
     include RubyDsl
 
@@ -44,7 +42,7 @@ module Bundler
   end
 end
 
-STDERR.puts "Warning: bundle_ruby will be deprecated in Bundler 2.0.0."
+Bundler::SharedHelpers.major_deprecation("the bundle_ruby executable has been removed in favor of `bundle platform --ruby`")
 
 dsl = Bundler::Dsl.new
 begin

data/bundler/exe/bundler

@@ -1,22 +1,4 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Exit cleanly from an early interrupt
-Signal.trap("INT") { exit 1 }
-
-require "bundler"
-# Check if an older version of bundler is installed
-$LOAD_PATH.each do |path|
-  next unless path =~ %r{/bundler-0\.(\d+)} && $1.to_i < 9
-  err = String.new
-  err << "Looks like you have a version of bundler that's older than 0.9.\n"
-  err << "Please remove your old versions.\n"
-  err << "An easy way to do this is by running `gem cleanup bundler`."
-  abort(err)
-end
-
-require "bundler/friendly_errors"
-Bundler.with_friendly_errors do
-  require "bundler/cli"
-  Bundler::CLI.start(ARGV, :debug => true)
-end
+load File.expand_path("../bundle", __FILE__)

data/bundler/lib/bundler.rb

@@ -3,14 +3,17 @@ require "fileutils"
 require "pathname"
 require "rbconfig"
 require "thread"
+require "tmpdir"
+
+require "bundler/errors"
 require "bundler/environment_preserver"
 require "bundler/gem_remote_fetcher"
+require "bundler/plugin"
 require "bundler/rubygems_ext"
 require "bundler/rubygems_integration"
 require "bundler/version"
 require "bundler/constants"
 require "bundler/current_ruby"
-require "bundler/errors"
 
 module Bundler
   environment_preserver = EnvironmentPreserver.new(ENV, %w(PATH GEM_PATH))
@@ -24,34 +27,34 @@ module Bundler
   autoload :Deprecate,              "bundler/deprecate"
   autoload :Dsl,                    "bundler/dsl"
   autoload :EndpointSpecification,  "bundler/endpoint_specification"
-  autoload :Environment,            "bundler/environment"
   autoload :Env,                    "bundler/env"
   autoload :Fetcher,                "bundler/fetcher"
+  autoload :FeatureFlag,            "bundler/feature_flag"
   autoload :GemHelper,              "bundler/gem_helper"
   autoload :GemHelpers,             "bundler/gem_helpers"
+  autoload :GemVersionPromoter,     "bundler/gem_version_promoter"
   autoload :Graph,                  "bundler/graph"
   autoload :Index,                  "bundler/index"
-  autoload :Installer,              "bundler/installer"
   autoload :Injector,               "bundler/injector"
+  autoload :Installer,              "bundler/installer"
   autoload :LazySpecification,      "bundler/lazy_specification"
   autoload :LockfileParser,         "bundler/lockfile_parser"
   autoload :MatchPlatform,          "bundler/match_platform"
   autoload :Mirror,                 "bundler/mirror"
   autoload :Mirrors,                "bundler/mirror"
-  autoload :Plugin,                 "bundler/plugin"
   autoload :RemoteSpecification,    "bundler/remote_specification"
   autoload :Resolver,               "bundler/resolver"
   autoload :Retry,                  "bundler/retry"
-  autoload :RubyVersion,            "bundler/ruby_version"
   autoload :RubyDsl,                "bundler/ruby_dsl"
+  autoload :RubyGemsGemInstaller,   "bundler/rubygems_gem_installer"
+  autoload :RubyVersion,            "bundler/ruby_version"
   autoload :Runtime,                "bundler/runtime"
   autoload :Settings,               "bundler/settings"
   autoload :SharedHelpers,          "bundler/shared_helpers"
-  autoload :SpecSet,                "bundler/spec_set"
-  autoload :StubSpecification,      "bundler/stub_specification"
   autoload :Source,                 "bundler/source"
   autoload :SourceList,             "bundler/source_list"
-  autoload :RubyGemsGemInstaller,   "bundler/rubygems_gem_installer"
+  autoload :SpecSet,                "bundler/spec_set"
+  autoload :StubSpecification,      "bundler/stub_specification"
   autoload :UI,                     "bundler/ui"
   autoload :URICredentialsFilter,   "bundler/uri_credentials_filter"
 
@@ -88,9 +91,11 @@ module Bundler
 
     def setup(*groups)
       # Return if all groups are already loaded
-      return @setup if defined?(@setup)
+      return @setup if defined?(@setup) && @setup
+
+      definition.validate_runtime!
 
-      definition.validate_ruby!
+      SharedHelpers.print_major_deprecations!
 
       if groups.empty?
         # Load all groups, but only once
@@ -109,7 +114,8 @@ module Bundler
     end
 
     def environment
-      Bundler::Environment.new(root, definition)
+      SharedHelpers.major_deprecation "Bundler.environment has been removed in favor of Bundler.load"
+      load
     end
 
     # Returns an instance of Bundler::Definition for given Gemfile and lockfile
@@ -121,27 +127,59 @@ module Bundler
       @definition = nil if unlock
       @definition ||= begin
         configure
-        upgrade_lockfile
         Definition.build(default_gemfile, default_lockfile, unlock)
       end
     end
 
     def locked_gems
-      return @locked_gems if defined?(@locked_gems)
-      if Bundler.default_lockfile.exist?
-        lock = Bundler.read_file(Bundler.default_lockfile)
-        @locked_gems = LockfileParser.new(lock)
-      else
-        @locked_gems = nil
-      end
+      @locked_gems ||=
+        if defined?(@definition) && @definition
+          definition.locked_gems
+        elsif Bundler.default_lockfile.exist?
+          lock = Bundler.read_file(Bundler.default_lockfile)
+          LockfileParser.new(lock)
+        end
     end
 
     def ruby_scope
       "#{Bundler.rubygems.ruby_engine}/#{Bundler.rubygems.config_map[:ruby_version]}"
     end
 
+    def user_home
+      @user_home ||= begin
+        home = Bundler.rubygems.user_home
+        warning = "Your home directory is not set properly:"
+        if home.nil?
+          warning += "\n * It is not set at all"
+        elsif !File.directory?(home)
+          warning += "\n * `#{home}` is not a directory"
+        elsif !File.writable?(home)
+          warning += "\n * `#{home}` is not writable"
+        else
+          return @user_home = Pathname.new(home)
+        end
+
+        login = Etc.getlogin || "unknown"
+
+        tmp_home = Pathname.new(Dir.tmpdir).join("bundler", "home", login)
+        begin
+          SharedHelpers.filesystem_access(tmp_home, :write) do |p|
+            FileUtils.mkdir_p(p)
+          end
+        rescue => e
+          warning += "\n\nBundler also failed to create a temporary home directory at `#{tmp_home}`:\n#{e}"
+          raise warning
+        end
+
+        warning += "\n\nBundler will use `#{tmp_home}` as your home directory temporarily"
+
+        Bundler.ui.warn(warning)
+        tmp_home
+      end
+    end
+
     def user_bundle_path
-      Pathname.new(Bundler.rubygems.user_home).join(".bundle")
+      Pathname.new(user_home).join(".bundle")
     end
 
     def home
@@ -193,6 +231,14 @@ module Bundler
 
     def rm_rf(path)
       FileUtils.remove_entry_secure(path) if path && File.exist?(path)
+    rescue ArgumentError
+      message = <<EOF
+It is a security vulnerability to allow your home directory to be world-writable, and bundler can not continue.
+You should probably consider fixing this issue by running `chmod o-w ~` on *nix.
+Please refer to http://ruby-doc.org/stdlib-2.1.2/libdoc/fileutils/rdoc/FileUtils.html#method-c-remove_entry_secure for details.
+EOF
+      File.world_writable?(path) ? Bundler.ui.warn(message) : raise
+      raise PathError, "Please fix the world-writable issue with your #{path} directory"
     end
 
     def settings
@@ -209,10 +255,11 @@ module Bundler
     # @deprecated Use `original_env` instead
     # @return [Hash] Environment with all bundler-related variables removed
     def clean_env
+      Bundler::SharedHelpers.major_deprecation("`Bundler.clean_env` has weird edge cases, use `.original_env` instead")
       env = original_env
 
-      if env.key?("BUNDLE_ORIG_MANPATH")
-        env["MANPATH"] = env["BUNDLE_ORIG_MANPATH"]
+      if env.key?("BUNDLER_ORIG_MANPATH")
+        env["MANPATH"] = env["BUNDLER_ORIG_MANPATH"]
       end
 
       env.delete_if {|k, _| k[0, 7] == "BUNDLE_" }
@@ -246,6 +293,11 @@ module Bundler
       with_clean_env { Kernel.exec(*args) }
     end
 
+    def local_platform
+      return Gem::Platform::RUBY if settings[:force_ruby_platform]
+      Gem::Platform.local
+    end
+
     def default_gemfile
       SharedHelpers.default_gemfile
     end
@@ -317,17 +369,23 @@ module Bundler
     def sudo(str)
       SUDO_MUTEX.synchronize do
         prompt = "\n\n" + <<-PROMPT.gsub(/^ {6}/, "").strip + " "
-        Your user account isn't allowed to install to the system Rubygems.
+        Your user account isn't allowed to install to the system RubyGems.
         You can cancel this installation and run:
 
             bundle install --path vendor/bundle
 
         to install the gems into ./vendor/bundle/, or you can enter your password
-        and install the bundled gems to Rubygems using sudo.
+        and install the bundled gems to RubyGems using sudo.
 
         Password:
         PROMPT
 
+        unless @prompted_for_sudo ||= system(%(sudo -k -p "#{prompt}" true))
+          raise SudoNotPermittedError,
+            "Bundler requires sudo access to install at the moment. " \
+            "Try installing again, granting Bundler sudo access when prompted, or installing into a different path."
+        end
+
         `sudo -p "#{prompt}" #{str}`
       end
     end
@@ -378,10 +436,27 @@ module Bundler
       @git_present = Bundler.which("git") || Bundler.which("git.exe")
     end
 
+    def feature_flag
+      @feature_flag ||= FeatureFlag.new(VERSION)
+    end
+
     def reset!
       @root = nil
       @settings = nil
       @definition = nil
+      @setup = nil
+      @load = nil
+      @locked_gems = nil
+      @bundle_path = nil
+      @bin_path = nil
+      @user_home = nil
+
+      Plugin.reset!
+
+      return unless defined?(@rubygems) && @rubygems
+      rubygems.undo_replacements
+      rubygems.reset
+      @rubygems = nil
     end
 
   private
@@ -397,31 +472,33 @@ module Bundler
     def eval_gemspec(path, contents)
       eval(contents, TOPLEVEL_BINDING, path.expand_path.to_s)
     rescue ScriptError, StandardError => e
-      original_line = e.backtrace.find {|line| line.include?(path.to_s) }
-      msg = String.new
-      msg << "There was a #{e.class} while loading #{path.basename}: \n#{e.message}"
-      msg << " from\n  #{original_line}" if original_line
-      msg << "\n"
+      msg = "There was an error while loading `#{path.basename}`: #{e.message}"
 
       if e.is_a?(LoadError) && RUBY_VERSION >= "1.9"
-        msg << "\nDoes it try to require a relative path? That's been removed in Ruby 1.9."
+        msg += "\nDoes it try to require a relative path? That's been removed in Ruby 1.9"
       end
 
-      raise GemspecError, msg
+      raise GemspecError, Dsl::DSLError.new(msg, path, e.backtrace, contents)
     end
 
     def configure_gem_home_and_path
-      blank_home = ENV["GEM_HOME"].nil? || ENV["GEM_HOME"].empty?
+      configure_gem_path
+      configure_gem_home
+      bundle_path
+    end
+
+    def configure_gem_path(env = ENV, settings = self.settings)
+      blank_home = env["GEM_HOME"].nil? || env["GEM_HOME"].empty?
       if settings[:disable_shared_gems]
-        ENV["GEM_PATH"] = ""
+        # this needs to be empty string to cause
+        # PathSupport.split_gem_path to only load up the
+        # Bundler --path setting as the GEM_PATH.
+        env["GEM_PATH"] = ""
       elsif blank_home || Bundler.rubygems.gem_dir != bundle_path.to_s
         possibles = [Bundler.rubygems.gem_dir, Bundler.rubygems.gem_path]
         paths = possibles.flatten.compact.uniq.reject(&:empty?)
-        ENV["GEM_PATH"] = paths.join(File::PATH_SEPARATOR)
+        env["GEM_PATH"] = paths.join(File::PATH_SEPARATOR)
       end
-
-      configure_gem_home
-      bundle_path
     end
 
     def configure_gem_home
@@ -436,13 +513,6 @@ module Bundler
       Bundler.rubygems.clear_paths
     end
 
-    def upgrade_lockfile
-      lockfile = default_lockfile
-      return unless lockfile.exist? && lockfile.read(3) == "---"
-      Bundler.ui.warn "Detected Gemfile.lock generated by 0.9, deleting..."
-      lockfile.rmtree
-    end
-
     # @param env [Hash]
     def with_env(env)
       backup = ENV.to_hash