bundler-multilock 2.0.0.beta7 → 2.0.0.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4be5320cfc5b4d3e13288c22fae8811f3be04f88ca74cc234f4959adcb918f48
-  data.tar.gz: 338049458fd3ac3c8b0878803c131824e392747cd30d4ca66abd90ac5bc5d6bc
+  metadata.gz: 7638f29bbcc3dd402436bbb09e5bf9eb9e9772116b03f99435ce71dda9831982
+  data.tar.gz: 39c5e02d886c8620b6d6cdbab2637dac724b67a8f8075da4211c8f468e4291f7
 SHA512:
-  metadata.gz: 67360e0dab15f5bb6c5fe2fb65ce7b78bbe9db065a37b8d9a35e640ddeab456f94a13cad9ae1d6ccc84b79525f3341f94f494e849194840e1bc6a6ff7cdfa544
-  data.tar.gz: 72452dda2334ed58087d938b68961a779acfa42529265181c36209f494e91ac27f07033710f56881a22f90bf2ace8b14561929376251ff9d54625e6d5300f6be
+  metadata.gz: 5d6222fefb962f8f65de158bd773459adb01e6426dda294d3134c9709c2cf0c58d7dfdf08e85da357e6a40c7c1479784b5743be47013838e91e50b466fb8f667
+  data.tar.gz: 50e0fe5048620037e78239a964628b88d44ec1ac7403053aa552939fbf738bba84ba6f27adb39f147e9e61e5e4cfcfc995e6ff933bb2ff32051affc88acb5d69

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/version.rb

@@ -2,6 +2,6 @@
 
 module Bundler
   module Multilock
-    VERSION = "2.0.0.beta7"
+    VERSION = "2.0.0.beta9"
   end
 end

data/lib/bundler/multilock.rb

@@ -924,6 +924,16 @@ module Bundler
         CLI.instance
       end
 
+      # @!visibility private
+      # Whether plugins.rb is being loaded by `bundle plugin install` (or a
+      # Gemfile's `plugin` command), as opposed to being loaded from the plugin
+      # index for some other bundle command
+      def installing_plugin?
+        caller_locations.any? do |location|
+          location.base_label == "register_plugin" && location.path.end_with?("bundler/plugin.rb")
+        end
+      end
+
       # @!visibility private
       def cli_loaded?
         Bundler.autoload?(:CLI).nil? && !defined?(Bundler::CLI).nil?
@@ -1226,7 +1236,9 @@ module Bundler
   end
 end
 
-Bundler::Multilock::Preamble.inject unless Bundler::Multilock.loaded? || Bundler.frozen_bundle?
+if Bundler::Multilock.installing_plugin? && !Bundler::Multilock.loaded? && !Bundler.frozen_bundle?
+  Bundler::Multilock::Preamble.inject
+end
 
 if Bundler::Multilock.cli_loaded?
   require_relative "multilock/ext/cli"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler-multilock
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta7
+  version: 2.0.0.beta9
 platform: ruby
 authors:
 - Instructure