bibliothecary 8.4.3 → 8.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27a0df595a08d1414ee9e6a119f4dbb82f6b7d5601a82c03121a3c1a456977ec
-  data.tar.gz: 1a81bfd9393e69be750950a1d6b382c1bc8c45b0d4b9191bdaf551b4af7e5725
+  metadata.gz: f96049ef42a355a057a20317490f01d21221f7404f2902ba6a79553bf747bfaf
+  data.tar.gz: ae2d328f4518584aba8c7b7f4da20f6e57dbf1bd0537114c2415eaf87c99f3f9
 SHA512:
-  metadata.gz: 9773287184bc08731228578b3f88218eaa261a462a89ae823222300c71a6276e23331acaef7ee1f2cace14b14e95f5b4d3fcce836bd51ebff35844d6547aee50
-  data.tar.gz: 5ffc87d102724e5a1f0d6d930f094a2591de23ff921aaee6670fb4d54988a10ffedd4d968477113e8acc44ac7d64e07d68a2906a91f32d19e3e0f43503b72ef5
+  metadata.gz: f2f081d723f5bce1294f82de0300af497ea1b94ffa932567f5d74cd3b382578f576f4272648d2144c68aea7ca9eae49d835fd1e884786a820bef9659c54f5baf
+  data.tar.gz: 58d93cbf354ed74b1d1c0e93ab3a4f6f8231ac8ce72060856147ce5eff5f6e830b2a01bdc0964be0d1c04f1d8b93acdc08ece1657dc1d4deb6f7cb8711870a8e

data/lib/bibliothecary/file_info.rb

@@ -17,7 +17,8 @@ module Bibliothecary
             # file that's actually on the filesystem
             nil
           else
-            File.open(@full_path).read
+            # Remove any Byte Order Marks so JSON, etc don't fail while parsing them.
+            File.open(@full_path).read.sub(/^\xEF\xBB\xBF/, '')
           end
         end
     end

data/lib/bibliothecary/parsers/maven.rb

@@ -209,8 +209,6 @@ module Bibliothecary
           end
         end
           .compact
-          # Prefer duplicate deps with the aliased ones first, so we don't lose the aliases in the next uniq step.
-          .sort_by { |dep| dep.key?(:original_name) || dep.key?(:original_requirement) ? 0 : 1 }
           .uniq { |item| item.values_at(:name, :requirement, :type, :original_name, :original_requirement) }
       end
 

data/lib/bibliothecary/runner/multi_manifest_filter.rb

@@ -71,7 +71,9 @@ module Bibliothecary
 
       def each_analysis_and_rfis
         @multiple_file_entries.each do |file|
-          analysis = @runner.analyse_file(file, File.read(File.join(@path, file)))
+          # Remove any Byte Order Marks so JSON, etc don't fail while parsing them.
+          contents = File.read(File.join(@path, file)).sub(/^\xEF\xBB\xBF/, '')
+          analysis = @runner.analyse_file(file, contents)
           rfis_for_file = @related_files_info_entries.find_all { |rfi| rfi.lockfiles.include?(file) }
 
           yield analysis, rfis_for_file

data/lib/bibliothecary/runner.rb

@@ -116,6 +116,9 @@ module Bibliothecary
 
     # Read a manifest file and extract the list of dependencies from that file.
     def analyse_file(file_path, contents)
+      # Remove any Byte Order Marks so JSON, etc don't fail while parsing them.
+      contents = contents.sub(/^\xEF\xBB\xBF/, '')
+
       package_managers.select { |pm| pm.match?(file_path, contents) }.map do |pm|
         pm.analyse_contents(file_path, contents, options: @options)
       end.flatten.uniq.compact

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "8.4.3"
+  VERSION = "8.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.4.3
+  version: 8.4.5
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb
@@ -339,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.22
 signing_key: 
 specification_version: 4
 summary: Find and parse manifests