bundler-multilock 1.0.6 → 1.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4ac5957b4e60ef1153bb017f5fcfd90c255f349cfb734cf59203229f334f5681
4
- data.tar.gz: d563a7ee8a4bafe90c045a91f96d43f8e0d14e3cb7b25240a2f2fc282640fc68
3
+ metadata.gz: c8dbbb09ada32b32ccfdb9dcab07a0d4a2c2a075abac7aba4544946f49ee159b
4
+ data.tar.gz: c3309600b53071ae9bcd3982153f591386bb9865879eb4eebf7ff3b031ed29a5
5
5
  SHA512:
6
- metadata.gz: b9b2ec93fb27705796664bfc22b0a78797bcc1ecf49d4f57708838907f78fe49b4130ca6be3a223b1a04ff590ef305418254647cff5c6d57f587aab633e378f7
7
- data.tar.gz: 9426a93cddf07b541c65d02de0d439a30efc21e696499cc18213bd9bdbf6a2f170843547a1ae13bd6ae5b659371da2a2b0c6b1d8707f1b312be3f1e7ebd16021
6
+ metadata.gz: 49d774d8d1e1ca350966bda2d30f7200d5d96473dcc67572d1a8dd54ba596de31972269ae1278447eb5305899e8d5afb9289e9356923c6ea9a3b9afd15c188f3
7
+ data.tar.gz: 9762a7b102a14d56cf5cea40667a3d7d0ec54db20bccd8d0979a91eadce1033ce60b4c9574eeb6a789a3d2f6769bc53908f296ec5c2ef03b5bf717b6ae118923
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Bundler
4
4
  module Multilock
5
- VERSION = "1.0.6"
5
+ VERSION = "1.0.8"
6
6
  end
7
7
  end
@@ -55,10 +55,6 @@ module Bundler
55
55
  lockfile = Bundler.root.join(lockfile).expand_path if lockfile
56
56
  # use the default lockfile (Gemfile.lock) if none was given
57
57
  lockfile ||= Bundler.default_lockfile(force_original: true)
58
- if current && (old_current = lockfile_definitions.find { |definition| definition[:current] })
59
- raise ArgumentError, "Only one lockfile (#{old_current[:lockfile]}) can be flagged as the default"
60
- end
61
-
62
58
  raise ArgumentError, "Lockfile #{lockfile} is already defined" if lockfile_definitions.any? do |definition|
63
59
  definition[:lockfile] == lockfile
64
60
  end
@@ -72,6 +68,10 @@ module Bundler
72
68
  current = env_lockfile == lockfile
73
69
  end
74
70
 
71
+ if current && (old_current = lockfile_definitions.find { |definition| definition[:current] })
72
+ raise ArgumentError, "Only one lockfile (#{old_current[:lockfile]}) can be flagged as the default"
73
+ end
74
+
75
75
  lockfile_definitions << (lockfile_def = {
76
76
  gemfile: (gemfile && Bundler.root.join(gemfile).expand_path) || Bundler.default_gemfile,
77
77
  lockfile: lockfile,
@@ -275,6 +275,8 @@ module Bundler
275
275
  end
276
276
  end
277
277
  end
278
+ ensure
279
+ Bundler.root = default_root
278
280
  end
279
281
 
280
282
  exit 1 unless checker.run(skip_base_checks: !synced_any)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bundler-multilock
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.6
4
+ version: 1.0.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Instructure
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-09-15 00:00:00.000000000 Z
11
+ date: 2023-09-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler