bibliothecary 15.1.2 → 15.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd0ca7b3946ccf2a33db994a2552273c6fad71f11253d3d34db4a7cd37ac9849
-  data.tar.gz: a542321fc9bc94e2b32a801adb6e4a9148d9454b843bd6ff590e87192edf5abc
+  metadata.gz: 0467bf0dd389f6a58cd69510bd2fe2865f3d3d762732e5aac80f0348f2b785a7
+  data.tar.gz: 0b2015f0e1d5e0c80c82c554f14b5d03fbe96c8be58a27f630eefe6e33083eda
 SHA512:
-  metadata.gz: aeb7c99b14891244ef60e21d46e5ce3bcc4bb50816295ce1acabd0197daf02f35e68c6792ae3674b707f03d9c3cb077e3021632eea1f7e1e6e240d8f4aab4fae
-  data.tar.gz: f80efb1670d56898046df1cba084fdbf1d677c4f42244311e86f26417f708d7041828d964d252a3ff3a1135b2f97d4802dcd0d0068078c2e45331eec93ddb214
+  metadata.gz: 47a1f33ff32ecb3bb8dcf4636e6b1bf4393d95b85a5a7b13c44b8438f14014e200043d45295b3c51f535acb34aa28293563584c8ce049b7af3b43955ac2f26a1
+  data.tar.gz: 45471c05872e2ec7b29013c4eab33fb268801ccb64c6e5c3238c7f86b0e5c3daea3969f3fdacbc2109f1dab55aeadb06a78084aaef6d82ed7c85135107ebe101

data/.rubocop.yml

@@ -1,5 +1,4 @@
 ---
-
 # Without this, CI might pickup nested dep's rubocop files in vendor/
 inherit_mode:
   merge:
@@ -12,7 +11,6 @@ AllCops:
     - spec/fixtures/**/*
     - vendor/bundle/**/* # This is actually needed for CI, not for biblio itself
 
-
 Metrics/BlockLength:
   Max: 100
   Exclude:
@@ -67,3 +65,5 @@ Style/IfUnlessModifier:
   Enabled: false
 Layout/BlockAlignment:
   EnforcedStyleAlignWith: start_of_block
+Style/EmptyClassDefinition:
+  Enabled: false

data/CHANGELOG.md

@@ -13,6 +13,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+## [15.1.3]
+
+### Added
+
+- Start collecting "project_name" from gradle-dependencies-q.txt lockfiles.
+- Start collecting "project_name" from package.json manifests.
+
+### Removed
+
+- Remove "go.sum" as a lockfile for Golang because it is not a lockfile.
+
 ## [15.1.2]
 
 ### Changed

data/Gemfile

@@ -11,7 +11,7 @@ end
 
 group :development, :test do
   gem "rake", "~> 12.0"
-  gem "rubocop", "~> 1.71"
+  gem "rubocop", "~> 1.84"
   gem "rubocop-rails"
   gem "rubocop-rake" # This is needed by packageurl-ruby, until it reclassifies it as a dev dependency.
 end

data/lib/bibliothecary/parsers/go.rb

@@ -25,10 +25,6 @@ module Bibliothecary
             kind: "manifest",
             parser: :parse_go_mod,
           },
-          match_filename("go.sum") => {
-            kind: "lockfile",
-            parser: :parse_go_sum,
-          },
           # Glide (unmaintained: https://github.com/Masterminds/glide#go-modules)
           match_filename("glide.yaml") => {
             kind: "manifest",
@@ -182,23 +178,6 @@ module Bibliothecary
         categorized_deps
       end
 
-      def self.parse_go_sum(file_contents, options: {})
-        deps = []
-        file_contents.lines.map(&:strip).each do |line|
-          next unless (match = line.match(GOSUM_REGEXP))
-
-          deps << Dependency.new(
-            name: match[1].strip,
-            requirement: match[2].strip.split("/").first,
-            type: "runtime",
-            source: options.fetch(:filename, nil),
-            platform: platform_name
-          )
-        end
-        dependencies = deps.uniq
-        ParserResult.new(dependencies: dependencies)
-      end
-
       def self.parse_go_resolved(file_contents, options: {})
         dependencies = JSON.parse(file_contents)
           .reject { |dep| dep["Main"] == "true" }

data/lib/bibliothecary/parsers/maven.rb

@@ -21,10 +21,12 @@ module Bibliothecary
       # e.g. "|    \\--- com.google.guava:guava:23.5-jre (*)"
       GRADLE_DEP_REGEXP = /(\+---|\\---){1}/
 
+      GRADLE_PROJECT_REGEXP = /\s*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_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)"
@@ -191,8 +193,14 @@ module Bibliothecary
 
       def self.parse_gradle_resolved(file_contents, options: {})
         current_type = nil
+        project_name = nil
 
         dependencies = file_contents.split("\n").map do |line|
+          if project_name.nil? && (project_name_match = GRADLE_PROJECT_REGEXP.match(line))
+            project_name = project_name_match.captures[0]
+            next
+          end
+
           current_type_match = GRADLE_TYPE_REGEXP.match(line)
           current_type = current_type_match.captures[0] if current_type_match
 
@@ -203,13 +211,13 @@ 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_REGEXP))
+          if (project_match = line.match(GRADLE_DEPENDENCY_PROJECT_REGEXP))
             # 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_REGEXP, "internal:#{project_name}:1.0.0")
+            line = line.sub(GRADLE_DEPENDENCY_PROJECT_REGEXP, "internal:#{project_name}:1.0.0")
           end
 
           dep = line
@@ -259,7 +267,10 @@ module Bibliothecary
         end
           .compact
           .uniq { |item| [item.name, item.requirement, item.type, item.original_name, item.original_requirement] }
-        ParserResult.new(dependencies: dependencies)
+        ParserResult.new(
+          project_name: project_name,
+          dependencies: dependencies
+        )
       end
 
       def self.parse_maven_resolved(file_contents, options: {})

data/lib/bibliothecary/parsers/npm.rb

@@ -167,7 +167,10 @@ module Bibliothecary
             )
           end
 
-        ParserResult.new(dependencies: dependencies)
+        ParserResult.new(
+          dependencies: dependencies,
+          project_name: manifest["name"]
+        )
       end
 
       def self.parse_yarn_lock(file_contents, options: {})

data/lib/bibliothecary/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 15.1.2
+  version: 15.1.3
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-07 00:00:00.000000000 Z
+date: 2026-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander