dependabot-common 0.242.0 → 0.242.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b85f6eea900488026cdee04e04dd5b51df99f8bafcff4c83ae83c5dfeb54c63
-  data.tar.gz: 30a4355a110f4be117fd9ece16d437f8a28704e75a7e0a62e4a5a5055c63e0cd
+  metadata.gz: 6e3dfe956941c85f2831b149fa443058ce3165f68890a9cc2f8a47f171cf76cf
+  data.tar.gz: 1e02a3d9fbcb515af27fe62656748dcf14394707a71d2d2ca78e2f4c5323142b
 SHA512:
-  metadata.gz: c928acaa28bf821c081dd80afda5aa16551a09ab031a28ea60241742d23ffeb54186087fca915317d811b88881bbe6ce99f3b343f45d8efd538aee1c9b7524cd
-  data.tar.gz: a2a4d975f4010b24077d4b558f8d1e4806230411b0d98983c58c7df5be2dd41a2e39868c1a346132743de560fdf28a059cbbb5800bae3ac19333008db3504591
+  metadata.gz: 1d14e15ab94001ea6a2aa5625b23a0db71b13a3f533aca335d6f4a6035fdb14fb1b1600bd38628b5f41919883a4fc20754ccd329e0167c936a4fc68bc7b1031e
+  data.tar.gz: d31623ce8db6226701b3a4c8c5a49c2b5805d0c9e8723decdf15d275c87f5d6c519ca2add01ea796a607345ceebe498dbe71f4ad80310e916ef04e394748c8ae

data/lib/dependabot/dependency.rb

@@ -88,15 +88,15 @@ module Dependabot
     sig do
       params(
         name: String,
-        requirements: T::Array[T::Hash[String, String]],
+        requirements: T::Array[T::Hash[T.any(Symbol, String), T.untyped]],
         package_manager: String,
         # TODO: Make version a Dependabot::Version everywhere
         version: T.nilable(T.any(String, Dependabot::Version)),
         previous_version: T.nilable(String),
         previous_requirements: T.nilable(T::Array[T::Hash[String, String]]),
-        subdependency_metadata: T.nilable(T::Array[T::Hash[String, String]]),
+        subdependency_metadata: T.nilable(T::Array[T::Hash[T.any(Symbol, String), String]]),
         removed: T::Boolean,
-        metadata: T.nilable(T::Hash[String, String])
+        metadata: T.nilable(T::Hash[T.any(Symbol, String), String])
       ).void
     end
     def initialize(name:, requirements:, package_manager:, version: nil,
@@ -110,7 +110,7 @@ module Dependabot
         end,
         T.nilable(String)
       )
-      @requirements = T.let(requirements.map { |req| symbolize_keys(req) }, T::Array[T::Hash[Symbol, String]])
+      @requirements = T.let(requirements.map { |req| symbolize_keys(req) }, T::Array[T::Hash[Symbol, T.untyped]])
       @previous_version = previous_version
       @previous_requirements = T.let(
         previous_requirements&.map { |req| symbolize_keys(req) },
@@ -391,7 +391,7 @@ module Dependabot
       end
     end
 
-    sig { params(hash: T::Hash[String, T.untyped]).returns(T::Hash[Symbol, T.untyped]) }
+    sig { params(hash: T::Hash[T.any(Symbol, String), T.untyped]).returns(T::Hash[Symbol, T.untyped]) }
     def symbolize_keys(hash)
       hash.keys.to_h { |k| [k.to_sym, hash[k]] }
     end

data/lib/dependabot/file_parsers/base/dependency_set.rb

@@ -1,6 +1,7 @@
-# typed: true
+# typed: strong
 # frozen_string_literal: true
 
+require "sorbet-runtime"
 require "dependabot/dependency"
 require "dependabot/file_parsers/base"
 require "dependabot/utils"
@@ -9,28 +10,36 @@ module Dependabot
   module FileParsers
     class Base
       class DependencySet
+        extend T::Sig
+
+        sig do
+          params(
+            dependencies: T::Array[Dependency],
+            case_sensitive: T::Boolean
+          )
+            .void
+        end
         def initialize(dependencies = [], case_sensitive: false)
-          unless dependencies.is_a?(Array) &&
-                 dependencies.all?(Dependency)
-            raise ArgumentError, "must be an array of Dependency objects"
-          end
-
           @case_sensitive = case_sensitive
-          @dependencies = Hash.new { |hsh, key| hsh[key] = DependencySlot.new }
+          @dependencies = T.let(
+            Hash.new { |hsh, key| hsh[key] = DependencySlot.new },
+            T::Hash[String, DependencySlot]
+          )
           dependencies.each { |dep| self << dep }
         end
 
+        sig { returns(T::Array[Dependency]) }
         def dependencies
           @dependencies.values.filter_map(&:combined)
         end
 
+        sig { params(dep: Dependabot::Dependency).returns(T.untyped) }
         def <<(dep)
-          raise ArgumentError, "must be a Dependency object" unless dep.is_a?(Dependency)
-
-          @dependencies[key_for_dependency(dep)] << dep
+          T.must(@dependencies[key_for_dependency(dep)]) << dep
           self
         end
 
+        sig { params(other: Object).returns(T.self_type) }
         def +(other)
           raise ArgumentError, "must be a DependencySet" unless other.is_a?(DependencySet)
 
@@ -43,26 +52,31 @@ module Dependabot
           self
         end
 
+        sig { params(name: String).returns(T::Array[Dependabot::Dependency]) }
         def all_versions_for_name(name)
           key = key_for_name(name)
-          @dependencies.key?(key) ? @dependencies[key].all_versions : []
+          @dependencies.key?(key) ? T.must(@dependencies[key]).all_versions : []
         end
 
+        sig { params(name: String).returns(T.nilable(Dependabot::Dependency)) }
         def dependency_for_name(name)
           key = key_for_name(name)
-          @dependencies.key?(key) ? @dependencies[key].combined : nil
+          @dependencies.key?(key) ? T.must(@dependencies[key]).combined : nil
         end
 
         private
 
+        sig { returns(T::Boolean) }
         def case_sensitive?
           @case_sensitive
         end
 
+        sig { params(name: String).returns(String) }
         def key_for_name(name)
           case_sensitive? ? name : name.downcase
         end
 
+        sig { params(dep: Dependabot::Dependency).returns(String) }
         def key_for_dependency(dep)
           key_for_name(dep.name)
         end
@@ -79,13 +93,21 @@ module Dependabot
         # `DependencySet#dependency_for_name`. The list of individual versions of the
         # dependency is accessible via `DependencySet#all_versions_for_name`.
         class DependencySlot
-          attr_reader :all_versions, :combined
+          extend T::Sig
+
+          sig { returns(T::Array[Dependabot::Dependency]) }
+          attr_reader :all_versions
+
+          sig { returns(T.nilable(Dependabot::Dependency)) }
+          attr_reader :combined
 
+          sig { void }
           def initialize
-            @all_versions = []
-            @combined = nil
+            @all_versions = T.let([], T::Array[Dependabot::Dependency])
+            @combined = T.let(nil, T.nilable(Dependabot::Dependency))
           end
 
+          sig { params(dep: Dependabot::Dependency).returns(T.self_type) }
           def <<(dep)
             return self if @all_versions.include?(dep)
 
@@ -102,7 +124,7 @@ module Dependabot
               @all_versions << dep
             else
               same_version = @all_versions[index_of_same_version]
-              @all_versions[index_of_same_version] = combined_dependency(same_version, dep)
+              @all_versions[index_of_same_version] = combined_dependency(T.must(same_version), dep)
             end
 
             self
@@ -114,6 +136,13 @@ module Dependabot
           # `new_dep`. Requirements and subdependency metadata will be combined and deduped.
           # The version of the combined dependency is determined by the
           # `#combined_version` method below.
+          sig do
+            params(
+              old_dep: Dependabot::Dependency,
+              new_dep: Dependabot::Dependency
+            )
+              .returns(Dependabot::Dependency)
+          end
           def combined_dependency(old_dep, new_dep)
             version = combined_version(old_dep, new_dep)
             requirements = (old_dep.requirements + new_dep.requirements).uniq
@@ -132,11 +161,18 @@ module Dependabot
             )
           end
 
+          sig do
+            params(
+              old_dep: Dependabot::Dependency,
+              new_dep: Dependabot::Dependency
+            )
+              .returns(T.nilable(String))
+          end
           def combined_version(old_dep, new_dep)
             if old_dep.version.nil? ^ new_dep.version.nil?
-              [old_dep, new_dep].find(&:version).version
+              T.must([old_dep, new_dep].find(&:version)).version
             elsif old_dep.top_level? ^ new_dep.top_level? # Prefer a direct dependency over a transitive one
-              [old_dep, new_dep].find(&:top_level?).version
+              T.must([old_dep, new_dep].find(&:top_level?)).version
             elsif !version_class.correct?(new_dep.version)
               old_dep.version
             elsif !version_class.correct?(old_dep.version)
@@ -148,8 +184,12 @@ module Dependabot
             end
           end
 
+          sig { returns(T.class_of(Gem::Version)) }
           def version_class
-            @version_class ||= @combined.version_class
+            @version_class ||= T.let(
+              T.must(@combined).version_class,
+              T.nilable(T.class_of(Gem::Version))
+            )
           end
         end
         private_constant :DependencySlot

data/lib/dependabot/pull_request_creator.rb

@@ -389,7 +389,7 @@ module Dependabot
         BranchNamer.new(
           dependencies: dependencies,
           files: files,
-          target_branch: T.must(source.branch),
+          target_branch: source.branch,
           dependency_group: dependency_group,
           separator: branch_name_separator,
           prefix: branch_name_prefix,

data/lib/dependabot/shared_helpers.rb

@@ -112,7 +112,7 @@ module Dependabot
       end
 
       sig { returns(T::Hash[Symbol, T.untyped]) }
-      def raven_context
+      def sentry_context
         { fingerprint: [@fingerprint], extra: @error_context.except(:stderr_output, :fingerprint) }
       end
     end

data/lib/dependabot.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Dependabot
-  VERSION = "0.242.0"
+  VERSION = "0.242.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.242.0
+  version: 0.242.1
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-22 00:00:00.000000000 Z
+date: 2024-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-codecommit
@@ -98,20 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.96'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.105'
+        version: '0.109'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.96'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.105'
+        version: '0.109'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -572,7 +566,7 @@ licenses:
 - Nonstandard
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.242.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.242.1
 post_install_message: 
 rdoc_options: []
 require_paths: