bibliothecary 7.1.0 → 7.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74f493b85e3dec08ab0c8aad09b9beb59eee3b8dc5317d6b9f20c6c5620298eb
-  data.tar.gz: 1f1dd61989f87a10974e205862e3a01c7808bdad072dcca2f74193d1c731c9ec
+  metadata.gz: 139600bf079b4cc07ba891b319f14dd7ec7af7622bcd5b87ef93b70e21191e58
+  data.tar.gz: 1b0162957be9078ffb00d6c2f1ff2d2654e7aad74853bb7f06e3c81be50ca950
 SHA512:
-  metadata.gz: '02351483c4000b031662de8ed48459c74d8d533b9676ba3968060e01cca50fcf5ede59982d8e6237d6ddf8395fa0b5172c87eb13a7d849e866236c88fec20150'
-  data.tar.gz: b437fe17ca779bc99a6d78753936726ae102c75ef7e2583ae6544320aa5b65ba53e16e644035c5eaa445cd2bc6fe2fa695856b6e518c5d3fbad389f33c0419ae
+  metadata.gz: ef6071d7672fc07be61cac936b10f694675758ca4ed2d9dfdf9cd77c440f1538771cccc528f1b4d2486fe8e6621eff96ae7825c69b97b957140302e3d7fa01f9
+  data.tar.gz: 3797470015e7d7f2da4b6603ece7e327083bb10d5b77f4bb2c8adc139f35fe0a5c1e90ef1d8cc36aba83a5ca77144f6433a98d85e8164dee8a3a38dc23fa9450

data/lib/bibliothecary/parsers/packagist.rb

@@ -26,7 +26,8 @@ module Bibliothecary
             requirement: dependency["version"],
             type: "runtime"
           }.tap do |result|
-            result[:drupal_requirement] = dependency.dig("source", "reference") if is_drupal_module(dependency)
+            # 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|
           {
@@ -34,7 +35,8 @@ module Bibliothecary
             requirement: dependency["version"],
             type: "development"
           }.tap do |result|
-            result[:drupal_requirement] = dependency.dig("source", "reference") if is_drupal_module(dependency)
+            # 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
@@ -51,7 +53,8 @@ module Bibliothecary
       # 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.
+      # 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

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

@@ -42,6 +42,22 @@ module Bibliothecary
       Bibliothecary::Parsers.constants.map{|c| Bibliothecary::Parsers.const_get(c) }.sort_by{|c| c.to_s.downcase }
     end
 
+    def load_file_info_list_from_contents(file_path_contents_hash)
+      # Parses an array of format [{file_path: "", contents: ""},] to match
+      #  on both filename matches, and one content_match patterns.
+      file_list = []
+
+      file_path_contents_hash.each do |file|
+        info = FileInfo.new(nil, file[:file_path], file[:contents])
+
+        next if ignored_files.include?(info.relative_path)
+
+        add_files_to_list(file_list, info)
+      end
+
+      file_list
+    end
+
     def load_file_info_list_from_paths(paths)
       file_list = []
 
@@ -50,12 +66,7 @@ module Bibliothecary
 
         next if ignored_files.include?(info.relative_path)
 
-        applicable_package_managers(info).each do |package_manager|
-          file = info.dup
-          file.package_manager = package_manager
-
-          file_list.push(file)
-        end
+        add_files_to_list(file_list, info)
       end
 
       file_list
@@ -71,12 +82,7 @@ module Bibliothecary
         next unless FileTest.file?(subpath)
         next if ignored_files.include?(info.relative_path)
 
-        applicable_package_managers(info).each do |package_manager|
-          file = info.dup
-          file.package_manager = package_manager
-
-          file_list.push(file)
-        end
+        add_files_to_list(file_list, info)
       end
 
       file_list
@@ -90,6 +96,10 @@ module Bibliothecary
       RelatedFilesInfo.create_from_file_infos(load_file_info_list_from_paths(paths).reject { |info| info.package_manager.nil? })
     end
 
+    def find_manifests_from_contents(file_path_contents_hash)
+      RelatedFilesInfo.create_from_file_infos(load_file_info_list_from_contents(file_path_contents_hash).reject { |info| info.package_manager.nil? })
+    end
+
     def analyse_file(file_path, contents)
       package_managers.select { |pm| pm.match?(file_path, contents) }.map do |pm|
         pm.analyse_contents(file_path, contents)
@@ -124,5 +134,16 @@ module Bibliothecary
     def ignored_files
       @configuration.ignored_files
     end
+
+    private
+
+    def add_files_to_list(file_list, info)
+      applicable_package_managers(info).each do |package_manager|
+        file = info.dup
+        file.package_manager = package_manager
+
+        file_list.push(file)
+      end
+    end
   end
 end

data/lib/bibliothecary/version.rb

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

data/lib/bibliothecary.rb

@@ -34,6 +34,10 @@ module Bibliothecary
     runner.load_file_info_list_from_paths(paths)
   end
 
+  def self.load_file_info_list_from_contents(file_path_contents_hash)
+    runner.load_file_info_list_from_contents(file_path_contents_hash)
+  end
+
   def self.analyse_file(file_path, contents)
     runner.analyse_file(file_path, contents)
   end
@@ -54,6 +58,10 @@ module Bibliothecary
     runner.find_manifests_from_paths(paths)
   end
 
+  def self.find_manifests_from_contents(file_path_contents_hash)
+    runner.find_manifests_from_contents(file_path_contents_hash)
+  end
+
   def self.ignored_dirs
     configuration.ignored_dirs
   end

metadata

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