bibliothecary 8.3.9 → 8.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5447f8ff7067f7eb7c0f1bfbd13f0ba6da33335dd31cee7b319587a09260308a
-  data.tar.gz: b23abc3e66340a26345db527803dcb7d7d8a3f9418297bff161deb72dd778aa5
+  metadata.gz: c21d1063a79efb1b133d650ba0d24754c26a9487341cc9e711f5387d22912602
+  data.tar.gz: f75fd37ef4c6262b3c23e908b6a044187ac048c96398eb8e7312b020e259ca6d
 SHA512:
-  metadata.gz: 79159794155d5ea5c18978f4e6a57eba72bd78699fcee008e66fbf0bb83a5c737893ee369d7cb4d3f8afe2758b1029c4a87a526344ea8d7a2aa2ba38a2ab3729
-  data.tar.gz: 01ec2a377345cc804c1fac8149f27fc40a7e34c45db27ae0f9b6eb0cea1ebdece6b64b23c5da6f96354d1440102bc3854dcf2b4297d9cf915e89c920d3de3f25
+  metadata.gz: d513694486a3af6bd68c654c022bf30e2ce601cf2f0150b41f824368ba5f826a47ec688c6a8e32adce516ac35bbe7baa234992d0d1cb24d4b630ba221ceaf92b
+  data.tar.gz: 63ae337f307b054c7b5c846c9847780a5a2f4a9d97502fd589ff35280acfd77f026a2abcb193dc2bb48ffb309c216561841d49b53cc985659ffbb72bc930dda1

data/lib/bibliothecary/parsers/maven.rb

@@ -9,9 +9,18 @@ module Bibliothecary
       # e.g. "annotationProcessor - Annotation processors and their dependencies for source set 'main'."
       GRADLE_TYPE_REGEX = /^(\w+)/
 
-      # "|    \\--- com.google.guava:guava:23.5-jre (*)"
+      # e.g. "|    \\--- com.google.guava:guava:23.5-jre (*)"
       GRADLE_DEP_REGEX = /(\+---|\\---){1}/
 
+      # Project declaration lines so we know the current project name
+      # e.g. "Project ':submodules:test'" (this example is a project nested in submodules/test/ folder)
+      GRADLE_PROJECT_DECLARATION_REGEX = /Project '?:([^\s']+)'?/
+      
+      # Dependencies that are on-disk projects, eg:
+      # e.g. "\--- project :api:my-internal-project"
+      # e.g. "+--- my-group:my-alias:1.2.3 -> project :client (*)"
+      GRADLE_PROJECT_REGEX = /project :(\S+)?/
+
       # Builtin methods: https://docs.gradle.org/current/userguide/java_plugin.html#tab:configurations
       # Deprecated methods: https://docs.gradle.org/current/userguide/upgrading_version_6.html#sec:configuration_removal
       GRADLE_DEPENDENCY_METHODS = %w(api compile compileClasspath compileOnly compileOnlyApi implementation runtime runtimeClasspath runtimeOnly testCompile testCompileOnly testImplementation testRuntime testRuntimeOnly)
@@ -138,21 +147,37 @@ module Bibliothecary
       end
 
       def self.parse_gradle_resolved(file_contents, options: {})
-        type = nil
+        current_type = nil
+        current_project = nil
+
         file_contents.split("\n").map do |line|
-          type_match = GRADLE_TYPE_REGEX.match(line)
-          type = type_match.captures[0] if type_match
+          current_type_match = GRADLE_TYPE_REGEX.match(line)
+          current_type = current_type_match.captures[0] if current_type_match
+
+          current_project_match = GRADLE_PROJECT_DECLARATION_REGEX.match(line)
+          current_project = current_project_match.captures[0] if current_project_match
 
           gradle_dep_match = GRADLE_DEP_REGEX.match(line)
           next unless gradle_dep_match
 
           split = gradle_dep_match.captures[0]
 
+          # gradle can import on-disk projects and deps will be listed under them, e.g. `+--- project :test:integration`,
+          # so we treat these projects as "internal" deps with requirement of "1.0.0"
+          if (project_match = line.match(GRADLE_PROJECT_REGEX))
+            # project names can have colons (e.g. for gradle projects in subfolders), which breaks maven artifact naming assumptions, so just replace them with hyphens.
+            project_name = (project_match[1] || current_project).gsub(/:/, "-")
+            line = line.sub(GRADLE_PROJECT_REGEX, "internal:#{project_name}:1.0.0")
+          else
+            project_name = ""
+          end
+
           dep = line
             .split(split)[1].sub(/(\((c|n|\*)\))$/, "") # line ending legend: (c) means a dependency constraint, (n) means not resolved, or (*) means resolved previously, e.g. org.springframework.boot:spring-boot-starter-web:2.1.0.M3 (*)
             .sub(/ FAILED$/, "") # dependency could not be resolved (but still may have a version)
             .sub(" -> ", ":") # handle version arrow syntax
-            .strip.split(":")
+            .strip
+            .split(":")
 
           # A testImplementation line can look like this so just skip those
           # \--- org.springframework.security:spring-security-test (n)
@@ -165,7 +190,7 @@ module Bibliothecary
               original_requirement: dep[2],
               name: dep[-3..-2].join(":"),
               requirement: dep[-1],
-              type: type
+              type: current_type
             }
           elsif dep.count == 5
             # get name from renamed package resolution "org:name -> renamed_org:name:version"
@@ -174,14 +199,14 @@ module Bibliothecary
               original_requirement: "*",
               name: dep[-3..-2].join(":"),
               requirement: dep[-1],
-              type: type
+              type: current_type
             }
           else
             # get name from version conflict resolution ("org:name:version -> version") and no-resolution ("org:name:version")
             {
               name: dep[0..1].join(":"),
               requirement: dep[-1],
-              type: type
+              type: current_type
             }
           end
         end

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "8.3.9"
+  VERSION = "8.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.3.9
+  version: 8.4.2
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2022-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb