bibliothecary 7.1.4 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 139600bf079b4cc07ba891b319f14dd7ec7af7622bcd5b87ef93b70e21191e58
-  data.tar.gz: 1b0162957be9078ffb00d6c2f1ff2d2654e7aad74853bb7f06e3c81be50ca950
+  metadata.gz: 6bf41693f3224f06747aa8ea8799d369d68b262033689b900fe1a18c35803b85
+  data.tar.gz: 4cee903aaa6fff7e24e7ca4f8ddd162d2dd42af4ec04161fac21397622e6f5cd
 SHA512:
-  metadata.gz: ef6071d7672fc07be61cac936b10f694675758ca4ed2d9dfdf9cd77c440f1538771cccc528f1b4d2486fe8e6621eff96ae7825c69b97b957140302e3d7fa01f9
-  data.tar.gz: 3797470015e7d7f2da4b6603ece7e327083bb10d5b77f4bb2c8adc139f35fe0a5c1e90ef1d8cc36aba83a5ca77144f6433a98d85e8164dee8a3a38dc23fa9450
+  metadata.gz: c178932cf88d945686cfa34ab2e9cf581c2b99878d51e2fc783e98804b63737f7f852a1017c81c4aec9c8ca7f425b54b3092722f95b767e37be07fce343a2740
+  data.tar.gz: b11a8ea3373f61fb2d1def0f203a400c864f30eec52faa77551d256cdc1a9c27e20e960b4151713982987faea0af8529e83f0d8606129613591487a358c26755

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

@@ -5,6 +5,9 @@ module Bibliothecary
     class NPM
       include Bibliothecary::Analyser
 
+      # Max depth to recurse into the "dependencies" property of package-lock.json
+      PACKAGE_LOCK_JSON_MAX_DEPTH = 10
+
       def self.mapping
         {
           match_filename("package.json") => {
@@ -43,26 +46,25 @@ module Bibliothecary
 
       def self.parse_package_lock(file_contents)
         manifest = JSON.parse(file_contents)
-        manifest.fetch('dependencies',[]).map do |name, requirement|
-          if requirement.fetch("dev", false)
-            type = 'development'
-          else
-            type = 'runtime'
-          end
-
-          version = nil
-
-          if requirement.key?("from")
-            version = requirement["from"][/#(?:semver:)?v?(.*)/, 1]
-          end
+        parse_package_lock_deps_recursively(manifest.fetch('dependencies', []))
+      end
 
+      def self.parse_package_lock_deps_recursively(dependencies, depth=1)
+        dependencies.flat_map do |name, requirement|
+          type = requirement.fetch("dev", false) ? 'development' : 'runtime'
+          version = requirement.key?("from") ? requirement["from"][/#(?:semver:)?v?(.*)/, 1] : nil
           version ||= requirement["version"].split("#").last
+          child_dependencies = if depth >= PACKAGE_LOCK_JSON_MAX_DEPTH
+            []
+          else
+            parse_package_lock_deps_recursively(requirement.fetch('dependencies', []), depth + 1)
+          end
 
-          {
+          [{
             name: name,
             requirement: version,
             type: type
-          }
+          }] + child_dependencies
         end
       end
 

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

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "7.1.4"
+  VERSION = "7.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 7.1.4
+  version: 7.3.0
 platform: ruby
 authors:
 - Andrew Nesbitt
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-10-25 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: []