bibliothecary 8.4.0 → 8.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65f4910198d30819544a51adff24b14ce2214631dc0adf958d264dd89800f1ab
-  data.tar.gz: 362bea1f8f48122e28253491c281e2a25bdf6d14c831e988435da4bc02b3da52
+  metadata.gz: 27a0df595a08d1414ee9e6a119f4dbb82f6b7d5601a82c03121a3c1a456977ec
+  data.tar.gz: 1a81bfd9393e69be750950a1d6b382c1bc8c45b0d4b9191bdaf551b4af7e5725
 SHA512:
-  metadata.gz: 51e6c14e963753db57341b241356a323dcc55e31b9593444aca6d2cc5882af26fe52d06b36b1382f11367f301bd817f82a35ab7ff8dd5d7d1e065ec52775e06f
-  data.tar.gz: bdfcc8fbb046095031c39619955eef933bfe4a59e7d59558e621e7bd6ab391fda2559b10a85640abf181505dfce0bd21ec7103325595a2dfa0cbeb2da828e437
+  metadata.gz: 9773287184bc08731228578b3f88218eaa261a462a89ae823222300c71a6276e23331acaef7ee1f2cace14b14e95f5b4d3fcce836bd51ebff35844d6547aee50
+  data.tar.gz: 5ffc87d102724e5a1f0d6d930f094a2591de23ff921aaee6670fb4d54988a10ffedd4d968477113e8acc44ac7d64e07d68a2906a91f32d19e3e0f43503b72ef5

data/lib/bibliothecary/parsers/maven.rb

@@ -9,13 +9,17 @@ 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}/
 
       # 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+)/
+      # e.g. "\--- project :api:my-internal-project"
+      # e.g. "+--- my-group:my-alias:1.2.3 -> project :client (*)"
+      GRADLE_PROJECT_REGEX = /project :(\S+)?/
+
+      # 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 (*)
+      # e.g. the "(n)" in "+--- my-group:my-name:1.2.3 (n)"
+      GRADLE_LINE_ENDING_REGEX = /(\((c|n|\*)\))$/
 
       # 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
@@ -143,37 +147,35 @@ module Bibliothecary
       end
 
       def self.parse_gradle_resolved(file_contents, options: {})
-        type = nil
+        current_type = 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
 
           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"])
+          # 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_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 = ""
+            # an empty project name is self-referential (i.e. a cycle), and we don't need to track the manifest's project itself, e.g. "+--- project :"
+            next if project_match[1].nil? 
+
+            # 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].gsub(/:/, "-")
+            line = line.sub(GRADLE_PROJECT_REGEX, "internal:#{project_name}:1.0.0")
           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 (*)
+            .split(split)[1]
+            .sub(GRADLE_LINE_ENDING_REGEX, "")
             .sub(/ FAILED$/, "") # dependency could not be resolved (but still may have a version)
             .sub(" -> ", ":") # handle version arrow syntax
             .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)
@@ -186,7 +188,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"
@@ -195,14 +197,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.4.0"
+  VERSION = "8.4.3"
 end

metadata

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