bundler-patch 1.1.0.pre1 → 1.1.0.pre2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +40 -36
  3. data/lib/bundler/patch/target_bundle.rb +13 -10
  4. data/lib/bundler/patch/version.rb +1 -1
  5. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4d0a7b1ce6bd99140213082d130de098b65c45ce
4
- data.tar.gz: f81ba6fbfecf3be917095c265e9cfe38929e49ec
3
+ metadata.gz: 7e15e29ba6d792404c4675f7f0a9feb02675cdea
4
+ data.tar.gz: ea0d23abcdc4859e441ed3a378bde6858187bf75
5
5
  SHA512:
6
- metadata.gz: 75aaf7bd3c7c80d6cd88c43604071277df983c0716ac4de46094f8aaa1bf41f9161769ab1e2320c99ec00f50b8ef54c75d8cfd68ab868304fda6c20ee5ebbc48
7
- data.tar.gz: bbfebaa7bd031e39ab1a5313233e256b2f6d2b3b8f6e0071afe14d15a25abca02ae9976eac90bbbe2656f488495af8df369c0e894ea26cbb933ebee357b3db96
6
+ metadata.gz: e9ff099ef9e01ef481be0b67ca8eb4e0e9d78a7d9cbfd7d907fa063122428e5050c53684d8a9b4856efad5c2271d74e8a6e75155007ecdd91c45d18576094409
7
+ data.tar.gz: a2399d339c85e883ed238eea4fb741daa97a7b7da0fdbac578d3e1761264543c7383e5d59cf1ae1aed0e1eba0cf84cbce1816f0c10687e5cba6d4136b0ebaf6c
data/.travis.yml CHANGED
@@ -13,39 +13,43 @@ script: bundle exec rake test:all
13
13
 
14
14
  matrix:
15
15
  include:
16
- env:
17
- - RVM_VER=2.3.4
18
- - BUNDLER_TEST_VERSION=1.9.10
19
- - BP_DEBUG=1
20
- env:
21
- - RVM_VER=2.3.4
22
- - BUNDLER_TEST_VERSION=1.10.5
23
- - BP_DEBUG=1
24
- env:
25
- - RVM_VER=2.3.4
26
- - BUNDLER_TEST_VERSION=1.11.2
27
- - BP_DEBUG=1
28
- env:
29
- - RVM_VER=2.3.4
30
- - BUNDLER_TEST_VERSION=1.12.5
31
- - BP_DEBUG=1
32
- env:
33
- - RVM_VER=2.3.4
34
- - BUNDLER_TEST_VERSION=1.13.6
35
- - BP_DEBUG=1
36
- env:
37
- - RVM_VER=2.3.4
38
- - BUNDLER_TEST_VERSION=1.14.6
39
- - BP_DEBUG=1
40
- # env:
41
- # - RVM_VER=2.1.10
42
- # - BUNDLER_TEST_VERSION=1.15.1
43
- # - BP_DEBUG=1
44
- env:
45
- - RVM_VER=2.2.7
46
- - BUNDLER_TEST_VERSION=1.15.1
47
- - BP_DEBUG=1
48
- env:
49
- - RVM_VER=2.3.4
50
- - BUNDLER_TEST_VERSION=1.15.1
51
- - BP_DEBUG=1
16
+ - rvm: 2.3.4
17
+ env:
18
+ - RVM_VER=2.3.4
19
+ - BUNDLER_TEST_VERSION=1.9.10
20
+ - BP_DEBUG=1
21
+ - rvm: 2.3.4
22
+ env:
23
+ - RVM_VER=2.3.4
24
+ - BUNDLER_TEST_VERSION=1.10.5
25
+ - BP_DEBUG=1
26
+ - rvm: 2.3.4
27
+ env:
28
+ - RVM_VER=2.3.4
29
+ - BUNDLER_TEST_VERSION=1.11.2
30
+ - BP_DEBUG=1
31
+ - rvm: 2.3.4
32
+ env:
33
+ - RVM_VER=2.3.4
34
+ - BUNDLER_TEST_VERSION=1.12.5
35
+ - BP_DEBUG=1
36
+ - rvm: 2.3.4
37
+ env:
38
+ - RVM_VER=2.3.4
39
+ - BUNDLER_TEST_VERSION=1.13.6
40
+ - BP_DEBUG=1
41
+ - rvm: 2.3.4
42
+ env:
43
+ - RVM_VER=2.3.4
44
+ - BUNDLER_TEST_VERSION=1.14.6
45
+ - BP_DEBUG=1
46
+ - rvm: 2.2.7
47
+ env:
48
+ - RVM_VER=2.2.7
49
+ - BUNDLER_TEST_VERSION=1.15.1
50
+ - BP_DEBUG=1
51
+ - rvm: 2.3.4
52
+ env:
53
+ - RVM_VER=2.3.4
54
+ - BUNDLER_TEST_VERSION=1.15.1
55
+ - BP_DEBUG=1
data/lib/bundler/patch/target_bundle.rb CHANGED
@@ -67,9 +67,13 @@ class TargetBundle
67
67
  File.join(ruby_bin, "#{RbConfig::CONFIG['ruby_install_name']}#{RbConfig::CONFIG['EXEEXT']}")
68
68
  end
69
69
 
70
- # Have to run a separate process in the other Ruby, because Bundler::Settings#path ultimately
71
- # arrives at RbConfig::CONFIG which is all special data derived from the active runtime.
72
- # TODO: fix ^^
70
+ # Have to run a separate process in the other Ruby, because Gem.default_dir depends on
71
+ # RbConfig::CONFIG which is all special data derived from the active runtime. It could perhaps
72
+ # be redone here, but I'd rather not copy that code in here at the moment.
73
+ #
74
+ # At one point during development, this would execute Bundler::Settings#path, which in most
75
+ # cases would just fall through to Gem.default_dir ... but would give preference to GEM_HOME
76
+ # env variable, which could be in a different Ruby, and that won't work.
73
77
  def gem_home
74
78
  result = shell_command "#{ruby_bin_exe} -C#{@dir} -e 'puts Gem.default_dir'"
75
79
  path = result[:stdout].chomp
@@ -78,18 +82,17 @@ class TargetBundle
78
82
  expanded_path
79
83
  end
80
84
 
81
- # To properly update another bundle, bundler-patch _does_ need to live in the same bundle
82
- # location because of its _dependencies_ (it's not a self-contained gem), and it can't both
85
+ # To properly update another bundle, bundler-patch _does_ need to live in the same Ruby
86
+ # version because of its _dependencies_ (it's not a self-contained gem), and it can't both
83
87
  # act on another bundle location AND find its own dependencies in a separate bundle location.
84
-
85
- # TODO: gem_home for this purpose does not need to be the local bundle path, can just
86
- # be in the Ruby "global" gem home, right?
88
+ #
89
+ # One known issue: older RubyGems in older Rubies don't install bundler-patch bin in the right
90
+ # directory. Upgrading RubyGems fixes this.
87
91
  def install_bundler_patch_in_target
92
+ # TODO: reconsider --conservative flag. Had problems with it in place on Travis, but I think I want it.
88
93
  # cmd = "#{ruby_bin}#{File::SEPARATOR}gem install -V --install-dir #{gem_home} --conservative --no-document --prerelease bundler-patch"
89
94
  cmd = "#{ruby_bin}#{File::SEPARATOR}gem install -V --install-dir #{gem_home} --no-document --prerelease bundler-patch"
90
95
  shell_command cmd
91
-
92
- shell_command "ls #{ruby_bin}#{File::SEPARATOR}**"
93
96
  end
94
97
 
95
98
  private
data/lib/bundler/patch/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bundler
2
2
  module Patch
3
- VERSION = '1.1.0.pre1'
3
+ VERSION = '1.1.0.pre2'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bundler-patch
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0.pre1
4
+ version: 1.1.0.pre2
5
5
  platform: ruby
6
6
  authors:
7
7
  - chrismo