bibliothecary 7.0.2 → 7.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c44d6a07f7c3cdd1e6517420b6fe59f0b453201f0f4deb7e3870f206ace5a04
-  data.tar.gz: 07ddf505184913265f608eea5b0ad8f9293b69a47bbe353606651d510b8d6158
+  metadata.gz: 363f07f35de59f9e70b69e78e25c47a16eaaeb88399db593af9fa8907f9057b4
+  data.tar.gz: e960f21a1d5df9dbe686efce3dd0968e08b60f24b20767fc861a344704e9f3f9
 SHA512:
-  metadata.gz: 2c8693bace5bb30e27ae2cd72c130a68f8c2e8cdbb0f487b5bef59374a7ac6ad103bc10a2214f3ce2409a5c73dd861136f3e7c4b751d1a17b9ff13bb400a4ba7
-  data.tar.gz: 6d92229299dd6c3997ab9ff2addde302baf95383660a7849afaa519bc94b519196c7a11aae08bc23c24daaf96bb689c1431f9ab07efe1e0cbcce7f4e0d91e6a5
+  metadata.gz: c4758b79d123881d8ead04bc325f2121388e216edffebfceadd2dae1183d8cb04999b205055d29a3b509ffee640e534dce9701a71fb97812d573a3bee0357297
+  data.tar.gz: 753f4495fb06a20dd2e77a41520c9db05b44442f94b261df5c2871454110636ca58efb22ccfecfb1922da8f5510e0edd6e3d5ec9384cf48494325c7489c90757

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

@@ -6,10 +6,16 @@ module Bibliothecary
       INSTALL_REGEXP = /install_requires\s*=\s*\[([\s\S]*?)\]/
       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,
@@ -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.2"
+  VERSION = "7.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.1.3
 platform: ruby
 authors:
 - Andrew Nesbitt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-22 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: []