bundler-patch 1.1.0 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +5 -5
  2. data/.ruby-version +1 -1
  3. data/.travis.yml +48 -33
  4. data/bundler-patch.gemspec +2 -1
  5. data/lib/bundler/patch/conservative_definition.rb +6 -0
  6. data/lib/bundler/patch/target_bundle.rb +3 -1
  7. data/lib/bundler/patch/version.rb +1 -1
  8. metadata +21 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: e8030d507c03fdca931c58cee4079e2aa2a35364
4
- data.tar.gz: b2876d132456848fab7cc238208efff5af588f44
2
+ SHA256:
3
+ metadata.gz: af38ea0ac10ada4d0dd9e7125acda84f49f03cb2ec7273581842137005e62e76
4
+ data.tar.gz: 4ff18c1e5bf79390ae4108edcd044595c135ddf9dcba29b4bc258ddddd70c9b1
5
5
  SHA512:
6
- metadata.gz: 307d148da72d9d254120ad9da172a92e8fc9b1b0fb13df7e8d259337fea15c2f92fda1e9e5eb55a204e4173ed7d60c91d966a75f2bd8fb2df0bbe0004a003b4f
7
- data.tar.gz: b142c58270fda462e7de2a52f0b5aea6899968db2ceb4d125b4f3249d03bb03c2ae70e48f8b68d30551986c75a97eb658dd12ca581cfd245442338296671f525
6
+ metadata.gz: a93c3b05fb3637f6a24b4f91b104c2b85e62aca5d3ba1ba7ba03e4dbe0225b60d9fa334f0cfb23e5d11863cc1d2af4fa423a2f03982a7bdaf7bb967a465c2430
7
+ data.tar.gz: 39353d66358709fec047dadc6405270f174a2aa9074f1124d7a7bab5f29947343c21702d149f0b7a5cae297c5b75a549266382d3057a97b8f608f6b7ba76cdbf
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- 2.3.4
1
+ 2.5.3
data/.travis.yml CHANGED
@@ -1,60 +1,75 @@
1
1
  language: ruby
2
2
 
3
3
  before_install:
4
- - for dir in $(echo $GEM_PATH | tr ':' ' '); do gem uninstall -i $dir bundler -a -x; done
5
- - gem install bundler -v $BUNDLER_TEST_VERSION
6
- - bundle --version
7
- - rvm use 2.1.10 --install --binary --fuzzy
8
- - gem update --system
9
- - rvm use $RVM_VER --install --binary --fuzzy
10
- - gem update --system
4
+ - curl -sSl https://raw.githubusercontent.com/chrismo/bundler-fixture/master/only-bundler.sh | bash -s ${BUNDLER_TEST_VERSION} ${RUBYGEMS_VERSION}
11
5
 
12
6
  script: bundle exec rake test:all
13
7
 
8
+ # Lookup RubyGems version installed with Ruby at https://github.com/ruby/ruby/blob/ruby_2_4/lib/rubygems.rb
14
9
  matrix:
15
10
  include:
16
- - rvm: 2.3.4
11
+ - rvm: 2.3.8
17
12
  env:
18
- - RVM_VER=2.3.4
19
- - BUNDLER_TEST_VERSION=1.9.10
20
- - BP_DEBUG=1
21
- - rvm: 2.3.4
22
- env:
23
- - RVM_VER=2.3.4
24
- - BUNDLER_TEST_VERSION=1.10.5
25
- - BP_DEBUG=1
26
- - rvm: 2.3.4
27
- env:
28
- - RVM_VER=2.3.4
13
+ - RUBYGEMS_VERSION=2.5.2
29
14
  - BUNDLER_TEST_VERSION=1.11.2
30
15
  - BP_DEBUG=1
31
- - rvm: 2.3.4
16
+ - rvm: 2.3.8
32
17
  env:
33
- - RVM_VER=2.3.4
18
+ - RUBYGEMS_VERSION=2.5.2
34
19
  - BUNDLER_TEST_VERSION=1.12.5
35
20
  - BP_DEBUG=1
36
- - rvm: 2.3.4
21
+ - rvm: 2.4.5
37
22
  env:
38
- - RVM_VER=2.3.4
23
+ - RUBYGEMS_VERSION=2.6.14
39
24
  - BUNDLER_TEST_VERSION=1.13.6
40
25
  - BP_DEBUG=1
41
- - rvm: 2.3.4
26
+ - rvm: 2.4.5
42
27
  env:
43
- - RVM_VER=2.3.4
28
+ - RUBYGEMS_VERSION=2.6.14
44
29
  - BUNDLER_TEST_VERSION=1.14.6
45
30
  - BP_DEBUG=1
46
- - rvm: 2.2.7
31
+ - rvm: 2.5.3
47
32
  env:
48
- - RVM_VER=2.2.7
33
+ - RUBYGEMS_VERSION=2.7.6
49
34
  - BUNDLER_TEST_VERSION=1.15.4
50
35
  - BP_DEBUG=1
51
- - rvm: 2.3.4
36
+ - rvm: 2.5.3
52
37
  env:
53
- - RVM_VER=2.3.4
54
- - BUNDLER_TEST_VERSION=1.15.4
38
+ - RUBYGEMS_VERSION=2.7.6
39
+ - BUNDLER_TEST_VERSION=1.16.6
40
+ - BP_DEBUG=1
41
+ - rvm: 2.3.8
42
+ env:
43
+ - RUBYGEMS_VERSION=2.5.2
44
+ - BUNDLER_TEST_VERSION=1.17.3
45
+ - BP_DEBUG=1
46
+ - rvm: 2.4.5
47
+ env:
48
+ - RUBYGEMS_VERSION=2.6.14
49
+ - BUNDLER_TEST_VERSION=1.17.3
50
+ - BP_DEBUG=1
51
+ - rvm: 2.5.3
52
+ env:
53
+ - RUBYGEMS_VERSION=2.7.6
54
+ - BUNDLER_TEST_VERSION=1.17.3
55
+ - BP_DEBUG=1
56
+ - rvm: 2.6.0
57
+ env:
58
+ - RUBYGEMS_VERSION=3.0.1
59
+ - BUNDLER_TEST_VERSION=1.17.3
60
+ - BP_DEBUG=1
61
+ - rvm: 2.6.0
62
+ env:
63
+ - RUBYGEMS_VERSION=latest
64
+ - BUNDLER_TEST_VERSION=1.17.3
65
+ - BP_DEBUG=1
66
+ - rvm: 2.5.3
67
+ env:
68
+ - RUBYGEMS_VERSION=latest
69
+ - BUNDLER_TEST_VERSION=latest
55
70
  - BP_DEBUG=1
56
- - rvm: 2.3.4
71
+ - rvm: 2.6.0
57
72
  env:
58
- - RVM_VER=2.3.4
59
- - BUNDLER_TEST_VERSION=1.16.0.pre.2
73
+ - RUBYGEMS_VERSION=latest
74
+ - BUNDLER_TEST_VERSION=latest
60
75
  - BP_DEBUG=1
data/bundler-patch.gemspec CHANGED
@@ -21,11 +21,12 @@ Gem::Specification.new do |spec|
21
21
 
22
22
  spec.add_dependency 'bundler-advise', '~> 1.1', '>= 1.1.5'
23
23
  spec.add_dependency 'slop', '~> 3.0'
24
- spec.add_dependency 'bundler', '~> 1.7'
24
+ spec.add_dependency 'bundler', '>= 1.11.0'
25
25
 
26
26
  spec.add_development_dependency 'bundler'
27
27
  spec.add_development_dependency 'bundler-fixture', '~> 1.6'
28
28
  spec.add_development_dependency 'pry'
29
29
  spec.add_development_dependency 'rake', '~> 10.0'
30
30
  spec.add_development_dependency 'rspec', '~> 3.5'
31
+ spec.add_development_dependency 'rubocop'
31
32
  end
data/lib/bundler/patch/conservative_definition.rb CHANGED
@@ -71,6 +71,12 @@ module Bundler::Patch
71
71
  def prep
72
72
  @bundler_def ||= Bundler.definition(@gems_to_update.to_bundler_definition)
73
73
  @bundler_def.extend ConservativeDefinition
74
+
75
+ # Starting with 1.17, this method has to be called externally, which isn't
76
+ # ideal in my opinion since the Definition class depends on it.
77
+ # https://github.com/bundler/bundler/commit/22f15209b87e0b0792c8a393549e1a10c963d59c
78
+ @bundler_def.gem_version_promoter if @bundler_def.respond_to?(:gem_version_promoter)
79
+
74
80
  @bundler_def.gems_to_update = @gems_to_update
75
81
  @bundler_def.strict = @options[:strict]
76
82
  @bundler_def.minor_preferred = @options[:minor]
data/lib/bundler/patch/target_bundle.rb CHANGED
@@ -70,7 +70,9 @@ class TargetBundle
70
70
  end
71
71
 
72
72
  def ruby_bin_exe
73
- File.join(ruby_bin, "#{RbConfig::CONFIG['ruby_install_name']}#{RbConfig::CONFIG['EXEEXT']}")
73
+ ruby_install_name = RbConfig::CONFIG['ruby_install_name']
74
+ exe_ext = RbConfig::CONFIG['EXEEXT']
75
+ File.join(ruby_bin, "#{ruby_install_name}#{exe_ext}")
74
76
  end
75
77
 
76
78
  def target_ruby_is_different?
data/lib/bundler/patch/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bundler
2
2
  module Patch
3
- VERSION = '1.1.0'
3
+ VERSION = '1.2.0'
4
4
  end
5
5
  end
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: 1.1.0
4
+ version: 1.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - chrismo
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-09-23 00:00:00.000000000 Z
11
+ date: 2019-01-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler-advise
@@ -48,16 +48,16 @@ dependencies:
48
48
  name: bundler
49
49
  requirement: !ruby/object:Gem::Requirement
50
50
  requirements:
51
- - - "~>"
51
+ - - ">="
52
52
  - !ruby/object:Gem::Version
53
- version: '1.7'
53
+ version: 1.11.0
54
54
  type: :runtime
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
57
57
  requirements:
58
- - - "~>"
58
+ - - ">="
59
59
  - !ruby/object:Gem::Version
60
- version: '1.7'
60
+ version: 1.11.0
61
61
  - !ruby/object:Gem::Dependency
62
62
  name: bundler
63
63
  requirement: !ruby/object:Gem::Requirement
@@ -128,6 +128,20 @@ dependencies:
128
128
  - - "~>"
129
129
  - !ruby/object:Gem::Version
130
130
  version: '3.5'
131
+ - !ruby/object:Gem::Dependency
132
+ name: rubocop
133
+ requirement: !ruby/object:Gem::Requirement
134
+ requirements:
135
+ - - ">="
136
+ - !ruby/object:Gem::Version
137
+ version: '0'
138
+ type: :development
139
+ prerelease: false
140
+ version_requirements: !ruby/object:Gem::Requirement
141
+ requirements:
142
+ - - ">="
143
+ - !ruby/object:Gem::Version
144
+ version: '0'
131
145
  description:
132
146
  email:
133
147
  - chrismo@clabs.org
@@ -180,8 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
180
194
  - !ruby/object:Gem::Version
181
195
  version: '0'
182
196
  requirements: []
183
- rubyforge_project:
184
- rubygems_version: 2.6.13
197
+ rubygems_version: 3.0.2
185
198
  signing_key:
186
199
  specification_version: 4
187
200
  summary: Conservative bundler updates