bibliothecary 7.0.1 → 7.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b444856f899510d260c076ddbfd10543e3592db2ede8ca618d99b9aeb9e033fe
-  data.tar.gz: f7da7041fa22140cafe5a9e84b4ab607688066fbf2d8f382ea85b6c01ab76e33
+  metadata.gz: 901e953500cd1880a638a6555c5dfc82dd8d8521be5b7bf85fc0d6dff981dfe0
+  data.tar.gz: 2c1d2c23f53bdea2a91b418bdee9ecc0becb8cbb651f94b53f76b8974b0a765e
 SHA512:
-  metadata.gz: e5d8cf6f14f6623c0d3d8d0e5cfd02e1f0a07cb5fafc87a66b206022238817e4e9bab204ac546d4c6200e181579eedead8e9bd4dfbcd48613d85e48af0017a15
-  data.tar.gz: 1ca3f3e2d5a1207cece4de5b62c386e9b98b1892e6e08024057fcbcc520f7f88444d62e5fa3bd66cafd086636f5a40f5a6a3fda3ceb4a5fda2d83b7e951039bb
+  metadata.gz: c1883bdfe4f28f284c4ef661f443b2e23830910368fbe63d8bf4e491e46278aaee12d8014c7181094933d7e3a6f33b6553318b016616ac27af00153ae763d65e
+  data.tar.gz: 59c5d53bffaeeb8c59df649370ff85c91245d8d7c3762dc97e21dc2663f02a10bd4a65e5c6f8dbf90bc8e2782b7420d3521623bb343e8b44985f396b019649a6

data/lib/bibliothecary/parsers/maven.rb

@@ -156,9 +156,8 @@ module Bibliothecary
       def self.parse_maven_tree(file_contents)
         file_contents = file_contents.gsub(/\r\n?/, "\n")
         captures = file_contents.scan(/^\[INFO\](?:(?:\+-)|\||(?:\\-)|\s)+((?:[\w\.-]+:)+[\w\.\-${}]+)/).flatten.uniq
-        captures.shift if captures.size > 1 # first dep line will be the package itself (unless we're only analyzing a single line)
 
-        captures.map do |item|
+        deps = captures.map do |item|
           parts = item.split(":")
           case parts.count
           when 4
@@ -173,6 +172,10 @@ module Bibliothecary
             type: type
           }
         end
+
+        # First dep line will be the package itself (unless we're only analyzing a single line)
+        package = deps[0]
+        deps.size < 2 ? deps : deps[1..-1].reject { |d| d[:name] == package[:name] && d[:requirement] == package[:requirement] }
       end
 
       def self.parse_resolved_dep_line(line)

data/lib/bibliothecary/parsers/packagist.rb

@@ -24,14 +24,20 @@ module Bibliothecary
           {
             name: dependency["name"],
             requirement: dependency["version"],
-            type: 'runtime'
-          }
+            type: "runtime"
+          }.tap do |result|
+            # Store Drupal version if Drupal, but include the original manifest version for reference
+            result[:original_requirement], result[:requirement] = result[:requirement], dependency.dig("source", "reference") if is_drupal_module(dependency)
+          end
         end + manifest.fetch('packages-dev',[]).map do |dependency|
           {
             name: dependency["name"],
             requirement: dependency["version"],
-            type: 'development'
-          }
+            type: "development"
+          }.tap do |result|
+            # Store Drupal version if Drupal, but include the original manifest version for reference
+            result[:original_requirement], result[:requirement] = result[:requirement], dependency.dig("source", "reference") if is_drupal_module(dependency)
+          end
         end
       end
 
@@ -40,6 +46,18 @@ module Bibliothecary
         map_dependencies(manifest, 'require', 'runtime') +
         map_dependencies(manifest, 'require-dev', 'development')
       end
+
+      # Drupal hosts its own Composer repository, where its "modules" are indexed and searchable. The best way to
+      # confirm that Drupal's repo is being used is if its in the "repositories" in composer.json
+      # (https://support.acquia.com/hc/en-us/articles/360048081273-Using-Composer-to-manage-dependencies-in-Drupal-8-and-9),
+      # but you may only have composer.lock, so we test if the type is "drupal-*" (e.g. "drupal-module" or "drupal-theme")
+      # The Drupal team also setup its own mapper of Composer semver -> Drupal tool-specfic versions
+      # (https://www.drupal.org/project/project_composer/issues/2622450),
+      # so we return the Drupal requirement instead of semver requirement if it's here
+      # (https://www.drupal.org/docs/develop/using-composer/using-composer-to-install-drupal-and-manage-dependencies#s-about-semantic-versioning)
+      private_class_method def self.is_drupal_module(dependency)
+        dependency["type"] =~ /drupal/ && dependency.dig("source", "reference")
+      end
     end
   end
 end

data/lib/bibliothecary/parsers/pypi.rb

@@ -7,9 +7,15 @@ module Bibliothecary
       REQUIRE_REGEXP = /([a-zA-Z0-9]+[a-zA-Z0-9\-_\.]+)([><=\w\.,]+)?/
       REQUIREMENTS_REGEXP = /^#{REQUIRE_REGEXP}/
       MANIFEST_REGEXP = /.*require[^\/]*(\/)?[^\/]*\.(txt|pip)$/
+      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,
@@ -174,6 +180,15 @@ module Bibliothecary
         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/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "7.0.1"
+  VERSION = "7.1.2"
 end

metadata

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