bundler-multilock 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad2556137eeec88cc813f9ac79cbb7062a4a16b067bf88a61cfacb03d1ae9add
-  data.tar.gz: 58c7c976aa0e57f426b80152f213d069ee7f24ea5b9da1ee0c1ef115a8208e64
+  metadata.gz: caaabd6305d7178a0f13e9892ad6c3ef7a87de1c18cc2098ee76761820dfee5d
+  data.tar.gz: c1cf4f2100eeeba5882a073e6db8db7b287e2a891bb6e8991d62f6f6512ac52b
 SHA512:
-  metadata.gz: 84e3cd4a4b12513f2a5ea4d0d214abb9e1a061bf96d041d1bea16c833131941ce8da7f9109018dd2bc5b2ddc4afc363e68caae7948707ec7d3a68ac8dea745f3
-  data.tar.gz: cb8d45a52af7437ab6192809711531df051f7da2343b91087d4522f520441ab90476c822499d6e0c13d015923bf0701a75c9cead68f52bc49026de439cd0fbbe
+  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:

data/lib/bundler/multilock/version.rb

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