bundler-multilock 2.0.0.beta7 → 2.0.0.beta8

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4be5320cfc5b4d3e13288c22fae8811f3be04f88ca74cc234f4959adcb918f48
4
- data.tar.gz: 338049458fd3ac3c8b0878803c131824e392747cd30d4ca66abd90ac5bc5d6bc
3
+ metadata.gz: c81d004914142833ca88a6ff646bba7c400aa93d0d5f259dcfb50b2e110d2cce
4
+ data.tar.gz: 56250a73a64e042bd8fac5d45bf9f538c014083903a19cc01e95835e39db7e7d
5
5
  SHA512:
6
- metadata.gz: 67360e0dab15f5bb6c5fe2fb65ce7b78bbe9db065a37b8d9a35e640ddeab456f94a13cad9ae1d6ccc84b79525f3341f94f494e849194840e1bc6a6ff7cdfa544
7
- data.tar.gz: 72452dda2334ed58087d938b68961a779acfa42529265181c36209f494e91ac27f07033710f56881a22f90bf2ace8b14561929376251ff9d54625e6d5300f6be
6
+ metadata.gz: 4b1414b3f464fee6dea314e7f1c7731ca8898fd0b3ac6740387582bbb75b13293397c43c269f2f0edf7f7a3baaa31152b6207554bc4465fbe451c6ecd304a5cb
7
+ data.tar.gz: dba5dc91abba869c04efa354ac2e24f17493e0c572ec6d76769c1ab382e968ae200646516bfe72d13cd0f2101d188b54ac52ffb14632bcc749b0c15debc62acd
@@ -117,7 +117,18 @@ module Bundler
117
117
  if source.respond_to?(:migrate_cache)
118
118
  source.migrate_cache(custom_path, local: false)
119
119
  elsif source.respond_to?(:cache)
120
- source.cache(spec, custom_path)
120
+ # like Bundler, leave path gems that are inside the project alone, even when they're
121
+ # outside the directory of the Gemfile that declared them
122
+ next if source.instance_of?(::Bundler::Source::Path) &&
123
+ source.send(:expanded_original_path).to_s.start_with?("#{Bundler.root}/")
124
+
125
+ if source.respond_to?(:root_path) && source.root_path.exist?
126
+ # (it also memoizes the cache path while Bundler.root is that Gemfile's directory)
127
+ source.instance_variable_set(:@app_cache_path, cache_path.join(source.app_cache_dirname))
128
+ Dir.chdir(source.root_path) { source.cache(spec, custom_path) }
129
+ else
130
+ source.cache(spec, custom_path)
131
+ end
121
132
  end
122
133
  end
123
134
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Bundler
4
4
  module Multilock
5
- VERSION = "2.0.0.beta7"
5
+ VERSION = "2.0.0.beta8"
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bundler-multilock
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0.beta7
4
+ version: 2.0.0.beta8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Instructure