bundler 1.15.0.pre.3 → 1.15.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9686bfd491be95a83088cbad46dfb994c7e81e6
-  data.tar.gz: 6a258bf2b5a72d9f8cf022d8a0437c4031c68b35
+  metadata.gz: 7709ef44818c17fec7a7ba49f09aec97705df4f7
+  data.tar.gz: 2590a16c1b973d695efacbd9bfc182531f750cc2
 SHA512:
-  metadata.gz: 5290fc10956b9399f4723b23af050f197cf1b15f6f793652645182ddec047d9268098f8e1479bac2e5f23ea53a90f68eda5b56961c61d19a252b38244d335c6f
-  data.tar.gz: b249ee0e8cd96a45e4fc49e2e65b9668d2d96f291ff129763274fe55e87885e462b9f6fff011a6b9bb51a3314110faf51e60a52398d65f6bc226973f025c4447
+  metadata.gz: 7855550faba2b93132bbc95ba3c8967ae081a358ec0b9b966cffaadc4e5ca04cb2e8838fc3466925394f4ed0e252540be90a9f2ad38825027f74f24d973acc33
+  data.tar.gz: ae3458d05c424e0d58be555c5282ca04d4cf8b4731c424b8148555a68b77a6c34202a5e2b029bf1ae17cfd1de787cd632c8ef5a84f32d964a2ba78d4082a9b93

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.15.0.pre.4 (2017-05-10)
+
+Bugfixes:
+
+  - avoid conflicts when `Gem.finish_resolve` is called after the bundle has been set up (@segiddins)
+  - ensure that `Gem::Specification.find_by_name` always returns an object that can have `#to_spec` called on it (#5592, @jules2689)
+
 ## 1.15.0.pre.3 (2017-04-30)
 
 Bugfixes:

data/lib/bundler/rubygems_integration.rb

@@ -698,6 +698,10 @@ module Bundler
         Gem.post_reset do
           Gem::Specification.all = specs
         end
+
+        redefine_method((class << Gem; self; end), :finish_resolve) do |*|
+          []
+        end
       end
 
       def all_specs

data/lib/bundler/stub_specification.rb

@@ -4,6 +4,7 @@ require "bundler/remote_specification"
 module Bundler
   class StubSpecification < RemoteSpecification
     def self.from_stub(stub)
+      return stub if stub.is_a?(Bundler::StubSpecification)
       spec = new(stub.name, stub.version, stub.platform, nil)
       spec.stub = stub
       spec

data/lib/bundler/version.rb

@@ -7,7 +7,7 @@ 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.15.0.pre.3" unless defined?(::Bundler::VERSION)
+  VERSION = "1.15.0.pre.4" unless defined?(::Bundler::VERSION)
 
   def self.overwrite_loaded_gem_version
     begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.15.0.pre.3
+  version: 1.15.0.pre.4
 platform: ruby
 authors:
 - André Arko
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek
@@ -454,3 +454,4 @@ signing_key:
 specification_version: 4
 summary: The best way to manage your application's dependencies
 test_files: []
+has_rdoc: