bibliothecary 6.11.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caaa965267d6272e22ec385e0ad56505f645cdc3437163ec2a9d40471c1e620b
-  data.tar.gz: a2ad1df3e6481e0faed3d27039557b5b248f73fe5fa9864cd7d9462e215af72a
+  metadata.gz: 527bb093daab817755bf4f5a3d35b1aa831f292f9fe8112ddf6a917b368239ac
+  data.tar.gz: 37ffb251371c1aed5465e15e933dd41921f341ff4794da004d8678cda695cd25
 SHA512:
-  metadata.gz: 2a333bfa32d1c31abf164afd8a09b7060ffe2809b43199273e706e83dd01d9638e57f85787390deba7e923a9b26494e47074718df319bac159d9cfbb4bb32a26
-  data.tar.gz: 7a68137ae7f02721a2ae8ae94dad59783a07ba291c440cbc6469af0164b0f57a83b055dd16ac5ca58ba2a00de76e217a8fd778b30c98b1585760aa47f60c3ff1
+  metadata.gz: 6f67cfe62ca501f2ad8064e3fff37593e929d20d8210d619a57e88a887f4fc981081fb1cdc09e9e8b5ab582d22eb46e760b6f53456e9ecfb179a744a7c6b1d91
+  data.tar.gz: 407398a4772816f145da883104d5a21516117fd8e544ecaff3e0dd438c26a02f8a17bc766e2c51a602ac72008c6954e16ee9478db2f80700d3ac47ebb6182858

data/README.md

@@ -88,6 +88,7 @@ All available config options are in: https://github.com/librariesio/bibliothecar
   - *.nuspec
   - paket.lock
   - *.csproj
+  - project.assets.json
 - Bower
   - bower.json
 - CPAN

data/bibliothecary.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "toml-rb", "~> 1.0"
+  spec.add_dependency "tomlrb", "~> 2.0"
   spec.add_dependency "librariesio-gem-parser"
   spec.add_dependency "ox", ">= 2.8.1"
   spec.add_dependency "typhoeus"

data/lib/bibliothecary.rb

@@ -6,6 +6,7 @@ require "bibliothecary/exceptions"
 require "bibliothecary/file_info"
 require "bibliothecary/related_files_info"
 require "find"
+require "tomlrb"
 
 Dir[File.expand_path('../bibliothecary/parsers/*.rb', __FILE__)].each do |file|
   require file
@@ -63,6 +64,8 @@ module Bibliothecary
 
   class << self
     attr_writer :configuration
+    alias analyze analyse
+    alias analyze_file analyse_file
   end
 
   def self.runner

data/lib/bibliothecary/analyser.rb

@@ -101,6 +101,7 @@ module Bibliothecary
       def analyse(folder_path, file_list)
         analyse_file_info(file_list.map { |full_path| FileInfo.new(folder_path, full_path) })
       end
+      alias analyze analyse
 
       def analyse_file_info(file_info_list)
         matching_info = file_info_list
@@ -111,10 +112,12 @@ module Bibliothecary
             .merge(related_paths: related_paths(info, matching_info))
         end
       end
+      alias analyze_file_info analyse_file_info
 
       def analyse_contents(filename, contents)
         analyse_contents_from_info(FileInfo.new(nil, filename, contents))
       end
+      alias analyze_contents analyse_contents
 
       def analyse_contents_from_info(info)
         # If your Parser needs to return multiple responses for one file, please override this method
@@ -126,6 +129,7 @@ module Bibliothecary
       rescue Bibliothecary::FileParsingError => e
         Bibliothecary::Analyser::create_error_analysis(platform_name, info.relative_path, kind, e.message)
       end
+      alias analyze_contents_from_info analyse_contents_from_info
 
       # calling this with contents=nil can produce less-informed
       # results, but kept for back compat

data/lib/bibliothecary/parsers/cargo.rb

@@ -1,5 +1,3 @@
-require 'toml-rb'
-
 module Bibliothecary
   module Parsers
     class Cargo
@@ -19,7 +17,7 @@ module Bibliothecary
       end
 
       def self.parse_manifest(file_contents)
-        manifest = TomlRB.parse(file_contents)
+        manifest = Tomlrb.parse(file_contents)
         manifest.fetch('dependencies', []).map do |name, requirement|
           if requirement.respond_to?(:fetch)
             requirement = requirement['version'] or next
@@ -34,7 +32,7 @@ module Bibliothecary
       end
 
       def self.parse_lockfile(file_contents)
-        manifest = TomlRB.parse(file_contents)
+        manifest = Tomlrb.parse(file_contents)
         manifest.fetch('package',[]).map do |dependency|
           next if not dependency['source'] or not dependency['source'].start_with?('registry+')
           {

data/lib/bibliothecary/parsers/go.rb

@@ -106,12 +106,12 @@ module Bibliothecary
       end
 
       def self.parse_dep_toml(file_contents)
-        manifest = TomlRB.parse file_contents
+        manifest = Tomlrb.parse file_contents
         map_dependencies(manifest, 'constraint', 'name', 'version', 'runtime')
       end
 
       def self.parse_dep_lockfile(file_contents)
-        manifest = TomlRB.parse file_contents
+        manifest = Tomlrb.parse file_contents
         map_dependencies(manifest, 'projects', 'name', 'revision', 'runtime')
       end
 

data/lib/bibliothecary/parsers/maven.rb

@@ -238,6 +238,7 @@ module Bibliothecary
         return nil if field.nil?
 
         value = field.nodes.first
+        value = value.value if value.is_a?(Ox::CData)
         match = value&.match(MAVEN_PROPERTY_REGEX)
         if match
           return extract_property(xml, match[1], value, parent_properties)

data/lib/bibliothecary/parsers/npm.rb

@@ -49,9 +49,18 @@ module Bibliothecary
           else
             type = 'runtime'
           end
+
+          version = nil
+
+          if requirement.key?("from")
+            version = requirement["from"][/#(?:semver:)?v?(.*)/, 1]
+          end
+
+          version ||= requirement["version"].split("#").last
+
           {
             name: name,
-            requirement: requirement["version"],
+            requirement: version,
             type: type
           }
         end

data/lib/bibliothecary/parsers/nuget.rb

@@ -35,7 +35,11 @@ module Bibliothecary
           match_filename("paket.lock") => {
             kind: 'lockfile',
             parser: :parse_paket_lock
-          }
+          },
+          match_filename("project.assets.json") => {
+            kind: 'lockfile',
+            parser: :parse_project_assets_json
+          },
         }
       end
 
@@ -137,6 +141,34 @@ module Bibliothecary
         # we only have to enforce uniqueness by name because paket ensures that there is only the single version globally in the project
         packages.uniq {|package| package[:name] }
       end
+
+      def self.parse_project_assets_json(file_contents)
+        manifest = JSON.parse file_contents
+
+        frameworks = {}
+        manifest.fetch("targets",[]).each do |framework, deps|
+          frameworks[framework] = deps
+                                    .select { |name, details| details["type"] == "package" }
+                                    .map do |name, details|
+            name_split = name.split("/")
+            {
+              name: name_split[0],
+              requirement: name_split[1],
+              type: "runtime"
+            }
+          end
+        end
+
+        if frameworks.size > 0
+          # we should really return multiple manifests, but bibliothecary doesn't
+          # do that yet so at least pick deterministically.
+
+          # Note, frameworks can be empty, so remove empty ones and then return the last sorted item if any
+          frameworks = frameworks.delete_if { |k, v| v.empty? }
+          return frameworks[frameworks.keys.sort.last] unless frameworks.empty?
+        end
+        []
+      end
     end
   end
 end

data/lib/bibliothecary/parsers/pypi.rb

@@ -61,12 +61,12 @@ module Bibliothecary
       end
 
       def self.parse_pipfile(file_contents)
-        manifest = TomlRB.parse(file_contents)
+        manifest = Tomlrb.parse(file_contents)
         map_dependencies(manifest['packages'], 'runtime') + map_dependencies(manifest['dev-packages'], 'develop')
       end
 
       def self.parse_poetry(file_contents)
-        manifest = TomlRB.parse(file_contents)['tool']['poetry']
+        manifest = Tomlrb.parse(file_contents)['tool']['poetry']
         map_dependencies(manifest['dependencies'], 'runtime') + map_dependencies(manifest['dev-dependencies'], 'develop')
       end
 
@@ -124,7 +124,7 @@ module Bibliothecary
       end
 
       def self.parse_poetry_lock(file_contents)
-        manifest = TomlRB.parse(file_contents)
+        manifest = Tomlrb.parse(file_contents)
         deps = []
         manifest["package"].each do |package|
           # next if group == "_meta"

data/lib/bibliothecary/runner.rb

@@ -26,6 +26,7 @@ module Bibliothecary
 
       analyses
     end
+    alias analyze analyse
 
     # deprecated; use load_file_info_list.
     def load_file_list(path)
@@ -94,6 +95,7 @@ module Bibliothecary
         pm.analyse_contents(file_path, contents)
       end.flatten.uniq.compact
     end
+    alias analyze_file analyse_file
 
     # this skips manifests sometimes because it doesn't look at file
     # contents and can't establish from only regexes that the thing

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "6.11.0"
+  VERSION = "7.0.0"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 6.11.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Andrew Nesbitt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-12 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: toml-rb
+  name: tomlrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: librariesio-gem-parser
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -289,8 +289,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Find and parse manifests
 test_files: []