bundler-patch 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e8030d507c03fdca931c58cee4079e2aa2a35364
-  data.tar.gz: b2876d132456848fab7cc238208efff5af588f44
+SHA256:
+  metadata.gz: af38ea0ac10ada4d0dd9e7125acda84f49f03cb2ec7273581842137005e62e76
+  data.tar.gz: 4ff18c1e5bf79390ae4108edcd044595c135ddf9dcba29b4bc258ddddd70c9b1
 SHA512:
-  metadata.gz: 307d148da72d9d254120ad9da172a92e8fc9b1b0fb13df7e8d259337fea15c2f92fda1e9e5eb55a204e4173ed7d60c91d966a75f2bd8fb2df0bbe0004a003b4f
-  data.tar.gz: b142c58270fda462e7de2a52f0b5aea6899968db2ceb4d125b4f3249d03bb03c2ae70e48f8b68d30551986c75a97eb658dd12ca581cfd245442338296671f525
+  metadata.gz: a93c3b05fb3637f6a24b4f91b104c2b85e62aca5d3ba1ba7ba03e4dbe0225b60d9fa334f0cfb23e5d11863cc1d2af4fa423a2f03982a7bdaf7bb967a465c2430
+  data.tar.gz: 39353d66358709fec047dadc6405270f174a2aa9074f1124d7a7bab5f29947343c21702d149f0b7a5cae297c5b75a549266382d3057a97b8f608f6b7ba76cdbf

data/.ruby-version

@@ -1 +1 @@
-2.3.4
+2.5.3

data/.travis.yml

@@ -1,60 +1,75 @@
 language: ruby
 
 before_install:
-  - for dir in $(echo $GEM_PATH | tr ':' ' '); do gem uninstall -i $dir bundler -a -x; done
-  - gem install bundler -v $BUNDLER_TEST_VERSION
-  - bundle --version
-  - rvm use 2.1.10 --install --binary --fuzzy
-  - gem update --system
-  - rvm use $RVM_VER --install --binary --fuzzy
-  - gem update --system
+  - curl -sSl https://raw.githubusercontent.com/chrismo/bundler-fixture/master/only-bundler.sh | bash -s ${BUNDLER_TEST_VERSION} ${RUBYGEMS_VERSION}
 
 script: bundle exec rake test:all
 
+# Lookup RubyGems version installed with Ruby at https://github.com/ruby/ruby/blob/ruby_2_4/lib/rubygems.rb
 matrix:
   include:
-    - rvm: 2.3.4
+    - rvm: 2.3.8
       env:
-      - RVM_VER=2.3.4
-      - BUNDLER_TEST_VERSION=1.9.10
-      - BP_DEBUG=1
-    - rvm: 2.3.4
-      env:
-      - RVM_VER=2.3.4
-      - BUNDLER_TEST_VERSION=1.10.5
-      - BP_DEBUG=1
-    - rvm: 2.3.4
-      env:
-      - RVM_VER=2.3.4
+      - RUBYGEMS_VERSION=2.5.2
       - BUNDLER_TEST_VERSION=1.11.2
       - BP_DEBUG=1
-    - rvm: 2.3.4
+    - rvm: 2.3.8
       env:
-      - RVM_VER=2.3.4
+      - RUBYGEMS_VERSION=2.5.2
       - BUNDLER_TEST_VERSION=1.12.5
       - BP_DEBUG=1
-    - rvm: 2.3.4
+    - rvm: 2.4.5
       env:
-      - RVM_VER=2.3.4
+      - RUBYGEMS_VERSION=2.6.14
       - BUNDLER_TEST_VERSION=1.13.6
       - BP_DEBUG=1
-    - rvm: 2.3.4
+    - rvm: 2.4.5
       env:
-      - RVM_VER=2.3.4
+      - RUBYGEMS_VERSION=2.6.14
       - BUNDLER_TEST_VERSION=1.14.6
       - BP_DEBUG=1
-    - rvm: 2.2.7
+    - rvm: 2.5.3
       env:
-      - RVM_VER=2.2.7
+      - RUBYGEMS_VERSION=2.7.6
       - BUNDLER_TEST_VERSION=1.15.4
       - BP_DEBUG=1
-    - rvm: 2.3.4
+    - rvm: 2.5.3
       env:
-      - RVM_VER=2.3.4
-      - BUNDLER_TEST_VERSION=1.15.4
+      - RUBYGEMS_VERSION=2.7.6
+      - BUNDLER_TEST_VERSION=1.16.6
+      - BP_DEBUG=1
+    - rvm: 2.3.8
+      env:
+        - RUBYGEMS_VERSION=2.5.2
+        - BUNDLER_TEST_VERSION=1.17.3
+        - BP_DEBUG=1
+    - rvm: 2.4.5
+      env:
+        - RUBYGEMS_VERSION=2.6.14
+        - BUNDLER_TEST_VERSION=1.17.3
+        - BP_DEBUG=1
+    - rvm: 2.5.3
+      env:
+      - RUBYGEMS_VERSION=2.7.6
+      - BUNDLER_TEST_VERSION=1.17.3
+      - BP_DEBUG=1
+    - rvm: 2.6.0
+      env:
+      - RUBYGEMS_VERSION=3.0.1
+      - BUNDLER_TEST_VERSION=1.17.3
+      - BP_DEBUG=1
+    - rvm: 2.6.0
+      env:
+      - RUBYGEMS_VERSION=latest
+      - BUNDLER_TEST_VERSION=1.17.3
+      - BP_DEBUG=1
+    - rvm: 2.5.3
+      env:
+      - RUBYGEMS_VERSION=latest
+      - BUNDLER_TEST_VERSION=latest
       - BP_DEBUG=1
-    - rvm: 2.3.4
+    - rvm: 2.6.0
       env:
-      - RVM_VER=2.3.4
-      - BUNDLER_TEST_VERSION=1.16.0.pre.2
+      - RUBYGEMS_VERSION=latest
+      - BUNDLER_TEST_VERSION=latest
       - BP_DEBUG=1

data/bundler-patch.gemspec

@@ -21,11 +21,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'bundler-advise', '~> 1.1', '>= 1.1.5'
   spec.add_dependency 'slop', '~> 3.0'
-  spec.add_dependency 'bundler', '~> 1.7'
+  spec.add_dependency 'bundler', '>= 1.11.0'
 
   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'
   spec.add_development_dependency 'rspec', '~> 3.5'
+  spec.add_development_dependency 'rubocop'
 end

data/lib/bundler/patch/conservative_definition.rb

@@ -71,6 +71,12 @@ module Bundler::Patch
     def prep
       @bundler_def ||= Bundler.definition(@gems_to_update.to_bundler_definition)
       @bundler_def.extend ConservativeDefinition
+
+      # Starting with 1.17, this method has to be called externally, which isn't
+      # ideal in my opinion since the Definition class depends on it.
+      # https://github.com/bundler/bundler/commit/22f15209b87e0b0792c8a393549e1a10c963d59c
+      @bundler_def.gem_version_promoter if @bundler_def.respond_to?(:gem_version_promoter)
+
       @bundler_def.gems_to_update = @gems_to_update
       @bundler_def.strict = @options[:strict]
       @bundler_def.minor_preferred = @options[:minor]

data/lib/bundler/patch/target_bundle.rb

@@ -70,7 +70,9 @@ class TargetBundle
   end
 
   def ruby_bin_exe
-    File.join(ruby_bin, "#{RbConfig::CONFIG['ruby_install_name']}#{RbConfig::CONFIG['EXEEXT']}")
+    ruby_install_name = RbConfig::CONFIG['ruby_install_name']
+    exe_ext = RbConfig::CONFIG['EXEEXT']
+    File.join(ruby_bin, "#{ruby_install_name}#{exe_ext}")
   end
 
   def target_ruby_is_different?

data/lib/bundler/patch/version.rb

@@ -1,5 +1,5 @@
 module Bundler
   module Patch
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundler-patch
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - chrismo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-23 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler-advise
@@ -48,16 +48,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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'
 description: 
 email:
 - chrismo@clabs.org
@@ -180,8 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Conservative bundler updates