bundler-multilock 1.0.7 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 120fec48596049892548e831194ad633d30c88048f4dc333ca70be729fb1aee1
-  data.tar.gz: 1cc4f39d08b2c99cf608cbe0221f41702f0deaeecf661ecefb61b7e4d9204f14
+  metadata.gz: c3c22d18b37d9d24220bfd86fa998d94cf5a1369252150b17d579b1921c2a7ff
+  data.tar.gz: 571095e3e063925db5afd3403c401d3c38eb598b2da0af7d7fe09b613b5a2686
 SHA512:
-  metadata.gz: 01e41aee6dc834bacab9aa4f7006f1fbdaa07ac880b3e1fb97598b3fa116c74d6d8f4179c117ceddac8e617f9ff354417df95eb4c058912a6f0e9e6dc1bc8320
-  data.tar.gz: fe4619b9a9e9a890310e6fc748b0d2b6581471f6e463d1d76cf9aa84a040177d622546d47e1f6820f3b0087ed9e737af77c8062f59b451ee5f4fcc8cb10fd6d9
+  metadata.gz: 8088c2a27858e008353eea944d3ed0c803433a2b5c3b71ee1f3e4e694624d9deebb54d0dc4b8af29241eb77fb59abb158191c3077b9eb261813228627930285c
+  data.tar.gz: a4ec23e48dba110e68773b170998f3c334a7adf117e8bd6a3a6c5485414901073006d76d07a48ebd7d8dfc20cb2a93ef4e8112e465dd4a21279a827ba4c03928

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.7"
+    VERSION = "1.0.9"
   end
 end

data/lib/bundler/multilock.rb

@@ -48,17 +48,15 @@ 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
         lockfile = Bundler.root.join(lockfile).expand_path if lockfile
         # use the default lockfile (Gemfile.lock) if none was given
         lockfile ||= Bundler.default_lockfile(force_original: true)
-        if current && (old_current = lockfile_definitions.find { |definition| definition[:current] })
-          raise ArgumentError, "Only one lockfile (#{old_current[:lockfile]}) can be flagged as the default"
-        end
-
         raise ArgumentError, "Lockfile #{lockfile} is already defined" if lockfile_definitions.any? do |definition|
                                                                             definition[:lockfile] == lockfile
                                                                           end
@@ -72,6 +70,10 @@ module Bundler
           current = env_lockfile == lockfile
         end
 
+        if current && (old_current = lockfile_definitions.find { |definition| definition[:current] })
+          raise ArgumentError, "Only one lockfile (#{old_current[:lockfile]}) can be flagged as the default"
+        end
+
         lockfile_definitions << (lockfile_def = {
           gemfile: (gemfile && Bundler.root.join(gemfile).expand_path) || Bundler.default_gemfile,
           lockfile: lockfile,
@@ -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,6 @@ module Bundler
           if install
             current_definition = builder.to_definition(current_lockfile, {})
             begin
-              current_definition.resolve_only_locally!
               if current_definition.missing_specs.any?
                 Bundler.with_default_lockfile(current_lockfile) do
                   Installer.install(gemfile.dirname, current_definition, {})
@@ -435,3 +441,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.7
+  version: 1.0.9
 platform: ruby
 authors:
 - Instructure
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2023-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler