bibliothecary 7.0.2 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c44d6a07f7c3cdd1e6517420b6fe59f0b453201f0f4deb7e3870f206ace5a04
-  data.tar.gz: 07ddf505184913265f608eea5b0ad8f9293b69a47bbe353606651d510b8d6158
+  metadata.gz: 74f493b85e3dec08ab0c8aad09b9beb59eee3b8dc5317d6b9f20c6c5620298eb
+  data.tar.gz: 1f1dd61989f87a10974e205862e3a01c7808bdad072dcca2f74193d1c731c9ec
 SHA512:
-  metadata.gz: 2c8693bace5bb30e27ae2cd72c130a68f8c2e8cdbb0f487b5bef59374a7ac6ad103bc10a2214f3ce2409a5c73dd861136f3e7c4b751d1a17b9ff13bb400a4ba7
-  data.tar.gz: 6d92229299dd6c3997ab9ff2addde302baf95383660a7849afaa519bc94b519196c7a11aae08bc23c24daaf96bb689c1431f9ab07efe1e0cbcce7f4e0d91e6a5
+  metadata.gz: '02351483c4000b031662de8ed48459c74d8d533b9676ba3968060e01cca50fcf5ede59982d8e6237d6ddf8395fa0b5172c87eb13a7d849e866236c88fec20150'
+  data.tar.gz: b437fe17ca779bc99a6d78753936726ae102c75ef7e2583ae6544320aa5b65ba53e16e644035c5eaa445cd2bc6fe2fa695856b6e518c5d3fbad389f33c0419ae

data/lib/bibliothecary/parsers/packagist.rb

@@ -24,14 +24,18 @@ module Bibliothecary
           {
             name: dependency["name"],
             requirement: dependency["version"],
-            type: 'runtime'
-          }
+            type: "runtime"
+          }.tap do |result|
+            result[:drupal_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|
+            result[:drupal_requirement] = dependency.dig("source", "reference") if is_drupal_module(dependency)
+          end
         end
       end
 
@@ -40,6 +44,17 @@ 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.
+      private_class_method def self.is_drupal_module(dependency)
+        dependency["type"] =~ /drupal/ && dependency.dig("source", "reference")
+      end
     end
   end
 end

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "7.0.2"
+  VERSION = "7.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.1.0
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb