bundler-multilock 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 514c6dd3f4961f833ea20dee15047941b649cdbe787f94808d9547e310ac7ff0
-  data.tar.gz: 79b046545b14b3b29c33a629e528cf9bf60712337052b0381fc1b6bf240228c1
+  metadata.gz: 3acaa706bf6ffde2f5fb070a729895371cfbebf2dbe2c97d249acbb698a0b6c0
+  data.tar.gz: 416ddd8252d1254472dfe5ee60b2cb7eb54e88b0ea25f58d2f34888dbe6b6f2a
 SHA512:
-  metadata.gz: d071c456f788219cfb144b70cfb3161f1b53d9add8d9a2d5395be1bceb56f1681abd787047ec1e6f109c2937944756cf9b7f4cd85ff6ad9483666d46f3acfa2d
-  data.tar.gz: 887dbb68890c5f643fdfb925eade83055afd262115a3a8970dd900955d1793ba4109569a56f9d4f273229023a051b63aec86c05fce2c6bf7ecc6bfe59f00e95b
+  metadata.gz: 7adc856fa4149e2f814d7aac9181addc3a7ad378a44b9d1f9855d277e84ef58e56d59aab99d81a59f0ad539a6735c1a233e58be86fe7f887d01bb6cf4d60c1fb
+  data.tar.gz: 60f364edd123e881827ab24c9bf18cb6e2bccad0156b8346096a8ed221ed4f8409ce5bab2a8752e2aedc1cc6a0d8c9ca5035490ccb41a014242c57817c92dc64

data/lib/bundler/multilock/check.rb

@@ -19,13 +19,14 @@ module Bundler
         end
       end
 
-      def run
+      def run(skip_base_checks: false)
         return true unless Bundler.default_lockfile.exist?
 
         success = true
-        missing_specs = base_check({ gemfile: Bundler.default_gemfile, lockfile: Bundler.default_lockfile },
-                                   return_missing: true).to_set
-
+        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 if lockfile_definition[:lockfile] == Bundler.default_lockfile
 
@@ -34,9 +35,11 @@ module Bundler
             success = false
           end
 
-          new_missing = base_check(lockfile_definition, log_missing: missing_specs, return_missing: true)
-          success = false unless new_missing.empty?
-          missing_specs.merge(new_missing)
+          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
@@ -53,7 +56,9 @@ module Bundler
 
         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 return_missing ? [] : false

data/lib/bundler/multilock/version.rb

@@ -2,6 +2,6 @@
 
 module Bundler
   module Multilock
-    VERSION = "1.0.4"
+    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

metadata

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