bundler-patch 0.10.3 → 0.10.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.ruby-version +1 -1
- data/.travis.yml +2 -0
- data/bundler-patch.gemspec +1 -1
- data/lib/bundler/patch/conservative_definition.rb +8 -2
- data/lib/bundler/patch/version.rb +1 -1
- metadata +8 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 621d370daa4220636771b1cdada19350d866797f
|
|
4
|
+
data.tar.gz: 694a377520e067ecc93690a7c7036f5046dc1702
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: df7910ec37f1ffd133e688db6d4252b3dac4d46ef52f311716f053c6b6a8cf35b5349643469aec956847497ace476415965e41dab5c4b32de01e3dd1163605df
|
|
7
|
+
data.tar.gz: dbcbfed4101b53ff2209768ed4f05db5913f1d5380a64fd85a96309b4d30715fbb96d97e7fcf710a58f57d0d3436b4605e8e4087f60c11a339def376be5e68b5
|
data/.ruby-version
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
2.3.
|
|
1
|
+
2.3.3
|
data/.travis.yml
CHANGED
data/bundler-patch.gemspec
CHANGED
|
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
|
|
|
23
23
|
spec.add_dependency 'slop', '~> 3.0'
|
|
24
24
|
spec.add_dependency 'bundler', '~> 1.7'
|
|
25
25
|
|
|
26
|
-
spec.add_development_dependency 'bundler-fixture', '~> 1.3'
|
|
26
|
+
spec.add_development_dependency 'bundler-fixture', '~> 1.3', '>= 1.3.2'
|
|
27
27
|
spec.add_development_dependency 'pry'
|
|
28
28
|
spec.add_development_dependency 'rake', '~> 10.0'
|
|
29
29
|
spec.add_development_dependency 'rspec', '~> 3.5'
|
|
@@ -16,7 +16,8 @@ module Bundler::Patch
|
|
|
16
16
|
else
|
|
17
17
|
# Run a resolve against the locally available gems
|
|
18
18
|
base = last_resolve.is_a?(Bundler::SpecSet) ? Bundler::SpecSet.new(last_resolve) : []
|
|
19
|
-
|
|
19
|
+
bundler_version = Gem::Version.new(Bundler::VERSION)
|
|
20
|
+
if bundler_version >= Gem::Version.new('1.13.0.rc.2')
|
|
20
21
|
require 'bundler/patch/gem_version_patch_promoter'
|
|
21
22
|
|
|
22
23
|
gvpp = Bundler::Patch::GemVersionPatchPromoter.new(@gem_version_promoter.locked_specs, @gem_version_promoter.unlock_gems)
|
|
@@ -24,7 +25,12 @@ module Bundler::Patch
|
|
|
24
25
|
gvpp.strict = @strict
|
|
25
26
|
gvpp.minimal = @prefer_minimal
|
|
26
27
|
gvpp.gems_to_update = @gems_to_update
|
|
27
|
-
|
|
28
|
+
|
|
29
|
+
if bundler_version >= Gem::Version.new('1.14.0.rc.1')
|
|
30
|
+
resolver = Bundler::Resolver.new(index, source_requirements, base, gvpp, additional_base_requirements_for_resolve, platforms)
|
|
31
|
+
else
|
|
32
|
+
resolver = Bundler::Resolver.new(index, source_requirements, base, nil, gvpp, additional_base_requirements_for_resolve)
|
|
33
|
+
end
|
|
28
34
|
else
|
|
29
35
|
resolver = ConservativeResolver.new(index, source_requirements, base)
|
|
30
36
|
locked_specs = if @unlocking && @locked_specs.length == 0
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: bundler-patch
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.10.
|
|
4
|
+
version: 0.10.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- chrismo
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-
|
|
11
|
+
date: 2017-03-24 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler-advise
|
|
@@ -65,6 +65,9 @@ dependencies:
|
|
|
65
65
|
- - "~>"
|
|
66
66
|
- !ruby/object:Gem::Version
|
|
67
67
|
version: '1.3'
|
|
68
|
+
- - ">="
|
|
69
|
+
- !ruby/object:Gem::Version
|
|
70
|
+
version: 1.3.2
|
|
68
71
|
type: :development
|
|
69
72
|
prerelease: false
|
|
70
73
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -72,6 +75,9 @@ dependencies:
|
|
|
72
75
|
- - "~>"
|
|
73
76
|
- !ruby/object:Gem::Version
|
|
74
77
|
version: '1.3'
|
|
78
|
+
- - ">="
|
|
79
|
+
- !ruby/object:Gem::Version
|
|
80
|
+
version: 1.3.2
|
|
75
81
|
- !ruby/object:Gem::Dependency
|
|
76
82
|
name: pry
|
|
77
83
|
requirement: !ruby/object:Gem::Requirement
|