file-digests 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a167cb6f59c4cdae02d1a84636e81a2a2deab97f1f23f6c9a47a3ff875da554
-  data.tar.gz: 193fb14076bfb7bc66928bbb4d1b6c4ff58c8c9ec9ba3d22bfcbda74960b9416
+  metadata.gz: 6028b58b55a01a5075c8ac95b81ef78d53aeddc015990b3823192321515e8cd3
+  data.tar.gz: 473996ec0c9bd45b6864da08ac69280a1787536a0405a43ddd1c714fc04f25ae
 SHA512:
-  metadata.gz: 20cfd65569fc3919ba8957ced4afca0572044c745a3d31f14f64872ea267599a911bb9e9f2ac203f25d1069c6bc50d4d24600a779d42f49e91a39f701eeaeee6
-  data.tar.gz: d6cee295615ce3ae115c20fde66533e547148ba7626ebcbc78bf30e6cd5e2d5b3f391ca4068f50e79892ae695636a00c0395f63226a6d9cf5ba4de9d27bcff24
+  metadata.gz: 3a7c560a043b17bf63fdcce1a003d9be812ee12f5b46bcfe25a117ab5d250b7b8f8146d89303db2bae9656b351dad6b2c88273198b92555fdef538e987a390e7
+  data.tar.gz: 932f4aaeb1fdf886b851880301befa45d7d5f1477d1b36e71807389990bde4b4398961478b7d3c35eaec0346beabf2224a67615be52f724bfa2dc1eb41e74f81

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,26 +152,32 @@ 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 @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
 
-      if File.exist?(digest_database_path.dirname + '.file-digests.sha512')
+      if File.exist?(@digest_database_path.dirname + '.file-digests.sha512')
         @use_sha512 = true
       end
 
-      @digest_database = DigestDatabase.new digest_database_path
+      @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
@@ -210,9 +214,11 @@ 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(

metadata

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