bibliothecary 7.1.1 → 7.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e99bd64be33f917579aeca0ce4d27a1290328020516f2bf2328f3bc82273da99
-  data.tar.gz: 3c431e57230c9d20ba3e66e4e5e9b72def9ba81ad8707f47166be5d9e993a751
+  metadata.gz: c9b98a74ca8714750a835ebe600e5a031edcad43bfffa82b475f47aaf1356d2b
+  data.tar.gz: a8a74dbbfdac38ad7da70258e080c9f61aad16c4f19002b8d1d53290873ba6d0
 SHA512:
-  metadata.gz: 722b6cad2fa9b84111fa97a5f925e6fb3967489bac80747e11ab1c6ac22cfec6a4fdeefa6e17ad9e926860e429322e1e1f182bfc88ea69a4778cfc0717d9de70
-  data.tar.gz: 0e92b678afe3f81ad3593f6feaa7e4357a4bda19e1ec4720a8f513c69261b87eb2916950b556ab645913432496b1153f8db7a44f3945baaa6e2154a0109fdd01
+  metadata.gz: 25f3208793295ee459d4a9995f38a877d48132fa31469091695e60597c09547f345a0f554539a4bfe065b8a307ba17a8e9fecc3d30d08cce22ef35cf7e5430e0
+  data.tar.gz: 8b38ae3f49162807dcf04f3e07c81d69501b1aa041b4e1239bc8bf477067e485266b15ad99a090f649dd826cf2f055a24ef3bf39e8fbcda071f2d087f0dea2a2

data/lib/bibliothecary/parsers/pypi.rb

@@ -4,12 +4,23 @@ module Bibliothecary
       include Bibliothecary::Analyser
 
       INSTALL_REGEXP = /install_requires\s*=\s*\[([\s\S]*?)\]/
-      REQUIRE_REGEXP = /([a-zA-Z0-9]+[a-zA-Z0-9\-_\.]+)([><=\w\.,]+)?/
+
+      # Capture Group 1 is package.
+      # Optional Group 2 is [extras].
+      # Capture Group 3 is Version
+      REQUIRE_REGEXP = /([a-zA-Z0-9]+[a-zA-Z0-9\-_\.]+)(?:\[.*?\])*([><=\w\.,]+)?/
+
       REQUIREMENTS_REGEXP = /^#{REQUIRE_REGEXP}/
-      MANIFEST_REGEXP = /.*require[^\/]*(\/)?[^\/]*\.(txt|pip)$/
+      MANIFEST_REGEXP = /.*require[^\/]*(\/)?[^\/]*\.(txt|pip|in)$/
+      PIP_COMPILE_REGEXP = /.*require.*$/
 
       def self.mapping
         {
+          lambda { |p| PIP_COMPILE_REGEXP.match(p) } => {
+            content_matcher: :pip_compile?,
+            kind: 'lockfile',
+            parser: :parse_requirements_txt
+          },
           lambda { |p| MANIFEST_REGEXP.match(p) } => {
             kind: 'manifest',
             parser: :parse_requirements_txt,
@@ -154,7 +165,7 @@ module Bibliothecary
           next unless match
           deps << {
             name: match[1],
-            requirement: match[2] || '*',
+            requirement: match[-1] || '*',
             type: 'runtime'
           }
         end
@@ -168,12 +179,21 @@ module Bibliothecary
           next unless match
           deps << {
             name: match[1],
-            requirement: match[2] || '*',
+            requirement: match[-1] || '*',
             type: 'runtime'
           }
         end
         deps
       end
+
+      def self.pip_compile?(file_contents)
+        return file_contents.include?("This file is autogenerated by pip-compile")
+      rescue Exception # rubocop:disable Lint/RescueException
+        # We rescue exception here since native libs can throw a non-StandardError
+        # We don't want to throw errors during the matching phase, only during
+        # parsing after we match.
+        false
+      end
     end
   end
 end

data/lib/bibliothecary/runner.rb

@@ -42,6 +42,22 @@ module Bibliothecary
       Bibliothecary::Parsers.constants.map{|c| Bibliothecary::Parsers.const_get(c) }.sort_by{|c| c.to_s.downcase }
     end
 
+    def load_file_info_list_from_contents(file_path_contents_hash)
+      # Parses an array of format [{file_path: "", contents: ""},] to match
+      #  on both filename matches, and one content_match patterns.
+      file_list = []
+
+      file_path_contents_hash.each do |file|
+        info = FileInfo.new(nil, file[:file_path], file[:contents])
+
+        next if ignored_files.include?(info.relative_path)
+
+        add_files_to_list(file_list, info)
+      end
+
+      file_list
+    end
+
     def load_file_info_list_from_paths(paths)
       file_list = []
 
@@ -50,12 +66,7 @@ module Bibliothecary
 
         next if ignored_files.include?(info.relative_path)
 
-        applicable_package_managers(info).each do |package_manager|
-          file = info.dup
-          file.package_manager = package_manager
-
-          file_list.push(file)
-        end
+        add_files_to_list(file_list, info)
       end
 
       file_list
@@ -71,12 +82,7 @@ module Bibliothecary
         next unless FileTest.file?(subpath)
         next if ignored_files.include?(info.relative_path)
 
-        applicable_package_managers(info).each do |package_manager|
-          file = info.dup
-          file.package_manager = package_manager
-
-          file_list.push(file)
-        end
+        add_files_to_list(file_list, info)
       end
 
       file_list
@@ -90,6 +96,10 @@ module Bibliothecary
       RelatedFilesInfo.create_from_file_infos(load_file_info_list_from_paths(paths).reject { |info| info.package_manager.nil? })
     end
 
+    def find_manifests_from_contents(file_path_contents_hash)
+      RelatedFilesInfo.create_from_file_infos(load_file_info_list_from_contents(file_path_contents_hash).reject { |info| info.package_manager.nil? })
+    end
+
     def analyse_file(file_path, contents)
       package_managers.select { |pm| pm.match?(file_path, contents) }.map do |pm|
         pm.analyse_contents(file_path, contents)
@@ -124,5 +134,16 @@ module Bibliothecary
     def ignored_files
       @configuration.ignored_files
     end
+
+    private
+
+    def add_files_to_list(file_list, info)
+      applicable_package_managers(info).each do |package_manager|
+        file = info.dup
+        file.package_manager = package_manager
+
+        file_list.push(file)
+      end
+    end
   end
 end

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "7.1.1"
+  VERSION = "7.1.5"
 end

data/lib/bibliothecary.rb

@@ -34,6 +34,10 @@ module Bibliothecary
     runner.load_file_info_list_from_paths(paths)
   end
 
+  def self.load_file_info_list_from_contents(file_path_contents_hash)
+    runner.load_file_info_list_from_contents(file_path_contents_hash)
+  end
+
   def self.analyse_file(file_path, contents)
     runner.analyse_file(file_path, contents)
   end
@@ -54,6 +58,10 @@ module Bibliothecary
     runner.find_manifests_from_paths(paths)
   end
 
+  def self.find_manifests_from_contents(file_path_contents_hash)
+    runner.find_manifests_from_contents(file_path_contents_hash)
+  end
+
   def self.ignored_dirs
     configuration.ignored_dirs
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.1.5
 platform: ruby
 authors:
 - Andrew Nesbitt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb
@@ -206,7 +206,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - andrewnez@gmail.com
 executables:
@@ -274,7 +274,7 @@ homepage: https://github.com/librariesio/bibliothecary
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Find and parse manifests
 test_files: []