bibliothecary 8.4.5 → 8.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f96049ef42a355a057a20317490f01d21221f7404f2902ba6a79553bf747bfaf
-  data.tar.gz: ae2d328f4518584aba8c7b7f4da20f6e57dbf1bd0537114c2415eaf87c99f3f9
+  metadata.gz: 33e04a00975f760b9181b0abd40f0e95d16cd13be398a451b66fb23515df11fa
+  data.tar.gz: 697ee1d7cbebdb1a1cfbce80263ef1d3d9a7d68e154aca137988e14ba96a8c22
 SHA512:
-  metadata.gz: f2f081d723f5bce1294f82de0300af497ea1b94ffa932567f5d74cd3b382578f576f4272648d2144c68aea7ca9eae49d835fd1e884786a820bef9659c54f5baf
-  data.tar.gz: 58d93cbf354ed74b1d1c0e93ab3a4f6f8231ac8ce72060856147ce5eff5f6e830b2a01bdc0964be0d1c04f1d8b93acdc08ece1657dc1d4deb6f7cb8711870a8e
+  metadata.gz: 792317a507641d26ec0903d59962c4e9949e253926346128c6c9d56c82a2716484163fe2c1cf626c10d967c19872c9c610fd12f9dcb7f2c5f27270be05a4ce29
+  data.tar.gz: 24795027d27690ea19467426cc9499ea93941d9eae184b02100900bfb6eb310f8f9de94e1baa24d2969e51f03b6a85c995bb16c53f5b77c4a011a9622309556e

data/lib/bibliothecary/file_info.rb

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

data/lib/bibliothecary/runner/multi_manifest_filter.rb

@@ -71,8 +71,7 @@ module Bibliothecary
 
       def each_analysis_and_rfis
         @multiple_file_entries.each do |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/, '')
+          contents = Bibliothecary.utf8_string(File.read(File.join(@path, file)))
           analysis = @runner.analyse_file(file, contents)
           rfis_for_file = @related_files_info_entries.find_all { |rfi| rfi.lockfiles.include?(file) }
 

data/lib/bibliothecary/runner.rb

@@ -116,8 +116,7 @@ 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/, '')
+      contents = Bibliothecary.utf8_string(contents)
 
       package_managers.select { |pm| pm.match?(file_path, contents) }.map do |pm|
         pm.analyse_contents(file_path, contents, options: @options)

data/lib/bibliothecary/version.rb

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

data/lib/bibliothecary.rb

@@ -75,6 +75,12 @@ module Bibliothecary
     configuration.ignored_files
   end
 
+  def self.utf8_string(string)
+    string
+      .force_encoding("UTF-8") # treat all strings as utf8
+      .sub(/^\xEF\xBB\xBF/, '') # remove any Byte Order Marks so JSON, etc don't fail while parsing them.
+  end
+
   class << self
     attr_writer :configuration
     alias analyze analyse

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.4.5
+  version: 8.4.6
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-07 00:00:00.000000000 Z
+date: 2022-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb