fingerprint 1.3.2 → 1.3.3

data/bin/fingerprint

@@ -37,6 +37,7 @@ OPTIONS = {
 	:checksums => Fingerprint::DEFAULT_CHECKSUMS,
 	:lockfile => true,
 	:additions => false,
+	:failures_exit_status => 0,
 }
 
 ARGV.options do |o|
@@ -106,6 +107,10 @@ ARGV.options do |o|
 		OPTIONS[:lockfile] = false
 	end
 	
+	o.on("-X", "Give a non-zero exit code if errors are detected by check or verify.") do
+		OPTIONS[:failures_exit_status] = 1
+	end
+	
 	o.separator ""
 	o.separator "Help and Copyright information:"
 
@@ -157,6 +162,16 @@ def with_lock
 	return true
 end
 
+def finish_check(error_count)
+	if error_count == 0
+		$stderr.puts "Data verified, 0 errors found."
+		exit(0)
+	else
+		$stderr.puts "Data inconsistent, #{error_count} errors found!"
+		exit(OPTIONS[:failures_exit_status])
+	end
+end
+
 case (OPTIONS[:mode])
 	when :analyze
 		result = with_lock do
@@ -214,13 +229,7 @@ case (OPTIONS[:mode])
 
 		error_count += Fingerprint::Checker::verify(master, copy, options)
 		
-		if error_count == 0
-			$stderr.puts "Data verified, 0 errors found."
-			exit(0)
-		else
-			$stderr.puts "Data inconsistent, #{error_count} errors found!"
-			exit(1)
-		end
+		finish_check(error_count)
 	when :scan
 		roots = ARGV
 		roots << Dir.pwd if roots.size == 0
@@ -242,5 +251,6 @@ case (OPTIONS[:mode])
 		options = OPTIONS.dup
 		
 		error_count = Fingerprint::Checker.check_files(ARGV[0], ARGV[1], options)
-		exit(error_count > 0 ? 1 : 0)
+		
+		finish_check(error_count)
 end

data/lib/fingerprint/checker.rb

@@ -59,6 +59,10 @@ module Fingerprint
 			@master.records.each_with_index do |record, processed_count|
 				copy_paths.delete(record.path)
 
+				if @options[:progress]
+					$stderr.puts "# Checking: #{record.path}"
+				end
+
 				next if record.mode != :file
 
 				result, message = @copy.compare(record)
@@ -74,7 +78,7 @@ module Fingerprint
 				end
 				
 				if @options[:progress]
-					$stderr.puts "# Progress: File #{processed_count} / #{total_count} = #{sprintf('%0.2f%', processed_count.to_f / total_count.to_f * 100.0)}; Byte #{processed_size} / #{total_size} = #{sprintf('%0.2f%', processed_size.to_f / total_size.to_f * 100.0)}"
+					$stderr.puts "# Progress: File #{processed_count} / #{total_count}; Byte #{processed_size} / #{total_size} = #{sprintf('%0.2f%', processed_size.to_f / total_size.to_f * 100.0)}"
 
 					processed_size += (record['file.size'] || 0).to_i
 				end
@@ -82,7 +86,9 @@ module Fingerprint
 			
 			if @options[:additions]
 				copy_paths.each do |path, record|
-					yield record, :addition, "File #{path} added."
+					next unless record.mode == :file || record.mode == :directory
+					
+					yield record, :addition, "File added"
 				end
 			end
 		end

data/lib/fingerprint/version.rb

@@ -23,7 +23,7 @@ module Fingerprint
   module VERSION
     MAJOR = 1
     MINOR = 3
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fingerprint
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - Samuel Williams