bundler-multilock 1.2.2 → 1.2.3

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: aa4ad7559633d79e55eea6f48aa41ea9c99d15449b7f10b702c109e066705dec
4
- data.tar.gz: 4b99ab0309f3853dee89cf3571cee02e2d662ca97cda59e7945547fc5f5039bb
3
+ metadata.gz: cc3afea590bb51cf3bb3ea6e5e1b5fc6da4ba400276db5b99cefbce26ac00a40
4
+ data.tar.gz: dc917e664709ab17ffdcd6b8d067c4e54c71377de945ecb9975ad8b8975271fd
5
5
  SHA512:
6
- metadata.gz: ba7be8c9ed956ef0235497812ab415b91541ac7e290c2a01e8418df10262bb3f7c9d19b0380ee69c44a62bed7c448fbf82ebeda6f282304b9a7966b51aacd23c
7
- data.tar.gz: 46a9d5e61d28a8c0a1b70264a5dbfcf4d865bbc3ced72606287de22ddeb8ec76d40a65d2ca43efa0d70f93625a760a1c95d4879e75c4adf54a9e5efbe0c290e3
6
+ metadata.gz: 4938a9f3a520ae864bc0f56b8f153d2f2bef00a3c0bacc6ec59647f3cb47db4b53062e213ab368f90c7901d777c911d0245eba9d59239eb1f02c5ee7d406f47c
7
+ data.tar.gz: 6055d06c51beec2d7e0be5f96f72edb19fcd70553fd07846350d0df1f8fa01f2addfa34cd75551889ee2af48247a9b1ad5ab45e4d2ac19ed756291ddc08c3dee
@@ -41,7 +41,7 @@ module Bundler
41
41
  if block
42
42
  instance_eval(&block)
43
43
  else
44
- instance_eval(contents.dup.tap { |x| x.untaint if RUBY_VERSION < "2.7" }, gemfile.to_s, 1)
44
+ instance_eval(contents.dup.tap { |x| x.untaint if RUBY_VERSION < "2.7" }, @gemfile.to_s, 1)
45
45
  end
46
46
  rescue Exception => e # rubocop:disable Lint/RescueException
47
47
  message = "There was an error " \
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Bundler
4
4
  module Multilock
5
- VERSION = "1.2.2"
5
+ VERSION = "1.2.3"
6
6
  end
7
7
  end
@@ -70,7 +70,8 @@ module Bundler
70
70
 
71
71
  parent = expand_lockfile(parent)
72
72
  if parent != Bundler.default_lockfile(force_original: true) &&
73
- !lockfile_definitions.find { |definition| definition[:lockfile] == parent }
73
+ !lockfile_definitions.find { |definition| definition[:lockfile] == parent } &&
74
+ !parent.exist?
74
75
  raise ArgumentError, "Parent lockfile #{parent} is not defined"
75
76
  end
76
77
 
@@ -469,7 +470,12 @@ module Bundler
469
470
  resolved_remotely = true
470
471
  end
471
472
  SharedHelpers.capture_filesystem_access do
472
- definition.lock(lockfile_definition[:lockfile], true)
473
+ if Bundler.gem_version >= Gem::Version.new("2.5.6")
474
+ definition.instance_variable_set(:@lockfile, lockfile_definition[:lockfile])
475
+ definition.lock(true)
476
+ else
477
+ definition.lock(lockfile_definition[:lockfile], true)
478
+ end
473
479
  end
474
480
  ensure
475
481
  Bundler.ui.level = previous_ui_level
@@ -494,6 +500,8 @@ module Bundler
494
500
  end
495
501
  end
496
502
 
503
+ # see https://github.com/rubygems/rubygems/pull/7368
504
+ Bundler::LazySpecification.include(Bundler::MatchMetadata) if defined?(Bundler::MatchMetadata)
497
505
  Bundler::Multilock.inject_preamble unless Bundler::Multilock.loaded?
498
506
 
499
507
  # this is terrible, but we can't prepend into these modules because we only load
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.2
4
+ version: 1.2.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Instructure
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-01-09 00:00:00.000000000 Z
11
+ date: 2024-02-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -30,6 +30,20 @@ dependencies:
30
30
  - - "<"
31
31
  - !ruby/object:Gem::Version
32
32
  version: '2.6'
33
+ - !ruby/object:Gem::Dependency
34
+ name: gem-release
35
+ requirement: !ruby/object:Gem::Requirement
36
+ requirements:
37
+ - - "~>"
38
+ - !ruby/object:Gem::Version
39
+ version: '2.2'
40
+ type: :development
41
+ prerelease: false
42
+ version_requirements: !ruby/object:Gem::Requirement
43
+ requirements:
44
+ - - "~>"
45
+ - !ruby/object:Gem::Version
46
+ version: '2.2'
33
47
  - !ruby/object:Gem::Dependency
34
48
  name: rake
35
49
  requirement: !ruby/object:Gem::Requirement
@@ -58,8 +72,8 @@ dependencies:
58
72
  - - "~>"
59
73
  - !ruby/object:Gem::Version
60
74
  version: '3.12'
61
- description:
62
- email:
75
+ description:
76
+ email:
63
77
  executables: []
64
78
  extensions: []
65
79
  extra_rdoc_files: []
@@ -82,7 +96,7 @@ licenses:
82
96
  - MIT
83
97
  metadata:
84
98
  rubygems_mfa_required: 'true'
85
- post_install_message:
99
+ post_install_message:
86
100
  rdoc_options: []
87
101
  require_paths:
88
102
  - lib
@@ -97,8 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
97
111
  - !ruby/object:Gem::Version
98
112
  version: '0'
99
113
  requirements: []
100
- rubygems_version: 3.4.19
101
- signing_key:
114
+ rubygems_version: 3.5.6
115
+ signing_key:
102
116
  specification_version: 4
103
117
  summary: Support Multiple Lockfiles
104
118
  test_files: []