bibliothecary 7.3.2 → 7.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dece4dd0ba501561d36353606c81211a31727e01168effc7bbfdf0dc9ceec19
-  data.tar.gz: 4aa63636cf6e4697e9c35c2965f7cfe16bbe82f408d28f37c10fed678a1e893f
+  metadata.gz: c3e4510e233cc6052a908e31f4d60498481c2b940448a2727e8cf89f28fae9b6
+  data.tar.gz: fe1fe8895bfae3b445b8c36de74a0285e9121a6fa49fde52bc481bc78d3b8931
 SHA512:
-  metadata.gz: 0e3aa9619424e7ddc658a61779463d92a21ce7c80b364c61da52c4e05ae82f00aa3e792385f3552dbf5be0a240a4ae5cdee1b413b6b5412ffc2c038cd69a82c9
-  data.tar.gz: df88033afb288b0dcff8babb62eccda691aebc74aa1f19f209c6407c6cdddab4caf39420b23d012c51540988f7f7ffc9a81aa562724cf0dfe5eb6465e3801524
+  metadata.gz: 203d1b6888ea667b5f0cf661f7282239d1736f70547c734fb890e0f58ac43d429e4193bda6977a88ca880a2d7cfbd5c1989442f171e27aa6d583932d83898109
+  data.tar.gz: 2fbf1aaee7ba11983db23d163b57d32e2ba195fc2fa1dad71447becba40c3eafabb9a8834a2e5a12a24d42b46424cafc32837ad8c9157478734e1d17c8d9a98d

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/README.md

@@ -62,6 +62,7 @@ All available config options are in: https://github.com/librariesio/bibliothecar
   - pom.xml
   - ivy.xml
   - build.gradle
+  - gradle-dependencies-q.txt
 - RubyGems
   - Gemfile
   - Gemfile.lock

data/lib/bibliothecary/analyser.rb

@@ -25,6 +25,10 @@ module Bibliothecary
       base.extend(ClassMethods)
     end
     module ClassMethods
+      def generic?
+        platform_name == "generic"
+      end
+
       def mapping_entry_match?(matcher, details, info)
         if matcher.call(info.relative_path)
           # we only want to load contents if we don't have them already
@@ -119,13 +123,32 @@ module Bibliothecary
       end
       alias analyze_contents analyse_contents
 
+      def dependencies_to_analysis(info, kind, dependencies)
+        dependencies = dependencies || [] # work around any legacy parsers that return nil
+        if generic?
+          analyses = []
+          grouped = dependencies.group_by { |dep| dep[:platform] }
+          all_analyses = grouped.keys.map do |platform|
+            deplatformed_dependencies = grouped[platform].map { |d| d.delete(:platform); d }
+            Bibliothecary::Analyser::create_analysis(platform, info.relative_path, kind, deplatformed_dependencies)
+          end
+          # this is to avoid a larger refactor for the time being. The larger refactor
+          # needs to make analyse_contents return multiple analysis, or add another
+          # method that can return multiple and deprecate analyse_contents, perhaps.
+          raise "File contains zero or multiple platforms, currently must have exactly one" if all_analyses.length != 1
+          all_analyses.first
+        else
+          Bibliothecary::Analyser::create_analysis(platform_name, info.relative_path, kind, dependencies)
+        end
+      end
+
       def analyse_contents_from_info(info)
         # If your Parser needs to return multiple responses for one file, please override this method
         # For example see conda.rb
         kind = determine_kind_from_info(info)
         dependencies = parse_file(info.relative_path, info.contents)
 
-        Bibliothecary::Analyser::create_analysis(platform_name, info.relative_path, kind, dependencies || [])
+        dependencies_to_analysis(info, kind, dependencies)
       rescue Bibliothecary::FileParsingError => e
         Bibliothecary::Analyser::create_error_analysis(platform_name, info.relative_path, kind, e.message)
       end

data/lib/bibliothecary/parsers/generic.rb

@@ -0,0 +1,39 @@
+require 'csv'
+
+module Bibliothecary
+  module Parsers
+    class Generic
+      include Bibliothecary::Analyser
+
+      def self.mapping
+        {
+          match_filename("dependencies.csv") => {
+            kind: 'lockfile',
+            parser: :parse_lockfile
+          }
+        }
+      end
+
+      def self.parse_lockfile(file_contents)
+        table = CSV.parse(file_contents, headers: true)
+
+        required_headers = ["platform", "name", "requirement"]
+        missing_headers = required_headers - table.headers
+        raise "Missing headers #{missing_headers} in CSV" unless missing_headers.empty?
+
+        table.map.with_index do |row, idx|
+          line = idx + 1
+          required_headers.each do |h|
+            raise "missing field '#{h}' on line #{line}" if row[h].empty?
+          end
+          {
+            platform: row['platform'],
+            name: row['name'],
+            requirement: row['requirement'],
+            type: row.fetch('type', 'runtime'),
+          }
+        end
+      end
+    end
+  end
+end

data/lib/bibliothecary/parsers/maven.rb

@@ -44,6 +44,10 @@ module Bibliothecary
             kind: 'manifest',
             parser: :parse_gradle
           },
+          match_filename("build.gradle.kts", case_insensitive: true) => {
+            kind: 'manifest',
+            parser: :parse_gradle_kts
+          },
           match_extension(".xml", case_insensitive: true) => {
             content_matcher: :ivy_report?,
             kind: 'lockfile',
@@ -223,6 +227,11 @@ module Bibliothecary
         end.compact
       end
 
+      def self.parse_gradle_kts(manifest)
+        # TODO: the gradle-parser side needs to be implemented for this, coming soon.
+        []
+      end
+
       def self.gradle_dependency_name(group, name)
         if group.empty? && name.include?(":")
           group, name = name.split(":", 2)
@@ -281,7 +290,7 @@ module Bibliothecary
         non_prop_name = property_name.gsub(".", "/").gsub("project/", "")
         return "${#{property_name}}" if !xml.respond_to?("properties") && parent_properties.empty? && xml.locate(non_prop_name).empty?
 
-        prop_field = xml.properties.locate(property_name).first
+        prop_field = xml.properties.locate(property_name).first if xml.respond_to?("properties")
         parent_prop = parent_properties[property_name]
         if prop_field
           prop_field.nodes.first

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "7.3.2"
+  VERSION = "7.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 7.3.2
+  version: 7.3.5
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2022-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb
@@ -251,6 +251,7 @@ files:
 - lib/bibliothecary/parsers/cran.rb
 - lib/bibliothecary/parsers/dub.rb
 - lib/bibliothecary/parsers/elm.rb
+- lib/bibliothecary/parsers/generic.rb
 - lib/bibliothecary/parsers/go.rb
 - lib/bibliothecary/parsers/hackage.rb
 - lib/bibliothecary/parsers/haxelib.rb