file-digests 0.0.11 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6028b58b55a01a5075c8ac95b81ef78d53aeddc015990b3823192321515e8cd3
-  data.tar.gz: 473996ec0c9bd45b6864da08ac69280a1787536a0405a43ddd1c714fc04f25ae
+  metadata.gz: db5f9c1faeeed556960cd8c1d6a448d0b860ff5145eefaa04890847222c04b87
+  data.tar.gz: b1858913665bd3ce971fd53fe605c5f5e83c3f54310cff0b57f9b4b08f3fddce
 SHA512:
-  metadata.gz: 3a7c560a043b17bf63fdcce1a003d9be812ee12f5b46bcfe25a117ab5d250b7b8f8146d89303db2bae9656b351dad6b2c88273198b92555fdef538e987a390e7
-  data.tar.gz: 932f4aaeb1fdf886b851880301befa45d7d5f1477d1b36e71807389990bde4b4398961478b7d3c35eaec0346beabf2224a67615be52f724bfa2dc1eb41e74f81
+  metadata.gz: 303c02c2d5374c4438829dbabb3ac479e77d20f3f0051d86c7b0ecb01ea0ff1cb50db40b692c9749c5a7da5d77dc54012881df92d309bb12700a57c232a50c32
+  data.tar.gz: 78fc7896d1090778d4a0fea0642c22208a8de1bf89506a3ca5e5efc7949b3bb2b2e528a2b0e4a070ea6c66d66cee3a6b6c9850664225e6c303b0e8abdc273591

data/lib/file-digests.rb

@@ -8,27 +8,6 @@ require 'sqlite3'
 
 module FileDigests
 
-  def self.ensure_dir_exists path
-    if File.exist?(path)
-      unless File.directory?(path)
-        raise "#{path} is not a directory"
-      end
-    else
-      FileUtils.mkdir_p path
-    end
-  end
-
-  def self.measure_time
-    start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    yield
-    elapsed = (Process.clock_gettime(Process::CLOCK_MONOTONIC) - start).to_i
-    puts "Elapsed time: #{elapsed / 3600}h #{(elapsed % 3600) / 60}m #{elapsed % 60}s" unless QUIET
-  end
-
-  def self.patch_path_string path
-    Gem.win_platform? ? path.gsub(/\\/, '/') : path
-  end
-
   def self.perform_check
     checker = Checker.new ARGV[0], ARGV[1]
     checker.perform_check
@@ -152,22 +131,26 @@ module FileDigests
 
   class Checker
     def initialize files_path, digest_database_path
-      @files_path = Pathname.new(FileDigests::patch_path_string(files_path || ".")).cleanpath
+      @files_path = cleanup_path(files_path || ".")
       @prefix_to_remove = @files_path.to_s + '/'
 
       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
+        cleanup_path(digest_database_path)
       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 @digest_database_path.dirname
+      ensure_dir_exists @digest_database_path.dirname
 
       if File.exist?(@digest_database_path.dirname + '.file-digests.sha512')
         @use_sha512 = true
@@ -178,7 +161,7 @@ module FileDigests
     end
 
     def perform_check
-      FileDigests::measure_time do
+      measure_time do
         walk_files do |filename|
           process_file filename
         end
@@ -193,11 +176,7 @@ module FileDigests
       puts @counters.inspect
     end
 
-    def walk_files
-      Dir.glob(@files_path + '**' + '*', File::FNM_DOTMATCH) do |filename|
-        yield filename
-      end
-    end
+    private
 
     def process_file filename
       return if File.symlink? filename
@@ -222,14 +201,38 @@ module FileDigests
       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 patch_path_string path
+      Gem.win_platform? ? path.gsub(/\\/, '/') : path
+    end
+
+    def cleanup_path path
+      Pathname.new(patch_path_string(path)).cleanpath
+    end
+
+    def ensure_dir_exists path
+      if File.exist?(path)
+        unless File.directory?(path)
+          raise "#{path} is not a directory"
+        end
+      else
+        FileUtils.mkdir_p path
+      end
+    end
+
+    def walk_files
+      Dir.glob(@files_path + '**' + '*', File::FNM_DOTMATCH) do |filename|
+        yield filename
+      end
     end
 
     def get_file_digest filename
@@ -243,5 +246,12 @@ module FileDigests
       end
     end
 
+    def measure_time
+      start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      yield
+      elapsed = (Process.clock_gettime(Process::CLOCK_MONOTONIC) - start).to_i
+      puts "Elapsed time: #{elapsed / 3600}h #{(elapsed % 3600) / 60}m #{elapsed % 60}s" unless QUIET
+    end
+
   end
 end

metadata

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