bundler 1.12.0.pre.1 → 1.12.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b760f9de4dfb482173fc42326c0835065a447b4
-  data.tar.gz: 76008afb974bf6f329a58cc41c82c2b5debb695c
+  metadata.gz: df71627144b74925ef94e86632b2a1e695aca20c
+  data.tar.gz: f0caee062084df614e8ae210e40d38cc644f6987
 SHA512:
-  metadata.gz: f86fc362c9d5734ec0356c53c19c80b896c804cc4c9598359544634d9f144778d4649ee64cfb790a76b21192d079808174088b32af1e84a826e4b2efc1c07b48
-  data.tar.gz: 33716914172bab80e7f76cfeee7a049800055bda2606a41042a43001925c56d1f4d2d1e6fd000a6cbda3875af23a574910ad0da6183a4a5098e04db86b7c1e5f
+  metadata.gz: 2df75889fd75224791131114686b8c30d51c72819ad410b86ab66a7fe04a08bd25bade89483cc40dc7465154f12e9e7dc64e6bd96fb665dc74ffc2994662703d
+  data.tar.gz: b12d427f335b9a56618fd52a415780070e4ca019dcbe190a57632ae2adb51035bb8d832dd408c4d91d6fe3999190ae231221d8514cc3d43e8866d384fec7ee6e

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-02-05 10:43:08 -0600 using RuboCop version 0.37.0.
+# on 2016-02-09 10:53:24 -0600 using RuboCop version 0.37.1.
 # 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
@@ -25,7 +25,7 @@ Lint/IneffectiveAccessModifier:
   Exclude:
     - 'lib/bundler/settings.rb'
 
-# Offense count: 4
+# Offense count: 3
 Lint/NestedMethodDefinition:
   Exclude:
     - 'lib/bundler/inline.rb'
@@ -52,7 +52,7 @@ Lint/UselessAssignment:
     - 'lib/bundler/index.rb'
     - 'lib/bundler/installer.rb'
 
-# Offense count: 1291
+# Offense count: 1295
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
 # URISchemes: http, https
 Metrics/LineLength:
@@ -63,7 +63,7 @@ Metrics/LineLength:
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 53
+# Offense count: 52
 Metrics/PerceivedComplexity:
   Max: 54
 
@@ -148,11 +148,10 @@ Style/GlobalVars:
     - 'spec/spec_helper.rb'
     - 'spec/support/helpers.rb'
 
-# Offense count: 2
+# Offense count: 1
 Style/IfInsideElse:
   Exclude:
     - 'lib/bundler/cli/install.rb'
-    - 'lib/bundler/definition.rb'
 
 # Offense count: 4
 # Cop supports --auto-correct.
@@ -196,7 +195,7 @@ Style/PredicateName:
     - 'lib/bundler/source/git/git_proxy.rb'
     - 'lib/bundler/source/path.rb'
 
-# Offense count: 22
+# Offense count: 23
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:

data/.travis.yml

@@ -39,7 +39,7 @@ 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.5.2
+  - RGV=v2.6.0
   - RGV=v2.4.8
 
 matrix:

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 1.12.0.pre.2 (2016-02-26)
+
+Performance:
+
+  - speed up `bundle exec` by `load`ing the executable whenever possible, saving roughly .2 seconds per invocation (@segiddins)
+
+Features:
+
+  - add a `--patch` flag for `bundle outdated` (@RochesterinNYC)
+  - add `Bundler.clean_env` and `Bundler.original_env` (#4232, @njam)
+  - add `--frozen` support to `bundle package` (#3356, @RochesterinNYC)
+
+Bugfixes:
+
+  - place bundler loaded gems after `-I` and `RUBYLIB` (@Elffers)
+  - give a better error message when filesystem access raises an `EPROTO` error (#3581, #3932, #4163, @RochesterinNYC)
+  - give a better error message when both `--deployment` and `--system` are used together (@RochesterinNYC)
+  - fix `$PATH` being preserved for use in `Bundler.with_clean_env` (#4251, @segiddins, @njam)
+  - give a better error message when running `bundle outdated` in frozen mode (#4287, @RochesterinNYC)
+  - handle when `http_proxy` is set to `:no_proxy` in the rubygems configuration (#4294, @segiddins)
+  - give a better error message when authentication details aren't properly escaped (#4288, @RochesterinNYC)
+  - fix `bundle outdated --minor` to only report updates that match the current minor version (@RochesterinNYC)
+  - fix extra dependencies being resolved unnecessarily (#4276, @segiddins)
+  - give a better error message when missing specs due to platform mis-matches (#4259, @RochesterinNYC)
+  - skip rebuilding extensions for git gems if they are already built (#4082, @csfrancis, @indirect, @segiddins)
+  - fix `bundle install` not installing when the `no_install` setting is set (#3966, @chulkilee, @segiddins)
+
 ## 1.12.0.pre.1 (2016-02-09)
 
 Performance:

data/DEVELOPMENT.md

@@ -33,6 +33,24 @@ Bundler doesn't use a Gemfile to list development dependencies, because when we
 
      With that set up, you can test changes you've made to Bundler by running `dbundle`, without interfering with the regular `bundle` command.
 
+# Submitting Pull Requests
+
+Before you submit a pull request, please remember to do the following:
+
+- Make sure the code formatting and styling adheres to the guidelines. We use Rubocop for this. Lack of formatting adherence will result in automatic Travis build failures.
+
+        $ bin/rubocop -a
+
+- Please run the test suite:
+
+        $ bin/rspec
+
+- If you are unable to run the entire test suite, please run the unit test suite and at least the integration specs related to the command or domain of Bundler that your code changes relate to.
+
+- Ex. For a pull request that changes something with `bundle update`, you might run:
+
+        $ bin/rspec spec/bundler
+        $ bin/rspec spec/commands/update_spec.rb
 
 # Bug triage
 

data/Rakefile

@@ -34,7 +34,7 @@ namespace :spec do
     deps = Hash[BUNDLER_SPEC.development_dependencies.map do |d|
       [d.name, d.requirement.to_s]
     end]
-    deps["rubocop"] ||= "= 0.37.0" if RUBY_VERSION >= "1.9.3" # can't go in the gemspec because of the ruby version requirement
+    deps["rubocop"] ||= "= 0.37.1" if RUBY_VERSION >= "1.9.3" # 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"
@@ -65,7 +65,7 @@ namespace :spec do
       sh "sudo apt-get install graphviz -y 2>&1 | tail -n 2"
 
       # Install the gems with a consistent version of RubyGems
-      sh "gem update --system 2.5.2"
+      sh "gem update --system 2.6.0"
 
       $LOAD_PATH.unshift("./spec")
       require "support/rubygems_ext"
@@ -88,7 +88,7 @@ begin
 
   if RUBY_VERSION >= "1.9.3"
     # can't go in the gemspec because of the ruby version requirement
-    gem "rubocop", "= 0.37.0"
+    gem "rubocop", "= 0.37.1"
     require "rubocop/rake_task"
     RuboCop::RakeTask.new
   end
@@ -122,7 +122,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.5.2)
+      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.0)
       (branches + releases).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|

data/bin/rake

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+load File.expand_path("../with_rubygems", __FILE__) if ENV["RGV"]
+
 require "rubygems"
 
 bundler_spec = Gem::Specification.load(File.expand_path("../../bundler.gemspec", __FILE__))
@@ -12,8 +14,6 @@ bundler_spec.dependencies.each do |dep|
   end
 end
 
-Gem::Specification.unresolved_deps.each do |_name, dep|
-  gem dep.name, *dep.requirement
-end
+Gem.finish_resolve if Gem.respond_to?(:finish_resolve)
 
 load Gem.bin_path("rake", "rake")

data/bin/rspec

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+load File.expand_path("../with_rubygems", __FILE__) if ENV["RGV"]
+
 require "rubygems"
 
 bundler_spec = Gem::Specification.load(File.expand_path("../../bundler.gemspec", __FILE__))
@@ -8,8 +10,6 @@ bundler_spec.dependencies.each do |dep|
   gem dep.name, dep.requirement.to_s
 end
 
-Gem::Specification.unresolved_deps.each do |_name, dep|
-  gem dep.name, *dep.requirement
-end
+Gem.finish_resolve if Gem.respond_to?(:finish_resolve)
 
 load Gem.bin_path("rspec-core", "rspec")

data/bin/rubocop

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+load File.expand_path("../with_rubygems", __FILE__) if ENV["RGV"]
+
 require "rubygems"
 
 bundler_spec = Gem::Specification.load(File.expand_path("../../bundler.gemspec", __FILE__))
@@ -8,10 +10,8 @@ bundler_spec.dependencies.each do |dep|
   gem dep.name, dep.requirement.to_s
 end
 
-gem "rubocop", "= 0.37.0"
+gem "rubocop", "= 0.37.1"
 
-Gem::Specification.unresolved_deps.each do |_name, dep|
-  gem dep.name, *dep.requirement
-end
+Gem.finish_resolve if Gem.respond_to?(:finish_resolve)
 
 load Gem.bin_path("rubocop", "rubocop")

data/bin/with_rubygems

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "pathname"
+
+def run(*cmd)
+  return if system(*cmd)
+  raise "Running `#{cmd.join(" ")}` failed"
+end
+
+version = ENV.delete("RGV")
+rubygems_path = Pathname.new(__FILE__).join("../../tmp/rubygems").expand_path
+unless rubygems_path.directory?
+  rubygems_path.parent.mkpath unless rubygems_path.directory?
+  run("git", "clone", "https://github.com/rubygems/rubygems.git", rubygems_path.to_s)
+end
+Dir.chdir(rubygems_path) do
+  version = "v#{version}" if version =~ /\A\d/
+  run("git", "checkout", version, "--quiet")
+end if version
+
+rubygems_lib = rubygems_path + "lib"
+ENV["RUBYOPT"] = %(-I#{rubygems_lib} #{ENV["RUBYOPT"]})
+
+if $0 != __FILE__
+  ARGV.unshift($0)
+elsif cmd = ARGV.first
+  possible_dirs = [
+    Pathname.new(__FILE__) + "..",
+    Pathname.new(__FILE__) + "../../exe",
+    rubygems_path + "bin",
+  ]
+  cmd = possible_dirs.map do |dir|
+    dir.join(cmd).expand_path
+  end.find(&:file?)
+  ARGV[0] = cmd.to_s if cmd
+end
+
+exec(*ARGV)

data/lib/bundler.rb

@@ -3,7 +3,7 @@ require "fileutils"
 require "pathname"
 require "rbconfig"
 require "thread"
-require "bundler/path_preserver"
+require "bundler/environment_preserver"
 require "bundler/gem_remote_fetcher"
 require "bundler/rubygems_ext"
 require "bundler/rubygems_integration"
@@ -13,9 +13,9 @@ require "bundler/current_ruby"
 require "bundler/errors"
 
 module Bundler
-  PathPreserver.preserve_path_in_environment("PATH", ENV)
-  PathPreserver.preserve_path_in_environment("GEM_PATH", ENV)
-  ORIGINAL_ENV = ENV.to_hash
+  environment_preserver = EnvironmentPreserver.new(ENV, %w(PATH GEM_PATH))
+  ORIGINAL_ENV = environment_preserver.restore
+  ENV.replace(environment_preserver.backup)
   SUDO_MUTEX = Mutex.new
 
   autoload :Definition,             "bundler/definition"
@@ -200,31 +200,41 @@ module Bundler
       @settings = Settings.new(Pathname.new(".bundle").expand_path)
     end
 
-    def with_original_env
-      bundled_env = ENV.to_hash
-      ENV.replace(ORIGINAL_ENV)
-      yield
-    ensure
-      ENV.replace(bundled_env.to_hash)
+    # @return [Hash] Environment present before Bundler was activated
+    def original_env
+      ORIGINAL_ENV.clone
     end
 
-    def with_clean_env
-      with_original_env do
-        ENV["MANPATH"] = ENV["BUNDLE_ORIG_MANPATH"]
-        ENV.delete_if {|k, _| k[0, 7] == "BUNDLE_" }
+    # @deprecated Use `original_env` instead
+    # @return [Hash] Environment with all bundler-related variables removed
+    def clean_env
+      env = original_env
 
-        if ENV.key?("RUBYOPT")
-          ENV["RUBYOPT"] = ENV["RUBYOPT"].sub "-rbundler/setup", ""
-        end
+      if env.key?("BUNDLE_ORIG_MANPATH")
+        env["MANPATH"] = env["BUNDLE_ORIG_MANPATH"]
+      end
 
-        if ENV.key?("RUBYLIB")
-          rubylib = ENV["RUBYLIB"].split(File::PATH_SEPARATOR)
-          rubylib.delete(File.expand_path("..", __FILE__))
-          ENV["RUBYLIB"] = rubylib.join(File::PATH_SEPARATOR)
-        end
+      env.delete_if {|k, _| k[0, 7] == "BUNDLE_" }
 
-        yield
+      if env.key?("RUBYOPT")
+        env["RUBYOPT"] = env["RUBYOPT"].sub "-rbundler/setup", ""
       end
+
+      if env.key?("RUBYLIB")
+        rubylib = env["RUBYLIB"].split(File::PATH_SEPARATOR)
+        rubylib.delete(File.expand_path("..", __FILE__))
+        env["RUBYLIB"] = rubylib.join(File::PATH_SEPARATOR)
+      end
+
+      env
+    end
+
+    def with_original_env
+      with_env(original_env) { yield }
+    end
+
+    def with_clean_env
+      with_env(clean_env) { yield }
     end
 
     def clean_system(*args)
@@ -345,18 +355,16 @@ module Bundler
       # depend on "./" relative paths.
       SharedHelpers.chdir(path.dirname.to_s) do
         contents = path.read
-        if contents[0..2] == "---" # YAML header
-          spec = eval_yaml_gemspec(path, contents)
+        spec = if contents[0..2] == "---" # YAML header
+          eval_yaml_gemspec(path, contents)
         else
-          spec = eval_gemspec(path, contents)
+          eval_gemspec(path, contents)
         end
-        Bundler.rubygems.validate(spec) if spec && validate
+        return unless spec
+        spec.loaded_from = path.expand_path.to_s
+        Bundler.rubygems.validate(spec) if validate
         spec
       end
-    rescue Gem::InvalidSpecificationException => e
-      error_message = "The gemspec at #{file} is not valid. Please fix this gemspec.\n" \
-        "The validation error was '#{e.message}'\n"
-      raise Gem::InvalidSpecificationException.new(error_message)
     end
 
     def clear_gemspec_cache
@@ -430,5 +438,14 @@ module Bundler
       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
+      ENV.replace(env)
+      yield
+    ensure
+      ENV.replace(backup)
+    end
   end
 end

data/lib/bundler/cli.rb

@@ -170,7 +170,11 @@ module Bundler
     map "i" => "install"
     def install
       require "bundler/cli/install"
+      no_install = Bundler.settings[:no_install]
+      Bundler.settings[:no_install] = false
       Install.new(options.dup).run
+    ensure
+      Bundler.settings[:no_install] = no_install
     end
 
     desc "update [OPTIONS]", "update the current environment"
@@ -244,7 +248,8 @@ module Bundler
     method_option "strict", :type => :boolean, :banner =>
       "Only list newer versions allowed by your Gemfile requirements"
     method_option "major", :type => :boolean, :banner => "Only list major newer versions"
-    method_option "minor", :type => :boolean, :banner => "Only list at least minor newer versions"
+    method_option "minor", :type => :boolean, :banner => "Only list minor newer versions"
+    method_option "patch", :type => :boolean, :banner => "Only list patch newer versions"
     method_option "parseable", :aliases => "--porcelain", :type => :boolean, :banner =>
       "Use minimal formatting for more parseable output"
     def outdated(*gems)
@@ -272,6 +277,8 @@ module Bundler
     method_option "path", :type => :string, :banner =>
       "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME). Bundler will remember this value for future installs on this machine"
     method_option "quiet", :type => :boolean, :banner => "Only output warnings and errors."
+    method_option "frozen", :type => :boolean, :banner =>
+      "Do not allow the Gemfile.lock to be updated after this package operation's install"
     long_desc <<-D
       The package command will copy the .gem files for every gem in the bundle into the
       directory ./vendor/cache. If you then check that directory into your source

data/lib/bundler/cli/exec.rb

@@ -18,16 +18,30 @@ module Bundler
     end
 
     def run
-      ui = Bundler.ui
-      raise ArgumentError if cmd.nil?
-
+      validate_cmd!
       SharedHelpers.set_bundle_environment
-      bin_path = Bundler.which(@cmd)
+      if bin_path = Bundler.which(cmd)
+        kernel_load(bin_path, *args) && return if ruby_shebang?(bin_path)
+        # First, try to exec directly to something in PATH
+        kernel_exec([bin_path, cmd], *args)
+      else
+        # Just exec using the given command
+        kernel_exec(cmd, *args)
+      end
+    end
+
+  private
+
+    def validate_cmd!
+      return unless cmd.nil?
+      Bundler.ui.error "bundler: exec needs a command to run"
+      exit 128
+    end
+
+    def kernel_exec(*args)
+      ui = Bundler.ui
       Bundler.ui = nil
-      # First, try to exec directly to something in PATH
-      Kernel.exec([bin_path, @cmd], *args) if bin_path
-      # Just exec using the given command
-      Kernel.exec(@cmd, *args)
+      Kernel.exec(*args)
     rescue Errno::EACCES, Errno::ENOEXEC
       Bundler.ui = ui
       Bundler.ui.error "bundler: not executable: #{cmd}"
@@ -37,10 +51,32 @@ module Bundler
       Bundler.ui.error "bundler: command not found: #{cmd}"
       Bundler.ui.warn "Install missing gem executables with `bundle install`"
       exit 127
-    rescue ArgumentError
+    end
+
+    def kernel_load(file, *args)
+      args.pop if args.last.is_a?(Hash)
+      ARGV.replace(args)
+      $0 = file
+      ui = Bundler.ui
+      Bundler.ui = nil
+      require "bundler/setup"
+      Kernel.load(file)
+    rescue SystemExit
+      raise
+    rescue Exception => e # rubocop:disable Lint/RescueException
       Bundler.ui = ui
-      Bundler.ui.error "bundler: exec needs a command to run"
-      exit 128
+      Bundler.ui.error "bundler: failed to load command: #{cmd} (#{file})"
+      backtrace = e.backtrace.take_while {|bt| !bt.start_with?(__FILE__) }
+      abort "#{e.class}: #{e.message}\n  #{backtrace.join("\n  ")}"
+    end
+
+    def ruby_shebang?(file)
+      possibilities = [
+        "#!/usr/bin/env ruby\n",
+        "#!#{Gem.ruby}\n",
+      ]
+      first_line = File.open(file, "rb") {|f| f.read(possibilities.map(&:size).max) }
+      possibilities.any? {|shebang| first_line.start_with?(shebang) }
     end
   end
 end

data/lib/bundler/cli/install.rb

@@ -45,11 +45,7 @@ module Bundler
       # Just disable color in deployment mode
       Bundler.ui.shell = Thor::Shell::Basic.new if options[:deployment]
 
-      if (options[:path] || options[:deployment]) && options[:system]
-        Bundler.ui.error "You have specified both a path to install your gems to, \n" \
-                         "as well as --system. Please choose."
-        exit 1
-      end
+      check_for_options_conflicts
 
       if options["trust-policy"]
         unless Bundler.rubygems.security_policies.keys.include?(options["trust-policy"])
@@ -185,5 +181,14 @@ module Bundler
       Bundler.ui.confirm "Post-install message from #{name}:"
       Bundler.ui.info msg
     end
+
+    def check_for_options_conflicts
+      if (options[:path] || options[:deployment]) && options[:system]
+        error_message = String.new
+        error_message << "You have specified both a path to install your gems to as well as --system. Please choose.\n" if options[:path]
+        error_message << "You have specified both --deployment as well as --system. Please choose.\n" if options[:deployment]
+        raise InvalidOption.new(error_message)
+      end
+    end
   end
 end

data/lib/bundler/cli/outdated.rb

@@ -10,6 +10,8 @@ module Bundler
     end
 
     def run
+      check_for_deployment_mode
+
       sources = Array(options[:source])
 
       gems.each do |gem_name|
@@ -54,18 +56,12 @@ module Bundler
           end
           active_spec = active_spec.last
 
-          if options[:major]
-            current_major = current_spec.version.segments.first
-            active_major = active_spec.version.segments.first
-            active_spec = nil unless active_major > current_major
-          end
-
-          if options[:minor]
-            current_minor = current_spec.version.segments[0, 2].compact.join(".")
-            active_minor = active_spec.version.segments[0, 2].compact.join(".")
-            active_spec = nil unless active_minor > current_minor
+          if options[:major] || options[:minor] || options[:patch]
+            update_present = update_present_via_semver_portions(current_spec, active_spec, options)
+            active_spec = nil unless update_present
           end
         end
+
         next if active_spec.nil?
 
         gem_outdated = Gem::Version.new(active_spec.version) > Gem::Version.new(current_spec.version)
@@ -109,5 +105,42 @@ module Bundler
         exit 1
       end
     end
+
+  private
+
+    def check_for_deployment_mode
+      if Bundler.settings[:frozen]
+        error_message = "You are trying to check outdated gems in deployment mode. " \
+              "Run `bundle outdated` elsewhere.\n" \
+              "\nIf this is a development machine, remove the #{Bundler.default_gemfile} freeze" \
+              "\nby running `bundle install --no-deployment`."
+        raise ProductionError, error_message
+      end
+    end
+
+    def update_present_via_semver_portions(current_spec, active_spec, options)
+      current_major = current_spec.version.segments.first
+      active_major = active_spec.version.segments.first
+
+      update_present = false
+
+      update_present = active_major > current_major if options[:major]
+
+      if (options[:minor] || options[:patch]) && current_major == active_major
+        current_minor = current_spec.version.segments[1, 1].first
+        active_minor = active_spec.version.segments[1, 1].first
+
+        if options[:minor]
+          update_present = active_minor > current_minor
+        elsif options[:patch] && current_minor == active_minor
+          current_patch = current_spec.version.segments[2, 1].first
+          active_patch = active_spec.version.segments[2, 1].first
+
+          update_present = active_patch > current_patch
+        end
+      end
+
+      update_present
+    end
   end
 end

data/lib/bundler/definition.rb

@@ -280,22 +280,11 @@ module Bundler
     end
 
     def locked_ruby_version
-      if @unlock[:ruby]
-        if ruby_version && !@locked_ruby_version
-          return Bundler::RubyVersion.system
-        elsif ruby_version && @locked_ruby_version
-          return Bundler::RubyVersion.system
-        elsif !ruby_version && @locked_ruby_version
-          return nil
-        end
+      return unless ruby_version
+      if @unlock[:ruby] || !@locked_ruby_version
+        Bundler::RubyVersion.system
       else
-        if ruby_version && !@locked_ruby_version
-          return Bundler::RubyVersion.system
-        elsif ruby_version && @locked_ruby_version
-          return @locked_ruby_version
-        elsif !ruby_version && @locked_ruby_version
-          return @locked_ruby_version
-        end
+        @locked_ruby_version
       end
     end
 

data/lib/bundler/environment_preserver.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+module Bundler
+  class EnvironmentPreserver
+    # @param env [ENV]
+    # @param keys [Array<String>]
+    def initialize(env, keys)
+      @original = env.to_hash
+      @keys = keys
+      @prefix = "BUNDLE_ORIG_"
+    end
+
+    # @return [Hash]
+    def backup
+      env = restore.clone
+      @keys.each do |key|
+        value = env[key]
+        env[@prefix + key] = value unless value.nil? || value.empty?
+      end
+      env
+    end
+
+    # @return [Hash]
+    def restore
+      env = @original.clone
+      @keys.each do |key|
+        value_original = env[@prefix + key]
+        unless value_original.nil? || value_original.empty?
+          env[key] = value_original
+          env.delete(@prefix + key)
+        end
+      end
+      env
+    end
+  end
+end

data/lib/bundler/errors.rb

@@ -98,4 +98,13 @@ module Bundler
 
     status_code(26)
   end
+
+  class VirtualProtocolError < BundlerError
+    def message
+      "There was an error relating to virtualization and file access." \
+      "It is likely that you need to grant access to or mount some file system correctly."
+    end
+
+    status_code(27)
+  end
 end

data/lib/bundler/fetcher.rb

@@ -236,7 +236,7 @@ module Bundler
 
         con = Net::HTTP::Persistent.new "bundler", :ENV
         if gem_proxy = Bundler.rubygems.configuration[:http_proxy]
-          con.proxy = URI.parse(gem_proxy)
+          con.proxy = URI.parse(gem_proxy) if gem_proxy != :no_proxy
         end
 
         if remote_uri.scheme == "https"

data/lib/bundler/resolver.rb

@@ -341,10 +341,11 @@ module Bundler
             "try passing them all to `bundle update`"
         elsif requirement.source
           name = requirement.name
-          versions = @source_requirements[name][name].map(&:version)
-          message  = String.new("Could not find gem '#{requirement}' in #{requirement.source}.\n")
-          message << if versions.any?
-                       "Source contains '#{name}' at: #{versions.join(", ")}"
+          specs = @source_requirements[name][name]
+          versions_with_platforms = specs.map {|s| [s.version, s.platform] }
+          message = String.new("Could not find gem '#{requirement}' in #{requirement.source}.\n")
+          message << if versions_with_platforms.any?
+                       "Source contains '#{name}' at: #{formatted_versions_with_platforms(versions_with_platforms)}"
                      else
                        "Source does not contain any versions of '#{requirement}'"
                      end
@@ -355,5 +356,15 @@ module Bundler
         raise GemNotFound, message
       end
     end
+
+    def formatted_versions_with_platforms(versions_with_platforms)
+      version_platform_strs = versions_with_platforms.map do |vwp|
+        version = vwp.first
+        platform = vwp.last
+        version_platform_str = String.new(version.to_s)
+        version_platform_str << " #{platform}" unless platform.nil?
+      end
+      version_platform_strs.join(", ")
+    end
   end
 end

data/lib/bundler/rubygems_ext.rb

@@ -53,7 +53,7 @@ module Gem
     if method_defined?(:extension_dir)
       alias_method :rg_extension_dir, :extension_dir
       def extension_dir
-        @extension_dir ||= if source.respond_to?(:extension_dir_name)
+        @bundler_extension_dir ||= if source.respond_to?(:extension_dir_name)
           File.expand_path(File.join(extensions_dir, source.extension_dir_name))
         else
           rg_extension_dir

data/lib/bundler/rubygems_integration.rb

@@ -35,6 +35,10 @@ module Bundler
       Gem::Command.build_args = args
     end
 
+    def load_path_insert_index
+      Gem.load_path_insert_index
+    end
+
     def loaded_specs(name)
       Gem.loaded_specs[name]
     end
@@ -50,10 +54,23 @@ module Bundler
 
     def validate(spec)
       Bundler.ui.silence { spec.validate(false) }
+    rescue Gem::InvalidSpecificationException => e
+      error_message = "The gemspec at #{spec.loaded_from} is not valid. Please fix this gemspec.\n" \
+        "The validation error was '#{e.message}'\n"
+      raise Gem::InvalidSpecificationException.new(error_message)
     rescue Errno::ENOENT
       nil
     end
 
+    def set_installed_by_version(spec, installed_by_version = Gem::VERSION)
+      return unless spec.respond_to?(:installed_by_version=)
+      spec.installed_by_version = Gem::Version.create(installed_by_version)
+    end
+
+    def spec_missing_extensions?(spec)
+      !spec.respond_to?(:missing_extensions?) || spec.missing_extensions?
+    end
+
     def path(obj)
       obj.to_s
     end
@@ -499,9 +516,7 @@ module Bundler
         # Missing summary is downgraded to a warning in later versions,
         # so we set it to an empty string to prevent an exception here.
         spec.summary ||= ""
-        Bundler.ui.silence { spec.validate(false) }
-      rescue Errno::ENOENT
-        nil
+        RubygemsIntegration.instance_method(:validate).bind(self).call(spec)
       end
     end
 

data/lib/bundler/runtime.rb

@@ -37,7 +37,17 @@ module Bundler
 
         Bundler.rubygems.mark_loaded(spec)
         load_paths = spec.load_paths.reject {|path| $LOAD_PATH.include?(path) }
-        $LOAD_PATH.unshift(*load_paths)
+
+        # See Gem::Specification#add_self_to_load_path (since RubyGems 1.8)
+        insert_index = Bundler.rubygems.load_path_insert_index
+
+        if insert_index
+          # Gem directories must come after -I and ENV['RUBYLIB']
+          $LOAD_PATH.insert(insert_index, *load_paths)
+        else
+          # We are probably testing in core, -I and RUBYLIB don't apply
+          $LOAD_PATH.unshift(*load_paths)
+        end
       end
 
       setup_manpath

data/lib/bundler/settings.rb

@@ -3,7 +3,7 @@ require "uri"
 
 module Bundler
   class Settings
-    BOOL_KEYS = %w(frozen cache_all no_prune disable_local_branch_check disable_shared_gems ignore_messages gem.mit gem.coc silence_root_warning).freeze
+    BOOL_KEYS = %w(frozen cache_all no_prune disable_local_branch_check disable_shared_gems ignore_messages gem.mit gem.coc silence_root_warning no_install).freeze
     NUMBER_KEYS = %w(retry timeout redirect ssl_verify_mode).freeze
     DEFAULT_CONFIG = { :retry => 3, :timeout => 10, :redirect => 5 }.freeze
 

data/lib/bundler/shared_helpers.rb

@@ -107,6 +107,8 @@ module Bundler
       raise PermissionError.new(path, action)
     rescue Errno::EAGAIN
       raise TemporaryResourceError.new(path, action)
+    rescue Errno::EPROTO
+      raise VirtualProtocolError.new
     end
 
     def const_get_safely(constant_name, namespace)

data/lib/bundler/source/git.rb

@@ -222,6 +222,10 @@ module Bundler
 
     private
 
+      def build_extensions(installer)
+        super if Bundler.rubygems.spec_missing_extensions?(installer.spec)
+      end
+
       def serialize_gemspecs_in(destination)
         expanded_path = destination.expand_path(Bundler.root)
         Dir["#{expanded_path}/#{@glob}"].each do |spec_path|

data/lib/bundler/source/path.rb

@@ -135,9 +135,12 @@ module Bundler
         if File.directory?(expanded_path)
           # We sort depth-first since `<<` will override the earlier-found specs
           Dir["#{expanded_path}/#{@glob}"].sort_by {|p| -p.split(File::SEPARATOR).size }.each do |file|
-            next unless spec = Bundler.load_gemspec(file, :validate)
-            spec.loaded_from = file.to_s
+            next unless spec = Bundler.load_gemspec(file)
             spec.source = self
+            Bundler.rubygems.set_installed_by_version(spec)
+            # Validation causes extension_dir to be calculated, which depends
+            # on #source, so we validate here instead of load_gemspec
+            Bundler.rubygems.validate(spec)
             index << spec
           end
 
@@ -194,8 +197,7 @@ module Bundler
         SharedHelpers.chdir(gem_dir) do
           installer = Path::Installer.new(spec, :env_shebang => false)
           run_hooks(:pre_install, installer)
-          installer.build_extensions unless disable_extensions
-          run_hooks(:post_build, installer)
+          build_extensions(installer) unless disable_extensions
           installer.generate_bin
           run_hooks(:post_install, installer)
         end
@@ -213,6 +215,11 @@ module Bundler
         Bundler.ui.warn "The validation message from Rubygems was:\n  #{e.message}"
       end
 
+      def build_extensions(installer)
+        installer.build_extensions
+        run_hooks(:post_build, installer)
+      end
+
       def run_hooks(type, installer)
         hooks_meth = "#{type}_hooks"
         return unless Gem.respond_to?(hooks_meth)

data/lib/bundler/source/rubygems/remote.rb

@@ -39,6 +39,10 @@ module Bundler
           end
 
           uri
+        rescue URI::InvalidComponentError
+          error_message = "Please CGI escape your usernames and passwords before " \
+                          "setting them for authentication."
+          raise HTTPError.new(error_message)
         end
 
         def remove_auth(uri)

data/lib/bundler/vendor/molinillo/lib/molinillo.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'bundler/vendor/molinillo/lib/molinillo/gem_metadata'
 require 'bundler/vendor/molinillo/lib/molinillo/errors'
 require 'bundler/vendor/molinillo/lib/molinillo/resolver'

data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'set'
 require 'tsort'
 

data/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler::Molinillo
   # An error that occurred during the resolution process
   class ResolverError < StandardError; end

data/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb

@@ -1,4 +1,5 @@
+# frozen_string_literal: true
 module Bundler::Molinillo
   # The version of Bundler::Molinillo.
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.4.3'.freeze
 end

data/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler::Molinillo
   # Provides information about specifcations and dependencies to the resolver,
   # allowing the {Resolver} class to remain generic while still providing power

data/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler::Molinillo
   # Conveys information about the resolution process to a user.
   module UI

data/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler::Molinillo
   class Resolver
     # A specific resolution from a given {Resolver}
@@ -362,6 +363,7 @@ module Bundler::Molinillo
           if !dep_names.include?(succ.name) && !succ.root? && succ.predecessors.to_a == [vertex]
             debug(depth) { "Removing orphaned spec #{succ.name} after swapping #{name}" }
             activated.detach_vertex_named(succ.name)
+            requirements.delete_if { |r| name_for(r) == succ.name }
           end
         end
       end

data/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph'
 
 module Bundler::Molinillo

data/lib/bundler/vendor/molinillo/lib/molinillo/state.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler::Molinillo
   # A state that a {Resolution} can be in
   # @attr [String] name the name of the current requirement

data/lib/bundler/version.rb

@@ -7,5 +7,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.12.0.pre.1" unless defined?(::Bundler::VERSION)
+  VERSION = "1.12.0.pre.2" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.12.0.pre.1
+  version: 1.12.0.pre.2
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek
@@ -124,6 +124,7 @@ files:
 - bin/rake
 - bin/rspec
 - bin/rubocop
+- bin/with_rubygems
 - bundler.gemspec
 - exe/bundle
 - exe/bundle_ruby
@@ -162,6 +163,7 @@ files:
 - lib/bundler/endpoint_specification.rb
 - lib/bundler/env.rb
 - lib/bundler/environment.rb
+- lib/bundler/environment_preserver.rb
 - lib/bundler/errors.rb
 - lib/bundler/fetcher.rb
 - lib/bundler/fetcher/base.rb
@@ -206,7 +208,6 @@ files:
 - lib/bundler/man/gemfile.5.txt
 - lib/bundler/match_platform.rb
 - lib/bundler/mirror.rb
-- lib/bundler/path_preserver.rb
 - lib/bundler/psyched_yaml.rb
 - lib/bundler/remote_specification.rb
 - lib/bundler/resolver.rb
@@ -352,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.0
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies

data/lib/bundler/path_preserver.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-module Bundler
-  module PathPreserver
-    def self.preserve_path_in_environment(env_var, env)
-      original_env_var      = "_ORIGINAL_#{env_var}"
-      original_path         = env[original_env_var]
-      path                  = env[env_var]
-      env[original_env_var] = path if original_path.nil? || original_path.empty?
-      env[env_var]          = original_path if path.nil? || path.empty?
-    end
-  end
-end