bibliothecary 6.3.0 → 6.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4beec9dee5f3223d4f87b7b1132cc069dc7e5d845492c94d7f7e32ffa865e53b
-  data.tar.gz: d63c47bd039937d9d9aeedac65930efd230edeb60c0107c2470a71c87bd08a0c
+  metadata.gz: ba88fac4e7fbc938bf270504f1b41787f314105f237bb1e4e080e5ad82379aef
+  data.tar.gz: 28de14e318ae6684074ac38e8a7b2f1fb57fa83d21a97e7908d6afe110bb5d22
 SHA512:
-  metadata.gz: d2153d34b8a178fd5149ead8c9497d6444c89dd6d39b03bd4581aca72042d7a746020ff4f0a0da17bc7a7a9f35c8484ceb5f360a5a0a76c7611401e6f7f45344
-  data.tar.gz: 78e365f170d21c0f8c46e42041916950f423526e74795b75c1db3c9d86f6acb701db99e649dc0d8dcfe81471047ee6776b291088e351e95fb4701123d2fec184
+  metadata.gz: a07ec3aeb787fe83e7a4d415f83b5aeefe1649eb590a320a48a90053b26b5bf215e6649799bc5792e9e20e5e6fc920bddd0f43c3e8f08111d34baf2695f64ed9
+  data.tar.gz: 3da7fe10d6c6e036091a82e84a1cbfa80ef9ee58f37289629fe8076b1c49da38a7dc40d03dfe7b56b3e1a12327dc714bf220576a2ca6b072ab66a7934bf06c0d

data/.ruby-version

@@ -0,0 +1 @@
+2.5.1

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
 - 2.4.2
-- 2.5.0
+- 2.5.1
 cache: bundler
 before_install:
 - gem update --system

data/README.md

@@ -3,9 +3,6 @@
 Dependency manifest parsing library for https://libraries.io
 
 [![Build Status](https://travis-ci.org/librariesio/bibliothecary.svg?branch=master)](https://travis-ci.org/librariesio/bibliothecary)
-[![Code Climate](https://img.shields.io/codeclimate/github/librariesio/bibliothecary.svg?style=flat)](https://codeclimate.com/github/librariesio/bibliothecary)
-[![Test Coverage](https://img.shields.io/codeclimate/coverage/github/librariesio/bibliothecary.svg?style=flat)](https://codeclimate.com/github/librariesio/bibliothecary)
-[![Code Climate](https://img.shields.io/codeclimate/issues/github/librariesio/bibliothecary.svg)](https://codeclimate.com/github/librariesio/bibliothecary/issues)
 [![license](https://img.shields.io/github/license/librariesio/bibliothecary.svg)](https://github.com/librariesio/bibliothecary/blob/master/LICENSE.txt)
 
 ## Installation

data/bibliothecary.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "toml-rb", "~> 1.0"
   spec.add_dependency "librariesio-gem-parser"
-  spec.add_dependency "ox"
+  spec.add_dependency "ox", ">= 2.8.1"
   spec.add_dependency "typhoeus"
   spec.add_dependency "deb_control"
   spec.add_dependency "sdl4r"
@@ -29,4 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "vcr"
 end

data/lib/bibliothecary/analyser.rb

@@ -41,13 +41,56 @@ module Bibliothecary
         end
       end
 
+      def set_related_paths_field(by_dirname_dest, by_dirname_source)
+        by_dirname_dest.each do |dirname, analyses|
+          analyses.each do |analysis|
+            source_analyses = by_dirname_source[dirname].map { |source_analysis| source_analysis[:path] }
+            analysis[:related_paths] = source_analyses.sort
+          end
+        end
+      end
+
+      def add_related_paths(analyses)
+        analyses.each do |analysis|
+          analysis[:related_paths] = []
+        end
+
+        # associate manifests and lockfiles in the same directory;
+
+        # note that right now we're in the context of a single
+        # package manager, so manifest and lockfile in the
+        # same directory is considered proof that they are
+        # matched.
+
+        by_dirname = {
+          "manifest" => Hash.new { |h, k| h[k] = [] },
+          "lockfile" => Hash.new { |h, k| h[k] = [] }
+        }
+
+        analyses.each do |analysis|
+          dirname = File.dirname(analysis[:path])
+          by_dirname[analysis[:kind]][dirname].push(analysis)
+        end
+
+        by_dirname["manifest"].each do |_, manifests|
+          manifests.delete_if { |manifest| !determine_can_have_lockfile(manifest[:path]) }
+        end
+
+        set_related_paths_field(by_dirname["manifest"], by_dirname["lockfile"])
+        set_related_paths_field(by_dirname["lockfile"], by_dirname["manifest"])
+      end
+
       def analyse(folder_path, file_list)
-        file_list.map do |path|
+        analyses = file_list.map do |path|
           filename = path.gsub(folder_path, '').gsub(/^\//, '')
           next unless match?(filename)
           contents = File.open(path).read
           analyse_contents(filename, contents)
         end.compact
+
+        add_related_paths(analyses)
+
+        analyses
       end
 
       def analyse_contents(filename, contents)
@@ -60,8 +103,8 @@ module Bibliothecary
             kind: determine_kind(filename)
           }
         end
-      rescue
-        nil
+      # rescue
+      #   nil
       end
 
       def determine_kind(filename)
@@ -73,6 +116,15 @@ module Bibliothecary
         return []
       end
 
+      def determine_can_have_lockfile(filename)
+        mapping.each do |regex, details|
+          if filename.match(regex)
+            return details.fetch(:can_have_lockfile, true)
+          end
+        end
+        return true
+      end
+
       def parse_ruby_manifest(manifest)
         manifest.dependencies.inject([]) do |deps, dep|
           deps.push({

data/lib/bibliothecary/parsers/cocoapods.rb

@@ -17,7 +17,8 @@ module Bibliothecary
           },
           /(^[A-Za-z0-9_-]+\.podspec$|.*\/[A-Za-z0-9_-]+\.podspec$)/ => {
             kind: 'manifest',
-            parser: :parse_podspec
+            parser: :parse_podspec,
+            can_have_lockfile: false
           },
           /(^Podfile\.lock$|.*\/Podfile\.lock$)/ => {
             kind: 'lockfile',
@@ -25,7 +26,8 @@ module Bibliothecary
           },
           /(^[A-Za-z0-9_-]+\.podspec.json$|.*\/[A-Za-z0-9_-]+\.podspec.json$)/ => {
             kind: 'manifest',
-            parser: :parse_json_manifest
+            parser: :parse_json_manifest,
+            can_have_lockfile: false
           }
         }
       end

data/lib/bibliothecary/parsers/julia.rb

@@ -6,21 +6,34 @@ module Bibliothecary
       def self.mapping
         {
           /^REQUIRE$|.*\/REQUIRE$/i => {
-            kind: 'manifest',
+            kind: "manifest",
             parser: :parse_require
           }
         }
       end
 
       def self.parse_require(manifest)
-        manifest.split("\n").map do |line|
-          match = line.split(/\s/)
-          {
-            name: match[0],
-            requirement: match[1] || '*',
-            type: 'runtime'
+        deps = []
+        manifest.split("\n").each do |line|
+          next if line.match(/^#/) || line.empty?
+          split = line.split(/\s/)
+          if line.match(/^@/)
+            name = split[1]
+            reqs = split[2, split.length].join(" ")
+          else
+            name = split[0]
+            reqs = split[1, split.length].join(" ")
+          end
+          reqs = "*" if reqs.empty?
+          next if name.empty?
+
+          deps << {
+            name: name,
+            requirement: reqs,
+            type: "runtime"
           }
         end
+        deps
       end
     end
   end

data/lib/bibliothecary/parsers/pypi.rb

@@ -11,11 +11,13 @@ module Bibliothecary
         {
           /.*require[^\/]*(\/)?[^\/]*\.(txt|pip)$/ => {
             kind: 'manifest',
-            parser: :parse_requirements_txt
+            parser: :parse_requirements_txt,
+            can_have_lockfile: false
           },
           /^setup\.py$|.*\/setup.py$/ => {
             kind: 'manifest',
-            parser: :parse_setup_py
+            parser: :parse_setup_py,
+            can_have_lockfile: false
           },
           /^Pipfile$|.*\/Pipfile$/ => {
             kind: 'manifest',

data/lib/bibliothecary/parsers/rubygems.rb

@@ -16,7 +16,8 @@ module Bibliothecary
           },
           /^[A-Za-z0-9_-]+\.gemspec$|.*\/[A-Za-z0-9_-]+\.gemspec$/ => {
             kind: 'manifest',
-            parser: :parse_gemspec
+            parser: :parse_gemspec,
+            can_have_lockfile: false
           },
           /^Gemfile\.lock$|^gems\.locked$|.*\/gems\.locked$|.*\/Gemfile\.lock$/ => {
             kind: 'lockfile',

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "6.3.0"
+  VERSION = "6.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.3.1
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - andrewnez@gmail.com
@@ -168,6 +196,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -229,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Find and parse manifests