bibliothecary 8.6.2 → 8.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86361a7bec7e2b16e6d15548c35ce460a39378f241d010b42f743f9aee761dc6
-  data.tar.gz: b6b44dd4064c686006932e77abe0c3d8e792bb132f15b0ae2876bd054c38d43c
+  metadata.gz: 89c5d8cb9fca421230fa967e5fbc3ce68d9178b0c065cb0c20737464739fab4e
+  data.tar.gz: 7ae9d50b5a82ae46f2c473eee0b483f2376674c97dd94ff8b1c70690973dd3d5
 SHA512:
-  metadata.gz: b371453204d2523671442fc45ec512f83f45eafb73f429f0a1b743fe5edc6bc23f65fc90c7110aadcb4ed24e7e50ed1b81863f50736355ac9068a274a242ca56
-  data.tar.gz: d94e3f5986f4d080d0b02d9a0349686220b4b3e9b96f91bd64050ad05dd6785cfbf823a2216b49ec78cec040f48bd3705212894e338efa2382da19ea848db833
+  metadata.gz: 29b2d8750cb9611c3a7cef9946fbaf12e8eb6d73d95ecbd604b4ac41c4428a07361f8d67db8ccece341d1f5c59c2b70510695f947bc060ae7a44f3e395126589
+  data.tar.gz: 418b9879a3028dc396e996972c49be58fb1a63a3ec707e035d7b9c9cccdbdcefe919ff741a37d71a719cffc15145b4f362534ed83e72e8debbff2e73c4ffdee8

data/Gemfile

@@ -1,5 +1,8 @@
 source 'https://rubygems.org'
 
+# Temporarily pegging to HEAD until 0.2.1 is released: https://github.com/piotrmurach/strings-ansi/pull/2
+gem "strings-ansi", ref: "35d0c9430cf0a8022dc12bdab005bce296cb9f00", git: "git@github.com:piotrmurach/strings-ansi.git"
+
 # Specify your gem's dependencies in bibliothecary.gemspec
 gemspec
 

data/bibliothecary.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "deb_control"
   spec.add_dependency "sdl4r"
   spec.add_dependency "commander"
-  spec.add_dependency "strings-ansi"
+  spec.add_dependency "strings-ansi" # NB this is also pegged to a git sha in Gemfile temporarily.  
   spec.add_dependency "strings"
   spec.add_dependency "packageurl-ruby"
 

data/lib/bibliothecary/cli.rb

@@ -19,7 +19,7 @@ module Bibliothecary
           options.default path: './'
           output = Bibliothecary.analyse(options.path)
           output.each do |file_contents|
-            puts "#{file_contents[:path]} (#{manifest[:platform]})"
+            puts "#{file_contents[:path]} (#{file_contents[:platform]})"
             file_contents[:dependencies].group_by{|d| d[:type] }.each do |type, deps|
               puts "  #{type}"
               deps.each do |dep|

data/lib/bibliothecary/parsers/maven.rb

@@ -221,8 +221,11 @@ module Bibliothecary
       end
 
       def self.parse_maven_tree(file_contents, options: {})
-        file_contents = file_contents.gsub(/\r\n?/, "\n")
-        captures = file_contents.scan(/^\[INFO\](?:(?:\+-)|\||(?:\\-)|\s)+((?:[\w\.-]+:)+[\w\.\-${}]+)/).flatten.uniq
+        captures = Strings::ANSI.sanitize(file_contents)
+          .gsub(/\r\n?/, "\n")
+          .scan(/^\[INFO\](?:(?:\+-)|\||(?:\\-)|\s)+((?:[\w\.-]+:)+[\w\.\-${}]+)/)
+          .flatten
+          .uniq
 
         deps = captures.map do |item|
           parts = item.split(":")

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "8.6.2"
+  VERSION = "8.6.4"
 end

data/lib/bibliothecary.rb

@@ -77,6 +77,7 @@ module Bibliothecary
 
   def self.utf8_string(string)
     string
+      .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.
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.6.2
+  version: 8.6.4
 platform: ruby
 authors:
 - Andrew Nesbitt
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-07-02 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:
@@ -324,7 +324,7 @@ homepage: https://github.com/librariesio/bibliothecary
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -339,8 +339,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.3.22
+signing_key: 
 specification_version: 4
 summary: Find and parse manifests
 test_files: []