file-digests 0.0.9 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee2508a2c4d70b5a4847f6403d74848db85145b181ff103c4b9dbc631ea03720
-  data.tar.gz: 7e0b68a73d34e54ba8b98b884f2184eda906ca9c11dac04d98607d8727ec1911
+  metadata.gz: fa2168306bdb4d923daef330ec22f3381bc2b3106f56a162b80dae94721e7799
+  data.tar.gz: f43dd24befade5a72e4fd0b878f7bd2abbd06266923c4d062b3c50b1d624b1e9
 SHA512:
-  metadata.gz: db27ac6edfbe7f6c243d4e2c54cf2c0d6419328e751151e6745bad97836881116ea5710490532cf87c1c4a5f6f50d7495b1ae05863f78b66436a20e5c83f7884
-  data.tar.gz: 3959e854c8b5539ba8e1882857730fd17f91ffb2f31252db070b31dcc69fb6fdf4ac02f99e2ce53ba1767085bada121840f2bb582f708ca6881128f92359cbb9
+  metadata.gz: 051d97686878d0d53cf3e2206c5e1f2ee8b0d4e678a7f8f5cc1edeb3fc5e34d706b6afdc2dc9c75a68863e9cc1a6afb6f14c4346ac46f2007c72427b38ed2ee2
+  data.tar.gz: a94aeec79e617d803f6f3e81bbabe07c68c0e287a0413ade53a4f085c007c92874f96432a5eb7505c4ca9057c4f5525a40f1f560f6ba05a258d0e78b4366bc7d

data/bin/file-digests

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'file-digests'
-
 QUIET = (ENV["QUIET"] == "true")
 TEST_ONLY = (ENV["TEST_ONLY"] == "true")
 
+require 'file-digests'
+
 FileDigests.perform_check

data/bin/file-digests-test

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'file-digests'
-
 QUIET = (ENV["QUIET"] == "true")
 TEST_ONLY = true
 
+require 'file-digests'
+
 FileDigests.perform_check

data/lib/file-digests.rb

@@ -30,10 +30,8 @@ module FileDigests
   end
 
   def self.perform_check
-    files_path = Pathname.new patch_path_string(ARGV[0] || ".")
-    digest_database_path = Pathname.new patch_path_string(ARGV[1]) if ARGV[1]
-    checker = Checker.new files_path, digest_database_path
-    checker.check
+    checker = Checker.new ARGV[0], ARGV[1]
+    checker.perform_check
   end
 
   class DigestDatabase
@@ -154,22 +152,36 @@ module FileDigests
 
   class Checker
     def initialize files_path, digest_database_path
-      @counters = {good: 0, updated: 0, new: 0, missing: 0, renamed: 0, likely_damaged: 0, exceptions: 0}
-      @files_path = files_path
+      @files_path = Pathname.new(FileDigests::patch_path_string(files_path || ".")).cleanpath
       @prefix_to_remove = @files_path.to_s + '/'
 
-      unless digest_database_path
-        digest_database_path = @files_path + '.file-digests.sqlite'
+      raise "Files path must be a readable directory" unless (File.directory?(@files_path) && File.readable?(@files_path))
+
+      @digest_database_path = if digest_database_path
+        Pathname.new(FileDigests::patch_path_string(digest_database_path)).cleanpath
+      else
+        @files_path + '.file-digests.sqlite'
+      end
+
+      if File.directory?(@digest_database_path)
+        @digest_database_path = @digest_database_path + '.file-digests.sqlite'
+      end
+
+      if @files_path == @digest_database_path.dirname
         @skip_file_digests_sqlite = true
       end
 
-      FileDigests::ensure_dir_exists @files_path
-      FileDigests::ensure_dir_exists digest_database_path.dirname
+      FileDigests::ensure_dir_exists @digest_database_path.dirname
 
-      @digest_database = DigestDatabase.new digest_database_path
+      if File.exist?(@digest_database_path.dirname + '.file-digests.sha512')
+        @use_sha512 = true
+      end
+
+      @digest_database = DigestDatabase.new @digest_database_path
+      @counters = {good: 0, updated: 0, new: 0, missing: 0, renamed: 0, likely_damaged: 0, exceptions: 0}
     end
 
-    def check
+    def perform_check
       FileDigests::measure_time do
         walk_files do |filename|
           process_file filename
@@ -206,25 +218,27 @@ module FileDigests
       return if stat.socket?
 
       if @skip_file_digests_sqlite
-        return if filename == '.file-digests.sqlite'
-        return if filename == '.file-digests.sqlite-wal'
-        return if filename == '.file-digests.sqlite-shm'
+        basename = File.basename(filename)
+        return if basename == '.file-digests.sha512'
+        return if basename == '.file-digests.sqlite'
+        return if basename == '.file-digests.sqlite-wal'
+        return if basename == '.file-digests.sqlite-shm'
       end
 
       @digest_database.insert_or_update(
-        filename.delete_prefix(@prefix_to_remove).unicode_normalize(:nfkc),
+        filename.delete_prefix(@prefix_to_remove).encode('utf-8', universal_newline: true).unicode_normalize(:nfkc),
         stat.mtime.utc.strftime('%Y-%m-%d %H:%M:%S'),
         get_file_digest(filename),
         @counters
         )
     rescue => exception
       @counters[:exceptions] += 1
-      STDERR.puts "EXCEPTION: #{filename}: #{exception.message}"
+      STDERR.puts "EXCEPTION: #{filename.encode('utf-8', universal_newline: true)}: #{exception.message}"
     end
 
     def get_file_digest filename
       File.open(filename, 'rb') do |io|
-        digest = Digest::SHA512.new
+        digest = (@use_sha512 ? Digest::SHA512 : Digest::SHA256).new
         buffer = ""
         while io.read(40960, buffer)
           digest.update(buffer)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: file-digests
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.14
 platform: ruby
 authors:
 - Stanislav Senotrusov