bibliothecary 12.2.0 → 12.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37cce0e70366df9eeaaf3d134ba139335359ed2b484ce78c737e8f155d4606b7
-  data.tar.gz: b23e369a3077301e8f3078a179f474b3afc83af926e445370988d170d998ae19
+  metadata.gz: 8405e79b9449b0f4e1f1dc7940b54870ab0aafe7adb511a7d4876ecfca2798ed
+  data.tar.gz: 15ef48279642088fdbb57291c44a1faaf74c4c2a47e0ac4258e215dfe40e8197
 SHA512:
-  metadata.gz: b46141115f05919f3d4f16b0e1cf03a0baf0060e972e5ec044c791c2f0124e0e0bcc34e87eec715298d207252cfbf8960c68edfc533ff5ee7290ad358af76ccb
-  data.tar.gz: a302ac6a16b775df78f2eef640feac02e624b2be6b8165f75492922c34e1c218de449bdfb6e3992e7f8b3941cf2d42c6457eb4d2025266b5abec05f553219902
+  metadata.gz: 7710e394463856a89913e95d49b525966a4b394c6be84c403d97a17bc0c8964df2293ab995164c65fdd9fb3f96d5b9cd1be114f03464d4fc9c1dd2fe269b0a48
+  data.tar.gz: 1a9e5a61ad6904934c85e324ffc66a5e7d8bdff592b5b0b63040db5431e6dd153e40b70f0d75c1d1a7a9652e3e8ef12fd9b4325b0b8acf31c9c128d4c61bea56

data/CHANGELOG.md

@@ -13,20 +13,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
-## [12.2.0] - 2025-05-30
+## [12.3.1] - 2025-06-06
 
-### Added
+### Changed
 
-- Maven parser support for maven-dependency-tree.dot file.
+- Handle .csproj files that begin with an <?xml> tag
 
-### Changed
+## [12.3.0] - 2025-06-06
 
-### Removed
+### Added
 
-## [12.1.10] - 2025-05-23
+- Nuget support for <Reference> tag in \*.csproj manifests.
+
+## [12.2.0] - 2025-05-30
 
 ### Added
 
+- Maven parser support for maven-dependency-tree.dot file.
+
+## [12.1.10] - 2025-05-23
+
 ### Changed
 
 - Normalize package names in Poetry manifests, storing the original in
@@ -34,50 +40,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   names in its lockfile according to PyPa's rules, but doesn't provide the original name.
   Storing the original_name will provide a connection from manifest to lockfile.
 
-### Removed
-
 ## [12.1.9] - 2025-05-16
 
-### Added
-
 ### Changed
 
 - Fix 12.1.8 Poetry regression that ignored deps with no category or group.
 
-### Removed
-
 ## [12.1.8] - 2025-05-16
 
 ### Added
 
 - Support multiple requirements for a single package in poetry.lock.
 
-### Changed
-
-### Removed
-
 ## [12.1.7] - 2025-04-29
 
-### Added
-
 ### Changed
 
 - Include "source" field in Dependency objects from pub files.
 - Include "source" field in Dependency objects from pnpm-lock.yaml files.
 
-### Removed
-
 ## [12.1.6] - 2025-04-29
 
-### Added
-
 ### Changed
 
 - Use JSON.parser.parse() in bun.lock parser to work around overriden JSON.parse() method.
 - Don't raise an error in pnpm-lock.yaml v9 parser if devDependencies isn't found.
 
-### Removed
-
 ## [12.1.5] - 2025-03-17
 
 ### Added
@@ -85,10 +73,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Adds alias support for PNPM lockfiles.
 - Add support for bun.lock files
 
-### Changed
-
-### Removed
-
 ## [12.1.4] - 2025-03-14
 
 ### Added
@@ -96,10 +80,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add support for PNPM lockfiles (lockfile versions 5, 6, and 9).
 - Add 'parser_options' arg to Bilbiothecary::Runner constructor.
 
-### Changed
-
-### Removed
-
 ## [12.1.3] - 2025-02-26
 
 ### Added
@@ -112,28 +92,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix a PyPI parser's regex to exclude false positive "require" names.
 - Drop all sub-projects from list of deps in a Maven maven-dependency-tree.txt.
 
-### Removed
-
 ## [12.1.2] - 2025-02-26
 
 ### Added
 
 - Add 'local' property to dependencies from Pipfile and Pipfile.lock
 
-### Changed
-
-### Removed
-
 ## [12.1.1] - 2025-02-21
 
 ### Added
 
 - Add test coverage for Go 1.24's new "tool" directive.
 
-### Changed
-
-### Removed
-
 ## [12.1.0] - 2025-01-30
 
 ### Added
@@ -145,8 +115,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Improved Rubocop rules to make future spec changes easier via Rubocop auto-correcting formatting violations.
 
-### Removed
-
 ## [12.0.0] - 2025-01-27
 
 ### Removed

data/lib/bibliothecary/parsers/nuget.rb

@@ -110,25 +110,54 @@ module Bibliothecary
       def self.parse_csproj(file_contents, options: {})
         manifest = Ox.parse file_contents
 
-        packages = manifest.locate("ItemGroup/PackageReference").select { |dep| dep.respond_to? "Include" }.map do |dependency|
-          requirement = (dependency.Version if dependency.respond_to? "Version")
-          if requirement.is_a?(Ox::Element)
-            requirement = dependency.nodes.detect { |n| n.value == "Version" }&.text
+        # The dotnet samples repo has examples with both of these cases, so both need to be handled:
+        project = if manifest.locate("Project").any?
+                    # 1) If there's an <?xml> tag, we need to pick out the "Project" element
+                    manifest.locate("Project").first
+                  else
+                    # 2) If there's no <?xml> tag, the root element is "Project"
+                    manifest
+                  end
+
+        packages = project
+          .locate("ItemGroup/PackageReference")
+          .select { |dep| dep.respond_to? "Include" }
+          .map do |dependency|
+            requirement = (dependency.Version if dependency.respond_to? "Version")
+            if requirement.is_a?(Ox::Element)
+              requirement = dependency.nodes.detect { |n| n.value == "Version" }&.text
+            end
+
+            type = if (dependency.nodes.first&.nodes&.include?("all") && dependency.nodes.first.value.include?("PrivateAssets")) || dependency.attributes[:PrivateAssets] == "All"
+                     "development"
+                   else
+                     "runtime"
+                   end
+
+            Dependency.new(
+              name: dependency.Include,
+              requirement: requirement,
+              type: type,
+              source: options.fetch(:filename, nil)
+            )
           end
 
-          type = if (dependency.nodes.first&.nodes&.include?("all") && dependency.nodes.first.value.include?("PrivateAssets")) || dependency.attributes[:PrivateAssets] == "All"
-                   "development"
-                 else
-                   "runtime"
-                 end
+        packages += project
+          .locate("ItemGroup/Reference")
+          .select { |dep| dep.respond_to? "Include" }
+          .map do |dependency|
+            vals = *dependency.Include.split(",").map(&:strip)
+            name = vals.shift
+            vals = vals.to_h { |r| r.split("=", 2) }
+
+            Dependency.new(
+              name: name,
+              requirement: vals["Version"] || "*",
+              type: "runtime",
+              source: options.fetch(:filename, nil)
+            )
+          end
 
-          Dependency.new(
-            name: dependency.Include,
-            requirement: requirement,
-            type: type,
-            source: options.fetch(:filename, nil)
-          )
-        end
         packages.uniq(&:name)
       rescue StandardError
         []

data/lib/bibliothecary/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 12.2.0
+  version: 12.3.1
 platform: ruby
 authors:
 - Andrew Nesbitt
 bindir: bin
 cert_chain: []
-date: 2025-05-30 00:00:00.000000000 Z
+date: 2025-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander