bundler-patch 1.1.0.pre5 → 1.1.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf13c59742651428f9c2e58ad275b5383e2cfac6
-  data.tar.gz: 8fb0e5b1c39c8452891bede98a0cde438cb62531
+  metadata.gz: aaa0cd92821c358fb21958e257a19b2199cb3161
+  data.tar.gz: 12ef0b2ccd92df1130f936bcf8806dd9a597bc59
 SHA512:
-  metadata.gz: d628c8d336745654cc44640ecbef3c9d4a8539fc4781baa6a2ab8c5d51b3ebd6a904ce404458551139e9bf1c0863b8c4609af8eb6cfc4ba2c2e41ec646b9d8ed
-  data.tar.gz: 382d8a2ec9832927dde72433da442ef802ce933fc7663d28f155e2524d175cdc542c1233115a7cf04bfe4995c5a2fbf9c1674cd06c24b9fa7f103f4ab16076a7
+  metadata.gz: 140681288ccfe1d0bdb0029a11246af8dfd09249a77baf9d530667ce0954aa20f06875812064f256d8b88bf0ed4f4d70457c79c8d6cf334043ff20f3549c1206
+  data.tar.gz: dca4570bd5c2592e7850469dee655c04205149b753d8db2589d90d0791fe2ff01837097200bb036a0eaa9f4552748a7032b1a67546055d7047ff44a904695a34

data/.travis.yml

@@ -46,10 +46,15 @@ matrix:
     - rvm: 2.2.7
       env:
       - RVM_VER=2.2.7
-      - BUNDLER_TEST_VERSION=1.15.1
+      - BUNDLER_TEST_VERSION=1.15.4
       - BP_DEBUG=1
     - rvm: 2.3.4
       env:
       - RVM_VER=2.3.4
-      - BUNDLER_TEST_VERSION=1.15.1
+      - BUNDLER_TEST_VERSION=1.15.4
+      - BP_DEBUG=1
+    - rvm: 2.3.4
+      env:
+      - RVM_VER=2.3.4
+      - BUNDLER_TEST_VERSION=1.16.0.pre.2
       - BP_DEBUG=1

data/bundler-patch.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'slop', '~> 3.0'
   spec.add_dependency 'bundler', '~> 1.7'
 
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'bundler-fixture', '~> 1.6'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/bundler/patch/cli_options.rb

@@ -7,7 +7,7 @@ module Bundler::Patch
           options.each_pair do |k, v|
             new_key = k.to_s.gsub('-', '_').to_sym
             new_key = map[new_key] || new_key
-            target[new_key] = v
+            target[new_key] ||= v
           end
           process_gemfile_option(target)
         end

data/lib/bundler/patch/version.rb

@@ -1,5 +1,5 @@
 module Bundler
   module Patch
-    VERSION = '1.1.0.pre5'
+    VERSION = '1.1.0.pre6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundler-patch
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre5
+  version: 1.1.0.pre6
 platform: ruby
 authors:
 - chrismo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler-advise
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler-fixture
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Conservative bundler updates