bundler 1.13.1 → 1.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22596756e05afe393c806e7be6f01eecb6481455
-  data.tar.gz: 182b0814c59dfb8bf1552bcccabaecb33fc5437d
+  metadata.gz: 6367d93989655c65cfd42ea41f443b378433adeb
+  data.tar.gz: 02e6fb7dba19f7d3239bb3dd924f2e13e8b1d717
 SHA512:
-  metadata.gz: a40c512a0b0c523b141906b1b27577345e6b774a0d8b64f5d5a21c574de0e30a6d27ab1f493b0881898a0232ec330c02615550ca7ed6992e5f23f327338127bd
-  data.tar.gz: 6003c4ed54dac0f68cccbd61305c7f2b4fc05a73bd694b57cf6a4b58923186469390b02da27105fb9156bfa0e3863dfa87d3abba0e47324f46dcc01498ce2402
+  metadata.gz: 8d2bb44155f319905ab606dbe26e4ac65832c3bba3944e66273db3733cb0353812363bb5474c34a9333812674e0a9d3cd7b3c1925ba011aee02e1a5e93a291a7
+  data.tar.gz: aecf45ed1368af04b9a3ce4648b759affc9cd18b4478fb361435cb427148c349b8ab02a5f74035b0dceddb678b6079cc6d4488b65828d3f761874f8930f97008

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 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 invoking bundler with binstubs generated by RubyGems 2.6.2+ (#4974, @chrismo)
+
+Performance:
+
+  - avoid parsing the lockfile twice when evaluating gemfiles (@segiddins)
+
 ## 1.13.1 (2016-09-13)
 
 Bugfixes:

data/lib/bundler.rb

@@ -438,7 +438,10 @@ EOF
     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"] = nil
+        # 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?)

data/lib/bundler/definition.rb

@@ -137,17 +137,15 @@ module Bundler
     end
 
     def create_gem_version_promoter
-      locked_specs = begin
+      locked_specs =
         if @unlocking && @locked_specs.empty? && !@lockfile_contents.empty?
           # Definition uses an empty set of locked_specs to indicate all gems
           # are unlocked, but GemVersionPromoter needs the locked_specs
           # for conservative comparison.
-          locked = Bundler::LockfileParser.new(@lockfile_contents)
-          Bundler::SpecSet.new(locked.specs)
+          Bundler::SpecSet.new(@locked_gems.specs)
         else
           @locked_specs
         end
-      end
       GemVersionPromoter.new(locked_specs, @unlock[:gems])
     end
 

data/lib/bundler/deployment.rb

@@ -15,7 +15,7 @@ module Bundler
       else
         context_name = "vlad"
         role_default = "[:app]"
-        error_type = ::Rake::CommandFailedError
+        error_type = ::Vlad::CommandFailedError
       end
 
       roles = context.fetch(:bundle_roles, false)

data/lib/bundler/endpoint_specification.rb

@@ -113,6 +113,8 @@ module Bundler
           @required_ruby_version = Gem::Requirement.new(v)
         end
       end
+    rescue => e
+      raise GemspecError, "There was an error parsing the metadata for the gem #{name} (#{version}): #{e.class}\n#{e}\nThe metadata was #{data.inspect}"
     end
 
     def build_dependency(name, requirements)

data/lib/bundler/lazy_specification.rb

@@ -55,7 +55,11 @@ module Bundler
     end
 
     def __materialize__
-      @specification = source.specs.search(Gem::Dependency.new(name, version)).last
+      @specification = if source.is_a?(Source::Gemspec) && source.gemspec.name == name
+        source.gemspec.tap {|s| s.source = source }
+      else
+        source.specs.search(Gem::Dependency.new(name, version)).last
+      end
     end
 
     def respond_to?(*args)

data/lib/bundler/ruby_version.rb

@@ -23,8 +23,8 @@ module Bundler
 
       @versions           = Array(versions)
       @gem_version        = Gem::Requirement.create(@versions.first).requirements.first.last
-      @input_engine       = engine
-      @engine             = engine || "ruby"
+      @input_engine       = engine && engine.to_s
+      @engine             = engine && engine.to_s || "ruby"
       @engine_versions    = (engine_version && Array(engine_version)) || @versions
       @engine_gem_version = Gem::Requirement.create(@engine_versions.first).requirements.first.last
       @patchlevel         = patchlevel

data/lib/bundler/rubygems_integration.rb

@@ -397,6 +397,17 @@ module Bundler
         spec
       end
 
+      redefine_method(gem_class, :activate_bin_path) do |name, *args|
+        exec_name = args.first
+        return ENV["BUNDLE_BIN_PATH"] if exec_name == "bundle"
+
+        # Copy of Rubygems activate_bin_path impl
+        requirement = args.last
+        spec = find_spec_for_exe name, exec_name, [requirement]
+        Gem::LOADED_SPECS_MUTEX.synchronize { spec.activate }
+        spec.bin_file exec_name
+      end
+
       redefine_method(gem_class, :bin_path) do |name, *args|
         exec_name = args.first
         return ENV["BUNDLE_BIN_PATH"] if exec_name == "bundle"
@@ -489,6 +500,7 @@ module Bundler
     end
 
     def redefine_method(klass, method, unbound_method = nil, &block)
+      visibility = method_visibility(klass, method)
       begin
         if (instance_method = klass.instance_method(method)) && method != :initialize
           # doing this to ensure we also get private methods
@@ -501,8 +513,20 @@ module Bundler
       @replaced_methods[[method, klass]] = instance_method
       if unbound_method
         klass.send(:define_method, method, unbound_method)
+        klass.send(visibility, method)
       elsif block
         klass.send(:define_method, method, &block)
+        klass.send(visibility, method)
+      end
+    end
+
+    def method_visibility(klass, method)
+      if klass.private_method_defined?(method)
+        :private
+      elsif klass.protected_method_defined?(method)
+        :protected
+      else
+        :public
       end
     end
 

data/lib/bundler/settings.rb

@@ -5,6 +5,7 @@ module Bundler
   class Settings
     BOOL_KEYS = %w(
       allow_offline_install
+      auto_install
       cache_all
       disable_exec_load
       disable_local_branch_check
@@ -278,7 +279,7 @@ module Bundler
     }xo
 
     def load_config(config_file)
-      return unless config_file
+      return {} unless config_file
       SharedHelpers.filesystem_access(config_file, :read) do |file|
         valid_file = file.exist? && !file.size.zero?
         return {} if ignore_config? || !valid_file

data/lib/bundler/source.rb

@@ -19,7 +19,7 @@ module Bundler
         locked_spec = Bundler.locked_gems.specs.find {|s| s.name == spec.name }
         locked_spec_version = locked_spec.version if locked_spec
         if locked_spec_version && spec.version != locked_spec_version
-          message += " (#{Bundler.ui.add_color("was #{locked_spec_version}", :green)})"
+          message += Bundler.ui.add_color(" (was #{locked_spec_version})", :green)
         end
       end
 

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.13.1" unless defined?(::Bundler::VERSION)
+  VERSION = "1.13.2" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-exec.ronn

@@ -63,6 +63,15 @@ It also modifies Rubygems:
   making system executables work
 * Add all gems in the bundle into Gem.loaded_specs
 
+### Loading
+
+By default, when attempting to `bundle exec` to a file with a ruby shebang,
+Bundler will `Kernel.load` that file instead of using `Kernel.exec`. For the
+vast majority of cases, this is a performance improvement. In a rare few cases,
+this could cause some subtle side-effects (such as dependence on the exact
+contents of `$0` or `__FILE__`) and the optimization can be disabled by enabling
+the `disable_exec_load` setting.
+
 ### Shelling out
 
 Any Ruby code that opens a subshell (like `system`, backticks, or `%x{}`) will

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.2
 platform: ruby
 authors:
 - André Arko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek
@@ -382,7 +382,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies