bibliothecary 8.7.1 → 8.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f6b75ad41b078c913dc3170bba3fa22d3d885b17e3c27e961f9b5e084d539c7
-  data.tar.gz: 8354e96eb6e2473549e4cbae545a6a9d80fbb9dc49965a0cb75cc66a1e5aa5ca
+  metadata.gz: 9d0f05bf5e90424caec70a51181e2fcdeef5ad3ba8ab03109cd765f2ea2943b0
+  data.tar.gz: e40d4ab5813287042f421c719df563869f2a6b3b8647d038e666b4e2bfc830c7
 SHA512:
-  metadata.gz: f6ab5428cbf33ca11c0013b1af6b0c0314141af095cef19921ebddbbb2ada7db7d6534768be658ff2408a6cc8ce94b84cdf8038ecd75449a3bdc20860a329d62
-  data.tar.gz: 1c5ebfcbf76c589345a818b9a4f2a463a52aca2d2ed3fb0fb90d9b77644ac1b9a0262fb4a38c8f08fabfabb4561c1f2b14d4692e149e3fb0af0092d028b9d117
+  metadata.gz: 279dd423656e36ce95d8ef56f4c6377019b8f101d2d57c71c8fcecba09c62bb2bb50deb0b98f996045f79f798021ef0eadaae351b2cfc5ca3ca9ad8b78fc80f4
+  data.tar.gz: 52e317e720768a405d9f2c77e1f855a025274da31b8460784524cff825715f19b58be1f158505de099c026e8ed292bd7008ec8a468bb733bba1e7787294e248b

data/lib/bibliothecary/analyser/analysis.rb

@@ -42,7 +42,7 @@ module Bibliothecary
 
         dependencies_to_analysis(info, kind, dependencies)
       rescue Bibliothecary::FileParsingError => e
-        Bibliothecary::Analyser::create_error_analysis(platform_name, info.relative_path, kind, e.message)
+        Bibliothecary::Analyser::create_error_analysis(platform_name, info.relative_path, kind, e.message, e.location)
       end
       alias analyze_contents_from_info analyse_contents_from_info
 
@@ -84,7 +84,10 @@ module Bibliothecary
 
       rescue Exception => e # default is StandardError but C bindings throw Exceptions
         # the C xml parser also puts a newline at the end of the message
-        raise Bibliothecary::FileParsingError.new(e.message.strip, filename)
+        location = e.backtrace_locations[0]
+          .to_s
+          .then { |l| l =~ /bibliothecary\// ? l.split("bibliothecary/").last : l.split("gems/").last }
+        raise Bibliothecary::FileParsingError.new(e.message.strip, filename, location)
       end
 
       private

data/lib/bibliothecary/analyser.rb

@@ -4,14 +4,15 @@ require_relative './analyser/analysis.rb'
 
 module Bibliothecary
   module Analyser
-    def self.create_error_analysis(platform_name, relative_path, kind, message)
+    def self.create_error_analysis(platform_name, relative_path, kind, message, location=nil)
       {
         platform: platform_name,
         path: relative_path,
         dependencies: nil,
         kind: kind,
         success: false,
-        error_message: message
+        error_message: message,
+        error_location: location,
       }
     end
 

data/lib/bibliothecary/exceptions.rb

@@ -8,9 +8,10 @@ module Bibliothecary
   end
 
   class FileParsingError < StandardError
-    attr_accessor :filename
-    def initialize(msg, filename)
+    attr_accessor :filename, :location
+    def initialize(msg, filename, location=nil)
       @filename = filename
+      @location = location # source code location of the error, e.g. "lib/hi.rb:34"
       msg = "#{filename}: #{msg}" unless msg.include?(filename)
       super("#{msg}")
     end

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/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "8.7.1"
+  VERSION = "8.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.7.1
+  version: 8.7.3
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb