bibliothecary 8.5.1 → 8.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28eee333f0558f68657092d126ca5465eddbba371f1ad189a3007d4b43915063
-  data.tar.gz: 91cb04d35a821cd7a8af93688a7db430d445f37f805493f379c2eeccddca5f74
+  metadata.gz: 339163151e8113f056a34e7089bcd5e68d0629cdd45b0109b40087974dd0efa4
+  data.tar.gz: 0bd35f6a15d412e7625268e41de4122a352a08c5def052a4bdd54efcaede8dba
 SHA512:
-  metadata.gz: 8286430aba8f90efd0fc73b63f1fe31f57a7aa3759f88613fdecced517ad98a12a2ce62032bab0919c94f125c84953a71ba3862533a4a2e410ec11d1e4cf4a99
-  data.tar.gz: 310fa03c90fca4ee65fb46b2fb78b9f9276b082adeada8a4536cd9357441c7f33c54cbf016cd087a7b7c5f0b6517664ed8107d92cbe730e57538888e2e778fe6
+  metadata.gz: 0f6ef41d068ddab930d57d22beb60cb8bdc1543de2429ed5d4e13a3ded544cc8dec1374798c2d5a432d610ed6a5612578996940c793d869795bb0c35ad6ebad5
+  data.tar.gz: dff39cdf5dc7b28de5343ad45a1b095336cdcdeb92224855b47abd112f61d0ff6d861367fe8c84fe546ce4a1c7e94fdd2b84cb7c3d841e6057a52db227bff194

data/lib/bibliothecary/parsers/pypi.rb

@@ -14,6 +14,9 @@ module Bibliothecary
       MANIFEST_REGEXP = /.*require[^\/]*(\/)?[^\/]*\.(txt|pip|in)$/
       PIP_COMPILE_REGEXP = /.*require.*$/
 
+      # Adapted from https://peps.python.org/pep-0508/#names
+      PEP_508_NAME_REGEX = /^([A-Z0-9][A-Z0-9._-]*[A-Z0-9]|[A-Z0-9])/i
+
       def self.mapping
         {
           match_filenames('requirements-dev.txt', 'requirements/dev.txt',
@@ -56,7 +59,7 @@ module Bibliothecary
           },
           match_filename("pyproject.toml") => {
             kind: 'manifest',
-            parser: :parse_poetry
+            parser: :parse_pyproject
           },
           match_filename("poetry.lock") => {
             kind: 'lockfile',
@@ -90,9 +93,30 @@ module Bibliothecary
         map_dependencies(manifest['packages'], 'runtime') + map_dependencies(manifest['dev-packages'], 'develop')
       end
 
+      def self.parse_pyproject(file_contents, options: {})
+        deps = []  
+
+        file_contents = Tomlrb.parse(file_contents)
+        
+        # Parse poetry [tool.poetry] deps
+        poetry_manifest = file_contents.fetch('tool', {}).fetch('poetry', {})
+        deps += map_dependencies(poetry_manifest['dependencies'], 'runtime')
+        deps += map_dependencies(poetry_manifest['dev-dependencies'], 'develop')
+
+        # Parse PEP621 [project] deps
+        pep621_manifest = file_contents.fetch('project', {})
+        pep621_deps = pep621_manifest.fetch('dependencies', []).map { |d| parse_pep_508_dep_spec(d) }
+        deps += map_dependencies(pep621_deps, 'runtime')
+
+        # We're combining both poetry+PEP621 deps instead of making them mutually exclusive, until we
+        # find a reason not to ingest them both.
+        deps.uniq
+      end
+
+      # TODO: this was deprecated in 8.6.0. Remove this in any major version bump >= 9.*
       def self.parse_poetry(file_contents, options: {})
-        manifest = Tomlrb.parse(file_contents).fetch('tool', {}).fetch('poetry', {})
-        map_dependencies(manifest['dependencies'], 'runtime') + map_dependencies(manifest['dev-dependencies'], 'develop')
+        puts "Warning: parse_poetry() is deprecated, use parse_pyproject() instead."
+        parse_pyproject(file_contents, options)
       end
 
       def self.parse_conda(file_contents, options: {})
@@ -252,6 +276,15 @@ module Bibliothecary
         # parsing after we match.
         false
       end
+
+      # Simply parses out the name of a PEP 508 Dependency specification: https://peps.python.org/pep-0508/
+      # Leaves the rest as-is with any leading semicolons or spaces stripped
+      def self.parse_pep_508_dep_spec(dep)
+        name, requirement = dep.split(PEP_508_NAME_REGEX, 2).last(2).map(&:strip)
+        requirement = requirement.sub(/^[\s;]*/, "")
+        requirement = "*" if requirement == ""
+        return name, requirement
+      end
     end
   end
 end

data/lib/bibliothecary/parsers/rubygems.rb

@@ -8,6 +8,7 @@ module Bibliothecary
 
       NAME_VERSION = '(?! )(.*?)(?: \(([^-]*)(?:-(.*))?\))?'.freeze
       NAME_VERSION_4 = /^ {4}#{NAME_VERSION}$/
+      BUNDLED_WITH = /BUNDLED WITH/
 
       def self.mapping
         {
@@ -35,14 +36,20 @@ module Bibliothecary
       def self.parse_gemfile_lock(file_contents, options: {})
         file_contents.lines(chomp: true).map do |line|
           match = line.match(NAME_VERSION_4)
-          next unless match
-          name = match[1]
-          version = match[2].gsub(/\(|\)/,'')
-          {
-            name: name,
-            requirement: version,
-            type: 'runtime'
-          }
+          bundler_match = line.match(BUNDLED_WITH)
+          next unless match || bundler_match
+
+          if match
+            name = match[1]
+            version = match[2].gsub(/\(|\)/,'')
+            {
+              name: name,
+              requirement: version,
+              type: 'runtime'
+            }
+          else
+            parse_bundler(file_contents)
+          end
         end.compact
       end
 
@@ -55,6 +62,19 @@ module Bibliothecary
         manifest = Gemnasium::Parser.send(:gemspec, file_contents)
         parse_ruby_manifest(manifest)
       end
+
+      def self.parse_bundler(file_contents)
+        bundled_with_index = file_contents.lines(chomp: true).find_index { |line| line.match(BUNDLED_WITH) }
+        version = file_contents.lines(chomp: true).fetch(bundled_with_index + 1)&.strip
+
+        return nil unless version
+
+        {
+          name: 'bundler',
+          requirement: version,
+          type: 'runtime'
+        }
+      end
     end
   end
 end

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "8.5.1"
+  VERSION = "8.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.5.1
+  version: 8.6.1
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb
@@ -339,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Find and parse manifests