bibliothecary 15.2.1 → 15.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bdea955af49167626e322630af5f77c27f6234c2bd8964b0ff64730e891a4fe
-  data.tar.gz: 8fa218df81a9fe6ff5170d7e0464171dd1ad8721007f4e88b298dd41da9242a2
+  metadata.gz: 1c856b89f10d42290894679e20641f18ba61f5929f3c3d86b3c43d66ae0c50ba
+  data.tar.gz: d76b5df4cb31982f2045338a693639e733331c557f6516ad060045f9f4a499f5
 SHA512:
-  metadata.gz: f92bf663b346b9500dc7ca3c0b3d42c1f3be93c712910a6aaf31082f88c1f2214a21a1aebca4c765313563bcceb32459b4a3da6cb5955869a74e228f6fceed77
-  data.tar.gz: 9e1ebebedf3ea4599132f7d2480a32c93dc34cca309fe6542cccf9d83ba8223c7fed9046a6f43e73779842ce8feb2800ae3f456221082b798c8e44f430e87410
+  metadata.gz: 949ac2408b25189052b10b1c2be9c66a73fca42134f4d47eb711b52061ef5625b1263ccdc3373bb815f327e3699d021210af2214ac85be84ec580c7dc95b957e
+  data.tar.gz: a62f39651879069a6d1ae6aed2506704af55f7296e3a5ba49ffceec08296598994448efc82d4d1bc356dc0e3f8bfda20d78f0798d909afc24461438552e583fa

data/CHANGELOG.md

@@ -13,6 +13,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+## [15.3.0]
+
+### Changed
+
+- Return the leading ":" with Gradle project names from gradle-dependencies-q.txt, and use "0.0.0" for a version instead of "*" since this is a lockfie.
+
+### Added
+
+- Adds a new Bibliothecary::Parsers::Maven.parse_resolved_gradle_dep_line() method for parsing a single line in gradle-dependencies-q.txt, and optimize it a bit.
+
 ## [15.2.1]
 
 ### Changed

data/lib/bibliothecary/parsers/maven.rb

@@ -24,12 +24,12 @@ module Bibliothecary
       GRADLE_ARROW_REGEXP = / -> /
 
       # The name of the project containing the given dependencies
-      GRADLE_PROJECT_REGEXP = /\s*(Root p|P)roject '?:?([^\s']+)'?/
+      GRADLE_PROJECT_REGEXP = /\s*(Root p|P)roject '?(:?[^\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_DEPENDENCY_PROJECT_REGEXP = /project :?(\S+)?/
+      GRADLE_DEPENDENCY_PROJECT_REGEXP = /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)"
@@ -196,88 +196,95 @@ module Bibliothecary
 
       def self.parse_gradle_resolved(file_contents, options: {})
         keep_subprojects = options.fetch(:keep_subprojects_in_maven_tree, false)
+        source = options.fetch(:filename, nil)
         current_type = nil
         project_name = nil
 
-        dependencies = file_contents.lines.filter_map do |line|
-          next if line.strip.end_with?("(n)") # skip unresolved or already-resolved dependencies
-
-          if project_name.nil? && (project_name_match = GRADLE_PROJECT_REGEXP.match(line))
-            project_name = project_name_match.captures[1]
-            next
+        dependencies = file_contents.lines
+          .filter_map do |line|
+            line = line.strip
+            if project_name.nil? && (project_name_match = GRADLE_PROJECT_REGEXP.match(line))
+              project_name = project_name_match.captures[1]
+              nil
+            elsif (current_type_match = GRADLE_TYPE_REGEXP.match(line))
+              current_type = current_type_match.captures[0] if current_type_match
+              nil
+            else
+              parse_resolved_gradle_dep_line(line, current_type: current_type, keep_subprojects: keep_subprojects, source: source)
+            end
           end
+          .uniq { |item| [item.name, item.requirement, item.type, item.original_name, item.original_requirement] }
 
-          current_type_match = GRADLE_TYPE_REGEXP.match(line)
-          current_type = current_type_match.captures[0] if current_type_match
+        ParserResult.new(
+          project_name: project_name,
+          dependencies: dependencies
+        )
+      end
 
-          gradle_dep_match = GRADLE_DEP_REGEXP.match(line)
-          next unless gradle_dep_match
+      def self.parse_resolved_gradle_dep_line(line, current_type: nil, keep_subprojects: false, source: nil)
+        return if line.end_with?("(n)") # skip unresolved or already-resolved dependencies
 
-          # omit Gradle project dependencies
-          if (project_match = line.match(GRADLE_DEPENDENCY_PROJECT_REGEXP))
-            next unless keep_subprojects
+        gradle_dep_match = GRADLE_DEP_REGEXP.match(line)
+        return unless gradle_dep_match
 
-            # 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?
+        # omit Gradle project dependencies
+        if (project_match = line.match(GRADLE_DEPENDENCY_PROJECT_REGEXP))
+          return unless keep_subprojects
 
-            sub_project_name = project_match[1]
-            # gradle sub-project versions cannot be specified when including them (gradle just uses whichever version is in the
-            # codebase), and their versions are 'unspecified' if not set, so just use a wildcard placeholder since it doesn't matter.
-            line = line.sub(GRADLE_DEPENDENCY_PROJECT_REGEXP, ":#{sub_project_name}:*")
-          end
+          # 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 :"
+          return if project_match[1].nil?
 
-          cleaned_line = line
-            .split(gradle_dep_match.captures[0])[1]
-            .sub(GRADLE_LINE_ENDING_REGEXP, "")
-            .sub(/ FAILED$/, "") # dependency could not be resolved (but still may have a version)
-            .strip
-
-          # " -> " is either for an aliased dependency, or a version that was resolved from a different requirement or no requirement.
-          if cleaned_line =~ GRADLE_ARROW_REGEXP
-            original_depstring, resolved_depstring = *cleaned_line.split(GRADLE_ARROW_REGEXP, 2)
-
-            parts = original_depstring.split(":")
-            original_name = parts[0..1].join(":") # original at minimum will have a 2-part name
-            original_requirement = parts[2] || "*"
-
-            parts = resolved_depstring.split(":")
-            resolved_requirement = parts.pop # resolved at minimum will have a 1-part version
-            resolved_name = parts.join(":")
-
-            # this case is not an actual alias, just a different version was resolved, so won't keep track of original
-            if resolved_name.empty? && !original_name.empty?
-              resolved_name = original_name
-              original_name = nil
-              original_requirement = nil
-            end
-          else
-            original_name = nil
-            original_requirement = nil
+          sub_project_name = project_match[1]
+          # gradle sub-project versions cannot be specified when including them (gradle just uses whichever version is in the
+          # codebase), and their versions are 'unspecified' if not set, so just use a placeholder version since it doesn't matter.
+          line = line.sub(project_match[0], "#{sub_project_name}:0.0.0")
+        end
+
+        cleaned_line = line
+          .split(gradle_dep_match.captures[0])[1]
+          .sub(GRADLE_LINE_ENDING_REGEXP, "")
+          .sub(/ FAILED$/, "") # dependency could not be resolved (but still may have a version)
+          .strip
 
-            # handle simple resolved dep
-            parts = cleaned_line.split(":")
-            next if parts.size < 3 # we didn't get a full name and version, so skip it
+        # " -> " is either for an aliased dependency, or a version that was resolved from a different requirement or no requirement.
+        if cleaned_line.include?(" -> ")
+          original_depstring, resolved_depstring = cleaned_line.split(" -> ", 2)
 
-            resolved_requirement = parts.pop
-            resolved_name = parts.join(":")
+          parts = original_depstring.split(":")
+          original_name = parts[0..1].join(":") # original at minimum will have a 2-part name
+          original_requirement = parts[2] || "*"
+
+          parts = resolved_depstring.split(":")
+          resolved_requirement = parts.pop # resolved at minimum will have a 1-part version
+          resolved_name = parts.join(":")
+
+          # this case is not an actual alias, just a different version was resolved, so won't keep track of original
+          if resolved_name.empty? && !original_name.empty?
+            resolved_name = original_name
+            original_name = nil
+            original_requirement = nil
           end
+        else
+          original_name = nil
+          original_requirement = nil
 
-          Dependency.new(
-            original_name: original_name,
-            original_requirement: original_requirement,
-            name: resolved_name,
-            requirement: resolved_requirement,
-            type: current_type,
-            source: options.fetch(:filename, nil),
-            platform: platform_name
-          )
+          # handle simple resolved dep
+          parts = cleaned_line.split(":")
+          return if parts.size < 3 # we didn't get a full name and version, so skip it
+
+          resolved_requirement = parts.pop
+          resolved_name = parts.join(":")
         end
-          .uniq { |item| [item.name, item.requirement, item.type, item.original_name, item.original_requirement] }
 
-        ParserResult.new(
-          project_name: project_name,
-          dependencies: dependencies
+        Dependency.new(
+          original_name: original_name,
+          original_requirement: original_requirement,
+          name: resolved_name,
+          requirement: resolved_requirement,
+          type: current_type,
+          source: source,
+          platform: platform_name
         )
       end
 

data/lib/bibliothecary/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bibliothecary
-  VERSION = "15.2.1"
+  VERSION = "15.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 15.2.1
+  version: 15.3.0
 platform: ruby
 authors:
 - Andrew Nesbitt