bibliothecary 6.8.3 → 6.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 631db7c6b4d1e299b186bd8491fc99ab0a6fee4b81b7224b70f1548b44d6ed09
-  data.tar.gz: 8c46571d73f5001114e4e2d880c07e03d0d4d8bc44851f1bb9eae667c83f6cc6
+  metadata.gz: 9f6d0c75dace8b988d53e7b6620e7c1c8aad139ddf4aebbc1497c1428b4bda09
+  data.tar.gz: ea3e235adc6e425269eb29fda38694555be29b54bcb5cdc7ec8b455ac06b554c
 SHA512:
-  metadata.gz: 803ac1fcc4ed177c468ab66009153c54c96c1079f397d18ef8361a5453f26cf3e51442cb58e059dcf95b2a908bf0f5d54210d9d1dbd018e1c926cdb18d28efd4
-  data.tar.gz: a288761f1e9db8fb87beca4daa1e08fed93d747192f921e7c38cc81743589f25673bfe805435f8876cadc4a4b0bf68bf948d6bbf0d3b4ea47250f9221c8d8ad4
+  metadata.gz: 191203c29364c6fb45bf9228fa49a1ae3e8f176ec1e7331c07e3bf731688ac896220d49a4271773703ec48a240cdb0fdfc555fd887ed14cd459d2788a285339c
+  data.tar.gz: 185c27f488fd30d3026447193396637b90a46c286c7cbf02b207ce0dd1ff30d576c73b5a39262f61ad3fe7bf7975f9df0ef20cfb61701ac532cc969733ef26f2

data/lib/bibliothecary/parsers/conda.rb

@@ -1,67 +1,53 @@
-require 'json'
+require "json"
 
 module Bibliothecary
   module Parsers
     class Conda
       include Bibliothecary::Analyser
-      FILE_KINDS = %w[manifest lockfile]
 
       def self.mapping
         {
           match_filename("environment.yml") => {
-            kind: FILE_KINDS
+            parser: :parse_conda,
+            kind: "manifest",
           },
           match_filename("environment.yaml") => {
-            kind: FILE_KINDS
-          }
+            parser: :parse_conda,
+            kind: "manifest",
+          },
+          match_filename("environment.yml.lock") => {
+            parser: :parse_conda_lockfile,
+            kind: "lockfile",
+          },
+          match_filename("environment.yaml.lock") => {
+            parser: :parse_conda_lockfile,
+            kind: "lockfile",
+          },
         }
       end
 
-      # Overrides Analyser.analyse_contents_from_info
-      def self.analyse_contents_from_info(info)
-        [parse_conda(info), parse_pip(info)].flatten.compact
-      rescue Bibliothecary::RemoteParsingError => e
-        Bibliothecary::Analyser::create_error_analysis(platform_name, info.relative_path, "runtime", e.message)
-      rescue Psych::SyntaxError => e
-        Bibliothecary::Analyser::create_error_analysis(platform_name, info.relative_path, "runtime", e.message)
-      end
-
-      private
-
       def self.parse_conda(info)
-        results = call_conda_parser_web(info.contents)
-        FILE_KINDS.map do |kind|
-          Bibliothecary::Analyser.create_analysis(
-            "conda",
-            info.relative_path,
-            kind,
-            results[kind.to_sym].map { |dep| dep.slice(:name, :requirement).merge(type: "runtime") }
-          )
-        end
+        dependencies = call_conda_parser_web(info, :manifest)[:manifest]
+        dependencies.map { |dep| dep.merge(type: "runtime") }
       end
 
-      def self.parse_pip(info)
-        dependencies = YAML.safe_load(info.contents)["dependencies"]
-        pip = dependencies.find { |dep| dep.is_a?(Hash) && dep["pip"]}
-        return unless pip
-
-        Bibliothecary::Analyser.create_analysis(
-          "pypi",
-          info.relative_path,
-          "manifest",
-          Pypi.parse_requirements_txt(pip["pip"].join("\n"))
-        )
+      def self.parse_conda_lockfile(info)
+        dependencies = call_conda_parser_web(info, :lockfile)[:lockfile]
+        dependencies.map { |dep| dep.merge(type: "runtime") }
       end
 
-      def self.call_conda_parser_web(file_contents)
+      private_class_method def self.call_conda_parser_web(file_contents, kind)
         host = Bibliothecary.configuration.conda_parser_host
         response = Typhoeus.post(
           "#{host}/parse",
           headers: {
-              ContentType: 'multipart/form-data'
+            ContentType: "multipart/form-data",
           },
-          # hardcoding `environment.yml` to send to `conda.libraries.io`, downside is logs will always show `environment.yml` there
-          body: {file: file_contents, filename: 'environment.yml'}
+          body: {
+            file: file_contents,
+            # Unfortunately we do not get the filename in the mapping parsers, so hardcoding the file name depending on the kind
+            filename: kind == "manifest" ? "environment.yml" : "environment.yml.lock",
+          }
         )
         raise Bibliothecary::RemoteParsingError.new("Http Error #{response.response_code} when contacting: #{host}/parse", response.response_code) unless response.success?
 

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "6.8.3"
+  VERSION = "6.8.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 6.8.3
+  version: 6.8.4
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2019-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb