bibliothecary 8.2.2 → 8.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dd448ab1be90710e81700b68541de4ba3f17731a67a24f734c9ff12d0898d1f
-  data.tar.gz: d595b3746c16a87f4442650f0c28ed07f9e4097875b0ca1b646b99914e9c699f
+  metadata.gz: 6f7fbf7ad34eaff5fc178a7befb091ec010341f3d5ad2a2b468c84c7fa3c3741
+  data.tar.gz: 7fd04a9d3d2e28e79cec97b15cd7983f558a8fa4351bc0d1819cdce74ad65a8c
 SHA512:
-  metadata.gz: cd75677e52714d25f33ae3da3295d1146eba3679bb89c093d91840c8c3d8f65bac2365f21021d41e7e58b9d88fa6e4160375870e4fab0d6c4cdd4e753775d68f
-  data.tar.gz: c3c70847f495b5c7eb3d0c4fe41454ae50534a4e131b6ef2618d31e3e188147c144363d31d024aab0daef76b62bec9e30f0cdd3d09ef4d61ae793912aaee184d
+  metadata.gz: 5a6488a468d0369e391329359622334d177fd7bcb6694efee45b25f8b5c0cd77145fd517606a7550744b5d17725440b98dc5b8b2f00801183498ac7dbfb9bfc4
+  data.tar.gz: 627e705c0201a891941bce2e2765cc9cd651473c49368270db4d0360fba6f15e3b645909bbe1052aebd2c5e24472ebfb07c7c90e68e87bf1558c40840c595c1d

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
           }
         }
@@ -39,18 +40,20 @@ module Bibliothecary
           # Lockfiles have exact versions.
           "lockfile_requirement" => {
             match: [
-              /^version$/i,
               /^(lockfile |)requirement$/i,
+              /^version$/i,
             ],
           },
           # Manifests have versions that can have operators.
+          # However, since Bibliothecary only currently supports analyzing a
+          # single file as a single thing (either manifest or lockfile)
+          # we can't return manifest-y data. Only take the lockfile requirement
+          # when processing dependencies.csv for now.
           "requirement" => {
             match: [
-              /^manifest requirement$/i,
-              /^version$/i,
               /^(lockfile |)requirement$/i,
+              /^version$/i,
             ],
-            default: nil
           },
           "type" => {
             default: "runtime",

data/lib/bibliothecary/parsers/pypi.rb

@@ -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.2"
+  VERSION = "8.2.5"
 end

metadata

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