bibliothecary 8.7.2 → 8.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c9c1312c6588259452d5c80c4196cef2df7da9b72bfcee0edc470d38937b90c
-  data.tar.gz: c5cb844eea89ab1799a87374aa68313b997fcf05d6df1580898c66b2675743ed
+  metadata.gz: 1498d2e39e0820cce0a03669d89bd6416b5afd67d1f0769602b1715a57a8ffc0
+  data.tar.gz: bd5d0f8c450b22c63106f4866c6d191dc3a3628eaf0f53fc341fb5e0663f33b1
 SHA512:
-  metadata.gz: e9f226b41b25dd246f2fefe16982ef99b43a2d3ae046ae67882acc0b8a69ba4dfab2213d091ca93f306dbe5e5a97ba59c38c352d9b99a2e90ee09b2b79f569e5
-  data.tar.gz: 2fb86982c8305897c48718ed8fd358438d4bb7231369127d320baa1663347a7dac49e56493c60f1e0593ddde6894ec8556ed4202f7415222589b3bd9b556ba9c
+  metadata.gz: 345d4049074667e97ca9a8c57a0b0327443a60fd5efc7b7566ef19154e1a95e395a4ef45b49f4bd20dfbeaf80c397f8cfab6b8f00203005f33ec60a1c2590270
+  data.tar.gz: 7e3a43056de7cfde69fa6bd6ab8329fb226ec65a591e4c4301fb39a8368e80974e112bce577d5a0bbdee42448edc5b692c68b058525d46c28c1235a09f412038

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

@@ -102,7 +102,15 @@ module Bibliothecary
         # Parse poetry [tool.poetry] deps
         poetry_manifest = file_contents.fetch('tool', {}).fetch('poetry', {})
         deps += map_dependencies(poetry_manifest['dependencies'], 'runtime')
+        # Poetry 1.0.0-1.2.0 way of defining dev deps
         deps += map_dependencies(poetry_manifest['dev-dependencies'], 'develop')
+        # Poetry's 1.2.0+ of defining dev deps
+        poetry_manifest
+          .fetch("group", {})
+          .each_pair do |group_name, obj|
+            group_name = "develop" if group_name == "dev"
+            deps += map_dependencies(obj.fetch("dependencies", {}), group_name)
+          end
 
         # Parse PEP621 [project] deps
         pep621_manifest = file_contents.fetch('project', {})
@@ -179,10 +187,10 @@ module Bibliothecary
         manifest["package"].each do |package|
           # next if group == "_meta"
           group = case package['category']
-                  when 'main'
-                    'runtime'
                   when 'dev'
                     'develop'
+                  else
+                    'runtime'
                   end
 
           deps << {

data/lib/bibliothecary/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.7.2
+  version: 8.7.4
 platform: ruby
 authors:
 - Andrew Nesbitt
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-15 00:00:00.000000000 Z
+date: 2023-12-11 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.1.6
-signing_key:
+rubygems_version: 3.3.22
+signing_key: 
 specification_version: 4
 summary: Find and parse manifests
 test_files: []