dependabot-gradle 0.128.1 → 0.129.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a807df34a976b1d6805662b0908248fc439c346795d42b8583b0640e7c3e6aba
-  data.tar.gz: a490375e78f3e3645ed5fa218b6400353e108495d06beb895ec4f24af27ad7c1
+  metadata.gz: 52304dd1ce847db147408d7c059e277e5e9ac378791b83ae6541f93773f84639
+  data.tar.gz: 6b63e2f958a895e903841215ba951b269f7e15f10c1005e94e2a235285eb7e41
 SHA512:
-  metadata.gz: c43d11a72e1598e54c7b00b5f61a9f6eb46afd91ba3b4679f294caab413b637d6f43684c96411732f8b23791d6072f1023f4ce1733ce94f689caae2c5810b588
-  data.tar.gz: 56cd0829ac61d900f961a380c915f19fe03fd83d8e910adc565e5c5e55d3c03cc0bb679fe7f004833a55346d94f2e12197f8f67c439910faf571171bf901c44e
+  metadata.gz: 0e281b5edbedc64f7a96486c377837e8504df3688b18af0b163357a3554cd90f9fad02f1bd18ed31f43b2b169c128fadb4c5d1334d46c74048c4b556b67f035b
+  data.tar.gz: e7274c38d3a6255f14df0eafbccd8b3a5a66b69ca4991dd9b0b1628380c44fd35e0f20a1a83aae93d7941f2af593ba6e3d750126173bc5e6b8cace8dcd57a292

data/lib/dependabot/gradle/file_fetcher.rb

@@ -31,6 +31,7 @@ module Dependabot
         fetched_files << buildfile
         fetched_files += subproject_buildfiles
         fetched_files += dependency_script_plugins
+        check_required_files_present
         fetched_files
       end
 
@@ -38,7 +39,7 @@ module Dependabot
         @buildfile ||= begin
           file = supported_build_file
           @buildfile_name ||= file.name if file
-          fetch_file_from_host(file.name) if file
+          file
         end
       end
 
@@ -58,7 +59,10 @@ module Dependabot
         end.compact
       end
 
+      # rubocop:disable Metrics/PerceivedComplexity
       def dependency_script_plugins
+        return [] unless buildfile
+
         dependency_plugin_paths =
           buildfile.content.
           scan(/apply from:\s+['"]([^'"]+)['"]/).flatten.
@@ -77,6 +81,15 @@ module Dependabot
           raise
         end.compact
       end
+      # rubocop:enable Metrics/PerceivedComplexity
+
+      def check_required_files_present
+        return if buildfile
+
+        path = Pathname.new(File.join(directory, "build.gradle")).cleanpath.to_path
+        path += "(.kts)?"
+        raise Dependabot::DependencyFileNotFound, path
+      end
 
       def file_exists_in_submodule?(path)
         fetch_file_from_host(path, fetch_submodules: true)
@@ -86,12 +99,7 @@ module Dependabot
       end
 
       def settings_file
-        @settings_file ||= begin
-          file = supported_settings_file
-          fetch_file_from_host(file.name) if file
-        rescue Dependabot::DependencyFileNotFound
-          nil
-        end
+        @settings_file ||= supported_settings_file
       end
 
       def supported_build_file

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

@@ -6,9 +6,6 @@ module Dependabot
   module Gradle
     class FileFetcher
       class SettingsFileParser
-        INCLUDE_ARGS_REGEX =
-          /(?:^|\s)include(?:\(|\s)(\s*[^\s,\)]+(?:,\s*[^\s,\)]+)*)/.freeze
-
         def initialize(settings_file:)
           @settings_file = settings_file
         end
@@ -49,7 +46,7 @@ module Dependabot
 
         def function_regex(function_name)
           /
-            (?:^|\s)#{Regexp.quote(function_name)}(?:\(|\s)
+            (?:^|\s)#{Regexp.quote(function_name)}(?:\s*\(|\s)
             (?<args>\s*[^\s,\)]+(?:,\s*[^\s,\)]+)*)
           /mx
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-gradle
 version: !ruby/object:Gem::Version
-  version: 0.128.1
+  version: 0.129.3
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.128.1
+        version: 0.129.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.128.1
+        version: 0.129.3
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: simplecov-console
   requirement: !ruby/object:Gem::Requirement