bibliothecary 8.6.0 → 8.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69baa22eeba713511d022a85df1280b987885810f25e421f8d7eecf8af795317
-  data.tar.gz: c663614b9e7c5aee6613a403a14aa2faccbbe07bf69d3cb68a92faa09449803c
+  metadata.gz: 86361a7bec7e2b16e6d15548c35ce460a39378f241d010b42f743f9aee761dc6
+  data.tar.gz: b6b44dd4064c686006932e77abe0c3d8e792bb132f15b0ae2876bd054c38d43c
 SHA512:
-  metadata.gz: 27bc063ab4832d89e65673935169d9ad78fb13a48bacaf4d8a640781f8bc5a1f4a486da73e7e7409e64eb721246695997471f342e966d9434d576f480238c253
-  data.tar.gz: aea0d2e9eea3a8e9dec803d040ea14299febdf52528d58a7479240e6e65def97a5e24c60a0c0955ee72929140698ae78f6ca6ecbe44c1d1b7240f64d90d6570a
+  metadata.gz: b371453204d2523671442fc45ec512f83f45eafb73f429f0a1b743fe5edc6bc23f65fc90c7110aadcb4ed24e7e50ed1b81863f50736355ac9068a274a242ca56
+  data.tar.gz: d94e3f5986f4d080d0b02d9a0349686220b4b3e9b96f91bd64050ad05dd6785cfbf823a2216b49ec78cec040f48bd3705212894e338efa2382da19ea848db833

data/lib/bibliothecary/parsers/maven.rb

@@ -268,11 +268,15 @@ module Bibliothecary
         [].tap do |deps|
           ['dependencies/dependency', 'dependencyManagement/dependencies/dependency'].each do |deps_xpath|
             xml.locate(deps_xpath).each do |dep|
-              deps.push({
+              dep_hash = {
                 name: "#{extract_pom_dep_info(xml, dep, 'groupId', parent_properties)}:#{extract_pom_dep_info(xml, dep, 'artifactId', parent_properties)}",
                 requirement: extract_pom_dep_info(xml, dep, 'version', parent_properties),
-                type: extract_pom_dep_info(xml, dep, 'scope', parent_properties) || 'runtime'
-              })
+                type: extract_pom_dep_info(xml, dep, 'scope', parent_properties) || 'runtime',
+              }
+              # optional field is, itself, optional, and will be either "true" or "false"
+              optional = extract_pom_dep_info(xml, dep, 'optional', parent_properties)
+              dep_hash[:optional] = optional == "true" unless optional.nil?
+              deps.push(dep_hash)
             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.6.0"
+  VERSION = "8.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.6.0
+  version: 8.6.2
 platform: ruby
 authors:
 - Andrew Nesbitt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-06 00:00:00.000000000 Z
+date: 2023-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb
@@ -248,7 +248,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - andrewnez@gmail.com
 executables:
@@ -324,7 +324,7 @@ homepage: https://github.com/librariesio/bibliothecary
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -339,8 +339,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Find and parse manifests
 test_files: []