bundler-multilock 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caaabd6305d7178a0f13e9892ad6c3ef7a87de1c18cc2098ee76761820dfee5d
-  data.tar.gz: c1cf4f2100eeeba5882a073e6db8db7b287e2a891bb6e8991d62f6f6512ac52b
+  metadata.gz: 3acaa706bf6ffde2f5fb070a729895371cfbebf2dbe2c97d249acbb698a0b6c0
+  data.tar.gz: 416ddd8252d1254472dfe5ee60b2cb7eb54e88b0ea25f58d2f34888dbe6b6f2a
 SHA512:
-  metadata.gz: ec3b461286a3f046a12f2ec0539b441ba15c8367037994c53ece2f8c679a17788e93dfe85c88046b1e8ddeca6303b3d8be968edb12ffcaec9a900e80aeb756ba
-  data.tar.gz: 8c1e2d525bc7c6955d750be9ef8c30cf5f120cb07d65fa844a0fcfa61ea54eecdb7faf10e38a7e5a4591a928c3aaaa2574dc7156207c8135976bd611c8497cb1
+  metadata.gz: 7adc856fa4149e2f814d7aac9181addc3a7ad378a44b9d1f9855d277e84ef58e56d59aab99d81a59f0ad539a6735c1a233e58be86fe7f887d01bb6cf4d60c1fb
+  data.tar.gz: 60f364edd123e881827ab24c9bf18cb6e2bccad0156b8346096a8ed221ed4f8409ce5bab2a8752e2aedc1cc6a0d8c9ca5035490ccb41a014242c57817c92dc64

data/lib/bundler/multilock/check.rb

@@ -19,13 +19,27 @@ module Bundler
         end
       end
 
-      def run
+      def run(skip_base_checks: false)
         return true unless Bundler.default_lockfile.exist?
 
         success = true
+        unless skip_base_checks
+          missing_specs = base_check({ gemfile: Bundler.default_gemfile, lockfile: Bundler.default_lockfile },
+                                     return_missing: true).to_set
+        end
         Multilock.lockfile_definitions.each do |lockfile_definition|
-          next unless lockfile_definition[:lockfile].exist?
+          next if lockfile_definition[:lockfile] == Bundler.default_lockfile
+
+          unless lockfile_definition[:lockfile].exist?
+            Bundler.ui.error("Lockfile #{lockfile_definition[:lockfile]} does not exist.")
+            success = false
+          end
 
+          unless skip_base_checks
+            new_missing = base_check(lockfile_definition, log_missing: missing_specs, return_missing: true)
+            success = false unless new_missing.empty?
+            missing_specs.merge(new_missing)
+          end
           success = false unless check(lockfile_definition)
         end
         success
@@ -33,21 +47,34 @@ module Bundler
 
       # this is mostly equivalent to the built in checks in `bundle check`, but even
       # more conservative, and returns false instead of exiting on failure
-      def base_check(lockfile_definition)
-        return false unless lockfile_definition[:lockfile].file?
+      def base_check(lockfile_definition, log_missing: false, return_missing: false)
+        return return_missing ? [] : false unless lockfile_definition[:lockfile].file?
 
         Multilock.prepare_block = lockfile_definition[:prepare]
         definition = Definition.build(lockfile_definition[:gemfile], lockfile_definition[:lockfile], false)
-        return false unless definition.send(:current_platform_locked?)
+        return return_missing ? [] : false unless definition.send(:current_platform_locked?)
 
         begin
           definition.validate_runtime!
-          definition.resolve_only_locally!
+          Bundler.ui.silence do
+            definition.resolve_only_locally!
+          end
           not_installed = definition.missing_specs
         rescue RubyVersionMismatch, GemNotFound, SolveFailure
-          return false
+          return return_missing ? [] : false
         end
 
+        if log_missing
+          not_installed.each do |spec|
+            next if log_missing.include?(spec)
+
+            Bundler.ui.error "The following gems are missing" if log_missing.empty?
+            Bundler.ui.error(" * #{spec.name} (#{spec.version})")
+          end
+        end
+
+        return not_installed if return_missing
+
         not_installed.empty? && definition.no_resolve_needed?
       ensure
         Multilock.prepare_block = nil

data/lib/bundler/multilock/version.rb

@@ -2,6 +2,6 @@
 
 module Bundler
   module Multilock
-    VERSION = "1.0.3"
+    VERSION = "1.0.5"
   end
 end

data/lib/bundler/multilock.rb

@@ -152,6 +152,7 @@ module Bundler
         attempts = 1
 
         checker = Check.new
+        synced_any = false
         Bundler.settings.temporary(cache_all_platforms: true, suppress_install_using_messages: true) do
           lockfile_definitions.each do |lockfile_definition|
             # we already wrote the default lockfile
@@ -188,6 +189,7 @@ module Bundler
               write_lockfile(lockfile_definition, lockfile_definition[:lockfile], install: install)
             else
               Bundler.ui.info("Syncing to #{relative_lockfile}...") if attempts == 1
+              synced_any = true
 
               # adjust locked paths from the default lockfile to be relative to _this_ gemfile
               adjusted_default_lockfile_contents =
@@ -272,7 +274,7 @@ module Bundler
           end
         end
 
-        exit 1 unless checker.run
+        exit 1 unless checker.run(skip_base_checks: !synced_any)
       ensure
         @recursive = previous_recursive
       end
@@ -362,8 +364,36 @@ module Bundler
       end
 
       def write_lockfile(lockfile_definition, lockfile, install:, dependency_changes: false)
-        self.prepare_block = lockfile_definition[:prepare]
-        definition = build_definition(lockfile_definition, lockfile, dependency_changes: dependency_changes)
+        prepare_block = lockfile_definition[:prepare]
+
+        gemfile = lockfile_definition[:gemfile]
+        # use avoid Definition.build, so that we don't have to evaluate
+        # the gemfile multiple times, each time we need a separate definition
+        builder = Dsl.new
+        builder.eval_gemfile(gemfile, &prepare_block) if prepare_block
+        builder.eval_gemfile(gemfile)
+
+        definition = builder.to_definition(lockfile, {})
+        definition.instance_variable_set(:@dependency_changes, dependency_changes) if dependency_changes
+        orig_definition = definition.dup # we might need it twice
+
+        current_lockfile = lockfile_definition[:lockfile]
+        if current_lockfile.exist?
+          definition.instance_variable_set(:@lockfile_contents, current_lockfile.read)
+          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, {})
+                end
+              end
+            rescue RubyVersionMismatch, GemNotFound, SolveFailure
+              # ignore
+            end
+          end
+        end
 
         resolved_remotely = false
         begin
@@ -372,7 +402,7 @@ module Bundler
           begin
             definition.resolve_with_cache!
           rescue GemNotFound, SolveFailure
-            definition = build_definition(lockfile_definition, lockfile, dependency_changes: dependency_changes)
+            definition = orig_definition
 
             definition.resolve_remotely!
             resolved_remotely = true
@@ -391,18 +421,6 @@ module Bundler
         end
 
         !definition.nothing_changed?
-      ensure
-        self.prepare_block = nil
-      end
-
-      def build_definition(lockfile_definition, lockfile, dependency_changes:)
-        definition = Definition.build(lockfile_definition[:gemfile], lockfile, false)
-        definition.instance_variable_set(:@dependency_changes, dependency_changes) if dependency_changes
-        if lockfile_definition[:lockfile].exist?
-          definition.instance_variable_set(:@lockfile_contents,
-                                           lockfile_definition[:lockfile].read)
-        end
-        definition
       end
     end
 

metadata

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