bundler-patch 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21dd52c3650783e93595df84c5c7002c89bbd807
-  data.tar.gz: 0d5330980d755392b93617687282407a0fdf6102
+  metadata.gz: 621d370daa4220636771b1cdada19350d866797f
+  data.tar.gz: 694a377520e067ecc93690a7c7036f5046dc1702
 SHA512:
-  metadata.gz: 9533c7201da5a85748a87dcbe6a4dab402acf86ae35a04b3712a2af3a231e8574b0477f24e2d712aa2fbc56c338bb2411286ccc9e0dcff2da78758d0489f9e79
-  data.tar.gz: 5cf61ad997dcd7d79eb43a89b102597754655bd7abe65799ba1301dbe4cf65d2dac1763fd70e3674c488b582129b1483d50561dd6cff9e544ca43f4127f76a05
+  metadata.gz: df7910ec37f1ffd133e688db6d4252b3dac4d46ef52f311716f053c6b6a8cf35b5349643469aec956847497ace476415965e41dab5c4b32de01e3dd1163605df
+  data.tar.gz: dbcbfed4101b53ff2209768ed4f05db5913f1d5380a64fd85a96309b4d30715fbb96d97e7fcf710a58f57d0d3436b4605e8e4087f60c11a339def376be5e68b5

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.3.3

data/.travis.yml

@@ -23,3 +23,5 @@ matrix:
       env: BUNDLER_TEST_VERSION=1.12.5
     - rvm: 2.3.1
       env: BUNDLER_TEST_VERSION=1.13.5
+    - rvm: 2.3.3
+      env: BUNDLER_TEST_VERSION=1.14.3

data/bundler-patch.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'slop', '~> 3.0'
   spec.add_dependency 'bundler', '~> 1.7'
 
-  spec.add_development_dependency 'bundler-fixture', '~> 1.3'
+  spec.add_development_dependency 'bundler-fixture', '~> 1.3', '>= 1.3.2'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.5'

data/lib/bundler/patch/conservative_definition.rb

@@ -16,7 +16,8 @@ module Bundler::Patch
         else
           # Run a resolve against the locally available gems
           base = last_resolve.is_a?(Bundler::SpecSet) ? Bundler::SpecSet.new(last_resolve) : []
-          if Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('1.13.0.rc.2')
+          bundler_version = Gem::Version.new(Bundler::VERSION)
+          if bundler_version >= Gem::Version.new('1.13.0.rc.2')
             require 'bundler/patch/gem_version_patch_promoter'
 
             gvpp = Bundler::Patch::GemVersionPatchPromoter.new(@gem_version_promoter.locked_specs, @gem_version_promoter.unlock_gems)
@@ -24,7 +25,12 @@ module Bundler::Patch
             gvpp.strict = @strict
             gvpp.minimal = @prefer_minimal
             gvpp.gems_to_update = @gems_to_update
-            resolver = Bundler::Resolver.new(index, source_requirements, base, nil, gvpp, additional_base_requirements_for_resolve)
+
+            if bundler_version >= Gem::Version.new('1.14.0.rc.1')
+              resolver = Bundler::Resolver.new(index, source_requirements, base, gvpp, additional_base_requirements_for_resolve, platforms)
+            else
+              resolver = Bundler::Resolver.new(index, source_requirements, base, nil, gvpp, additional_base_requirements_for_resolve)
+            end
           else
             resolver = ConservativeResolver.new(index, source_requirements, base)
             locked_specs = if @unlocking && @locked_specs.length == 0

data/lib/bundler/patch/version.rb

@@ -1,5 +1,5 @@
 module Bundler
   module Patch
-    VERSION = '0.10.3'
+    VERSION = '0.10.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundler-patch
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - chrismo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler-advise
@@ -65,6 +65,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,6 +75,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement