bundler-multilock 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 514c6dd3f4961f833ea20dee15047941b649cdbe787f94808d9547e310ac7ff0
-  data.tar.gz: 79b046545b14b3b29c33a629e528cf9bf60712337052b0381fc1b6bf240228c1
+  metadata.gz: 4ac5957b4e60ef1153bb017f5fcfd90c255f349cfb734cf59203229f334f5681
+  data.tar.gz: d563a7ee8a4bafe90c045a91f96d43f8e0d14e3cb7b25240a2f2fc282640fc68
 SHA512:
-  metadata.gz: d071c456f788219cfb144b70cfb3161f1b53d9add8d9a2d5395be1bceb56f1681abd787047ec1e6f109c2937944756cf9b7f4cd85ff6ad9483666d46f3acfa2d
-  data.tar.gz: 887dbb68890c5f643fdfb925eade83055afd262115a3a8970dd900955d1793ba4109569a56f9d4f273229023a051b63aec86c05fce2c6bf7ecc6bfe59f00e95b
+  metadata.gz: b9b2ec93fb27705796664bfc22b0a78797bcc1ecf49d4f57708838907f78fe49b4130ca6be3a223b1a04ff590ef305418254647cff5c6d57f587aab633e378f7
+  data.tar.gz: 9426a93cddf07b541c65d02de0d439a30efc21e696499cc18213bd9bdbf6a2f170843547a1ae13bd6ae5b659371da2a2b0c6b1d8707f1b312be3f1e7ebd16021

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.6"
   end
 end

data/lib/bundler/multilock.rb

@@ -85,10 +85,13 @@ module Bundler
             defined?(CLI::Install) ||
             defined?(CLI::Lock) ||
             defined?(CLI::Update)) &&
-           !defined?(CLI::Cache)
+           !defined?(CLI::Cache) && !env_lockfile
           # always use Gemfile.lock for `bundle check`, `bundle install`,
           # `bundle lock`, and `bundle update`. `bundle cache` delegates to
           # `bundle install`, but we want that to run as normal.
+          # If they're using BUNDLE_LOCKFILE, then they really do want to
+          # use a particular lockfile, and it overrides whatever they
+          # dynamically set in their gemfile
           current = lockfile == Bundler.default_lockfile(force_original: true)
         end
 
@@ -152,6 +155,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 +192,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 +277,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.6
 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