bundler-multilock 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a44fab8512a3a0912817ccf20f482b9e50e4f95dfd9c19b4650e0646b24eb33
-  data.tar.gz: a3f523373eb598adcfde15044b0c585f0aec588ec922b8443079720a07058a75
+  metadata.gz: caaabd6305d7178a0f13e9892ad6c3ef7a87de1c18cc2098ee76761820dfee5d
+  data.tar.gz: c1cf4f2100eeeba5882a073e6db8db7b287e2a891bb6e8991d62f6f6512ac52b
 SHA512:
-  metadata.gz: 2e315ad8dd6fcf0a6fb7f58c1875d364e558aea761f908aa61b6591fd65e3993d039a6ba9a97ce7373fafa30149bf1486693cf336ce314c6f57bd1f3cd4936cc
-  data.tar.gz: a83535ae988209c4776317332bc51d565e49c8754543f52c41db6dbad211d6e38f1faac916ca0b54896e78f6a13f354e6476fa8b28c5f3da6a2ade396088acb1
+  metadata.gz: ec3b461286a3f046a12f2ec0539b441ba15c8367037994c53ece2f8c679a17788e93dfe85c88046b1e8ddeca6303b3d8be968edb12ffcaec9a900e80aeb756ba
+  data.tar.gz: 8c1e2d525bc7c6955d750be9ef8c30cf5f120cb07d65fa844a0fcfa61ea54eecdb7faf10e38a7e5a4591a928c3aaaa2574dc7156207c8135976bd611c8497cb1

data/lib/bundler/multilock/ext/definition.rb

@@ -15,6 +15,12 @@ module Bundler
           end
           super
         end
+
+        def validate_runtime!
+          Multilock.loaded! unless Multilock.lockfile_definitions.empty?
+
+          super
+        end
       end
     end
   end

data/lib/bundler/multilock/ext/dsl.rb

@@ -27,6 +27,7 @@ module Bundler
         def initialize
           super
           @gemfiles = Set.new
+          Multilock.loaded! unless Multilock.lockfile_definitions.empty?
         end
 
         # Significant changes:
@@ -53,7 +54,7 @@ module Bundler
         end
 
         def lockfile(*args, **kwargs, &block)
-          return if Multilock.loaded?
+          return true if Multilock.loaded?
 
           Multilock.add_lockfile(*args, builder: self, **kwargs, &block)
         end

data/lib/bundler/multilock/version.rb

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

data/lib/bundler/multilock.rb

@@ -283,14 +283,21 @@ module Bundler
 
         @loaded = true
         return if lockfile_definitions.empty?
+
         return unless lockfile_definitions.none? { |definition| definition[:current] }
+
         # Gemfile.lock isn't explicitly specified, otherwise it would be current
-        return if lockfile_definitions.none? do |definition|
-                    definition[:lockfile] == Bundler.default_lockfile(force_original: true)
-                  end
+        default_lockfile_definition = lockfile_definitions.find do |definition|
+          definition[:lockfile] == Bundler.default_lockfile(force_original: true)
+        end
+        if ENV["BUNDLE_LOCKFILE"] == Bundler.default_lockfile(force_original: true) && default_lockfile_definition
+          return
+        end
 
         raise GemfileNotFound, "Could not locate lockfile #{ENV["BUNDLE_LOCKFILE"].inspect}" if ENV["BUNDLE_LOCKFILE"]
 
+        return unless default_lockfile_definition && default_lockfile_definition[:current] == false
+
         raise GemfileEvalError, "No lockfiles marked as default"
       end
 

metadata

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