bibliothecary 8.3.8 → 8.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31e20366740ce8c8cd09247e0726269d573e35f0221b9cec8f8d9099371cf5f1
-  data.tar.gz: adae39a69653081d1df571097de790fb4d484e6e6955a6677b70d215dd31acb3
+  metadata.gz: 88bb227529774df01fff8b890d9a2ef3d4c211ff8cf7ddb012c0b0da83e867ad
+  data.tar.gz: 596d991826e48b1b42f00f795a8ab2e8da831b3dabf358c00c47fcd0e55a9daa
 SHA512:
-  metadata.gz: 6ada17caa10d59baea3741b02c71922769844592c7155227dea264454b07268e459bccb61e32f963ae467275708c3d90ccf7502e767340d14f18ecd82cf4a56d
-  data.tar.gz: 2155e70b7284ab6254c75750b5f0e594263e3a769e8ac6962e0736495acdb76422151eb49dd7c80c763d03911380a641ce8a8c19e19abba45dcc84c46fa42f05
+  metadata.gz: c126388716f2676a601f6b59119f15471bc4c124cccebf15cde1149d25604d45abc9a338ada17785ac572a31871f495567e2a71b8ac7363f383b2f8ee05e2e76
+  data.tar.gz: 2bf471a522a8822646c28f481ad61dd805b682756ae8cf7017138cb0cd086157bec0aaa6885e349c60979d3d9ced4c6734e0e9e97c3c3fe52675246c2db2e344

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+2.7.6

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,42 @@ 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 :pie2-testing`,
+          # so we treat these projects as internal deps themselves (["internal:foo","0.0.0"])
+          if (project_match = line.match(GRADLE_PROJECT_REGEX))
+            project_name = project_match[1] || current_project
+            line = line.sub(GRADLE_PROJECT_REGEX, "__PROJECT_GROUP__:__PROJECT_NAME__:__PROJECT_REQUIREMENT__") # project names can have colons, which breaks our split(":") below, so sub it out until after we've parsed the line.
+          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(":")
+            .map do |part| 
+              part
+                .sub(/__PROJECT_GROUP__/, "internal") # give all projects a group namespace of "internal"
+                .sub(/__PROJECT_NAME__/, project_name)
+                .sub(/__PROJECT_REQUIREMENT__/, "1.0.0") # give all projects a requirement of "1.0.0".
+            end # replace placeholders after we've parsed the line
 
           # A testImplementation line can look like this so just skip those
           # \--- org.springframework.security:spring-security-test (n)
@@ -165,7 +195,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,21 +204,21 @@ 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
           .compact
           # Prefer duplicate deps with the aliased ones first, so we don't lose the aliases in the next uniq step.
           .sort_by { |dep| dep.key?(:original_name) || dep.key?(:original_requirement) ? 0 : 1 }
-          .uniq { |item| [item[:name], item[:requirement], item[:type]] }
+          .uniq { |item| item.values_at(:name, :requirement, :type, :original_name, :original_requirement) }
       end
 
       def self.parse_maven_resolved(file_contents, options: {})

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "8.3.8"
+  VERSION = "8.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.3.8
+  version: 8.4.1
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-05 00:00:00.000000000 Z
+date: 2022-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb
@@ -339,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Find and parse manifests