bibliothecary 5.3.4 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 063b544e4ac6eebc896b7c302661ae0ffcbc75a3
-  data.tar.gz: 126b6165dcfe0fe5ce21eb98b81e745a24b166cf
+  metadata.gz: 55f3b8b100c7062b5bf99ae28ed96a3ec829d84b
+  data.tar.gz: c0335df69f289ad093a836bf594283a59e135928
 SHA512:
-  metadata.gz: 9dc6f7227c16bcf3f013776b822df9fd1302c4834855fd9fb4b3c96a54b9e93903dd1a4e96039c3914e3edcab727c25fe2146b685c9ec804627c93b81ed04fc0
-  data.tar.gz: 6e65bbe8c730a5fd4ede8db52eb163d000752262c3018ea77ac2faf1b069db31e403278c7caca2f6ced08788e473039076574bc0760f41a4514500787413ebca
+  metadata.gz: 030ed2e020f7d72a8ef1ea37ad5d709a080d04f7d8ee7b6fb36de87d1b6a583a0ce6235c777ce726f3b150be7b5b835e0a22bd8ac7c39a03669cfa9ac6d12f75
+  data.tar.gz: c16e95e0eec887b7972c56e02d91de4b62747d4bb89bf7e72826755cb42040073ed8686dc16989bc318596317554b463df9c283c821de20bdd160d506d488bb8

data/bibliothecary.gemspec

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

data/lib/bibliothecary/analyser.rb

@@ -21,6 +21,26 @@ module Bibliothecary
         self.name.to_s.split('::').last.downcase
       end
 
+      def parse_json_runtime_manifest(file_contents)
+        JSON.parse(file_contents).fetch('dependencies',[]).map do |name, requirement|
+          {
+            name: name,
+            requirement: requirement,
+            type: 'runtime'
+          }
+        end
+      end
+
+      def map_dependencies(hash, key, type)
+        hash.fetch(key,[]).map do |name, requirement|
+          {
+            name: name,
+            requirement: requirement,
+            type: type
+          }
+        end
+      end
+
       def analyse(folder_path, file_list)
         file_list.map do |path|
           filename = path.gsub(folder_path, '').gsub(/^\//, '')

data/lib/bibliothecary/parsers/bower.rb

@@ -19,16 +19,6 @@ module Bibliothecary
         map_dependencies(json, 'dependencies', 'runtime') +
         map_dependencies(json, 'devDependencies', 'development')
       end
-
-      def self.map_dependencies(hash, key, type)
-        hash.fetch(key,[]).map do |name, requirement|
-          {
-            name: name,
-            requirement: requirement,
-            type: type
-          }
-        end
-      end
     end
   end
 end

data/lib/bibliothecary/parsers/cargo.rb

@@ -1,4 +1,4 @@
-require 'toml'
+require 'toml-rb'
 
 module Bibliothecary
   module Parsers
@@ -19,7 +19,7 @@ module Bibliothecary
       end
 
       def self.parse_manifest(file_contents)
-        manifest = TOML.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 +34,7 @@ module Bibliothecary
       end
 
       def self.parse_lockfile(file_contents)
-        manifest = TOML.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/cpan.rb

@@ -30,16 +30,6 @@ module Bibliothecary
         manifest = YAML.load file_contents
         map_dependencies(manifest, 'requires', 'runtime')
       end
-
-      def self.map_dependencies(hash, key, type)
-        hash.fetch(key,[]).map do |name, requirement|
-          {
-            name: name,
-            requirement: requirement,
-            type: type
-          }
-        end
-      end
     end
   end
 end

data/lib/bibliothecary/parsers/dub.rb

@@ -10,7 +10,7 @@ module Bibliothecary
         {
           /^dub\.json$/ => {
             kind: 'manifest',
-            parser: :parse_manifest
+            parser: :parse_json_runtime_manifest
           },
           /^dub\.sdl$/ => {
             kind: 'manifest',
@@ -19,24 +19,9 @@ module Bibliothecary
         }
       end
 
-      def self.parse_manifest(file_contents)
-        manifest = JSON.parse(file_contents)
-        map_dependencies(manifest, 'dependencies', 'runtime')
-      end
-
       def self.parse_sdl_manifest(manifest)
         SdlParser.new(:runtime, manifest).dependencies
       end
-
-      def self.map_dependencies(hash, key, type)
-        hash.fetch(key,[]).map do |name, requirement|
-          {
-            name: name,
-            requirement: requirement,
-            type: type
-          }
-        end
-      end
     end
   end
 end

data/lib/bibliothecary/parsers/elm.rb

@@ -9,7 +9,7 @@ module Bibliothecary
         {
           /^elm-package\.json$|^elm_dependencies\.json$/ => {
             kind: 'manifest',
-            parser: :parse_json_manifest
+            parser: :parse_json_runtime_manifest
           },
           /^elm-stuff\/exact-dependencies\.json$/ => {
             kind: 'lockfile',
@@ -18,11 +18,6 @@ module Bibliothecary
         }
       end
 
-      def self.parse_json_manifest(file_contents)
-        manifest = JSON.parse file_contents
-        map_dependencies(manifest, 'dependencies', 'runtime')
-      end
-
       def self.parse_json_lock(file_contents)
         manifest = JSON.parse file_contents
         manifest.map do |name, requirement|
@@ -33,16 +28,6 @@ module Bibliothecary
           }
         end
       end
-
-      def self.map_dependencies(hash, key, type)
-        hash.fetch(key,[]).map do |name, requirement|
-          {
-            name: name,
-            requirement: requirement,
-            type: type
-          }
-        end
-      end
     end
   end
 end

data/lib/bibliothecary/parsers/haxelib.rb

@@ -0,0 +1,18 @@
+require 'json'
+
+module Bibliothecary
+  module Parsers
+    class Haxelib
+      include Bibliothecary::Analyser
+
+      def self.mapping
+        {
+          /^haxelib\.json$/ => {
+            kind: 'manifest',
+            parser: :parse_json_runtime_manifest
+          }
+        }
+      end
+    end
+  end
+end

data/lib/bibliothecary/parsers/meteor.rb

@@ -9,25 +9,10 @@ module Bibliothecary
         {
           /^versions\.json$/ => {
             kind: 'manifest',
-            parser: :parse_manifest
+            parser: :parse_json_runtime_manifest
           }
         }
       end
-
-      def self.parse_manifest(file_contents)
-        manifest = JSON.parse(file_contents)
-        map_dependencies(manifest, 'dependencies', 'runtime')
-      end
-
-      def self.map_dependencies(hash, key, type)
-        hash.fetch(key,[]).map do |name, requirement|
-          {
-            name: name,
-            requirement: requirement,
-            type: type
-          }
-        end
-      end
     end
   end
 end

data/lib/bibliothecary/parsers/npm.rb

@@ -59,16 +59,6 @@ module Bibliothecary
         return [] unless response.response_code == 200
         JSON.parse(response.body)
       end
-
-      def self.map_dependencies(hash, key, type)
-        hash.fetch(key,[]).map do |name, requirement|
-          {
-            name: name,
-            requirement: requirement,
-            type: type
-          }
-        end
-      end
     end
   end
 end

data/lib/bibliothecary/parsers/nuget.rb

@@ -10,7 +10,7 @@ module Bibliothecary
         {
           /Project\.json$/ => {
             kind: 'manifest',
-            parser: :parse_project_json
+            parser: :parse_json_runtime_manifest
           },
           /Project\.lock\.json$/ => {
             kind: 'lockfile',
@@ -35,17 +35,6 @@ module Bibliothecary
         }
       end
 
-      def self.parse_project_json(file_contents)
-        manifest = JSON.parse file_contents
-        manifest.fetch('dependencies',[]).map do |name, requirement|
-          {
-            name: name,
-            requirement: requirement,
-            type: 'runtime'
-          }
-        end
-      end
-
       def self.parse_project_lock_json(file_contents)
         manifest = JSON.parse file_contents
         manifest.fetch('libraries',[]).map do |name, _requirement|

data/lib/bibliothecary/parsers/packagist.rb

@@ -34,16 +34,6 @@ module Bibliothecary
         map_dependencies(manifest, 'require', 'runtime') +
         map_dependencies(manifest, 'require-dev', 'development')
       end
-
-      def self.map_dependencies(hash, key, type)
-        hash.fetch(key,[]).map do |name, requirement|
-          {
-            name: name,
-            requirement: requirement,
-            type: type
-          }
-        end
-      end
     end
   end
 end

data/lib/bibliothecary/parsers/pub.rb

@@ -34,16 +34,6 @@ module Bibliothecary
           }
         end
       end
-
-      def self.map_dependencies(hash, key, type)
-        hash.fetch(key,[]).map do |name, requirement|
-          {
-            name: name,
-            requirement: requirement,
-            type: type
-          }
-        end
-      end
     end
   end
 end

data/lib/bibliothecary/parsers/pypi.rb

@@ -29,7 +29,7 @@ module Bibliothecary
       end
 
       def self.parse_pipfile(file_contents)
-        manifest = TOML.parse(file_contents)
+        manifest = TomlRB.parse(file_contents)
         map_dependencies(manifest['packages'], 'runtime') + map_dependencies(manifest['dev-packages'], 'develop')
       end
 

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "5.3.4"
+  VERSION = "5.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 5.3.4
+  version: 5.4.0
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: librariesio-gem-parser
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +172,7 @@ files:
 - lib/bibliothecary/parsers/dub.rb
 - lib/bibliothecary/parsers/elm.rb
 - lib/bibliothecary/parsers/go.rb
+- lib/bibliothecary/parsers/haxelib.rb
 - lib/bibliothecary/parsers/hex.rb
 - lib/bibliothecary/parsers/julia.rb
 - lib/bibliothecary/parsers/maven.rb