bibliothecary 8.4.0 → 8.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65f4910198d30819544a51adff24b14ce2214631dc0adf958d264dd89800f1ab
-  data.tar.gz: 362bea1f8f48122e28253491c281e2a25bdf6d14c831e988435da4bc02b3da52
+  metadata.gz: 88bb227529774df01fff8b890d9a2ef3d4c211ff8cf7ddb012c0b0da83e867ad
+  data.tar.gz: 596d991826e48b1b42f00f795a8ab2e8da831b3dabf358c00c47fcd0e55a9daa
 SHA512:
-  metadata.gz: 51e6c14e963753db57341b241356a323dcc55e31b9593444aca6d2cc5882af26fe52d06b36b1382f11367f301bd817f82a35ab7ff8dd5d7d1e065ec52775e06f
-  data.tar.gz: bdfcc8fbb046095031c39619955eef933bfe4a59e7d59558e621e7bd6ab391fda2559b10a85640abf181505dfce0bd21ec7103325595a2dfa0cbeb2da828e437
+  metadata.gz: c126388716f2676a601f6b59119f15471bc4c124cccebf15cde1149d25604d45abc9a338ada17785ac572a31871f495567e2a71b8ac7363f383b2f8ee05e2e76
+  data.tar.gz: 2bf471a522a8822646c28f481ad61dd805b682756ae8cf7017138cb0cd086157bec0aaa6885e349c60979d3d9ced4c6734e0e9e97c3c3fe52675246c2db2e344

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}/
 
+      # 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:
-      # \--- 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+)?/
 
       # 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,10 +147,15 @@ 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
@@ -156,7 +165,7 @@ module Bibliothecary
           # 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]
+            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 = ""
@@ -170,9 +179,9 @@ module Bibliothecary
             .split(":")
             .map do |part| 
               part
-                .sub(/__PROJECT_GROUP__/, "internal")# give all projects a group namespace of "internal"
+                .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".
+                .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
@@ -186,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"
@@ -195,14 +204,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.1"
 end

metadata

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