dependabot-nix 0.391.0 → 0.392.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76a0d538ea07a901db4c105e3f9d9ec9781092a5b140ec7e438a5978ae92f9fb
-  data.tar.gz: f51521922590aaf2eae87c10624a1769ed0f6a1c32bbc583a5410966a6b5ca03
+  metadata.gz: '0854f16dea1cbd1246cd58a76f290198c7bd4f124681b2aa1e2b28063e88b30c'
+  data.tar.gz: ce83d066b3331ed94082a1c021f21d72054f5b6ecdade603cc39cc91b98791d8
 SHA512:
-  metadata.gz: 8c63389117a33466e4a266b186c6171e20f5a1993d0f2b6ca2570446ecfdd9ab54cdea4401de7530394b0bd43794f2e3636be51faac3a78c10954b5677fe329d
-  data.tar.gz: 73f6a626f8ff11a613094e166a2934fa44bd513485bec60b332e7783cf0862048136907b513db380cab2c7c39444052d96f809f39ad3d21f7a56ef9ec4178036
+  metadata.gz: 137558c3e44e6dcc6fa7013982d6feea2f79f19ea669538453a76d5d0f2c32c04ada2a07a51f58682509740274d553efeb97345a1d5bbf0ed06653304da69c7b
+  data.tar.gz: c0ee7a47fbee3e1e22294db2cfda26ef2ccf69e163845a42261795cc5246e91089cc8f136c7e7254d2595d1ca7874a268c6cd5a0455ffde8f168ed9ef113617e

data/lib/dependabot/nix/file_updater.rb

@@ -1,4 +1,4 @@
-# typed: strict
+# typed: strong
 # frozen_string_literal: true
 
 require "sorbet-runtime"
@@ -84,12 +84,12 @@ module Dependabot
 
       sig { returns(T.nilable(String)) }
       def new_source_ref
-        dependency.requirements.first&.dig(:source, :ref)
+        dependency.requirements.first&.source_string("ref")
       end
 
       sig { returns(T.nilable(String)) }
       def old_source_ref
-        dependency.previous_requirements&.first&.dig(:source, :ref)
+        dependency.previous_requirements&.first&.source_string("ref")
       end
 
       sig { override.void }

data/lib/dependabot/nix/metadata_finder.rb

@@ -1,4 +1,4 @@
-# typed: strict
+# typed: strong
 # frozen_string_literal: true
 
 require "sorbet-runtime"
@@ -19,8 +19,7 @@ module Dependabot
 
       sig { override.returns(T.nilable(Dependabot::Source)) }
       def look_up_source
-        source = dependency.requirements.first&.fetch(:source, nil)
-        url = source && (source[:url] || source["url"])
+        url = dependency.requirements.first&.source_string("url")
 
         return Source.from_url(NIXPKGS_SOURCE_URL) if Channel.channel_url?(url)
 

data/lib/dependabot/nix/update_checker.rb

@@ -97,11 +97,16 @@ module Dependabot
         return dependency.requirements unless result
 
         dependency.requirements.map do |req|
-          source = req[:source]
-          next req unless source
+          next req unless req.source_hash
 
           Dependabot::DependencyRequirement.create(
-            req.merge(source: source.merge(ref: result[:channel], url: result[:url]))
+            req.merge(
+              source: source_with_values(
+                req,
+                "ref" => result[:channel],
+                "url" => result[:url]
+              )
+            )
           )
         end
       end
@@ -151,10 +156,17 @@ module Dependabot
         return dependency.requirements unless new_tag
 
         dependency.requirements.map do |req|
-          source = req[:source]
-          next req unless source
+          next req unless req.source_hash
 
-          Dependabot::DependencyRequirement.create(req.merge(source: source.merge(ref: new_tag[:tag], branch: nil)))
+          Dependabot::DependencyRequirement.create(
+            req.merge(
+              source: source_with_values(
+                req,
+                "ref" => T.cast(new_tag[:tag], String),
+                "branch" => nil
+              )
+            )
+          )
         end
       end
 
@@ -180,10 +192,17 @@ module Dependabot
         return dependency.requirements unless result
 
         dependency.requirements.map do |req|
-          source = req[:source]
-          next req unless source
+          next req unless req.source_hash
 
-          Dependabot::DependencyRequirement.create(req.merge(source: source.merge(ref: result[:branch], branch: nil)))
+          Dependabot::DependencyRequirement.create(
+            req.merge(
+              source: source_with_values(
+                req,
+                "ref" => result[:branch],
+                "branch" => nil
+              )
+            )
+          )
         end
       end
 
@@ -201,6 +220,29 @@ module Dependabot
         )
       end
 
+      sig do
+        params(
+          requirement: Dependabot::DependencyRequirement,
+          values: T::Hash[String, T.nilable(String)]
+        ).returns(Dependabot::DependencyRequirement::ObjectHash)
+      end
+      def source_with_values(requirement, values)
+        source = T.must(requirement.source_hash).dup
+        values.each do |key, value|
+          actual_key = if source.key?(key.to_sym)
+                         key.to_sym
+                       elsif source.key?(key)
+                         key
+                       elsif source.keys.any?(Symbol)
+                         key.to_sym
+                       else
+                         key
+                       end
+          source[actual_key] = value
+        end
+        source
+      end
+
       # --- Commit-tracking (existing behavior) ---
 
       sig { returns(T.nilable(String)) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nix
 version: !ruby/object:Gem::Version
-  version: 0.391.0
+  version: 0.392.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.391.0
+        version: 0.392.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.391.0
+        version: 0.392.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -263,7 +263,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.391.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.392.0
 rdoc_options: []
 require_paths:
 - lib