bibliothecary 8.7.6 → 8.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57b89f5321f44b47f940c8fe8be9e50e2007ad4176fd002744f1f44a2bd9cbe7
-  data.tar.gz: 742a28fbf8a17708e64736bf49039347af391db3b1ad4c62355df83f45459d5f
+  metadata.gz: 9c0af4f20a3dda13587bef4ed23446be465960fb69970f0f6b928b01dedb5599
+  data.tar.gz: ac0b2b21d35c70ff4c58c9470691a1dcd9f9080ece1a0e4d7606b39292d4022b
 SHA512:
-  metadata.gz: 7a86455347539c89417c398c19e99ff8cd4ea84d52057c4e67f991f6ac518083db567a733b83cc4044dbb326d4a7322dde9514b3a486ed1c7825bc6cf2fdad7c
-  data.tar.gz: a3c33ebc60114b4c9627d8dfd205d0579e32efd706c01fc84f00606d378db05c103f50655eb68c8b2f6383d0b50c9fcf7370a65d16d18c0dd1a9dd74241bbf45
+  metadata.gz: b2cbe6f624584fded45298b635105e68c41cf7e857472f94ac47582bdd57273339373c21c18982c87bd1556c559f2f58fb1949c25f21cffb04ae082efc16d46e
+  data.tar.gz: 8d35a25784b49e90f639ba0678be9d802e77f66b9e81376d042ce5d7e79af68f5101922bc35b2fff8233c56b9a90759b64dbc492a8bf4104643099bc8fc66eab

data/lib/bibliothecary/multi_parsers/cyclonedx.rb

@@ -81,11 +81,21 @@ module Bibliothecary
             parser: :parse_cyclonedx_json,
             ungroupable: true,
           },
+          match_extension("cdx.json") => {
+            kind: "lockfile",
+            parser: :parse_cyclonedx_json,
+            ungroupable: true,
+          },
           match_filename("cyclonedx.xml") => {
             kind: "lockfile",
             parser: :parse_cyclonedx_xml,
             ungroupable: true,
           },
+          match_extension(".cdx.xml") => {
+            kind: "lockfile",
+            parser: :parse_cyclonedx_xml,
+            ungroupable: true,
+          },
         }
       end
 

data/lib/bibliothecary/parsers/pypi.rb

@@ -12,6 +12,7 @@ module Bibliothecary
 
       REQUIREMENTS_REGEXP = /^#{REQUIRE_REGEXP}/
       MANIFEST_REGEXP = /.*require[^\/]*(\/)?[^\/]*\.(txt|pip|in)$/
+      # TODO: can this be a more specific regexp so it doesn't match something like ".yarn/cache/create-require-npm-1.0.0.zip"?
       PIP_COMPILE_REGEXP = /.*require.*$/
 
       # Adapted from https://peps.python.org/pep-0508/#names

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "8.7.6"
+  VERSION = "8.7.7"
 end

data/lib/bibliothecary.rb

@@ -17,7 +17,8 @@ Dir[File.expand_path("../bibliothecary/parsers/*.rb", __FILE__)].each do |file|
 end
 
 module Bibliothecary
-  VERSION_OPERATORS = /[~^<>*"]/
+  VERSION_OPERATORS = /[~^<>*"]/.freeze
+  INVALID_UTF8_ERROR_REGEXP = /invalid byte sequence/.freeze
 
   def self.analyse(path, ignore_unparseable_files: true)
     runner.analyse(path, ignore_unparseable_files: ignore_unparseable_files)
@@ -81,6 +82,10 @@ module Bibliothecary
       .dup # ensure we don't have a frozen string
       .force_encoding("UTF-8") # treat all strings as utf8
       .sub(/^\xEF\xBB\xBF/, "") # remove any Byte Order Marks so JSON, etc don't fail while parsing them.
+  rescue ArgumentError => e
+    # Bibliothecary doesn't need to analyze non-UTF8 files like binary files, so just return blank.
+    return "" if e.message.match?(INVALID_UTF8_ERROR_REGEXP)
+    raise e
   end
 
   class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.7.6
+  version: 8.7.7
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-11 00:00:00.000000000 Z
+date: 2024-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb