bibliothecary 8.2.3 → 8.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bf3193b6daf685565ca3fe2105ca8be8e03c5e83d1edcafe3ca6d3c7be12d8b
-  data.tar.gz: c2b96281c11a89bf49f830bbb0be00e35d18096dcc8a8e8b2d0038e1256a6eed
+  metadata.gz: 77204631e2bfcd808b697fa06b39e9b026b59231bb4acd705af42c5b36b36001
+  data.tar.gz: 712424873beece9fca7c15fbde387ff0f11a12973b0a785c8d94ac8cd833b9ed
 SHA512:
-  metadata.gz: d3d45d37ac4c8e3c982d708f454906ab41db86fc285ba800d90acb6d2e541ae7151e7d09c5ae10eccec2678760b24f2bbb3d5c2e77048b714aa71c953395ce70
-  data.tar.gz: b86748a552b1774895cad46925205a7c4915907d336436c945a7dc027d80e8feff7d12465c9524ea12a3495d4635e45c4cd32489456453b4c744a22fdf7c5c32
+  metadata.gz: 5eb8cad8145bef3d6fb87c713e2cc145a6ca75be9a65b9c81f09c551552c9c8a40a95f7e192dcb7585f9a2ef15d3233522de367b23135fa503704b37c1b8bf06
+  data.tar.gz: f29c04901db7650463e80a7a0436a629001a9758ae6e21a38683091f4d30a1d76424bd2a3e8ec944ec526801fd5a6122a2940cf333e74a37f6e8c5be019e4f2b

data/lib/bibliothecary/analyser/determinations.rb

@@ -22,6 +22,12 @@ module Bibliothecary
         first_matching_mapping_details(info)
           .fetch(:can_have_lockfile, true)
       end
+
+      def groupable?(info)
+        # More package managers are groupable than ungroupable, but the methods
+        # to get this information should be positive.
+        !first_matching_mapping_details(info).fetch(:ungroupable, false)
+      end
     end
   end
 end

data/lib/bibliothecary/file_info.rb

@@ -49,5 +49,9 @@ module Bibliothecary
 
       @package_manager = nil
     end
+
+    def groupable?
+      @package_manager&.groupable?(self)
+    end
   end
 end

data/lib/bibliothecary/multi_parsers/cyclonedx.rb

@@ -98,11 +98,13 @@ module Bibliothecary
         {
           match_filename('cyclonedx.json') => {
             kind: 'lockfile',
-            parser: :parse_cyclonedx_json
+            parser: :parse_cyclonedx_json,
+            ungroupable: true
           },
           match_filename('cyclonedx.xml') => {
             kind: 'lockfile',
-            parser: :parse_cyclonedx_xml
+            parser: :parse_cyclonedx_xml,
+            ungroupable: true
           }
         }
       end

data/lib/bibliothecary/multi_parsers/dependencies_csv.rb

@@ -10,6 +10,7 @@ module Bibliothecary
         {
           match_filename('dependencies.csv') => {
             kind: 'lockfile',
+            ungroupable: true,
             parser: :parse_dependencies_csv
           }
         }

data/lib/bibliothecary/parsers/pypi.rb

@@ -84,7 +84,7 @@ module Bibliothecary
       end
 
       def self.parse_poetry(file_contents, options: {})
-        manifest = Tomlrb.parse(file_contents)['tool']['poetry']
+        manifest = Tomlrb.parse(file_contents).fetch('tool', {}).fetch('poetry', {})
         map_dependencies(manifest['dependencies'], 'runtime') + map_dependencies(manifest['dev-dependencies'], 'develop')
       end
 
@@ -179,20 +179,55 @@ module Bibliothecary
         deps
       end
 
+      # While the thing in the repo that PyPI is using might be either in
+      # egg format or wheel format, PyPI uses "egg" in the fragment of the
+      # VCS URL to specify what package in the PyPI index the VCS URL
+      # should be treated as.
+      NoEggSpecified = Class.new(ArgumentError)
+
+      # Parses a requirements.txt file, following the
+      # https://pip.pypa.io/en/stable/cli/pip_install/#requirement-specifiers
+      # and https://pip.pypa.io/en/stable/topics/vcs-support/#git.
+      # Invalid lines in requirements.txt are skipped.
       def self.parse_requirements_txt(file_contents, options: {})
         deps = []
         file_contents.split("\n").each do |line|
-          match = line.delete(' ').match(REQUIREMENTS_REGEXP)
-          next unless match
-          deps << {
-            name: match[1],
-            requirement: match[-1] || '*',
-            type: 'runtime'
-          }
+          if line['://']
+            begin
+              result = parse_requirements_txt_url(line)
+            rescue URI::Error, NoEggSpecified => e
+              next
+            end
+
+            deps << result.merge(
+              type: 'runtime'
+            )
+          else
+            match = line.delete(' ').match(REQUIREMENTS_REGEXP)
+            next unless match
+
+            deps << {
+              name: match[1],
+              requirement: match[-1] || '*',
+              type: 'runtime'
+            }
+          end
         end
         deps
       end
 
+      def self.parse_requirements_txt_url(url)
+        uri = URI.parse(url)
+        raise NoEggSpecified, "No egg specified in #{url}" unless uri.fragment
+
+        name = uri.fragment[/^egg=([^&]+)([&]|$)/, 1]
+        raise NoEggSpecified, "No egg specified in #{url}" unless name
+
+        requirement = uri.path[/@(.+)$/, 1]
+
+        { name: name, requirement: requirement || "*" }
+      end
+
       def self.pip_compile?(file_contents)
         return file_contents.include?("This file is autogenerated by pip-compile")
       rescue Exception # rubocop:disable Lint/RescueException

data/lib/bibliothecary/related_files_info.rb

@@ -12,7 +12,14 @@ module Bibliothecary
 
       file_infos_by_directory = file_infos.group_by { |info| File.dirname(info.relative_path) }
       file_infos_by_directory.values.each do |file_infos_for_path|
-        file_infos_by_directory_by_package_manager = file_infos_for_path.group_by { |info| info.package_manager}
+        groupable, ungroupable = file_infos_for_path.partition(&:groupable?)
+
+        # add ungroupable ones as separate RFIs
+        ungroupable.each do |file_info|
+          returns.append(RelatedFilesInfo.new([file_info]))
+        end
+
+        file_infos_by_directory_by_package_manager = groupable.group_by { |info| info.package_manager}
 
         file_infos_by_directory_by_package_manager.values.each do |file_infos_in_directory_for_package_manager|
           returns.append(RelatedFilesInfo.new(file_infos_in_directory_for_package_manager))

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "8.2.3"
+  VERSION = "8.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.2.3
+  version: 8.2.6
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-06 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb