bundler-patch 1.1.0.pre5 → 1.1.0.pre6

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bf13c59742651428f9c2e58ad275b5383e2cfac6
4
- data.tar.gz: 8fb0e5b1c39c8452891bede98a0cde438cb62531
3
+ metadata.gz: aaa0cd92821c358fb21958e257a19b2199cb3161
4
+ data.tar.gz: 12ef0b2ccd92df1130f936bcf8806dd9a597bc59
5
5
  SHA512:
6
- metadata.gz: d628c8d336745654cc44640ecbef3c9d4a8539fc4781baa6a2ab8c5d51b3ebd6a904ce404458551139e9bf1c0863b8c4609af8eb6cfc4ba2c2e41ec646b9d8ed
7
- data.tar.gz: 382d8a2ec9832927dde72433da442ef802ce933fc7663d28f155e2524d175cdc542c1233115a7cf04bfe4995c5a2fbf9c1674cd06c24b9fa7f103f4ab16076a7
6
+ metadata.gz: 140681288ccfe1d0bdb0029a11246af8dfd09249a77baf9d530667ce0954aa20f06875812064f256d8b88bf0ed4f4d70457c79c8d6cf334043ff20f3549c1206
7
+ data.tar.gz: dca4570bd5c2592e7850469dee655c04205149b753d8db2589d90d0791fe2ff01837097200bb036a0eaa9f4552748a7032b1a67546055d7047ff44a904695a34
@@ -46,10 +46,15 @@ matrix:
46
46
  - rvm: 2.2.7
47
47
  env:
48
48
  - RVM_VER=2.2.7
49
- - BUNDLER_TEST_VERSION=1.15.1
49
+ - BUNDLER_TEST_VERSION=1.15.4
50
50
  - BP_DEBUG=1
51
51
  - rvm: 2.3.4
52
52
  env:
53
53
  - RVM_VER=2.3.4
54
- - BUNDLER_TEST_VERSION=1.15.1
54
+ - BUNDLER_TEST_VERSION=1.15.4
55
+ - BP_DEBUG=1
56
+ - rvm: 2.3.4
57
+ env:
58
+ - RVM_VER=2.3.4
59
+ - BUNDLER_TEST_VERSION=1.16.0.pre.2
55
60
  - BP_DEBUG=1
@@ -23,6 +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'
26
27
  spec.add_development_dependency 'bundler-fixture', '~> 1.6'
27
28
  spec.add_development_dependency 'pry'
28
29
  spec.add_development_dependency 'rake', '~> 10.0'
@@ -7,7 +7,7 @@ module Bundler::Patch
7
7
  options.each_pair do |k, v|
8
8
  new_key = k.to_s.gsub('-', '_').to_sym
9
9
  new_key = map[new_key] || new_key
10
- target[new_key] = v
10
+ target[new_key] ||= v
11
11
  end
12
12
  process_gemfile_option(target)
13
13
  end
@@ -1,5 +1,5 @@
1
1
  module Bundler
2
2
  module Patch
3
- VERSION = '1.1.0.pre5'
3
+ VERSION = '1.1.0.pre6'
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.pre5
4
+ version: 1.1.0.pre6
5
5
  platform: ruby
6
6
  authors:
7
7
  - chrismo
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-07-12 00:00:00.000000000 Z
11
+ date: 2017-09-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler-advise
@@ -58,6 +58,20 @@ dependencies:
58
58
  - - "~>"
59
59
  - !ruby/object:Gem::Version
60
60
  version: '1.7'
61
+ - !ruby/object:Gem::Dependency
62
+ name: bundler
63
+ requirement: !ruby/object:Gem::Requirement
64
+ requirements:
65
+ - - ">="
66
+ - !ruby/object:Gem::Version
67
+ version: '0'
68
+ type: :development
69
+ prerelease: false
70
+ version_requirements: !ruby/object:Gem::Requirement
71
+ requirements:
72
+ - - ">="
73
+ - !ruby/object:Gem::Version
74
+ version: '0'
61
75
  - !ruby/object:Gem::Dependency
62
76
  name: bundler-fixture
63
77
  requirement: !ruby/object:Gem::Requirement
@@ -167,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
167
181
  version: 1.3.1
168
182
  requirements: []
169
183
  rubyforge_project:
170
- rubygems_version: 2.6.12
184
+ rubygems_version: 2.6.13
171
185
  signing_key:
172
186
  specification_version: 4
173
187
  summary: Conservative bundler updates