bundler-patch 1.1.0.pre1 → 1.1.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d0a7b1ce6bd99140213082d130de098b65c45ce
-  data.tar.gz: f81ba6fbfecf3be917095c265e9cfe38929e49ec
+  metadata.gz: 7e15e29ba6d792404c4675f7f0a9feb02675cdea
+  data.tar.gz: ea0d23abcdc4859e441ed3a378bde6858187bf75
 SHA512:
-  metadata.gz: 75aaf7bd3c7c80d6cd88c43604071277df983c0716ac4de46094f8aaa1bf41f9161769ab1e2320c99ec00f50b8ef54c75d8cfd68ab868304fda6c20ee5ebbc48
-  data.tar.gz: bbfebaa7bd031e39ab1a5313233e256b2f6d2b3b8f6e0071afe14d15a25abca02ae9976eac90bbbe2656f488495af8df369c0e894ea26cbb933ebee357b3db96
+  metadata.gz: e9ff099ef9e01ef481be0b67ca8eb4e0e9d78a7d9cbfd7d907fa063122428e5050c53684d8a9b4856efad5c2271d74e8a6e75155007ecdd91c45d18576094409
+  data.tar.gz: a2399d339c85e883ed238eea4fb741daa97a7b7da0fdbac578d3e1761264543c7383e5d59cf1ae1aed0e1eba0cf84cbce1816f0c10687e5cba6d4136b0ebaf6c

data/.travis.yml

@@ -13,39 +13,43 @@ script: bundle exec rake test:all
 
 matrix:
   include:
-      env:
-        - RVM_VER=2.3.4
-        - BUNDLER_TEST_VERSION=1.9.10
-        - BP_DEBUG=1
-      env:
-        - RVM_VER=2.3.4
-        - BUNDLER_TEST_VERSION=1.10.5
-        - BP_DEBUG=1
-      env:
-        - RVM_VER=2.3.4
-        - BUNDLER_TEST_VERSION=1.11.2
-        - BP_DEBUG=1
-      env:
-        - RVM_VER=2.3.4
-        - BUNDLER_TEST_VERSION=1.12.5
-        - BP_DEBUG=1
-      env:
-        - RVM_VER=2.3.4
-        - BUNDLER_TEST_VERSION=1.13.6
-        - BP_DEBUG=1
-      env:
-        - RVM_VER=2.3.4
-        - BUNDLER_TEST_VERSION=1.14.6
-        - BP_DEBUG=1
-#      env:
-#        - RVM_VER=2.1.10
-#        - BUNDLER_TEST_VERSION=1.15.1
-#        - BP_DEBUG=1
-      env:
-        - RVM_VER=2.2.7
-        - BUNDLER_TEST_VERSION=1.15.1
-        - BP_DEBUG=1
-      env:
-        - RVM_VER=2.3.4
-        - BUNDLER_TEST_VERSION=1.15.1
-        - BP_DEBUG=1
+    - rvm: 2.3.4
+      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
+      - BUNDLER_TEST_VERSION=1.11.2
+      - BP_DEBUG=1
+    - rvm: 2.3.4
+      env:
+      - RVM_VER=2.3.4
+      - BUNDLER_TEST_VERSION=1.12.5
+      - BP_DEBUG=1
+    - rvm: 2.3.4
+      env:
+      - RVM_VER=2.3.4
+      - BUNDLER_TEST_VERSION=1.13.6
+      - BP_DEBUG=1
+    - rvm: 2.3.4
+      env:
+      - RVM_VER=2.3.4
+      - BUNDLER_TEST_VERSION=1.14.6
+      - BP_DEBUG=1
+    - rvm: 2.2.7
+      env:
+      - RVM_VER=2.2.7
+      - BUNDLER_TEST_VERSION=1.15.1
+      - BP_DEBUG=1
+    - rvm: 2.3.4
+      env:
+      - RVM_VER=2.3.4
+      - BUNDLER_TEST_VERSION=1.15.1
+      - BP_DEBUG=1

data/lib/bundler/patch/target_bundle.rb

@@ -67,9 +67,13 @@ class TargetBundle
     File.join(ruby_bin, "#{RbConfig::CONFIG['ruby_install_name']}#{RbConfig::CONFIG['EXEEXT']}")
   end
 
-  # Have to run a separate process in the other Ruby, because Bundler::Settings#path ultimately
-  # arrives at RbConfig::CONFIG which is all special data derived from the active runtime.
-  # TODO: fix ^^
+  # Have to run a separate process in the other Ruby, because Gem.default_dir depends on
+  # RbConfig::CONFIG which is all special data derived from the active runtime. It could perhaps
+  # be redone here, but I'd rather not copy that code in here at the moment.
+  #
+  # At one point during development, this would execute Bundler::Settings#path, which in most
+  # cases would just fall through to Gem.default_dir ... but would give preference to GEM_HOME
+  # env variable, which could be in a different Ruby, and that won't work.
   def gem_home
     result = shell_command "#{ruby_bin_exe} -C#{@dir} -e 'puts Gem.default_dir'"
     path = result[:stdout].chomp
@@ -78,18 +82,17 @@ class TargetBundle
     expanded_path
   end
 
-  # To properly update another bundle, bundler-patch _does_ need to live in the same bundle
-  # location because of its _dependencies_ (it's not a self-contained gem), and it can't both
+  # To properly update another bundle, bundler-patch _does_ need to live in the same Ruby 
+  # version because of its _dependencies_ (it's not a self-contained gem), and it can't both
   # act on another bundle location AND find its own dependencies in a separate bundle location.
-
-  # TODO: gem_home for this purpose does not need to be the local bundle path, can just
-  # be in the Ruby "global" gem home, right?
+  #
+  # One known issue: older RubyGems in older Rubies don't install bundler-patch bin in the right
+  # directory. Upgrading RubyGems fixes this.
   def install_bundler_patch_in_target
+    # TODO: reconsider --conservative flag. Had problems with it in place on Travis, but I think I want it.
     # cmd = "#{ruby_bin}#{File::SEPARATOR}gem install -V --install-dir #{gem_home} --conservative --no-document --prerelease bundler-patch"
     cmd = "#{ruby_bin}#{File::SEPARATOR}gem install -V --install-dir #{gem_home} --no-document --prerelease bundler-patch"
     shell_command cmd
-
-    shell_command "ls #{ruby_bin}#{File::SEPARATOR}**"
   end
 
   private

data/lib/bundler/patch/version.rb

@@ -1,5 +1,5 @@
 module Bundler
   module Patch
-    VERSION = '1.1.0.pre1'
+    VERSION = '1.1.0.pre2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler-patch
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre1
+  version: 1.1.0.pre2
 platform: ruby
 authors:
 - chrismo