bundler 1.14.1 → 1.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a2f2fe939ed0384b141862cc12d83951b736cbf
-  data.tar.gz: dbecc9fbf2be0e82b375c1a01557118f8614e3f8
+  metadata.gz: 7ab010bff890baf19768622a2dde3e079fd4ab6b
+  data.tar.gz: ca12ee1b5eb41e1a0e63949c6f2bfdc4c4a56a18
 SHA512:
-  metadata.gz: 7aa823d4059a45cbaadbda9ea1a6b8f3f4959e4fea2458c7815a9516556189ba233a5fa4b9af988f2a0e97a8cdc4cfa95f253b9d02f45ec9dd6e4aba6c71af7d
-  data.tar.gz: 32f88271adbd25309c95404379e8a098a91e80fd7c4c06287d19abf7483a96c4f95a75d821c9814933b1681155b0f595e321693d033f094d4c841fe6b7ede141
+  metadata.gz: 416e77e9b0faf8e368a9e54baaf06f6cd017cf2cafd13f3c8af5fd08acbdb7a61815b2884559514df638be6bb4a290f8d77673ae4d3bda32e887a591f8f956fe
+  data.tar.gz: 56762f2ff50d22275e5e12ea4a96faf6f23bfb612869d2508b0e3a012c6ff09aee1a64cd15cd2e557b7cebcbc3a9543271532f3c69a19ddf4bed80b78d4ec6b9

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.14.2 (2017-01-22)
+
+Bugfixes:
+
+  - fix using `force_ruby_platform` on windows (#5344, @segiddins)
+  - fix an incorrect version conflict error when using `gemspec` on multiple platforms (#5340, @segiddins)
+
 ## 1.14.1 (2017-01-21)
 
 Bugfixes:

data/lib/bundler/current_ruby.rb

@@ -58,15 +58,15 @@ module Bundler
     end
 
     def mswin64?
-      Bundler::WINDOWS && Bundler.local_platform.os == "mswin64" && Bundler.local_platform.cpu == "x64"
+      Bundler::WINDOWS && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mswin64" && Bundler.local_platform.cpu == "x64"
     end
 
     def mingw?
-      Bundler::WINDOWS && Bundler.local_platform.os == "mingw32" && Bundler.local_platform.cpu != "x64"
+      Bundler::WINDOWS && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mingw32" && Bundler.local_platform.cpu != "x64"
     end
 
     def x64_mingw?
-      Bundler::WINDOWS && Bundler.local_platform.os == "mingw32" && Bundler.local_platform.cpu == "x64"
+      Bundler::WINDOWS && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mingw32" && Bundler.local_platform.cpu == "x64"
     end
 
     (KNOWN_MINOR_VERSIONS + KNOWN_MAJOR_VERSIONS).each do |version|

data/lib/bundler/definition.rb

@@ -104,7 +104,9 @@ module Bundler
 
       add_current_platform unless Bundler.settings[:frozen]
 
+      converge_gemspec_sources
       @path_changes = converge_paths
+      @source_changes = converge_sources
 
       unless @unlock[:lock_shared_dependencies]
         eager_unlock = expand_dependencies(@unlock[:gems])
@@ -113,7 +115,6 @@ module Bundler
 
       @gem_version_promoter = create_gem_version_promoter
 
-      @source_changes = converge_sources
       @dependency_changes = converge_dependencies
       @local_changes = converge_locals
 
@@ -627,15 +628,20 @@ module Bundler
       gemspec_source || source
     end
 
-    def converge_sources
-      changes = false
-
+    def converge_gemspec_sources
       @locked_sources.map! do |source|
         converge_path_source_to_gemspec_source(source)
       end
       @locked_specs.each do |spec|
         spec.source &&= converge_path_source_to_gemspec_source(spec.source)
       end
+      @locked_deps.each do |dep|
+        dep.source &&= converge_path_source_to_gemspec_source(dep.source)
+      end
+    end
+
+    def converge_sources
+      changes = false
 
       # Get the Rubygems sources from the Gemfile.lock
       locked_gem_sources = @locked_sources.select {|s| s.is_a?(Source::Rubygems) }

data/lib/bundler/installer/parallel_installer.rb

@@ -67,6 +67,10 @@ module Bundler
       def all_dependencies
         @spec.dependencies
       end
+
+      def to_s
+        "#<#{self.class} #{@spec.full_name} (#{state})>"
+      end
     end
 
     def self.call(*args)

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.14.2
 platform: ruby
 authors:
 - André Arko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-21 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek