bibliothecary 8.3.7 → 8.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5bd402aa6174c1ce713cbb245f8536de6444d231635b591bded1f22fbae890f
-  data.tar.gz: ae9249153e0f409665a008a8423639a648343ca6d16ccc86516c0dfa70a13570
+  metadata.gz: 65f4910198d30819544a51adff24b14ce2214631dc0adf958d264dd89800f1ab
+  data.tar.gz: 362bea1f8f48122e28253491c281e2a25bdf6d14c831e988435da4bc02b3da52
 SHA512:
-  metadata.gz: 9c79302eb1f9dd93f555c6338433ddb12c99baf4037bc1de40f113bfda8fac15dd75685f000ad25b5b6058eebc4e720b1fd29cee04beabf7f5662ff56295d442
-  data.tar.gz: 2899dfd48185b8d71cbab5d9d830d8350b37cd2b6ad1561768494d37b79c63e001c7a6d5ea732f891e0822463da4d2cfbafbfaa85b3f4923ff7833290c7c6e47
+  metadata.gz: 51e6c14e963753db57341b241356a323dcc55e31b9593444aca6d2cc5882af26fe52d06b36b1382f11367f301bd817f82a35ab7ff8dd5d7d1e065ec52775e06f
+  data.tar.gz: bdfcc8fbb046095031c39619955eef933bfe4a59e7d59558e621e7bd6ab391fda2559b10a85640abf181505dfce0bd21ec7103325595a2dfa0cbeb2da828e437

data/.ruby-version

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

data/lib/bibliothecary/parsers/maven.rb

@@ -12,6 +12,11 @@ module Bibliothecary
       # "|    \\--- com.google.guava:guava:23.5-jre (*)"
       GRADLE_DEP_REGEX = /(\+---|\\---){1}/
 
+      # Dependencies that are on-disk projects, eg:
+      # \--- project :api:my-internal-project
+      # +--- 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)
@@ -148,11 +153,27 @@ module Bibliothecary
 
           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]
+            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)
@@ -167,6 +188,15 @@ module Bibliothecary
               requirement: dep[-1],
               type: type
             }
+          elsif dep.count == 5
+            # get name from renamed package resolution "org:name -> renamed_org:name:version"
+            {
+              original_name: dep[0,2].join(":"),
+              original_requirement: "*",
+              name: dep[-3..-2].join(":"),
+              requirement: dep[-1],
+              type: type
+            }
           else
             # get name from version conflict resolution ("org:name:version -> version") and no-resolution ("org:name:version")
             {
@@ -179,7 +209,7 @@ module Bibliothecary
           .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.7"
+  VERSION = "8.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.3.7
+  version: 8.4.0
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-08-18 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