bundler-multilock 1.2.1 → 1.2.2
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: aa4ad7559633d79e55eea6f48aa41ea9c99d15449b7f10b702c109e066705dec
|
4
|
+
data.tar.gz: 4b99ab0309f3853dee89cf3571cee02e2d662ca97cda59e7945547fc5f5039bb
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ba7be8c9ed956ef0235497812ab415b91541ac7e290c2a01e8418df10262bb3f7c9d19b0380ee69c44a62bed7c448fbf82ebeda6f282304b9a7966b51aacd23c
|
7
|
+
data.tar.gz: 46a9d5e61d28a8c0a1b70264a5dbfcf4d865bbc3ced72606287de22ddeb8ec76d40a65d2ca43efa0d70f93625a760a1c95d4879e75c4adf54a9e5efbe0c290e3
|
@@ -190,7 +190,8 @@ module Bundler
|
|
190
190
|
private
|
191
191
|
|
192
192
|
def cache_reverse_dependencies(lockfile)
|
193
|
-
|
193
|
+
# can use Gem::Requirement.default_prelease when Ruby 2.6 support is dropped
|
194
|
+
reverse_dependencies = Hash.new { |h, k| h[k] = Gem::Requirement.new(">= 0.a") }
|
194
195
|
|
195
196
|
lockfile.dependencies.each_value do |spec|
|
196
197
|
reverse_dependencies[spec.name].requirements.concat(spec.requirement.requirements)
|
data/lib/bundler/multilock.rb
CHANGED
@@ -60,11 +60,12 @@ module Bundler
|
|
60
60
|
raise ArgumentError, "Lockfile #{lockfile} is already defined"
|
61
61
|
end
|
62
62
|
|
63
|
-
env_lockfile = ENV["BUNDLE_LOCKFILE"]
|
63
|
+
env_lockfile = lockfile if active && ENV["BUNDLE_LOCKFILE"] == "active"
|
64
|
+
env_lockfile ||= ENV["BUNDLE_LOCKFILE"]&.then { |l| expand_lockfile(l) }
|
64
65
|
active = env_lockfile == lockfile if env_lockfile
|
65
66
|
|
66
67
|
if active && (old_active = lockfile_definitions.find { |definition| definition[:active] })
|
67
|
-
raise ArgumentError, "Only one lockfile (#{old_active[:lockfile]}) can be flagged as
|
68
|
+
raise ArgumentError, "Only one lockfile (#{old_active[:lockfile]}) can be flagged as active"
|
68
69
|
end
|
69
70
|
|
70
71
|
parent = expand_lockfile(parent)
|
@@ -313,7 +314,7 @@ module Bundler
|
|
313
314
|
end
|
314
315
|
return unless default_lockfile_definition && default_lockfile_definition[:active] == false
|
315
316
|
|
316
|
-
raise GemfileEvalError, "No lockfiles marked as
|
317
|
+
raise GemfileEvalError, "No lockfiles marked as active"
|
317
318
|
end
|
318
319
|
|
319
320
|
# @!visibility private
|
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.2.
|
4
|
+
version: 1.2.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Instructure
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2024-01-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -30,20 +30,6 @@ dependencies:
|
|
30
30
|
- - "<"
|
31
31
|
- !ruby/object:Gem::Version
|
32
32
|
version: '2.6'
|
33
|
-
- !ruby/object:Gem::Dependency
|
34
|
-
name: debug
|
35
|
-
requirement: !ruby/object:Gem::Requirement
|
36
|
-
requirements:
|
37
|
-
- - "~>"
|
38
|
-
- !ruby/object:Gem::Version
|
39
|
-
version: '1.8'
|
40
|
-
type: :development
|
41
|
-
prerelease: false
|
42
|
-
version_requirements: !ruby/object:Gem::Requirement
|
43
|
-
requirements:
|
44
|
-
- - "~>"
|
45
|
-
- !ruby/object:Gem::Version
|
46
|
-
version: '1.8'
|
47
33
|
- !ruby/object:Gem::Dependency
|
48
34
|
name: rake
|
49
35
|
requirement: !ruby/object:Gem::Requirement
|
@@ -72,48 +58,6 @@ dependencies:
|
|
72
58
|
- - "~>"
|
73
59
|
- !ruby/object:Gem::Version
|
74
60
|
version: '3.12'
|
75
|
-
- !ruby/object:Gem::Dependency
|
76
|
-
name: rubocop-inst
|
77
|
-
requirement: !ruby/object:Gem::Requirement
|
78
|
-
requirements:
|
79
|
-
- - "~>"
|
80
|
-
- !ruby/object:Gem::Version
|
81
|
-
version: '1.0'
|
82
|
-
type: :development
|
83
|
-
prerelease: false
|
84
|
-
version_requirements: !ruby/object:Gem::Requirement
|
85
|
-
requirements:
|
86
|
-
- - "~>"
|
87
|
-
- !ruby/object:Gem::Version
|
88
|
-
version: '1.0'
|
89
|
-
- !ruby/object:Gem::Dependency
|
90
|
-
name: rubocop-rake
|
91
|
-
requirement: !ruby/object:Gem::Requirement
|
92
|
-
requirements:
|
93
|
-
- - "~>"
|
94
|
-
- !ruby/object:Gem::Version
|
95
|
-
version: '0.6'
|
96
|
-
type: :development
|
97
|
-
prerelease: false
|
98
|
-
version_requirements: !ruby/object:Gem::Requirement
|
99
|
-
requirements:
|
100
|
-
- - "~>"
|
101
|
-
- !ruby/object:Gem::Version
|
102
|
-
version: '0.6'
|
103
|
-
- !ruby/object:Gem::Dependency
|
104
|
-
name: rubocop-rspec
|
105
|
-
requirement: !ruby/object:Gem::Requirement
|
106
|
-
requirements:
|
107
|
-
- - "~>"
|
108
|
-
- !ruby/object:Gem::Version
|
109
|
-
version: '2.24'
|
110
|
-
type: :development
|
111
|
-
prerelease: false
|
112
|
-
version_requirements: !ruby/object:Gem::Requirement
|
113
|
-
requirements:
|
114
|
-
- - "~>"
|
115
|
-
- !ruby/object:Gem::Version
|
116
|
-
version: '2.24'
|
117
61
|
description:
|
118
62
|
email:
|
119
63
|
executables: []
|
@@ -146,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
146
90
|
requirements:
|
147
91
|
- - ">="
|
148
92
|
- !ruby/object:Gem::Version
|
149
|
-
version: '2.
|
93
|
+
version: '2.6'
|
150
94
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
151
95
|
requirements:
|
152
96
|
- - ">="
|