bundler-patch 1.1.0.pre3 → 1.1.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67617245f2ccb603b4e769123cfeca8c1651b7ed
-  data.tar.gz: '0318430c3f11b8a769bba339aeebb869e94fe3e2'
+  metadata.gz: df6792e5e314e509f2cc1d71baed6900e77a175d
+  data.tar.gz: e3ee93884719854d29bd5feba495fc8099af6984
 SHA512:
-  metadata.gz: 47a5029a627739791d69d9e5ea8b4098ed7339b44501c438158d7402ff40e8a972e07578d5182b9fc30b16a3db9dd8d0f6c4cb11d0c3963492546189ab846d2f
-  data.tar.gz: a1f27bc6462f64e0d7ba846e507e0bf24212b3f5180ed78ada81af96a98613d479ed1b7b8a76e627631d850b343f98ab825af84f77a23b836c3777b0f0a74368
+  metadata.gz: a9360b34b07c2b4733b97cb72d9305cf1264520732b43bdf18e53a96b98ae16ab89a1da4322ced5d14dd3c8c97350cbe9bceceace9b36c67506e7bd668c5407f
+  data.tar.gz: adb7f5871ad2cb7b6a6d9778d301b4ca08f2e7367e09bc6533fd7443898bb1d68faf8756a3fecc893d1719ac3fcf35616aa1af659405e372ef19594de8a412fb

data/lib/bundler/patch/cli.rb

@@ -65,14 +65,9 @@ module Bundler::Patch
 
       options = Bundler::Patch::CLI::Options.new.normalize_options(options)
 
-      if options[:use_target_ruby] # TODO: && different_ruby_found
-        tb = options[:target]
-        ruby = tb.ruby_bin_exe
-        tb.install_bundler_patch_in_target
-        bundler_patch = File.join(tb.ruby_bin, 'bundler-patch') # uses 'latest' bundler-patch, which can work after we've installed ours. 
-        full_command = "#{ruby} #{bundler_patch} #{options[:original_command].gsub(/use_target_ruby/, '')}"
-        result = shell_command(full_command)
-        puts result[:stdout] unless ENV['BP_DEBUG']
+      tb = options[:target]
+      if options[:use_target_ruby] && tb.target_ruby_is_different?
+        launch_target_bundler_patch(options)
       else
         return list(options) if options[:list]
 
@@ -82,6 +77,16 @@ module Bundler::Patch
       end
     end
 
+    def launch_target_bundler_patch(options)
+      tb = options[:target]
+      ruby = tb.ruby_bin_exe
+      tb.install_bundler_patch_in_target
+      bundler_patch = File.join(tb.ruby_bin, 'bundler-patch')
+      full_command = "#{ruby} #{bundler_patch} #{options[:original_command].gsub(/use_target_ruby/, '')}"
+      result = shell_command(full_command)
+      puts result[:stdout] unless ENV['BP_DEBUG']
+    end
+
     private
 
     def list(options)
@@ -152,9 +157,9 @@ module Bundler::Patch
 end
 
 def shell_command(command)
+  puts "-command:  #{command}" if ENV['BP_DEBUG']
   stdout, stderr, status = Open3.capture3(command)
   if ENV['BP_DEBUG']
-    puts "-command:  #{command}"
     puts "--stdout:#{indent(stdout)}"
     puts "--stderr:#{indent(stderr)}"
   end

data/lib/bundler/patch/target_bundle.rb

@@ -71,6 +71,10 @@ class TargetBundle
     File.join(ruby_bin, "#{RbConfig::CONFIG['ruby_install_name']}#{RbConfig::CONFIG['EXEEXT']}")
   end
 
+  def target_ruby_is_different?
+    !(ruby_bin == RbConfig::CONFIG['bindir'])
+  end
+
   # 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.

data/lib/bundler/patch/version.rb

@@ -1,5 +1,5 @@
 module Bundler
   module Patch
-    VERSION = '1.1.0.pre3'
+    VERSION = '1.1.0.pre4'
   end
 end

metadata

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