bundler-multilock 1.0.8 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8dbbb09ada32b32ccfdb9dcab07a0d4a2c2a075abac7aba4544946f49ee159b
-  data.tar.gz: c3309600b53071ae9bcd3982153f591386bb9865879eb4eebf7ff3b031ed29a5
+  metadata.gz: f71e197447bdcd02b427ac7bc3a21a7e41e20a3d67edda69ed3821dea293e3ac
+  data.tar.gz: bf11ee91ace5dff77af3bc2b56ec283d2d227513e8d9397ce00e199ab73e3d83
 SHA512:
-  metadata.gz: 49d774d8d1e1ca350966bda2d30f7200d5d96473dcc67572d1a8dd54ba596de31972269ae1278447eb5305899e8d5afb9289e9356923c6ea9a3b9afd15c188f3
-  data.tar.gz: 9762a7b102a14d56cf5cea40667a3d7d0ec54db20bccd8d0979a91eadce1033ce60b4c9574eeb6a789a3d2f6769bc53908f296ec5c2ef03b5bf717b6ae118923
+  metadata.gz: 4cad381cf2fbb7d441f98d39322d54a0496570ceb3e564669a39429072224b7cbbca1af2f68205bc1149e05dc7535ca75e3f51631795732c019354d92ce17952
+  data.tar.gz: 3ddb854fc272683a96711403a8f65fc4d588260c46e7753f71ca790192be19f8f9e7b9b7612457d99ea4596ab6830b8cf8eda5c0385621f0769949f41cb95c87

data/lib/bundler/multilock/check.rb

@@ -56,10 +56,7 @@ module Bundler
 
         begin
           definition.validate_runtime!
-          Bundler.ui.silence do
-            definition.resolve_only_locally!
-          end
-          not_installed = definition.missing_specs
+          not_installed = Bundler.ui.silence { definition.missing_specs }
         rescue RubyVersionMismatch, GemNotFound, SolveFailure
           return return_missing ? [] : false
         end

data/lib/bundler/multilock/version.rb

@@ -2,6 +2,6 @@
 
 module Bundler
   module Multilock
-    VERSION = "1.0.8"
+    VERSION = "1.0.10"
   end
 end

data/lib/bundler/multilock.rb

@@ -48,7 +48,9 @@ module Bundler
         current = true if current.nil? && lockfile_definitions.empty? && lockfile.nil? && gemfile.nil?
 
         # allow short-form lockfile names
-        lockfile = "Gemfile.#{lockfile}.lock" if lockfile && !(lockfile.include?("/") || lockfile.end_with?(".lock"))
+        if lockfile.is_a?(String) && !(lockfile.include?("/") || lockfile.end_with?(".lock"))
+          lockfile = "Gemfile.#{lockfile}.lock"
+        end
         # if a gemfile was provided, but not a lockfile, infer the default lockfile for that gemfile
         lockfile ||= "#{gemfile}.lock" if gemfile
         # use absolute paths
@@ -339,8 +341,13 @@ module Bundler
           end
         end
 
-        modified = inject_specific_preamble(gemfile, injection_point, bundle_preamble2, add_newline: true)
+        builder = Bundler::Plugin::DSL.new
+        builder.eval_gemfile(Bundler.default_gemfile)
+        gemfiles = builder.instance_variable_get(:@gemfiles).map(&:read)
+
+        modified = inject_specific_preamble(gemfile, gemfiles, injection_point, bundle_preamble2, add_newline: true)
         modified = true if inject_specific_preamble(gemfile,
+                                                    gemfiles,
                                                     injection_point,
                                                     bundle_preamble1,
                                                     match: bundle_preamble1_match,
@@ -357,8 +364,8 @@ module Bundler
 
       private
 
-      def inject_specific_preamble(gemfile, injection_point, preamble, add_newline:, match: preamble)
-        return false if gemfile.include?(match)
+      def inject_specific_preamble(gemfile, gemfiles, injection_point, preamble, add_newline:, match: preamble)
+        return false if gemfiles.any? { |g| g.include?(match) }
 
         add_newline = false unless gemfile[injection_point - 1] == "\n"
 
@@ -388,7 +395,7 @@ module Bundler
           if install
             current_definition = builder.to_definition(current_lockfile, {})
             begin
-              current_definition.resolve_only_locally!
+              current_definition.resolve_with_cache!
               if current_definition.missing_specs.any?
                 Bundler.with_default_lockfile(current_lockfile) do
                   Installer.install(gemfile.dirname, current_definition, {})
@@ -435,3 +442,5 @@ module Bundler
     @prepare_block = nil
   end
 end
+
+Bundler::Multilock.inject_preamble unless Bundler::Multilock.loaded?

data/plugins.rb

@@ -46,5 +46,3 @@ end
 Bundler::Plugin.add_hook(Bundler::Plugin::Events::GEM_AFTER_INSTALL_ALL) do |_|
   Bundler::Multilock.after_install_all
 end
-
-Bundler::Multilock.inject_preamble unless Bundler::Multilock.loaded?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundler-multilock
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.10
 platform: ruby
 authors:
 - Instructure
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2023-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler