bundler-multilock 1.0.0 → 1.0.1
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 +4 -4
- data/lib/bundler/multilock/version.rb +1 -1
- data/lib/bundler/multilock.rb +13 -7
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1a44fab8512a3a0912817ccf20f482b9e50e4f95dfd9c19b4650e0646b24eb33
|
|
4
|
+
data.tar.gz: a3f523373eb598adcfde15044b0c585f0aec588ec922b8443079720a07058a75
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2e315ad8dd6fcf0a6fb7f58c1875d364e558aea761f908aa61b6591fd65e3993d039a6ba9a97ce7373fafa30149bf1486693cf336ce314c6f57bd1f3cd4936cc
|
|
7
|
+
data.tar.gz: a83535ae988209c4776317332bc51d565e49c8754543f52c41db6dbad211d6e38f1faac916ca0b54896e78f6a13f354e6476fa8b28c5f3da6a2ade396088acb1
|
data/lib/bundler/multilock.rb
CHANGED
|
@@ -356,12 +356,7 @@ module Bundler
|
|
|
356
356
|
|
|
357
357
|
def write_lockfile(lockfile_definition, lockfile, install:, dependency_changes: false)
|
|
358
358
|
self.prepare_block = lockfile_definition[:prepare]
|
|
359
|
-
definition =
|
|
360
|
-
definition.instance_variable_set(:@dependency_changes, dependency_changes) if dependency_changes
|
|
361
|
-
if lockfile_definition[:lockfile].exist?
|
|
362
|
-
definition.instance_variable_set(:@lockfile_contents,
|
|
363
|
-
lockfile_definition[:lockfile].read)
|
|
364
|
-
end
|
|
359
|
+
definition = build_definition(lockfile_definition, lockfile, dependency_changes: dependency_changes)
|
|
365
360
|
|
|
366
361
|
resolved_remotely = false
|
|
367
362
|
begin
|
|
@@ -370,7 +365,8 @@ module Bundler
|
|
|
370
365
|
begin
|
|
371
366
|
definition.resolve_with_cache!
|
|
372
367
|
rescue GemNotFound, SolveFailure
|
|
373
|
-
definition =
|
|
368
|
+
definition = build_definition(lockfile_definition, lockfile, dependency_changes: dependency_changes)
|
|
369
|
+
|
|
374
370
|
definition.resolve_remotely!
|
|
375
371
|
resolved_remotely = true
|
|
376
372
|
end
|
|
@@ -391,6 +387,16 @@ module Bundler
|
|
|
391
387
|
ensure
|
|
392
388
|
self.prepare_block = nil
|
|
393
389
|
end
|
|
390
|
+
|
|
391
|
+
def build_definition(lockfile_definition, lockfile, dependency_changes:)
|
|
392
|
+
definition = Definition.build(lockfile_definition[:gemfile], lockfile, false)
|
|
393
|
+
definition.instance_variable_set(:@dependency_changes, dependency_changes) if dependency_changes
|
|
394
|
+
if lockfile_definition[:lockfile].exist?
|
|
395
|
+
definition.instance_variable_set(:@lockfile_contents,
|
|
396
|
+
lockfile_definition[:lockfile].read)
|
|
397
|
+
end
|
|
398
|
+
definition
|
|
399
|
+
end
|
|
394
400
|
end
|
|
395
401
|
|
|
396
402
|
reset!
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: bundler-multilock
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Instructure
|
|
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
145
145
|
- !ruby/object:Gem::Version
|
|
146
146
|
version: '0'
|
|
147
147
|
requirements: []
|
|
148
|
-
rubygems_version: 3.
|
|
148
|
+
rubygems_version: 3.4.19
|
|
149
149
|
signing_key:
|
|
150
150
|
specification_version: 4
|
|
151
151
|
summary: Support Multiple Lockfiles
|