bibliothecary 7.1.3 → 7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 363f07f35de59f9e70b69e78e25c47a16eaaeb88399db593af9fa8907f9057b4
-  data.tar.gz: e960f21a1d5df9dbe686efce3dd0968e08b60f24b20767fc861a344704e9f3f9
+  metadata.gz: ba740dd30abb75fb073f3160d963a970ffa41099966e86a38558fc50c515c9bf
+  data.tar.gz: 19de22f64f4390acd0c15781283d1089c85459aa989393485ab25337e246ef01
 SHA512:
-  metadata.gz: c4758b79d123881d8ead04bc325f2121388e216edffebfceadd2dae1183d8cb04999b205055d29a3b509ffee640e534dce9701a71fb97812d573a3bee0357297
-  data.tar.gz: 753f4495fb06a20dd2e77a41520c9db05b44442f94b261df5c2871454110636ca58efb22ccfecfb1922da8f5510e0edd6e3d5ec9384cf48494325c7489c90757
+  metadata.gz: 9f7f301227e79af9a7f3bafc5484e39426c9d5faee1ee1c6a97f4173d6b438def08cf36ea3a8eedaa06d9ce0741ee6bf012b7aba1a972680c79b397ac57a1ac9
+  data.tar.gz: 11bbaf66d5dcb32b042923abf85be353d96a6d1f09c1e641e0c40df215d9f70347e56b4d7afe81b5bb27a685318667c7c53d2ba24a2961e2a4dad72ad1c90273

data/README.md

@@ -53,8 +53,6 @@ All available config options are in: https://github.com/librariesio/bibliothecar
 
 ## Supported package manager file formats
 
-- Hackage
-  - \*.cabal
 - npm
   - package.json
   - package-lock.json
@@ -81,6 +79,8 @@ All available config options are in: https://github.com/librariesio/bibliothecar
   - requirements/*.pip
   - Pipfile
   - Pipfile.lock
+  - pyproject.toml
+  - poetry.lock
 - Nuget
   - packages.config
   - Project.json
@@ -149,7 +149,7 @@ All available config options are in: https://github.com/librariesio/bibliothecar
 - Haxelib
   - haxelib.json
 - Hackage
-  - *.cabal
+  - \*.cabal
   - cabal.config
 
 ## Development

data/lib/bibliothecary/parsers/pypi.rb

@@ -4,7 +4,12 @@ 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|in)$/
       PIP_COMPILE_REGEXP = /.*require.*$/
@@ -21,6 +26,10 @@ module Bibliothecary
             parser: :parse_requirements_txt,
             can_have_lockfile: false
           },
+          match_filename('requirements.frozen') => { # pattern exists to store frozen deps in requirements.frozen
+            parser: :parse_requirements_txt,
+            kind: 'lockfile',
+          },
           match_filename('pip-resolved-dependencies.txt') => { # Inferred from pip
             kind: 'lockfile',
             parser: :parse_requirements_txt,
@@ -160,7 +169,7 @@ module Bibliothecary
           next unless match
           deps << {
             name: match[1],
-            requirement: match[2] || '*',
+            requirement: match[-1] || '*',
             type: 'runtime'
           }
         end
@@ -174,7 +183,7 @@ module Bibliothecary
           next unless match
           deps << {
             name: match[1],
-            requirement: match[2] || '*',
+            requirement: match[-1] || '*',
             type: 'runtime'
           }
         end

data/lib/bibliothecary/related_files_info.rb

@@ -22,8 +22,8 @@ module Bibliothecary
       @platform = package_manager.platform_name
       @path = Pathname.new(File.dirname(file_infos.first.relative_path)).cleanpath.to_path
       # `package_manager.determine_kind_from_info(info)` can be an Array, so use include? which also works for string
-      @manifests = file_infos.select { |info| package_manager.determine_kind_from_info(info).include? "manifest" }.map { |info| File.basename(info.relative_path) }
-      @lockfiles = file_infos.select { |info| package_manager.determine_kind_from_info(info).include? "lockfile" }.map { |info| File.basename(info.relative_path) }
+      @manifests = file_infos.select { |info| package_manager.determine_kind_from_info(info).include? "manifest" }.map(&:relative_path)
+      @lockfiles = file_infos.select { |info| package_manager.determine_kind_from_info(info).include? "lockfile" }.map(&:relative_path)
     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.3"
+  VERSION = "7.2.1"
 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.3
+  version: 7.2.1
 platform: ruby
 authors:
 - Andrew Nesbitt
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2021-10-15 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: []