bibliothecary 7.1.5 → 7.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9b98a74ca8714750a835ebe600e5a031edcad43bfffa82b475f47aaf1356d2b
-  data.tar.gz: a8a74dbbfdac38ad7da70258e080c9f61aad16c4f19002b8d1d53290873ba6d0
+  metadata.gz: 0663db5989fda63b06b68549a29bcd58976f96b7f7fd35b4063738fac6fbf8ff
+  data.tar.gz: 16e3caf672f0d34b19e2cbd80acfec45b7b65f559cf152d3d23003b4282a7933
 SHA512:
-  metadata.gz: 25f3208793295ee459d4a9995f38a877d48132fa31469091695e60597c09547f345a0f554539a4bfe065b8a307ba17a8e9fecc3d30d08cce22ef35cf7e5430e0
-  data.tar.gz: 8b38ae3f49162807dcf04f3e07c81d69501b1aa041b4e1239bc8bf477067e485266b15ad99a090f649dd826cf2f055a24ef3bf39e8fbcda071f2d087f0dea2a2
+  metadata.gz: d3041468f12d9080d2d06cad3a5a3e2a316727207e0bc6d1ec263a6dd5f7da25be3ce5901fed3f9b0e362cdf02892c1e9e6bcf93f133264e8de42ccad08a1f81
+  data.tar.gz: '08d43bb3e8a35463162ee0379ca0c5563a81a2665c236f256c4613e1d825e25cf16899c690ffff9f4fa8fc55ef09fe9d8a9acdcb5b5f8f51bc0df76a49b38be4'

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

@@ -127,10 +127,12 @@ module Bibliothecary
 
           split = gradle_dep_match.captures[0]
 
-          # org.springframework.boot:spring-boot-starter-web:2.1.0.M3 (*)
-          # Lines can end with (c), (n), or (*)
-          # to indicate that something was a dependency constraint (c), not resolved (n), or resolved previously (*).
-          dep = line.split(split)[1].sub(/(\((c|n|\*)\))$/, "").sub(" -> ", ":").strip.split(":")
+
+          dep = line
+            .split(split)[1].sub(/(\((c|n|\*)\))$/, "") # line ending legend: (c) means a dependency constraint, (n) means not resolved, or (*) means resolved previously, e.g. org.springframework.boot:spring-boot-starter-web:2.1.0.M3 (*)
+            .sub(/ FAILED$/, "") # dependency could not be resolved (but still may have a version)
+            .sub(" -> ", ":") # handle version arrow syntax
+            .strip.split(":")
 
           # A testImplementation line can look like this so just skip those
           # \--- org.springframework.security:spring-security-test (n)

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

@@ -26,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,

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.5"
+  VERSION = "7.3.1"
 end

metadata

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