bundler-multilock 2.0.0.beta6 → 2.0.0.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bdc44af5344eed4edb2782c151e3ab714450bcd81003130fba1385247c227da
-  data.tar.gz: 77391ab3ec993404d7363736accb18921c8d1c5190c2609a3bf45e4e950c6f3f
+  metadata.gz: c81d004914142833ca88a6ff646bba7c400aa93d0d5f259dcfb50b2e110d2cce
+  data.tar.gz: 56250a73a64e042bd8fac5d45bf9f538c014083903a19cc01e95835e39db7e7d
 SHA512:
-  metadata.gz: 38436b8ee5d0096b5387da472d11a543158dcb884143cbbd9cf8acf9f9dd76e91a644ffb4b3fcdadeb7768b7b0f87f5597531060633fdc1dca92c8893adc31eb
-  data.tar.gz: aad7cd30a4f7ef60aff473d0ac763dab63f33f7dbfddceb2b18748563294d9d49f414f44f067ec2bfe482edee9925a4242f0a34f5dbc0de0d4053564a1661fa7
+  metadata.gz: 4b1414b3f464fee6dea314e7f1c7731ca8898fd0b3ac6740387582bbb75b13293397c43c269f2f0edf7f7a3baaa31152b6207554bc4465fbe451c6ecd304a5cb
+  data.tar.gz: dba5dc91abba869c04efa354ac2e24f17493e0c572ec6d76769c1ab382e968ae200646516bfe72d13cd0f2101d188b54ac52ffb14632bcc749b0c15debc62acd

data/lib/bundler/multilock/ext/runtime.rb

@@ -117,7 +117,18 @@ module Bundler
               if source.respond_to?(:migrate_cache)
                 source.migrate_cache(custom_path, local: false)
               elsif source.respond_to?(:cache)
-                source.cache(spec, custom_path)
+                # like Bundler, leave path gems that are inside the project alone, even when they're
+                # outside the directory of the Gemfile that declared them
+                next if source.instance_of?(::Bundler::Source::Path) &&
+                        source.send(:expanded_original_path).to_s.start_with?("#{Bundler.root}/")
+
+                if source.respond_to?(:root_path) && source.root_path.exist?
+                  # (it also memoizes the cache path while Bundler.root is that Gemfile's directory)
+                  source.instance_variable_set(:@app_cache_path, cache_path.join(source.app_cache_dirname))
+                  Dir.chdir(source.root_path) { source.cache(spec, custom_path) }
+                else
+                  source.cache(spec, custom_path)
+                end
               end
             end
           end

data/lib/bundler/multilock/lockfile_generator.rb

@@ -45,6 +45,10 @@ module Bundler
           __getobj__
         end
 
+        def overrides_to_lock
+          Array(overrides).map(&:to_lock).uniq
+        end
+
         def bundler_version_to_lock
           bundler_version
         end

data/lib/bundler/multilock/version.rb

@@ -2,6 +2,6 @@
 
 module Bundler
   module Multilock
-    VERSION = "2.0.0.beta6"
+    VERSION = "2.0.0.beta8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler-multilock
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta6
+  version: 2.0.0.beta8
 platform: ruby
 authors:
 - Instructure
@@ -15,7 +15,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta2
+        version: 4.1.0.beta3
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.2'
@@ -25,7 +25,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta2
+        version: 4.1.0.beta3
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.2'