dependabot-gradle 0.98.3 → 0.98.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 714742e62c87e61e63d5f8cb39dbcbdf43363f0ab46a9ef172b825efcd6c9471
-  data.tar.gz: 8728f8febf341d6b0672c273ee51cbeb1ff9d00fb2490007bfb64975ce4738ad
+  metadata.gz: 36705725a0d7b22ad378d1a7008b954b02c379f1daf560504e3ae2bd4efa4a56
+  data.tar.gz: 5d1373dd715ee86ab0fa62ea1e7120e5b5f232346fd1066e14f024ae7ec660c4
 SHA512:
-  metadata.gz: 55b292b81d3594f47225d2785440f6c039736e9a5a346d27612c1bc550f655c22e961abb779581299334cdb71ec95b2f407937d5bc3d213d31410092c72854eb
-  data.tar.gz: 5625c0a644bb50a870354fc3581db64bc5b6dea63144c7113c7e5dafdb366cc939507d6c9781a1878d1dc7e9295a946d8f2faa6676b406002de7c419d217c5f4
+  metadata.gz: 82aa124e39fa06b329a7270e954c4a29b373e2d4a3c602189f644b526494076f639926e4bc234da591d2ebb5a6dd8695582f372f523f0b392df73a3bddf7c91b
+  data.tar.gz: 7c7bc116873a52b9cbfd05a5fa2e1e9ff641d86d4ccf38173bb8453f39a27a41165429d24643a18200d4c66f9e2c252a7dbb138e7097ac6500f769602792874b

data/lib/dependabot/gradle/file_fetcher.rb

@@ -53,7 +53,8 @@ module Dependabot
           reject { |path| path.include?("://") }.
           reject { |path| !path.include?("/") && path.split(".").count > 2 }.
           select { |filename| filename.include?("dependencies") }.
-          map { |path| path.gsub("$rootDir", ".") }
+          map { |path| path.gsub("$rootDir", ".") }.
+          uniq
 
         dependency_plugin_paths.map do |path|
           fetch_file_from_host(path)

data/lib/dependabot/gradle/file_parser.rb

@@ -236,8 +236,10 @@ module Dependabot
           buildfiles.flat_map do |buildfile|
             buildfile.content.
               scan(/apply from:\s+['"]([^'"]+)['"]/).flatten.
-              map { |f| dependency_files.find { |bf| bf.name == f } }.compact
-          end
+              map { |f| dependency_files.find { |bf| bf.name == f } }.
+              compact
+          end.
+          uniq
       end
 
       def check_required_files

data/lib/dependabot/gradle/file_parser/property_value_finder.rb

@@ -6,10 +6,17 @@ module Dependabot
   module Gradle
     class FileParser
       class PropertyValueFinder
-        PROPERTY_DECLARATION_REGEX =
+        SINGLE_PROPERTY_DECLARATION_REGEX =
           /(?:^|\s+|ext.)(?<name>[^\s=]+)\s*=\s*['"](?<value>[^\s]+)['"]/.
           freeze
 
+        MULTI_PROPERTY_DECLARATION_REGEX =
+          /(?:^|\s+|ext.)(?<namespace>[^\s=]+)\s*=\s*\[(?<values>[^\]]+)\]/m.
+          freeze
+
+        NAMESPACED_DECLARATION_REGEX =
+          /(?:^|\s+)(?<name>[^\s:]+)\s*:\s*['"](?<value>[^\s]+)['"]\s*/.freeze
+
         def initialize(dependency_files:)
           @dependency_files = dependency_files
         end
@@ -57,18 +64,55 @@ module Dependabot
           return @properties[buildfile.name] if @properties[buildfile.name]
 
           @properties[buildfile.name] = {}
-          prepared_content(buildfile).scan(PROPERTY_DECLARATION_REGEX) do
+
+          @properties[buildfile.name].
+            merge!(fetch_single_property_declarations(buildfile))
+
+          @properties[buildfile.name].
+            merge!(fetch_multi_property_declarations(buildfile))
+
+          @properties[buildfile.name]
+        end
+
+        def fetch_single_property_declarations(buildfile)
+          properties = {}
+
+          prepared_content(buildfile).scan(SINGLE_PROPERTY_DECLARATION_REGEX) do
             declaration_string = Regexp.last_match.to_s.strip
             captures = Regexp.last_match.named_captures
             name = captures.fetch("name").sub(/^ext\./, "")
-            @properties[buildfile.name][name] = {
+            properties[name] = {
               value: captures.fetch("value"),
               declaration_string: declaration_string,
               file: buildfile.name
             }
           end
 
-          @properties[buildfile.name]
+          properties
+        end
+
+        def fetch_multi_property_declarations(buildfile)
+          properties = {}
+
+          prepared_content(buildfile).scan(MULTI_PROPERTY_DECLARATION_REGEX) do
+            captures = Regexp.last_match.named_captures
+            namespace = captures.fetch("namespace").sub(/^ext\./, "")
+
+            captures.fetch("values").scan(NAMESPACED_DECLARATION_REGEX) do
+              declaration_string = Regexp.last_match.to_s.strip
+              sub_captures = Regexp.last_match.named_captures
+              name = sub_captures.fetch("name")
+              full_name = [namespace, name].join(".")
+
+              properties[full_name] = {
+                value: sub_captures.fetch("value"),
+                declaration_string: declaration_string,
+                file: buildfile.name
+              }
+            end
+          end
+
+          properties
         end
 
         def prepared_content(buildfile)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-gradle
 version: !ruby/object:Gem::Version
-  version: 0.98.3
+  version: 0.98.4
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-16 00:00:00.000000000 Z
+date: 2019-03-17 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.98.3
+        version: 0.98.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.98.3
+        version: 0.98.4
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement