bibliothecary 6.8.1 → 6.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eba49f95b74f689cbe73561342e6bb17c6e46a6ff29b3fce387d58d16b681e4c
-  data.tar.gz: 4e7c6979cd79bca265bb22561fe4ab401d77ac6233019e6a9a0bb0e40e5fbd34
+  metadata.gz: 378e983675d94e76e43f46f817d52a998117ae5087eafd7560d59332331f984b
+  data.tar.gz: e0b15d4f98ee40e47419ac2e28cbc916ec8d3f2349d3823f45bc71e20b8b31f9
 SHA512:
-  metadata.gz: 99ed7c075636c3899a69116c24ada3a60564346703bed2271e41a0d2e587a91387fbcddae515a04d53c882ed2540d4574860104fdab4dd87421d5b56c5ecadd5
-  data.tar.gz: 89bffd86e5fc0ff5c4bf04829a287158f60b86ca4f6f686e0773267e27f48bfda910a403e791e6388efd078eeabd868a47804aa1a8fde04892297ada507692d5
+  metadata.gz: ca1645d2941bb6098cabb01faedb1a2a25eb1888c4b87d078108a7bd6cae6ff7b93e2dfc852f4cbb239f70d63e36baabdbe3cb8afdd90b6107181f86c30cf0e1
+  data.tar.gz: de5e4d546172d0e661d52e8f951624b134ec9ad2cf4a04bdbecbe7f5aa23305f8f42df25c4e8fba3888a477109e5707b43e44d422c923bad3b6c3bb598d8d3c4

data/lib/bibliothecary/parsers/conda.rb

@@ -4,7 +4,7 @@ module Bibliothecary
   module Parsers
     class Conda
       include Bibliothecary::Analyser
-      FILE_KINDS = %i[manifest lockfile]
+      FILE_KINDS = %w[manifest lockfile]
 
       def self.mapping
         {
@@ -34,14 +34,14 @@ module Bibliothecary
           Bibliothecary::Analyser.create_analysis(
             "conda",
             info.relative_path,
-            kind.to_s,
-            results[kind].map { |dep| dep.slice(:name, :requirement).merge(type: "runtime") }
+            kind,
+            results[kind.to_sym].map { |dep| dep.slice(:name, :requirement).merge(type: "runtime") }
           )
         end
       end
 
       def self.parse_pip(info)
-        dependencies = YAML.load(info.contents)["dependencies"]
+        dependencies = YAML.safe_load(info.contents)["dependencies"]
         pip = dependencies.find { |dep| dep.is_a?(Hash) && dep["pip"]}
         return unless pip
 

data/lib/bibliothecary/related_files_info.rb

@@ -21,8 +21,9 @@ module Bibliothecary
       package_manager = file_infos.first.package_manager
       @platform = package_manager.platform_name
       @path = Pathname.new(File.dirname(file_infos.first.relative_path)).cleanpath.to_path
-      @manifests = file_infos.select { |info| package_manager.determine_kind_from_info(info) == "manifest" }.map { |info| File.basename(info.relative_path) }
-      @lockfiles = file_infos.select { |info| package_manager.determine_kind_from_info(info) == "lockfile" }.map { |info| File.basename(info.relative_path) }
+      # `package_manager.determine_kind_from_info(info)` can be an Array, so use include? which also works for string
+      @manifests = file_infos.select { |info| package_manager.determine_kind_from_info(info).include? "manifest" }.map { |info| File.basename(info.relative_path) }
+      @lockfiles = file_infos.select { |info| package_manager.determine_kind_from_info(info).include? "lockfile" }.map { |info| File.basename(info.relative_path) }
     end
   end
 end

data/lib/bibliothecary/runner.rb

@@ -62,7 +62,7 @@ module Bibliothecary
     end
 
     def find_manifests(path)
-        RelatedFilesInfo.create_from_file_infos(load_file_info_list(path).reject { |info| info.package_manager.nil? })
+      RelatedFilesInfo.create_from_file_infos(load_file_info_list(path).reject { |info| info.package_manager.nil? })
     end
 
     def analyse_file(file_path, contents)

data/lib/bibliothecary/version.rb

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

metadata

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