bundler-patch 1.1.0.pre4 → 1.1.0.pre5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: df6792e5e314e509f2cc1d71baed6900e77a175d
4
- data.tar.gz: e3ee93884719854d29bd5feba495fc8099af6984
3
+ metadata.gz: bf13c59742651428f9c2e58ad275b5383e2cfac6
4
+ data.tar.gz: 8fb0e5b1c39c8452891bede98a0cde438cb62531
5
5
  SHA512:
6
- metadata.gz: a9360b34b07c2b4733b97cb72d9305cf1264520732b43bdf18e53a96b98ae16ab89a1da4322ced5d14dd3c8c97350cbe9bceceace9b36c67506e7bd668c5407f
7
- data.tar.gz: adb7f5871ad2cb7b6a6d9778d301b4ca08f2e7367e09bc6533fd7443898bb1d68faf8756a3fecc893d1719ac3fcf35616aa1af659405e372ef19594de8a412fb
6
+ metadata.gz: d628c8d336745654cc44640ecbef3c9d4a8539fc4781baa6a2ab8c5d51b3ebd6a904ce404458551139e9bf1c0863b8c4609af8eb6cfc4ba2c2e41ec646b9d8ed
7
+ data.tar.gz: 382d8a2ec9832927dde72433da442ef802ce933fc7663d28f155e2524d175cdc542c1233115a7cf04bfe4995c5a2fbf9c1674cd06c24b9fa7f103f4ab16076a7
@@ -82,7 +82,7 @@ module Bundler::Patch
82
82
  ruby = tb.ruby_bin_exe
83
83
  tb.install_bundler_patch_in_target
84
84
  bundler_patch = File.join(tb.ruby_bin, 'bundler-patch')
85
- full_command = "#{ruby} #{bundler_patch} #{options[:original_command].gsub(/use_target_ruby/, '')}"
85
+ full_command = %Q{GEM_HOME="#{tb.gem_home}" "#{ruby}" "#{bundler_patch}" #{options[:original_command].gsub(/use_target_ruby/, '')}}
86
86
  result = shell_command(full_command)
87
87
  puts result[:stdout] unless ENV['BP_DEBUG']
88
88
  end
@@ -33,10 +33,12 @@ class TargetBundle
33
33
 
34
34
  result ||= if File.exist?(ruby_version_filename)
35
35
  File.read(File.join(@dir, '.ruby-version')).chomp
36
- else
36
+ elsif File.exist?(gemfile_name)
37
37
  Bundler::Definition.build(gemfile_name, lockfile_name, nil).ruby_version
38
38
  end
39
39
 
40
+ result ||= RbConfig::CONFIG['RUBY_PROGRAM_VERSION']
41
+
40
42
  version, patch_level = result.to_s.scan(/(\d+\.\d+\.\d+)(p\d+)*/).first
41
43
  patch_level ? "#{version}-#{patch_level}" : version
42
44
  end
@@ -1,5 +1,5 @@
1
1
  module Bundler
2
2
  module Patch
3
- VERSION = '1.1.0.pre4'
3
+ VERSION = '1.1.0.pre5'
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.pre4
4
+ version: 1.1.0.pre5
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-11 00:00:00.000000000 Z
11
+ date: 2017-07-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler-advise