dependabot-gradle 0.262.0 → 0.264.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a030ae92a1ad242061604cdf1539a1e71ecd8da55cf8efebaed77cf933c7f3e4
-  data.tar.gz: ea81ec27791890cff4e7c3552186ee9c2cc8c9004aff6fc3f6db1d0fe1026d0b
+  metadata.gz: d10eedea81449df321f09127a88f4c3be2aa317d8cb437a381825fd811e9fc2a
+  data.tar.gz: b3936158b65edb6c2027e361d76cd2aa78235fabae98d17a5d5ca24893f2a06f
 SHA512:
-  metadata.gz: e47e3532b98a2d438d819d49dcf26a755adeff307b6f4f69e7e564c7a04bfc2b4a50d616991bd677d0fa38083c24e36c394cdfd9aa6df7232bd0a568d0cd4953
-  data.tar.gz: 2450516acf431f0873cc90c5eadf602972a7a65c71805fb348ccf54f1c6d35c51b52f211d9c09caa2b0fa0bdfddab86e9e3374ca1c8d6a9563f340530a1f5988
+  metadata.gz: 50d579cc9c25840cd632d8507f90339c218ee81964d732b7b799cea740a6dd0ae8ab846bf111a701ccf4b8c40c56b08e64a46300cbed3a3ec73968e5b6b9b40f
+  data.tar.gz: 41e425cf72d56b615abefac4895d9bf897d07e99532fcfbf37ec14e330e5819152aabc96b32793b4bec4d9032f84770a0a7125ea884ff9933dc6c700ba786f18

data/lib/dependabot/gradle/file_fetcher/settings_file_parser.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strong
 # frozen_string_literal: true
 
 require "sorbet-runtime"
@@ -11,53 +11,61 @@ module Dependabot
       class SettingsFileParser
         extend T::Sig
 
+        sig { params(settings_file: Dependabot::DependencyFile).void }
         def initialize(settings_file:)
           @settings_file = settings_file
         end
 
+        sig { returns(T::Array[String]) }
         def included_build_paths
           paths = []
-          comment_free_content.scan(function_regex("includeBuild")) do
+          comment_free_content&.scan(function_regex("includeBuild")) do
             arg = T.must(Regexp.last_match).named_captures.fetch("args")
             paths << T.must(arg).gsub(/["']/, "").strip
           end
           paths.uniq
         end
 
+        sig { returns(T::Array[T.nilable(String)]) }
         def subproject_paths
           subprojects = T.let([], T::Array[String])
+          process_include_functions(subprojects)
+          subprojects.uniq.map { |name| process_subproject_name(name) }
+        end
+
+        private
 
-          comment_free_content.scan(function_regex("include")) do
+        sig { params(subprojects: T::Array[String]).void }
+        def process_include_functions(subprojects)
+          comment_free_content&.scan(function_regex("include")) do
             args = T.must(Regexp.last_match).named_captures.fetch("args")
             args = T.must(args).split(",")
             args = args.filter_map { |p| p.gsub(/["']/, "").strip }
-            subprojects += args
+            subprojects.concat(args)
           end
+        end
 
-          subprojects = subprojects.uniq
-
-          subproject_dirs = subprojects.map do |proj|
-            if comment_free_content.match?(project_dir_regex(proj))
-              comment_free_content.match(project_dir_regex(proj))
-                                  .named_captures.fetch("path").sub(%r{^/}, "")
-            else
-              proj.tr(":", "/").sub(%r{^/}, "")
-            end
+        sig { params(proj: String).returns(T.nilable(String)) }
+        def process_subproject_name(proj)
+          if comment_free_content&.match?(project_dir_regex(proj))
+            comment_free_content&.match(project_dir_regex(proj))
+                                &.named_captures&.fetch("path")&.sub(%r{^/}, "")
+          else
+            proj.tr(":", "/").sub(%r{^/}, "")
           end
-
-          subproject_dirs.uniq
         end
 
-        private
-
+        sig { returns(Dependabot::DependencyFile) }
         attr_reader :settings_file
 
+        sig { returns(T.nilable(String)) }
         def comment_free_content
           settings_file.content
-                       .gsub(%r{(?<=^|\s)//.*$}, "\n")
-                       .gsub(%r{(?<=^|\s)/\*.*?\*/}m, "")
+                       &.gsub(%r{(?<=^|\s)//.*$}, "\n")
+                       &.gsub(%r{(?<=^|\s)/\*.*?\*/}m, "")
         end
 
+        sig { params(function_name: T.any(String, Symbol)).returns(Regexp) }
         def function_regex(function_name)
           /
             (?:^|\s)#{Regexp.quote(function_name)}(?:\s*\(|\s)
@@ -65,6 +73,7 @@ module Dependabot
           /mx
         end
 
+        sig { params(proj: String).returns(Regexp) }
         def project_dir_regex(proj)
           prefixed_proj = Regexp.quote(":#{proj.gsub(/^:/, '')}")
           /['"]#{prefixed_proj}['"].*dir\s*=.*['"](?<path>.*?)['"]/i

data/lib/dependabot/gradle/file_fetcher.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 require "sorbet-runtime"
@@ -16,21 +16,39 @@ module Dependabot
       require_relative "file_fetcher/settings_file_parser"
 
       SUPPORTED_BUILD_FILE_NAMES =
-        %w(build.gradle build.gradle.kts).freeze
+        T.let(%w(build.gradle build.gradle.kts).freeze, T::Array[String])
 
       SUPPORTED_SETTINGS_FILE_NAMES =
-        %w(settings.gradle settings.gradle.kts).freeze
+        T.let(%w(settings.gradle settings.gradle.kts).freeze, T::Array[String])
 
       # For now Gradle only supports library .toml files in the main gradle folder
       SUPPORTED_VERSION_CATALOG_FILE_PATH =
-        %w(/gradle/libs.versions.toml).freeze
+        T.let(%w(/gradle/libs.versions.toml).freeze, T::Array[String])
 
+      sig do
+        override
+          .params(
+            source: Dependabot::Source,
+            credentials: T::Array[Dependabot::Credential],
+            repo_contents_path: T.nilable(String),
+            options: T::Hash[String, String]
+          )
+          .void
+      end
+      def initialize(source:, credentials:, repo_contents_path: nil, options: {})
+        super
+
+        @buildfile_name = T.let(nil, T.nilable(String))
+      end
+
+      sig { override.params(filenames: T::Array[String]).returns(T::Boolean) }
       def self.required_files_in?(filenames)
         filenames.any? do |filename|
           SUPPORTED_BUILD_FILE_NAMES.any? { |supported| filename.end_with?(supported) }
         end
       end
 
+      sig { override.returns(String) }
       def self.required_files_message
         "Repo must contain a build.gradle / build.gradle.kts file."
       end
@@ -42,6 +60,7 @@ module Dependabot
 
       private
 
+      sig { params(root_dir: String).returns(T::Array[DependencyFile]) }
       def all_buildfiles_in_build(root_dir)
         files = [buildfile(root_dir), settings_file(root_dir), version_catalog_file(root_dir)].compact
         files += subproject_buildfiles(root_dir)
@@ -50,6 +69,7 @@ module Dependabot
                 .flat_map { |dir| all_buildfiles_in_build(dir) }
       end
 
+      sig { params(root_dir: String).returns(T::Array[String]) }
       def included_builds(root_dir)
         builds = []
 
@@ -61,7 +81,7 @@ module Dependabot
         return builds unless settings_file(root_dir)
 
         builds += SettingsFileParser
-                  .new(settings_file: settings_file(root_dir))
+                  .new(settings_file: T.must(settings_file(root_dir)))
                   .included_build_paths
                   .map { |p| clean_join([root_dir, p]) }
 
@@ -73,17 +93,19 @@ module Dependabot
         Pathname.new(File.join(parts)).cleanpath.to_path
       end
 
+      sig { params(root_dir: String).returns(T::Array[DependencyFile]) }
       def subproject_buildfiles(root_dir)
         return [] unless settings_file(root_dir)
 
         subproject_paths =
           SettingsFileParser
-          .new(settings_file: settings_file(root_dir))
+          .new(settings_file: T.must(settings_file(root_dir)))
           .subproject_paths
 
         subproject_paths.filter_map do |path|
           if @buildfile_name
-            fetch_file_from_host(File.join(root_dir, path, @buildfile_name))
+            buildfile_path = File.join(root_dir, path, @buildfile_name)
+            fetch_file_from_host(buildfile_path)
           else
             buildfile(File.join(root_dir, path))
           end
@@ -93,6 +115,7 @@ module Dependabot
         end
       end
 
+      sig { params(root_dir: String).returns(T.nilable(DependencyFile)) }
       def version_catalog_file(root_dir)
         return nil unless root_dir == "."
 
@@ -100,6 +123,7 @@ module Dependabot
       end
 
       # rubocop:disable Metrics/PerceivedComplexity
+      sig { params(root_dir: String).returns(T::Array[DependencyFile]) }
       def dependency_script_plugins(root_dir)
         return [] unless buildfile(root_dir)
 
@@ -123,6 +147,7 @@ module Dependabot
       end
       # rubocop:enable Metrics/PerceivedComplexity
 
+      sig { params(path: T.any(Pathname, String)).returns(T::Boolean) }
       def file_exists_in_submodule?(path)
         fetch_file_from_host(path, fetch_submodules: true)
         true
@@ -130,20 +155,24 @@ module Dependabot
         false
       end
 
+      sig { params(dir: String).returns(T.nilable(DependencyFile)) }
       def buildfile(dir)
         file = find_first(dir, SUPPORTED_BUILD_FILE_NAMES) || return
         @buildfile_name ||= File.basename(file.name)
         file
       end
 
+      sig { params(dir: String).returns(T.nilable(DependencyFile)) }
       def gradle_toml_file(dir)
         find_first(dir, SUPPORTED_VERSION_CATALOG_FILE_PATH)
       end
 
+      sig { params(dir: String).returns(T.nilable(DependencyFile)) }
       def settings_file(dir)
         find_first(dir, SUPPORTED_SETTINGS_FILE_NAMES)
       end
 
+      sig { params(dir: String, supported_names: T::Array[String]).returns(T.nilable(DependencyFile)) }
       def find_first(dir, supported_names)
         paths = supported_names
                 .map { |name| clean_join([dir, name]) }
@@ -153,10 +182,12 @@ module Dependabot
         fetch_first_if_present(paths)
       end
 
+      sig { returns(T::Hash[String, DependencyFile]) }
       def cached_files
-        @cached_files ||= {}
+        @cached_files ||= T.let({}, T.nilable(T::Hash[String, DependencyFile]))
       end
 
+      sig { params(paths: T::Array[String]).returns(T.nilable(DependencyFile)) }
       def fetch_first_if_present(paths)
         paths.each do |path|
           file = fetch_file_if_present(path) || next

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-gradle
 version: !ruby/object:Gem::Version
-  version: 0.262.0
+  version: 0.264.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.262.0
+        version: 0.264.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.262.0
+        version: 0.264.0
 - !ruby/object:Gem::Dependency
   name: dependabot-maven
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.262.0
+        version: 0.264.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.262.0
+        version: 0.264.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -277,7 +277,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.262.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.264.0
 post_install_message: 
 rdoc_options: []
 require_paths: