bibliothecary 8.7.0 → 8.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39af4653f19e0376f945656791b9dc2eb6e60f5d519a9a0e947e4623827376d2
-  data.tar.gz: c2a6b01a1d14abffde071d07a95a28e851e85c61a89fe3ebb5239c82f2cef3fd
+  metadata.gz: 1c9c1312c6588259452d5c80c4196cef2df7da9b72bfcee0edc470d38937b90c
+  data.tar.gz: c5cb844eea89ab1799a87374aa68313b997fcf05d6df1580898c66b2675743ed
 SHA512:
-  metadata.gz: 5e923a36a18760a6f3acdc05f7330de7704c42f235fd1bbee880dc7d7ea3bf1604ea8ecd060f6984db7a32ac6b552d10cd19d8b6257153fc7c19f55430234661
-  data.tar.gz: a65aed02e5de4338a4c48ce44f77b2119fee0a26be51c7bac1bd18cdf8a51ceebed0305e16b965483cf4d2452ba63f3557de93acd29b474428245d62bceac707
+  metadata.gz: e9f226b41b25dd246f2fefe16982ef99b43a2d3ae046ae67882acc0b8a69ba4dfab2213d091ca93f306dbe5e5a97ba59c38c352d9b99a2e90ee09b2b79f569e5
+  data.tar.gz: 2fb86982c8305897c48718ed8fd358438d4bb7231369127d320baa1663347a7dac49e56493c60f1e0593ddde6894ec8556ed4202f7415222589b3bd9b556ba9c

data/lib/bibliothecary/parsers/maven.rb

@@ -254,6 +254,10 @@ module Bibliothecary
       end
 
       def self.parse_resolved_dep_line(line)
+        # filter out anything that doesn't look like a
+        # resolved dep line
+        return unless line[/  .*:[^-]+-- /]
+
         dep_parts = line.strip.split(":")
         return unless dep_parts.length == 5
         # org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE:compile -- module spring.boot.starter.web [auto]
@@ -365,6 +369,8 @@ module Bibliothecary
 
         value = field.nodes.first
         value = value.value if value.is_a?(Ox::CData)
+        # whitespace in dependency tags should be ignored
+        value = value&.strip
         match = value&.match(MAVEN_PROPERTY_REGEX)
         if match
           return extract_property(xml, match[1], value, parent_properties)

data/lib/bibliothecary/parsers/nuget.rb

@@ -65,15 +65,17 @@ module Bibliothecary
 
         frameworks = {}
         manifest.fetch('dependencies',[]).each do |framework, deps|
-          frameworks[framework] = deps.map do |name, details|
-            {
-              name: name,
-              # 'resolved' has been set in all examples so far
-              # so fallback to requested is pure paranoia
-              requirement: details.fetch('resolved', details.fetch('requested', '*')),
-              type: 'runtime'
-            }
-          end
+          frameworks[framework] = deps
+            .reject { |_name, details| details["type"] == "Project" } # Projects do not have versions
+            .map do |name, details|
+              {
+                name: name,
+                # 'resolved' has been set in all examples so far
+                # so fallback to requested is pure paranoia
+                requirement: details.fetch('resolved', details.fetch('requested', '*')),
+                type: 'runtime'
+              }
+            end
         end
 
         if frameworks.size > 0

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "8.7.0"
+  VERSION = "8.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.7.0
+  version: 8.7.2
 platform: ruby
 authors:
 - Andrew Nesbitt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb
@@ -248,7 +248,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - andrewnez@gmail.com
 executables:
@@ -326,7 +326,7 @@ homepage: https://github.com/librariesio/bibliothecary
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -341,8 +341,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Find and parse manifests
 test_files: []