bibliothecary 8.6.3 → 8.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbb80d11b51f48774a10ad1617525f5a01f580f10571a90b418bcc974ad07da4
-  data.tar.gz: 9a3c8bf41e7a7e461e28ea966acdd98ee5b4fb49d3fb94c59294734a6bd04b6a
+  metadata.gz: 89c5d8cb9fca421230fa967e5fbc3ce68d9178b0c065cb0c20737464739fab4e
+  data.tar.gz: 7ae9d50b5a82ae46f2c473eee0b483f2376674c97dd94ff8b1c70690973dd3d5
 SHA512:
-  metadata.gz: 0aa9c475c57d5a5fb902cfbd049f12d113ed0ab0472fcd0ee788c07ff3cece579a92fb6d65e0b91d2ecc4415b1cb10c3fcdf2487b539990a11c785ab4078046e
-  data.tar.gz: 6d35f0e547438be4e1cb6fe981ed9a96ffb86a3cdfd3dc8b633b7502412505f7884e0c12792987659c7e547dd48c99333dbe45add7e39bc0b5d4d727ef1cdf0a
+  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.3"
+  VERSION = "8.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.6.3
+  version: 8.6.4
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-30 00:00:00.000000000 Z
+date: 2023-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb
@@ -339,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.22
 signing_key: 
 specification_version: 4
 summary: Find and parse manifests