file-digests 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1816d453ddc057c7a8eef4a0c81f63699f9ba10fdee404488fa8dc945bac791d
-  data.tar.gz: ae5baf350ac64577f0807b81231f045d875eff6351c78e559df46379ad8d6b1e
+  metadata.gz: 3bae6b10fe6496192c178f9139003b8d5a19774c70d957fd83f83ee91540cff9
+  data.tar.gz: 15d2965cb47eaeedec5dd56a0fe0a30e2f686e72d80f823416a351326d034ba8
 SHA512:
-  metadata.gz: d76b3e25d709e17e7260c0ab7836f016107c7335461f7d8ab6a74b391067fbfb1691abd6286fa3894aa432b9af229ba417972ba08c5d1524dd06d06c8dffe653
-  data.tar.gz: 9e39f4ae5d19268c986fac6d6d3bc47e2be66bb60857be608c033670ccd4b7ba3f0c5a8242a18e9ebaf161b8f5b230c040f931405e32a5a53d840e250c46fe9f
+  metadata.gz: 89b7fc7eea7a5b87f2cc23ea794ac1b2f85e9b367825694876afd91c9206c438a8df91487aaa4872e7b24480e0e5eb25b2750237318fc63305c605aa7fa372a4
+  data.tar.gz: 8fedea5e7034824276ea1f315543d5248e09a06e2fb97cf714f242181012701209383ab6416fcc0bfa206ce5b278abcdef216e4d3e41bbb9463a265b537091f2

data/lib/file-digests.rb

@@ -9,11 +9,13 @@ require 'sqlite3'
 
 class FileDigests
   DIGEST_ALGORITHMS=["BLAKE2b512", "SHA3-256", "SHA512-256"]
+  LEGACY_DIGEST_ALGORITHMS = ["SHA512", "SHA256"]
 
   def self.canonical_digest_algorithm_name(string)
     if string
-      index = DIGEST_ALGORITHMS.map(&:downcase).index(string.downcase)
-      index && DIGEST_ALGORITHMS[index]
+      algorithms = DIGEST_ALGORITHMS + LEGACY_DIGEST_ALGORITHMS
+      index = algorithms.map(&:downcase).index(string.downcase)
+      index && algorithms[index]
     end
   end
 
@@ -27,14 +29,14 @@ class FileDigests
 
   def self.parse_cli_options
     options = {}
-    
+
     OptionParser.new do |opts|
       opts.banner = [
         "Usage: file-digests [options] [path/to/directory] [path/to/database_file]",
         "       By default the current directory will be operated upon, and the database file will be placed to the current directory as well.",
         "       Should you wish to check current directory but place the database elsewhere, you could provide \".\" as a first argument, and the path to a database_file as a second."
       ].join "\n"
-    
+
       opts.on("-a", "--auto", "Do not ask for any confirmation") do
         options[:auto] = true
       end
@@ -49,8 +51,8 @@ class FileDigests
         'Transition to a new algorithm will only occur if all files pass the check by digests which were stored using the old one.'
       ) do |value|
         digest_algorithm = canonical_digest_algorithm_name(value)
-        unless digest_algorithm
-          STDERR.puts "ERROR: #{digest_algorithms_list_text}" 
+        unless DIGEST_ALGORITHMS.include?(digest_algorithm)
+          STDERR.puts "ERROR: #{digest_algorithms_list_text}"
           exit 1
         end
         options[:digest_algorithm] = digest_algorithm
@@ -212,7 +214,7 @@ class FileDigests
       end
 
       track_renames
-      
+
       if any_missing_files?
         if any_exceptions?
           STDERR.puts "Due to previously occurred errors, database cleanup from missing files will be skipped this time."
@@ -370,7 +372,7 @@ class FileDigests
     @db.execute *args, &block
   end
 
-  def nested_transaction(mode)
+  def nested_transaction(mode = :deferred)
     if @db.transaction_active?
       yield
     else
@@ -380,9 +382,9 @@ class FileDigests
     end
   end
 
-  def perhaps_transaction(condition, mode)
+  def perhaps_transaction(condition, mode = :deferred)
     if condition
-      @db.transaction(mode) do
+      nested_transaction(mode) do
         yield
       end
     else

metadata

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