bundler-multilock 1.0.9 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3c22d18b37d9d24220bfd86fa998d94cf5a1369252150b17d579b1921c2a7ff
-  data.tar.gz: 571095e3e063925db5afd3403c401d3c38eb598b2da0af7d7fe09b613b5a2686
+  metadata.gz: 16c87f72f551998a90bed072f8c103a9870aad116cd7f2fd97226f64d64524e9
+  data.tar.gz: f3a25f8165c3c7e3169a6f03ce812572dbe95ddab0901d6af5110c10b631eba2
 SHA512:
-  metadata.gz: 8088c2a27858e008353eea944d3ed0c803433a2b5c3b71ee1f3e4e694624d9deebb54d0dc4b8af29241eb77fb59abb158191c3077b9eb261813228627930285c
-  data.tar.gz: a4ec23e48dba110e68773b170998f3c334a7adf117e8bd6a3a6c5485414901073006d76d07a48ebd7d8dfc20cb2a93ef4e8112e465dd4a21279a827ba4c03928
+  metadata.gz: e6b8780298dceaa4181dd6e524906af947fe26842acca882c4f06a9e6b84dcee2b479b00a88375faec133cf7d429a136f2cafe5200354f7342317088afdbae75
+  data.tar.gz: 5824ecc485b0934497beba52e5b6c554a1e990cdee7ab9db79fe24e1e8ff547a07c32390eef2470c1c8e93a6545e7ace99b115ac830266cdbe2151c492eff8fd

data/lib/bundler/multilock/version.rb

@@ -2,6 +2,6 @@
 
 module Bundler
   module Multilock
-    VERSION = "1.0.9"
+    VERSION = "1.0.11"
   end
 end

data/lib/bundler/multilock.rb

@@ -243,7 +243,10 @@ module Bundler
                   end
                 end
                 lockfile.instance_variable_set(:@ruby_version, default_lockfile.ruby_version)
-                lockfile.instance_variable_set(:@bundler_version, default_lockfile.bundler_version)
+                unless lockfile.bundler_version == default_lockfile.bundler_version
+                  unlocking_bundler = true
+                  lockfile.instance_variable_set(:@bundler_version, default_lockfile.bundler_version)
+                end
 
                 new_contents = LockfileGenerator.generate(lockfile)
               else
@@ -261,7 +264,8 @@ module Bundler
                 had_changes = write_lockfile(lockfile_definition,
                                              temp_lockfile.path,
                                              install: install,
-                                             dependency_changes: dependency_changes)
+                                             dependency_changes: dependency_changes,
+                                             unlocking_bundler: unlocking_bundler)
               end
 
               # if we had changes, bundler may have updated some common
@@ -375,7 +379,7 @@ module Bundler
         true
       end
 
-      def write_lockfile(lockfile_definition, lockfile, install:, dependency_changes: false)
+      def write_lockfile(lockfile_definition, lockfile, install:, dependency_changes: false, unlocking_bundler: false)
         prepare_block = lockfile_definition[:prepare]
 
         gemfile = lockfile_definition[:gemfile]
@@ -385,7 +389,7 @@ module Bundler
         builder.eval_gemfile(gemfile, &prepare_block) if prepare_block
         builder.eval_gemfile(gemfile)
 
-        definition = builder.to_definition(lockfile, {})
+        definition = builder.to_definition(lockfile, { bundler: unlocking_bundler })
         definition.instance_variable_set(:@dependency_changes, dependency_changes) if dependency_changes
         orig_definition = definition.dup # we might need it twice
 
@@ -393,8 +397,9 @@ module Bundler
         if current_lockfile.exist?
           definition.instance_variable_set(:@lockfile_contents, current_lockfile.read)
           if install
-            current_definition = builder.to_definition(current_lockfile, {})
+            current_definition = builder.to_definition(current_lockfile, { bundler: unlocking_bundler })
             begin
+              current_definition.resolve_with_cache!
               if current_definition.missing_specs.any?
                 Bundler.with_default_lockfile(current_lockfile) do
                   Installer.install(gemfile.dirname, current_definition, {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundler-multilock
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.11
 platform: ruby
 authors:
 - Instructure
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-19 00:00:00.000000000 Z
+date: 2023-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.4.19
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement