bundler-multilock 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba0cab59258e277e546634302417061f583bccb384c48d2573ac5565c23d436b
-  data.tar.gz: f0571eef5788f3299324cc39c8ca6bdeb742d7296b2a564d5511e5118e72e94c
+  metadata.gz: 96d2ea242c1ed2649402ecdaef79a271a80e406158aed36ace8e1bcd54c499e2
+  data.tar.gz: cf18464bb04949db98e4c18cff115a80fa287b1013befd2032c03cad6c171e59
 SHA512:
-  metadata.gz: 92aa36d22778ef5073846af9eae61c1046be24ca103edd3b6ad4efc2ad2d99e0463e6b0750c74dc24174a16414aae64356465c957a1e85f4c214c4e42c49b3ad
-  data.tar.gz: 4b420871866b9be6de5e33671e63ad9741ddb17909a9899c8ed86ebe2c8b011e3e89366c99dc8c044323697636edbd9a048f8173572f5218100f3024300ff662
+  metadata.gz: b2a454d5a6ce63f688233c70712d3dfec217c296b3a36c40081ae74f76bbf20fe6c347be91168d575dfe11df2ebb521b2e48d925464ddd02a18c7ce5e33095c6
+  data.tar.gz: edd63eaf7fdaf1b1c3809a8adeed6022ab954cacfc8feee0d44a855fe11ce39a83f3aa8aed6779291dfc009a77608381551100436b73bfedb2bdd92606e47dd9

data/lib/bundler/multilock/check.rb

@@ -91,7 +91,7 @@ module Bundler
       def deep_check(lockfile_definition, conflicts: nil)
         lockfile_name = lockfile_definition[:lockfile]
         @cache.deep_check(lockfile_name) do
-          success = true
+          success = true # -- work around rubocop bug
           proven_pinned = Set.new
           needs_pin_check = []
           parser = @cache.parser(lockfile_name)
@@ -100,12 +100,12 @@ module Bundler
           parent_parser = @cache.parser(parent_lockfile_name)
           unless parser.platforms == parent_parser.platforms
             Bundler.ui.error("The platforms in #{lockfile_path} do not match the parent lockfile.")
-            success = false
+            success = false # -- work around rubocop bug
           end
           unless parser.bundler_version == parent_parser.bundler_version
             Bundler.ui.error("bundler (#{parser.bundler_version}) in #{lockfile_path} " \
                              "does not match the parent lockfile's version (@#{parent_parser.bundler_version}).")
-            success = false
+            success = false # -- work around rubocop bug
           end
           unless parser.ruby_version == parent_parser.ruby_version
             Bundler.ui.error("ruby (#{parser.ruby_version || "<none>"}) in #{lockfile_path} " \

data/lib/bundler/multilock/ext/dsl.rb

@@ -59,15 +59,15 @@ module Bundler
                     "#{e.is_a?(GemfileEvalError) ? "evaluating" : "parsing"} " \
                     "`#{File.basename gemfile.to_s}`: #{e.message}"
 
-          raise Bundler::Dsl::DSLError.new(message, gemfile, e.backtrace, contents)
+          raise Bundler::Dsl::DSLError.new(message, gemfile.to_s, e.backtrace, contents)
         ensure
           @gemfile = original_gemfile
         end
 
-        def lockfile(*args, **kwargs, &block)
+        def lockfile(*args, **kwargs, &)
           return true if Multilock.loaded?
 
-          Multilock.add_lockfile(*args, builder: self, **kwargs, &block)
+          Multilock.add_lockfile(*args, builder: self, **kwargs, &)
         end
       end
     end

data/lib/bundler/multilock/version.rb

@@ -2,6 +2,6 @@
 
 module Bundler
   module Multilock
-    VERSION = "1.3.3"
+    VERSION = "1.4.0"
   end
 end

data/lib/bundler/multilock.rb

@@ -75,11 +75,11 @@ module Bundler
 
         lockfile_definitions[lockfile] = (lockfile_def = {
           gemfile: (gemfile && Bundler.root.join(gemfile).expand_path) || Bundler.default_gemfile,
-          lockfile: lockfile,
-          active: active,
+          lockfile:,
+          active:,
           prepare: block,
-          parent: parent,
-          enforce_pinned_additional_dependencies: enforce_pinned_additional_dependencies
+          parent:,
+          enforce_pinned_additional_dependencies:
         })
 
         # If they're using BUNDLE_LOCKFILE, then they really do want to
@@ -179,7 +179,7 @@ module Bundler
             Bundler.settings.temporary(frozen: true) do
               Bundler.ui.silence do
                 up_to_date = checker.base_check(lockfile_definition, check_missing_deps: true) &&
-                             checker.deep_check(lockfile_definition, conflicts: conflicts)
+                             checker.deep_check(lockfile_definition, conflicts:)
               end
             end
             if up_to_date
@@ -198,7 +198,7 @@ module Bundler
               end
 
               Bundler.ui.info("Installing gems for #{relative_lockfile}...")
-              write_lockfile(lockfile_definition, lockfile_name, cache, install: install)
+              write_lockfile(lockfile_definition, lockfile_name, cache, install:)
             else
               Bundler.ui.info("Syncing to #{relative_lockfile}...") if attempts == 1
               synced_any = true
@@ -248,7 +248,7 @@ module Bundler
                   next :self if parent_spec.nil?
                   next spec_precedences[spec.name] if spec_precedences.key?(spec.name)
 
-                  precedence = if !(cache.reverse_dependencies(lockfile_name)[spec.name] & conflicts).empty?
+                  precedence = if !(cache.reverse_dependencies(lockfile_name)[spec.name] & conflicts).empty? # rubocop:disable Style/ArrayIntersect -- not an array
                                  :parent
                                elsif cache.conflicting_requirements?(lockfile_name,
                                                                      parent_lockfile_name,
@@ -271,6 +271,10 @@ module Bundler
 
                   dependency_changes ||= spec != parent_spec
 
+                  if spec.source != parent_spec.source
+                    parent_spec = parent_spec.dup
+                    parent_spec.source = spec.source
+                  end
                   parent_spec
                 end
 
@@ -303,9 +307,9 @@ module Bundler
                 had_changes ||= write_lockfile(lockfile_definition,
                                                temp_lockfile.path,
                                                cache,
-                                               install: install,
-                                               dependency_changes: dependency_changes,
-                                               unlocking_bundler: unlocking_bundler)
+                                               install:,
+                                               dependency_changes:,
+                                               unlocking_bundler:)
               end
               cache.invalidate_lockfile(lockfile_name) if had_changes
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundler-multilock
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Instructure
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-25 00:00:00.000000000 Z
+date: 2025-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -19,7 +19,7 @@ dependencies:
         version: 2.4.19
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,51 +29,9 @@ dependencies:
         version: 2.4.19
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: gem-release
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-description: 
-email: 
+        version: '2.7'
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -99,7 +57,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -107,15 +65,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
-signing_key: 
+rubygems_version: 3.5.8
+signing_key:
 specification_version: 4
 summary: Support Multiple Lockfiles
 test_files: []