bibliothecary 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63862e85e3869ed89e0fd67e3c880fdf6e11710a
-  data.tar.gz: e63a382ed34ef91da60d964567baa14b62ea4305
+  metadata.gz: 2fa6295e2d804a14e0272bc9e6df52cbdf44f013
+  data.tar.gz: 09a249dd16c786b3e66f1f0b02c6eddbe82cd794
 SHA512:
-  metadata.gz: 12dc273cb5db780d643a33655bc9f712599b6bba7e8ff2c5532d8d2e38b23b4092e85d7a5c26a588afd513fd6aec7b8351ccd7fd5c9ca911ac8ed3d6673cb368
-  data.tar.gz: 621afd3937fdce67f3b78972e7e5ac16ddc9b10891b4fac2eadb99299787e9730e8f7d3323929bf6742a6b718aafabeb3d35901a83cebada9f3672c265b9f864
+  metadata.gz: e9a2921352f301b01d2c251508300c026ac03fdb90acd68bf16f3a405d1b86666994cdb1058e1000bdca4489087491dca4503256dd5736732088ef1182578f10
+  data.tar.gz: 3895ca5d0d453f70dab81f7b284b86679a738beac7d8942be22ae72fad84ce5a84b1ad24d6a8438da019bb9d5cb864c0ca33c926e5daedf52bb78052d23a5bd1

data/lib/bibliothecary/parsers/npm.rb

@@ -7,15 +7,15 @@ module Bibliothecary
 
       def self.mapping
         {
-          /^package\.json$/ => {
+          /^(?!node_modules).+*package\.json$/ => {
             kind: 'manifest',
             parser: :parse_manifest
           },
-          /^npm-shrinkwrap\.json$/ => {
+          /^(?!node_modules).+*npm-shrinkwrap\.json$/ => {
             kind: 'lockfile',
             parser: :parse_shrinkwrap
           },
-          /^yarn\.lock$/ => {
+          /^(?!node_modules).+*yarn\.lock$/ => {
             kind: 'lockfile',
             parser: :parse_yarn_lock
           }

data/lib/bibliothecary/parsers/pypi.rb

@@ -7,31 +7,25 @@ module Bibliothecary
       REQUIRE_REGEXP = /([a-zA-Z0-9]+[a-zA-Z0-9\-_\.]+)([><=\d\.,]+)?/
       REQUIREMENTS_REGEXP = /^#{REQUIRE_REGEXP}/
 
-      def self.parse_file(filename, contents)
-        if is_requirements_file(filename)
-          parse_requirements_txt(contents)
-        elsif filename.match(/setup\.py$/)
-          parse_setup_py(contents)
-        elsif filename.match(/^Pipfile$/)
-          parse_pipfile(contents)
-        elsif filename.match(/^Pipfile\.lock$/)
-          parse_pipfile_lock(contents)
-        end
-      end
-
-      def self.determine_kind(filename)
-        if is_requirements_file(filename) || filename.match(/setup\.py$/) || filename.match(/^Pipfile$/)
-          'manifest'
-        elsif filename.match(/^Pipfile\.lock$/)
-          'lockfile'
-        end
-      end
-
-      def self.match?(filename)
-        is_requirements_file(filename) ||
-        filename.match(/setup\.py$/) ||
-        filename.match(/Pipfile$/) ||
-        filename.match(/Pipfile\.lock$/)
+      def self.mapping
+        {
+          /^(?!node_modules).*require.*\.(txt|pip)$/ => {
+            kind: 'manifest',
+            parser: :parse_requirements_txt
+          },
+          /setup\.py$/ => {
+            kind: 'manifest',
+            parser: :parse_setup_py
+          },
+          /^Pipfile$/ => {
+            kind: 'manifest',
+            parser: :parse_pipfile
+          },
+          /^Pipfile\.lock$/ => {
+            kind: 'lockfile',
+            parser: :parse_pipfile_lock
+          }
+        }
       end
 
       def self.parse_pipfile(file_contents)
@@ -111,14 +105,6 @@ module Bibliothecary
         end
         deps
       end
-
-      def self.is_requirements_file(filename)
-        if filename.match(/require.*\.(txt|pip)$/) and !filename.match(/^node_modules/)
-          return true
-        else
-          return false
-        end
-      end
     end
   end
 end

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "5.2.0"
+  VERSION = "5.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb