bibliothecary 8.4.2 → 8.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c21d1063a79efb1b133d650ba0d24754c26a9487341cc9e711f5387d22912602
-  data.tar.gz: f75fd37ef4c6262b3c23e908b6a044187ac048c96398eb8e7312b020e259ca6d
+  metadata.gz: 6abe09e3167fa5ad9a80a6d930229647039466c357d331d5053e87339e28cc2f
+  data.tar.gz: 2ac7a02f2275c7d8bb1402c9536c481734e3216a0c1109a99e26c8d271e119d5
 SHA512:
-  metadata.gz: d513694486a3af6bd68c654c022bf30e2ce601cf2f0150b41f824368ba5f826a47ec688c6a8e32adce516ac35bbe7baa234992d0d1cb24d4b630ba221ceaf92b
-  data.tar.gz: 63ae337f307b054c7b5c846c9847780a5a2f4a9d97502fd589ff35280acfd77f026a2abcb193dc2bb48ffb309c216561841d49b53cc985659ffbb72bc930dda1
+  metadata.gz: 6cf5a7bd4bee3fa2490876d2f14f1ced959a7e11178476439fcfbb6951aeb8b740d46ed21e78a537028b5b09a65afbbc7aeb544dade1863a791e1e95604abc49
+  data.tar.gz: 5288808d2301c01c72dcb61888099c49f06753e15d9d09e86d2d934ae30671f1d80d6aa93a935ffb1b46ee3bd1b1100283bf055b61d16ca23fa8de5f7e9c3aab

data/lib/bibliothecary/parsers/maven.rb

@@ -12,15 +12,15 @@ module Bibliothecary
       # 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+)?/
 
+      # 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
       GRADLE_DEPENDENCY_METHODS = %w(api compile compileClasspath compileOnly compileOnlyApi implementation runtime runtimeClasspath runtimeOnly testCompile testCompileOnly testImplementation testRuntime testRuntimeOnly)
@@ -148,15 +148,11 @@ module Bibliothecary
 
       def self.parse_gradle_resolved(file_contents, options: {})
         current_type = nil
-        current_project = nil
 
         file_contents.split("\n").map do |line|
           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
 
@@ -165,15 +161,17 @@ module Bibliothecary
           # 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))
+            # 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] || current_project).gsub(/:/, "-")
+            project_name = project_match[1].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 (*)
+            .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
@@ -211,8 +209,6 @@ module Bibliothecary
           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.values_at(:name, :requirement, :type, :original_name, :original_requirement) }
       end
 

data/lib/bibliothecary/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.4.2
+  version: 8.4.4
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-20 00:00:00.000000000 Z
+date: 2022-10-05 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.6
+rubygems_version: 3.3.22
 signing_key: 
 specification_version: 4
 summary: Find and parse manifests