bibliothecary 1.4.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f8a50e840d707f085b11ff12f9033303546f4d6
-  data.tar.gz: 6b0f613937fd994c4d90eceaa16e30fba3d2a9ec
+  metadata.gz: f73395b523e5d1053eb00fdbfaefddb0cfdfe414
+  data.tar.gz: e738b7e775f7da5ac6d6f03765cea1364a2aad4a
 SHA512:
-  metadata.gz: 9276e5d2594eedc7ad89f972f870efdbf096ad2c7a36840f4fa3a43d249ad8fc8d66792d0fcaf047276210b7babf51a393576e12b24d12e22e32d34640425e70
-  data.tar.gz: 8f3db5617d6ef3e3344404f88af15d2838873b193a7e434e881119c173969a56decde5145b6063b2929334bb283bf4cf103f590a5940038777d701500589254a
+  metadata.gz: 90314f4a57cdce6a1609a94fcac4f97c171bf18668ed35996863a5d3d763cc9fb22526d3ba55e8879df0313ae0cb3476984553a4906c6d1858f8d36519b8f237
+  data.tar.gz: 07197d551b8d917b594447af58a2bb32241fda1f3e3c1c204e6a7dbfb6a9f92c00b83436f54e2090b90e0de987e70a17ac10d268e1c482ba6f31e8106987e8e0

data/lib/bibliothecary.rb

@@ -1,4 +1,5 @@
 require "bibliothecary/version"
+require "bibliothecary/analyser"
 
 Dir[File.expand_path('../bibliothecary/parsers/*.rb', __FILE__)].each do |file|
   require file

data/lib/bibliothecary/analyser.rb

@@ -0,0 +1,37 @@
+module Bibliothecary
+  module Analyser
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+    module ClassMethods
+      def platform_name
+        self.name.to_s.split('::').last.downcase
+      end
+
+      def analyse(folder_path, file_list)
+        file_list.map do |path|
+          file_contents = File.open(path).read
+          filename = path.gsub(folder_path, '').gsub(/^\//, '')
+          analyse_file(filename, file_contents, path)
+        end.compact
+      end
+
+      def analyse_file(filename, file_contents, path)
+        begin
+          dependencies = parse(filename, file_contents)
+          if dependencies.any?
+            {
+              platform: platform_name,
+              path: path,
+              dependencies: dependencies
+            }
+          else
+            nil
+          end
+        rescue
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/bibliothecary/parsers/bower.rb

@@ -3,32 +3,17 @@ require 'json'
 module Bibliothecary
   module Parsers
     class Bower
-      PLATFORM_NAME = 'bower'
+      include Bibliothecary::Analyser
 
       def self.parse(filename, file_contents)
-        json = JSON.parse(file_contents)
         if filename.match(/^bower\.json$/)
+          json = JSON.parse(file_contents)
           parse_manifest(json)
         else
           []
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^bower\.json$/) }
-        return unless path
-
-        manifest = JSON.parse File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_manifest(manifest)
-        }
-      rescue
-        []
-      end
-
       def self.parse_manifest(manifest)
         map_dependencies(manifest, 'dependencies', 'runtime') +
         map_dependencies(manifest, 'devDependencies', 'development')

data/lib/bibliothecary/parsers/cargo.rb

@@ -3,41 +3,20 @@ require 'toml'
 module Bibliothecary
   module Parsers
     class Cargo
-      PLATFORM_NAME = 'cargo'
+      include Bibliothecary::Analyser
 
       def self.parse(filename, file_contents)
-        toml = TOML.parse(file_contents)
         if filename.match(/Cargo\.toml$/)
+          toml = TOML.parse(file_contents)
           parse_manifest(toml)
         elsif filename.match(/Cargo\.lock$/)
+          toml = TOML.parse(file_contents)
           parse_lockfile(toml)
         else
           []
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        [analyse_cargo_toml(folder_path, file_list),
-          analyse_cargo_lock(folder_path, file_list)].flatten
-      end
-
-      def self.analyse_cargo_toml(folder_path, file_list)
-        paths = file_list.select{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/Cargo\.toml$/) }
-        return unless paths.any?
-
-        paths.map do |path|
-          manifest = TOML.load_file(path)
-
-          {
-            platform: PLATFORM_NAME,
-            path: path,
-            dependencies: parse_manifest(manifest)
-          }
-        end
-      rescue
-        []
-      end
-
       def self.parse_manifest(manifest)
         manifest.fetch('dependencies', []).map do |name, requirement|
           {

data/lib/bibliothecary/parsers/carthage.rb

@@ -1,7 +1,7 @@
 module Bibliothecary
   module Parsers
     class Carthage
-      PLATFORM_NAME = 'Carthage'
+      include Bibliothecary::Analyser
 
       def self.parse(filename, file_contents)
         if filename.match(/^Cartfile$/)
@@ -15,59 +15,6 @@ module Bibliothecary
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        [
-          analyse_cartfile(folder_path, file_list),
-          analyse_cartfile_private(folder_path, file_list),
-          analyse_cartfile_resolved(folder_path, file_list)
-        ]
-      end
-
-      def self.analyse_cartfile(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^Cartfile$/) }
-        return unless path
-
-        manifest = parse_cartfile(File.open(path).read)
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: manifest.dependencies
-        }
-      rescue
-        []
-      end
-
-      def self.analyse_cartfile_private(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^Cartfile\.private$/) }
-        return unless path
-
-        manifest = parse_cartfile_private(File.open(path).read)
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: manifest.dependencies
-        }
-      rescue
-        []
-      end
-
-      def self.analyse_cartfile_resolved(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^Cartfile\.resolved$/) }
-        return unless path
-
-        manifest = parse_cartfile_resolved(File.open(path).read)
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: manifest.dependencies
-        }
-      rescue
-        []
-      end
-
       def self.parse_cartfile(manifest)
         response = Typhoeus.post("https://carthageparser.herokuapp.com/cartfile", params: {body: manifest})
         json = JSON.parse(response.body)

data/lib/bibliothecary/parsers/clojars.rb

@@ -4,7 +4,7 @@ require 'typhoeus'
 module Bibliothecary
   module Parsers
     class Clojars
-      PLATFORM_NAME = 'clojars'
+      include Bibliothecary::Analyser
 
       def self.parse(filename, file_contents)
         if filename.match(/^project\.clj$/)
@@ -14,25 +14,6 @@ module Bibliothecary
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        [analyse_manifest(folder_path, file_list)]
-      end
-
-      def self.analyse_manifest(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^project\.clj$/) }
-        return unless path
-
-        manifest = JSON.parse File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_json_manifest(manifest)
-        }
-      rescue
-        []
-      end
-
       def self.parse_manifest(manifest)
         response = Typhoeus.post("https://clojars-json.herokuapp.com/project.clj", body: manifest)
         json = JSON.parse response.body

data/lib/bibliothecary/parsers/cocoapods.rb

@@ -4,13 +4,12 @@ require 'yaml'
 module Bibliothecary
   module Parsers
     class CocoaPods
+      include Bibliothecary::Analyser
+
       NAME_VERSION = '(?! )(.*?)(?: \(([^-]*)(?:-(.*))?\))?'.freeze
       NAME_VERSION_4 = /^ {4}#{NAME_VERSION}$/
 
-      PLATFORM_NAME = 'CocoaPods'
-
       def self.parse(filename, file_contents)
-
         if filename.match(/^Podfile$/)
           manifest = Gemnasium::Parser.send(:podfile, file_contents)
           parse_manifest(manifest)
@@ -28,79 +27,6 @@ module Bibliothecary
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        [
-          analyse_podfile(folder_path, file_list),
-          analyse_podspec(folder_path, file_list),
-          analyse_podfile_lock(folder_path, file_list),
-          analyse_podspec_json(folder_path, file_list)
-        ].flatten
-      end
-
-      def self.analyse_podfile(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^Podfile$/) }
-        return unless path
-
-        manifest = Gemnasium::Parser.send(:podfile, File.open(path).read)
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_manifest(manifest)
-        }
-      rescue
-        []
-      end
-
-      def self.analyse_podspec(folder_path, file_list)
-        paths = file_list.select{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^[A-Za-z0-9_-]+\.podspec$/) }
-        return unless paths.any?
-
-        paths.map do |path|
-          manifest = Gemnasium::Parser.send(:podspec, File.open(path).read)
-
-          {
-            platform: PLATFORM_NAME,
-            path: path,
-            dependencies: parse_manifest(manifest)
-          }
-        end
-      rescue
-        []
-      end
-
-      def self.analyse_podspec_json(folder_path, file_list)
-        paths = file_list.select{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^[A-Za-z0-9_-]+\.podspec.json$/) }
-        return unless paths.any?
-
-        paths.map do |path|
-          manifest = JSON.parse File.open(path).read
-
-          {
-            platform: PLATFORM_NAME,
-            path: path,
-            dependencies: parse_json_manifest(manifest)
-          }
-        end
-      rescue
-        []
-      end
-
-      def self.analyse_podfile_lock(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^Podfile\.lock$/) }
-        return unless path
-
-        manifest = YAML.load File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_podfile_lock(manifest)
-        }
-      rescue
-        []
-      end
-
       def self.parse_podfile_lock(manifest)
         manifest['PODS'].map do |row|
           pod = row.is_a?(String) ? row : row.keys.first

data/lib/bibliothecary/parsers/cpan.rb

@@ -4,7 +4,7 @@ require 'json'
 module Bibliothecary
   module Parsers
     class CPAN
-      PLATFORM_NAME = 'cpan'
+      include Bibliothecary::Analyser
 
       def self.parse(filename, file_contents)
         if filename.match(/^META\.json$/i)
@@ -18,41 +18,6 @@ module Bibliothecary
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        [analyse_json(folder_path, file_list),
-        analyse_yaml(folder_path, file_list)]
-      end
-
-      def self.analyse_json(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^META\.json$/i) }
-        return unless path
-
-        manifest = JSON.parse File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_json_manifest(manifest)
-        }
-      rescue
-        []
-      end
-
-      def self.analyse_yaml(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^META\.yml$/i) }
-        return unless path
-
-        manifest = YAML.load File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_yaml_manifest(manifest)
-        }
-      rescue
-        []
-      end
-
       def self.parse_json_manifest(manifest)
         manifest['prereqs'].map do |group, deps|
           map_dependencies(deps, 'requires', 'runtime')

data/lib/bibliothecary/parsers/cran.rb

@@ -3,7 +3,8 @@ require 'deb_control'
 module Bibliothecary
   module Parsers
     class CRAN
-      PLATFORM_NAME = 'cran'
+      include Bibliothecary::Analyser
+
       REQUIRE_REGEXP = /([a-zA-Z0-9\-_\.]+)\s?\(?([><=\s\d\.,]+)?\)?/
 
       def self.parse(filename, file_contents)
@@ -15,25 +16,6 @@ module Bibliothecary
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        [analyse_description(folder_path, file_list)]
-      end
-
-      def self.analyse_description(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^DESCRIPTION$/i) }
-        return unless path
-
-        manifest = DebControl::ControlFileBase.parse File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_description(manifest)
-        }
-      rescue
-        []
-      end
-
       def self.parse_description(manifest)
         parse_section(manifest, 'Depends') +
         parse_section(manifest, 'Imports') +

data/lib/bibliothecary/parsers/dub.rb

@@ -4,7 +4,7 @@ require 'sdl_parser'
 module Bibliothecary
   module Parsers
     class Dub
-      PLATFORM_NAME = 'dub'
+      include Bibliothecary::Analyser
 
       def self.parse(filename, file_contents)
         if filename.match(/^dub\.json$/)
@@ -17,41 +17,6 @@ module Bibliothecary
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        [analyse_json(folder_path, file_list),
-         analyse_sdl(folder_path, file_list)]
-      end
-
-      def self.analyse_json(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^dub\.json$/) }
-        return unless path
-
-        manifest = JSON.parse File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_manifest(manifest)
-        }
-      rescue
-        []
-      end
-
-      def self.analyse_sdl(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^dub\.sdl$/) }
-        return unless path
-
-        manifest = File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_sdl_manifest(manifest)
-        }
-      rescue
-        []
-      end
-
       def self.parse_manifest(manifest)
         map_dependencies(manifest, 'dependencies', 'runtime')
       end

data/lib/bibliothecary/parsers/elm.rb

@@ -3,7 +3,7 @@ require 'json'
 module Bibliothecary
   module Parsers
     class Elm
-      PLATFORM_NAME = 'elm'
+      include Bibliothecary::Analyser
 
       def self.parse(filename, file_contents)
         if filename.match(/^elm-package\.json$|^elm_dependencies\.json$/)

data/lib/bibliothecary/parsers/go.rb

@@ -4,7 +4,7 @@ require 'json'
 module Bibliothecary
   module Parsers
     class Go
-      PLATFORM_NAME = 'go'
+      include Bibliothecary::Analyser
 
       def self.parse(filename, file_contents)
         if filename.match(/^glide\.yaml$/)
@@ -24,73 +24,6 @@ module Bibliothecary
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        [analyse_glide_yaml(folder_path, file_list),
-        analyse_glide_lockfile(folder_path, file_list),
-        analyse_godep_json(folder_path, file_list),
-        analyse_gb_manifest(folder_path, file_list)]
-      end
-
-      def self.analyse_godep_json(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^Godeps\/Godeps\.json$/) }
-        return unless path
-
-        manifest = JSON.parse File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_godep_json(manifest)
-        }
-      rescue
-        []
-      end
-
-      def self.analyse_gb_manifest(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^vendor\/manifest$/) }
-        return unless path
-
-        manifest = JSON.parse File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_gb_manifest(manifest)
-        }
-      rescue
-        []
-      end
-
-      def self.analyse_glide_yaml(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^glide\.yaml$/) }
-        return unless path
-
-        manifest = YAML.load File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_glide_yaml(manifest)
-        }
-      rescue
-        []
-      end
-
-      def self.analyse_glide_lockfile(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^glide\.lock$/) }
-        return unless path
-
-        manifest = YAML.load File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_glide_lockfile(manifest)
-        }
-      rescue
-        []
-      end
-
       def self.parse_godep_json(manifest)
         manifest.fetch('Deps',[]).map do |dependency|
           {

data/lib/bibliothecary/parsers/hex.rb

@@ -3,7 +3,7 @@ require 'json'
 module Bibliothecary
   module Parsers
     class Hex
-      PLATFORM_NAME = 'hex'
+      include Bibliothecary::Analyser
 
       def self.parse(filename, file_contents)
         if filename.match(/^mix\.exs$/)
@@ -15,37 +15,6 @@ module Bibliothecary
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        [analyse_mix(folder_path, file_list),
-        analyse_mix_lock(folder_path, file_list)]
-      end
-
-      def self.analyse_mix(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^mix\.exs$/) }
-        return unless path
-
-        manifest = File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_mix(manifest)
-        }
-      end
-
-      def self.analyse_mix_lock(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^mix\.lock$/) }
-        return unless path
-
-        manifest = File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_mix_lock(manifest)
-        }
-      end
-
       def self.parse_mix(manifest)
         response = Typhoeus.post("https://mix-deps-json.herokuapp.com/", body: manifest)
         json = JSON.parse response.body

data/lib/bibliothecary/parsers/julia.rb

@@ -1,7 +1,7 @@
 module Bibliothecary
   module Parsers
     class Julia
-      PLATFORM_NAME = 'julia'
+      include Bibliothecary::Analyser
 
       def self.parse(filename, file_contents)
         if filename.match(/^REQUIRE$/i)
@@ -11,25 +11,6 @@ module Bibliothecary
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        [analyse_json(folder_path, file_list)]
-      end
-
-      def self.analyse_json(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^REQUIRE$/i) }
-        return unless path
-
-        manifest = File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_require(manifest)
-        }
-      rescue
-        []
-      end
-
       def self.parse_require(manifest)
         manifest.split("\n").map do |line|
           match = line.split(/\s/)

data/lib/bibliothecary/parsers/maven.rb

@@ -3,7 +3,7 @@ require 'ox'
 module Bibliothecary
   module Parsers
     class Maven
-      PLATFORM_NAME = 'Maven'
+      include Bibliothecary::Analyser
 
       def self.parse(filename, file_contents)
         if filename.match(/ivy\.xml$/i)
@@ -19,65 +19,6 @@ module Bibliothecary
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        [
-          analyse_pom(folder_path, file_list),
-          analyse_ivy(folder_path, file_list),
-          analyse_gradle(folder_path, file_list),
-        ].flatten
-      end
-
-      def self.analyse_pom(folder_path, file_list)
-        paths = file_list.select{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/pom\.xml$/i) }
-        return unless paths.any?
-
-        paths.map do |path|
-          manifest = Ox.parse File.open(path).read
-
-          {
-            platform: PLATFORM_NAME,
-            path: path,
-            dependencies: parse_pom_manifest(manifest)
-          }
-        end
-      rescue
-        []
-      end
-
-      def self.analyse_ivy(folder_path, file_list)
-        paths = file_list.select{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/ivy\.xml$/i) }
-        return unless paths.any?
-
-        paths.map do |path|
-          manifest = Ox.parse File.open(path).read
-
-          {
-            platform: PLATFORM_NAME,
-            path: path,
-            dependencies: parse_ivy_manifest(manifest)
-          }
-        end
-      rescue
-        []
-      end
-
-      def self.analyse_gradle(folder_path, file_list)
-        paths = file_list.select{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/build\.gradle$/i) }
-        return unless paths.any?
-
-        paths.map do |path|
-          manifest = File.open(path).read
-
-          {
-            platform: PLATFORM_NAME,
-            path: path,
-            dependencies: parse_gradle(manifest)
-          }
-        end
-      rescue
-        []
-      end
-
       def self.parse_ivy_manifest(manifest)
         manifest.dependencies.locate('dependency').map do |dependency|
           attrs = dependency.attributes

data/lib/bibliothecary/parsers/meteor.rb

@@ -3,32 +3,17 @@ require 'json'
 module Bibliothecary
   module Parsers
     class Meteor
-      PLATFORM_NAME = 'meteor'
+      include Bibliothecary::Analyser
 
       def self.parse(filename, file_contents)
-        json = JSON.parse(file_contents)
         if filename.match(/^versions\.json$/)
+          json = JSON.parse(file_contents)
           parse_manifest(json)
         else
           []
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^versions\.json$/) }
-        return unless path
-
-        manifest = JSON.parse File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_manifest(manifest)
-        }
-      rescue
-        []
-      end
-
       def self.parse_manifest(manifest)
         map_dependencies(manifest, 'dependencies', 'runtime')
       end

data/lib/bibliothecary/parsers/npm.rb

@@ -3,54 +3,20 @@ require 'json'
 module Bibliothecary
   module Parsers
     class NPM
-      PLATFORM_NAME = 'npm'
+      include Bibliothecary::Analyser
 
       def self.parse(filename, file_contents)
-        json = JSON.parse(file_contents)
         if filename.match(/^package\.json$/)
+          json = JSON.parse(file_contents)
           parse_manifest(json)
         elsif filename.match(/^npm-shrinkwrap\.json$/)
+          json = JSON.parse(file_contents)
           parse_shrinkwrap(json)
         else
           []
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        [analyse_package_json(folder_path, file_list),
-        analyse_shrinkwrap(folder_path, file_list)]
-      end
-
-      def self.analyse_package_json(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^package\.json$/) }
-        return unless path
-
-        manifest = JSON.parse File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_manifest(manifest)
-        }
-      rescue
-        []
-      end
-
-      def self.analyse_shrinkwrap(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^npm-shrinkwrap\.json$/) }
-        return unless path
-
-        manifest = JSON.parse File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_shrinkwrap(manifest)
-        }
-      rescue
-        []
-      end
-
       def self.parse_shrinkwrap(manifest)
         manifest.fetch('dependencies',[]).map do |name, requirement|
           {

data/lib/bibliothecary/parsers/nuget.rb

@@ -4,7 +4,7 @@ require 'json'
 module Bibliothecary
   module Parsers
     class Nuget
-      PLATFORM_NAME = 'nuget'
+      include Bibliothecary::Analyser
 
       def self.parse(filename, file_contents)
         if filename.match(/Project\.json$/)
@@ -26,98 +26,6 @@ module Bibliothecary
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        [analyse_project_json(folder_path, file_list),
-        analyse_project_lock_json(folder_path, file_list),
-        analyse_packages_config(folder_path, file_list),
-        analyse_nuspec(folder_path, file_list),
-        analyse_paket_lock(folder_path, file_list)].flatten
-      end
-
-      def self.analyse_project_json(folder_path, file_list)
-        paths = file_list.select{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/Project\.json$/i) }
-        return unless paths.any?
-
-        paths.map do |path|
-          manifest = JSON.parse File.open(path).read
-
-          {
-            platform: PLATFORM_NAME,
-            path: path,
-            dependencies: parse_project_json(manifest)
-          }
-        end
-      rescue
-        []
-      end
-
-      def self.analyse_project_lock_json(folder_path, file_list)
-        paths = file_list.select{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/Project\.lock\.json$/) }
-        return unless paths.any?
-
-        paths.map do |path|
-          manifest = JSON.parse File.open(path).read
-
-          {
-            platform: PLATFORM_NAME,
-            path: path,
-            dependencies: parse_project_lock_json(manifest)
-          }
-        end
-      rescue
-        []
-      end
-
-      def self.analyse_packages_config(folder_path, file_list)
-        paths = file_list.select{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/packages\.config$/) }
-        return unless paths.any?
-
-        paths.map do |path|
-          manifest = Ox.parse File.open(path).read
-
-          {
-            platform: PLATFORM_NAME,
-            path: path,
-            dependencies: parse_packages_config(manifest)
-          }
-        end
-      rescue
-        []
-      end
-
-      def self.analyse_nuspec(folder_path, file_list)
-        paths = file_list.select{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^[A-Za-z0-9_-]+\.nuspec$/) }
-        return unless paths.any?
-
-        paths.map do |path|
-          manifest = Ox.parse File.open(path).read
-
-          {
-            platform: PLATFORM_NAME,
-            path: path,
-            dependencies: parse_nuspec(manifest)
-          }
-        end
-      rescue
-        []
-      end
-
-      def self.analyse_paket_lock(folder_path, file_list)
-        paths = file_list.select{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/paket\.lock$/) }
-        return unless paths.any?
-
-        paths.map do |path|
-          lines = File.readlines(path)
-          {
-            platform: PLATFORM_NAME,
-            path: path,
-            dependencies: parse_paket_lock(lines)
-          }
-        end
-      rescue
-        []
-      end
-
       def self.parse_project_json(manifest)
         manifest.fetch('dependencies',[]).map do |name, requirement|
           {

data/lib/bibliothecary/parsers/packagist.rb

@@ -3,54 +3,20 @@ require 'json'
 module Bibliothecary
   module Parsers
     class Packagist
-      PLATFORM_NAME = 'Packagist'
+      include Bibliothecary::Analyser
 
       def self.parse(filename, file_contents)
-        json = JSON.parse(file_contents)
         if filename.match(/^composer\.json$/)
+          json = JSON.parse(file_contents)
           parse_manifest(json)
         elsif filename.match(/^composer\.lock$/)
+          json = JSON.parse(file_contents)
           parse_lockfile(json)
         else
           []
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        [analyse_composer_json(folder_path, file_list),
-        analyse_composer_lock(folder_path, file_list)]
-      end
-
-      def self.analyse_composer_json(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^composer\.json$/) }
-        return unless path
-
-        manifest = JSON.parse File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_manifest(manifest)
-        }
-      rescue
-        []
-      end
-
-      def self.analyse_composer_lock(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^composer\.lock$/) }
-        return unless path
-
-        manifest = JSON.parse File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_lockfile(manifest)
-        }
-      rescue
-        []
-      end
-
       def self.parse_lockfile(manifest)
         manifest.fetch('packages',[]).map do |dependency|
           {

data/lib/bibliothecary/parsers/pub.rb

@@ -3,56 +3,20 @@ require 'yaml'
 module Bibliothecary
   module Parsers
     class Pub
-      PLATFORM_NAME = 'Pub'
+      include Bibliothecary::Analyser
 
       def self.parse(filename, file_contents)
-        yaml = YAML.load file_contents
         if filename.match(/^pubspec\.yaml$/i)
+          yaml = YAML.load file_contents
           parse_yaml_manifest(yaml)
         elsif filename.match(/^pubspec\.lock$/i)
+          yaml = YAML.load file_contents
           parse_yaml_lockfile(yaml)
         else
           []
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        [
-          analyse_yaml(folder_path, file_list),
-          analyse_lockfile(folder_path, file_list)
-        ]
-      end
-
-      def self.analyse_yaml(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^pubspec\.yaml$/i) }
-        return unless path
-
-        manifest = YAML.load File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_yaml_manifest(manifest)
-        }
-      rescue
-        []
-      end
-
-      def self.analyse_lockfile(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^pubspec\.lock$/i) }
-        return unless path
-
-        manifest = YAML.load File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_yaml_lockfile(manifest)
-        }
-      rescue
-        []
-      end
-
       def self.parse_yaml_manifest(manifest)
         map_dependencies(manifest, 'dependencies', 'runtime') +
         map_dependencies(manifest, 'dev_dependencies', 'development')

data/lib/bibliothecary/parsers/pypi.rb

@@ -1,7 +1,8 @@
 module Bibliothecary
   module Parsers
     class Pypi
-      PLATFORM_NAME = 'pypi'
+      include Bibliothecary::Analyser
+
       INSTALL_REGEXP = /install_requires\s*=\s*\[([\s\S]*?)\]/
       REQUIRE_REGEXP = /([a-zA-Z0-9]+[a-zA-Z0-9\-_\.]+)([><=\d\.,]+)?/
       REQUIREMENTS_REGEXP = /^#{REQUIRE_REGEXP}/
@@ -17,48 +18,6 @@ module Bibliothecary
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        [analyse_requirements_txt(folder_path, file_list),
-        analyse_setup_py(folder_path, file_list)].flatten
-      end
-
-      def self.analyse_requirements_txt(folder_path, file_list)
-        paths = file_list.select do |path|
-          p = path.gsub(folder_path, '').gsub(/^\//, '')
-          p.match(/require.*\.(txt|pip)$/) && !path.match(/^node_modules/)
-        end
-        return unless paths.any?
-
-        paths.map do |path|
-          manifest = File.open(path).read
-
-          {
-            platform: PLATFORM_NAME,
-            path: path,
-            dependencies: parse_requirements_txt(manifest)
-          }
-        end
-      rescue
-        []
-      end
-
-      def self.analyse_setup_py(folder_path, file_list)
-        paths = file_list.select{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/setup\.py$/) }
-        return unless paths.any?
-
-        paths.map do |path|
-          manifest = File.open(path).read
-
-          {
-            platform: PLATFORM_NAME,
-            path: path,
-            dependencies: parse_setup_py(manifest)
-          }
-        end
-      rescue
-        []
-      end
-
       def self.parse_setup_py(manifest)
         match = manifest.match(INSTALL_REGEXP)
         return [] unless match

data/lib/bibliothecary/parsers/rubygems.rb

@@ -3,9 +3,10 @@ require 'gemnasium/parser'
 module Bibliothecary
   module Parsers
     class Rubygems
+      include Bibliothecary::Analyser
+
       NAME_VERSION = '(?! )(.*?)(?: \(([^-]*)(?:-(.*))?\))?'.freeze
       NAME_VERSION_4 = /^ {4}#{NAME_VERSION}$/
-      PLATFORM_NAME = 'Rubygems'
 
       def self.parse(filename, file_contents)
         if filename.match(/^Gemfile$|^gems\.rb$/)
@@ -21,61 +22,6 @@ module Bibliothecary
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        [
-          analyse_gemfile(folder_path, file_list),
-          analyse_gemspec(folder_path, file_list),
-          analyse_gemfile_lock(folder_path, file_list)
-        ].flatten
-      end
-
-      def self.analyse_gemfile(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^Gemfile$|^gems\.rb$/) }
-        return unless path
-
-        manifest = Gemnasium::Parser.send(:gemfile, File.open(path).read)
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_manifest(manifest)
-        }
-      rescue
-        []
-      end
-
-      def self.analyse_gemspec(folder_path, file_list)
-        paths = file_list.select{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/[A-Za-z0-9_-]+\.gemspec$/) }
-        return unless paths.any?
-
-        paths.map do |path|
-          manifest = Gemnasium::Parser.send(:gemspec, File.open(path).read)
-
-          {
-            platform: PLATFORM_NAME,
-            path: path,
-            dependencies: parse_manifest(manifest)
-          }
-        end
-      rescue
-        []
-      end
-
-      def self.analyse_gemfile_lock(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^Gemfile\.lock$|^gems\.locked$/) }
-        return unless path
-
-        manifest = File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_gemfile_lock(manifest)
-        }
-      rescue
-        []
-      end
-
       def self.parse_gemfile_lock(manifest)
         manifest.split("\n").map do |line|
           match = line.match(NAME_VERSION_4)

data/lib/bibliothecary/parsers/shard.rb

@@ -3,7 +3,7 @@ require 'yaml'
 module Bibliothecary
   module Parsers
     class Shard
-      PLATFORM_NAME = 'shard'
+      include Bibliothecary::Analyser
 
       def self.parse(filename, file_contents)
         if filename.match(/^shard\.yml$/i)
@@ -17,41 +17,6 @@ module Bibliothecary
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        [analyse_yaml_manifest(folder_path, file_list),
-        analyse_yaml_lockfile(folder_path, file_list)]
-      end
-
-      def self.analyse_yaml_manifest(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^shard\.yml$/i) }
-        return unless path
-
-        manifest = YAML.load File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_yaml_manifest(manifest)
-        }
-      rescue
-        []
-      end
-
-      def self.analyse_yaml_lockfile(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^shard\.lock$/i) }
-        return unless path
-
-        manifest = YAML.load File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_yaml_lockfile(manifest)
-        }
-      rescue
-        []
-      end
-
       def self.parse_yaml_lockfile(manifest)
         map_dependencies(manifest, 'shards', 'runtime')
       end

data/lib/bibliothecary/parsers/swift.rb

@@ -1,7 +1,7 @@
 module Bibliothecary
   module Parsers
     class Swift
-      PLATFORM_NAME = 'swift'
+      include Bibliothecary::Analyser
 
       def self.parse(filename, file_contents)
         if filename.match(/^Package\.swift$/i)
@@ -11,25 +11,6 @@ module Bibliothecary
         end
       end
 
-      def self.analyse(folder_path, file_list)
-        [analyse_package_swift(folder_path, file_list)]
-      end
-
-      def self.analyse_package_swift(folder_path, file_list)
-        path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^Package\.swift$/i) }
-        return unless path
-
-        manifest = File.open(path).read
-
-        {
-          platform: PLATFORM_NAME,
-          path: path,
-          dependencies: parse_package_swift(manifest)
-        }
-      rescue
-        []
-      end
-
       def self.parse_package_swift(manifest)
         response = Typhoeus.post("http://192.241.154.173/to-json", body: manifest)
         json = JSON.parse(response.body)

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "1.4.2"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Andrew Nesbitt
@@ -156,6 +156,7 @@ files:
 - bin/console
 - bin/setup
 - lib/bibliothecary.rb
+- lib/bibliothecary/analyser.rb
 - lib/bibliothecary/parsers/bower.rb
 - lib/bibliothecary/parsers/cargo.rb
 - lib/bibliothecary/parsers/carthage.rb