bundler-multilock 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ac5957b4e60ef1153bb017f5fcfd90c255f349cfb734cf59203229f334f5681
-  data.tar.gz: d563a7ee8a4bafe90c045a91f96d43f8e0d14e3cb7b25240a2f2fc282640fc68
+  metadata.gz: c8dbbb09ada32b32ccfdb9dcab07a0d4a2c2a075abac7aba4544946f49ee159b
+  data.tar.gz: c3309600b53071ae9bcd3982153f591386bb9865879eb4eebf7ff3b031ed29a5
 SHA512:
-  metadata.gz: b9b2ec93fb27705796664bfc22b0a78797bcc1ecf49d4f57708838907f78fe49b4130ca6be3a223b1a04ff590ef305418254647cff5c6d57f587aab633e378f7
-  data.tar.gz: 9426a93cddf07b541c65d02de0d439a30efc21e696499cc18213bd9bdbf6a2f170843547a1ae13bd6ae5b659371da2a2b0c6b1d8707f1b312be3f1e7ebd16021
+  metadata.gz: 49d774d8d1e1ca350966bda2d30f7200d5d96473dcc67572d1a8dd54ba596de31972269ae1278447eb5305899e8d5afb9289e9356923c6ea9a3b9afd15c188f3
+  data.tar.gz: 9762a7b102a14d56cf5cea40667a3d7d0ec54db20bccd8d0979a91eadce1033ce60b4c9574eeb6a789a3d2f6769bc53908f296ec5c2ef03b5bf717b6ae118923

data/lib/bundler/multilock/version.rb

@@ -2,6 +2,6 @@
 
 module Bundler
   module Multilock
-    VERSION = "1.0.6"
+    VERSION = "1.0.8"
   end
 end

data/lib/bundler/multilock.rb

@@ -55,10 +55,6 @@ module Bundler
         lockfile = Bundler.root.join(lockfile).expand_path if lockfile
         # use the default lockfile (Gemfile.lock) if none was given
         lockfile ||= Bundler.default_lockfile(force_original: true)
-        if current && (old_current = lockfile_definitions.find { |definition| definition[:current] })
-          raise ArgumentError, "Only one lockfile (#{old_current[:lockfile]}) can be flagged as the default"
-        end
-
         raise ArgumentError, "Lockfile #{lockfile} is already defined" if lockfile_definitions.any? do |definition|
                                                                             definition[:lockfile] == lockfile
                                                                           end
@@ -72,6 +68,10 @@ module Bundler
           current = env_lockfile == lockfile
         end
 
+        if current && (old_current = lockfile_definitions.find { |definition| definition[:current] })
+          raise ArgumentError, "Only one lockfile (#{old_current[:lockfile]}) can be flagged as the default"
+        end
+
         lockfile_definitions << (lockfile_def = {
           gemfile: (gemfile && Bundler.root.join(gemfile).expand_path) || Bundler.default_gemfile,
           lockfile: lockfile,
@@ -275,6 +275,8 @@ module Bundler
               end
             end
           end
+        ensure
+          Bundler.root = default_root
         end
 
         exit 1 unless checker.run(skip_base_checks: !synced_any)

metadata

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