bibliothecary 6.12.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5353b0fbb338eaeec8f162cdcaf3e3d5750afc2ed82d23eddf13367f92ebd39c
-  data.tar.gz: f76ddb1b0bbcf754d65ad136a6c010f132a0b4e8cc1be0501525eafb2186beb6
+  metadata.gz: b444856f899510d260c076ddbfd10543e3592db2ede8ca618d99b9aeb9e033fe
+  data.tar.gz: f7da7041fa22140cafe5a9e84b4ab607688066fbf2d8f382ea85b6c01ab76e33
 SHA512:
-  metadata.gz: 473789f139eb246fcb13433c2307951f6d777db0e82a71179dace7a36f9b82903a655b82aa283844da41f85fc0c1ca1cb4c7845e9ce322295acd6b7f46639012
-  data.tar.gz: e30f25772c86b511ac390f739d6ff5e19e871a3269c272359f823233c9ab7d38ef3f537d8c7b08842016d2641ac90c4d0b2603b1d1e2503524613a91ad0b33e2
+  metadata.gz: e5d8cf6f14f6623c0d3d8d0e5cfd02e1f0a07cb5fafc87a66b206022238817e4e9bab204ac546d4c6200e181579eedead8e9bd4dfbcd48613d85e48af0017a15
+  data.tar.gz: 1ca3f3e2d5a1207cece4de5b62c386e9b98b1892e6e08024057fcbcc520f7f88444d62e5fa3bd66cafd086636f5a40f5a6a3fda3ceb4a5fda2d83b7e951039bb

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

@@ -152,9 +152,12 @@ module Bibliothecary
           .compact
           .uniq
       end
+
       def self.parse_maven_tree(file_contents)
         file_contents = file_contents.gsub(/\r\n?/, "\n")
         captures = file_contents.scan(/^\[INFO\](?:(?:\+-)|\||(?:\\-)|\s)+((?:[\w\.-]+:)+[\w\.\-${}]+)/).flatten.uniq
+        captures.shift if captures.size > 1 # first dep line will be the package itself (unless we're only analyzing a single line)
+
         captures.map do |item|
           parts = item.split(":")
           case parts.count
@@ -238,6 +241,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/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.12.0"
+  VERSION = "7.0.1"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 6.12.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-06-21 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