bundler-multilock 1.0.9 → 1.0.11

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: c3c22d18b37d9d24220bfd86fa998d94cf5a1369252150b17d579b1921c2a7ff
4
- data.tar.gz: 571095e3e063925db5afd3403c401d3c38eb598b2da0af7d7fe09b613b5a2686
3
+ metadata.gz: 16c87f72f551998a90bed072f8c103a9870aad116cd7f2fd97226f64d64524e9
4
+ data.tar.gz: f3a25f8165c3c7e3169a6f03ce812572dbe95ddab0901d6af5110c10b631eba2
5
5
  SHA512:
6
- metadata.gz: 8088c2a27858e008353eea944d3ed0c803433a2b5c3b71ee1f3e4e694624d9deebb54d0dc4b8af29241eb77fb59abb158191c3077b9eb261813228627930285c
7
- data.tar.gz: a4ec23e48dba110e68773b170998f3c334a7adf117e8bd6a3a6c5485414901073006d76d07a48ebd7d8dfc20cb2a93ef4e8112e465dd4a21279a827ba4c03928
6
+ metadata.gz: e6b8780298dceaa4181dd6e524906af947fe26842acca882c4f06a9e6b84dcee2b479b00a88375faec133cf7d429a136f2cafe5200354f7342317088afdbae75
7
+ data.tar.gz: 5824ecc485b0934497beba52e5b6c554a1e990cdee7ab9db79fe24e1e8ff547a07c32390eef2470c1c8e93a6545e7ace99b115ac830266cdbe2151c492eff8fd
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Bundler
4
4
  module Multilock
5
- VERSION = "1.0.9"
5
+ VERSION = "1.0.11"
6
6
  end
7
7
  end
@@ -243,7 +243,10 @@ module Bundler
243
243
  end
244
244
  end
245
245
  lockfile.instance_variable_set(:@ruby_version, default_lockfile.ruby_version)
246
- lockfile.instance_variable_set(:@bundler_version, default_lockfile.bundler_version)
246
+ unless lockfile.bundler_version == default_lockfile.bundler_version
247
+ unlocking_bundler = true
248
+ lockfile.instance_variable_set(:@bundler_version, default_lockfile.bundler_version)
249
+ end
247
250
 
248
251
  new_contents = LockfileGenerator.generate(lockfile)
249
252
  else
@@ -261,7 +264,8 @@ module Bundler
261
264
  had_changes = write_lockfile(lockfile_definition,
262
265
  temp_lockfile.path,
263
266
  install: install,
264
- dependency_changes: dependency_changes)
267
+ dependency_changes: dependency_changes,
268
+ unlocking_bundler: unlocking_bundler)
265
269
  end
266
270
 
267
271
  # if we had changes, bundler may have updated some common
@@ -375,7 +379,7 @@ module Bundler
375
379
  true
376
380
  end
377
381
 
378
- def write_lockfile(lockfile_definition, lockfile, install:, dependency_changes: false)
382
+ def write_lockfile(lockfile_definition, lockfile, install:, dependency_changes: false, unlocking_bundler: false)
379
383
  prepare_block = lockfile_definition[:prepare]
380
384
 
381
385
  gemfile = lockfile_definition[:gemfile]
@@ -385,7 +389,7 @@ module Bundler
385
389
  builder.eval_gemfile(gemfile, &prepare_block) if prepare_block
386
390
  builder.eval_gemfile(gemfile)
387
391
 
388
- definition = builder.to_definition(lockfile, {})
392
+ definition = builder.to_definition(lockfile, { bundler: unlocking_bundler })
389
393
  definition.instance_variable_set(:@dependency_changes, dependency_changes) if dependency_changes
390
394
  orig_definition = definition.dup # we might need it twice
391
395
 
@@ -393,8 +397,9 @@ module Bundler
393
397
  if current_lockfile.exist?
394
398
  definition.instance_variable_set(:@lockfile_contents, current_lockfile.read)
395
399
  if install
396
- current_definition = builder.to_definition(current_lockfile, {})
400
+ current_definition = builder.to_definition(current_lockfile, { bundler: unlocking_bundler })
397
401
  begin
402
+ current_definition.resolve_with_cache!
398
403
  if current_definition.missing_specs.any?
399
404
  Bundler.with_default_lockfile(current_lockfile) do
400
405
  Installer.install(gemfile.dirname, current_definition, {})
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.9
4
+ version: 1.0.11
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-19 00:00:00.000000000 Z
11
+ date: 2023-09-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -25,19 +25,19 @@ dependencies:
25
25
  - !ruby/object:Gem::Version
26
26
  version: 2.4.19
27
27
  - !ruby/object:Gem::Dependency
28
- name: byebug
28
+ name: debug
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '11.1'
33
+ version: '1.8'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: '11.1'
40
+ version: '1.8'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rake
43
43
  requirement: !ruby/object:Gem::Requirement