bibliothecary 6.8.0 → 6.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad656049717370381dab1f44bfe7b0da145a5428b04e9366519c3f39f8bdf2aa
-  data.tar.gz: 8e30a85be3b00e5d56ae5826ecd0fef20c4d4bc348486a54cfdb0f26e0892262
+  metadata.gz: eba49f95b74f689cbe73561342e6bb17c6e46a6ff29b3fce387d58d16b681e4c
+  data.tar.gz: 4e7c6979cd79bca265bb22561fe4ab401d77ac6233019e6a9a0bb0e40e5fbd34
 SHA512:
-  metadata.gz: b852fe3cb0da5168a2de6b25dac9bfb9335aba3f3eb2d36ca04db1c4492d7e150d30037a2d41571861fe15b1a8beb2094312bb71c3ef0e43d2a553c7991c714c
-  data.tar.gz: 05e20877ea6700d89dc33f61dde31a63b8352435c72a27dd881ae7521dac2f6c6fb770ae7c46488c2ee5dd5e43a32e77e6c41f6329fff049625e04aab2f11763
+  metadata.gz: 99ed7c075636c3899a69116c24ada3a60564346703bed2271e41a0d2e587a91387fbcddae515a04d53c882ed2540d4574860104fdab4dd87421d5b56c5ecadd5
+  data.tar.gz: 89bffd86e5fc0ff5c4bf04829a287158f60b86ca4f6f686e0773267e27f48bfda910a403e791e6388efd078eeabd868a47804aa1a8fde04892297ada507692d5

data/lib/bibliothecary/parsers/conda.rb

@@ -19,8 +19,17 @@ module Bibliothecary
 
       # Overrides Analyser.analyse_contents_from_info
       def self.analyse_contents_from_info(info)
-        results = call_conda_parser_web(info.contents)
+        [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",
@@ -29,11 +38,20 @@ module Bibliothecary
             results[kind].map { |dep| dep.slice(:name, :requirement).merge(type: "runtime") }
           )
         end
-      rescue Bibliothecary::RemoteParsingError => e
-        Bibliothecary::Analyser::create_error_analysis(platform_name, info.relative_path, "runtime", e.message)
       end
 
-      private
+      def self.parse_pip(info)
+        dependencies = YAML.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"))
+        )
+      end
 
       def self.call_conda_parser_web(file_contents)
         host = Bibliothecary.configuration.conda_parser_host

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "6.8.0"
+  VERSION = "6.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 6.8.0
+  version: 6.8.1
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-27 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb
@@ -302,8 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Find and parse manifests