fingerprint 1.3.1 → 1.3.2

data/bin/fingerprint

@@ -35,7 +35,8 @@ OPTIONS = {
 	:name => "index.fingerprint",
 	:extended => false,
 	:checksums => Fingerprint::DEFAULT_CHECKSUMS,
-	:lockfile => true
+	:lockfile => true,
+	:additions => false,
 }
 
 ARGV.options do |o|
@@ -66,12 +67,29 @@ ARGV.options do |o|
 	end
 	
 	o.separator ""
-	o.separator "Low level operations:"
+	
+	o.on("-x", "Include additional extended information about files and directories.") do
+		OPTIONS[:extended] = true
+	end
+	
+	o.on("-s [checksum1,checksum2]", "Provide a list of the checksum algorithms to use.", "Available: #{Fingerprint::CHECKSUMS.keys.join(', ')}; Default: #{OPTIONS[:checksums].join(', ')}") do |checksums|
+		OPTIONS[:checksums] = checksums.split(/[\s,]+/)
+	end
+	
+	o.separator ""
+	o.separator "Compare fingerprints:"
 
 	o.on("-c", "Compare the given fingerprints. Check that the second fingerprint is a superset of the first.") do
 		 OPTIONS[:mode] = :check
 	end
 	
+	o.on("-A", "Report files that have been added to the second fingerprint.") do
+		OPTIONS[:additions] = true
+	end
+	
+	o.separator ""
+	o.separator "Output manipulation:"
+	
 	o.on("-o [output-path]", String, "Write the fingerprint output to the given file.") do |path|
 		OPTIONS[:output] = File.open(path, "w")
 	end
@@ -87,16 +105,6 @@ ARGV.options do |o|
 	o.on("--no-lockfile", "Don't use a lockfile to validate access to the fingerprint.") do
 		OPTIONS[:lockfile] = false
 	end
-
-	o.separator ""
-	
-	o.on("-x", "Include additional extended information about files and directories.") do
-		OPTIONS[:extended] = true
-	end
-	
-	o.on("-s [checksum1,checksum2]", "Provide a list of the checksum algorithms to use.", "Available: #{Fingerprint::CHECKSUMS.keys.join(', ')}; Default: #{OPTIONS[:checksums].join(', ')}") do |checksums|
-		OPTIONS[:checksums] = checksums.split(/[\s,]+/)
-	end
 	
 	o.separator ""
 	o.separator "Help and Copyright information:"

data/lib/fingerprint/checker.rb

@@ -42,7 +42,7 @@ module Fingerprint
 		attr :copy
 
 		# Run the checking process.
-		def check (options = {}, &block)
+		def check (&block)
 			# For every file in the src, we check that it exists
 			# in the destination:
 			
@@ -50,7 +50,15 @@ module Fingerprint
 			processed_size = 0
 			total_size = @master.records.inject(0) { |count, record| count + (record['file.size'] || 0).to_i }
 			
+			if @options[:additions]
+				copy_paths = @copy.paths.dup
+			else
+				copy_paths = {}
+			end
+			
 			@master.records.each_with_index do |record, processed_count|
+				copy_paths.delete(record.path)
+
 				next if record.mode != :file
 
 				result, message = @copy.compare(record)
@@ -71,6 +79,12 @@ module Fingerprint
 					processed_size += (record['file.size'] || 0).to_i
 				end
 			end
+			
+			if @options[:additions]
+				copy_paths.each do |path, record|
+					yield record, :addition, "File #{path} added."
+				end
+			end
 		end
 		
 		# A list of files which either did not exist in the copy, or had the wrong checksum.
@@ -105,14 +119,17 @@ module Fingerprint
 
 			checker.check do |record, result, message|
 				error_count += 1
-				copy = checker.copy.paths[record.path]
 
 				metadata = {
 					'error.code' => result,
 					'error.message' => message
 				}
 
-				if copy
+				if result == :addition
+					metadata.merge!(record.metadata)
+					
+					errors << Record.new(:warning, record.path, metadata)
+				elsif (copy = checker.copy.paths[record.path])
 					changes = record.diff(copy)
 
 					changes.each do |name|
@@ -126,7 +143,13 @@ module Fingerprint
 				end
 			end
 
-			errors << Record.new(:summary, nil, {
+			if error_count
+				summary_message = "#{error_count} error(s) detected."
+			else
+				summary_message = "No errors detected"
+			end
+
+			errors << Record.new(:summary, summary_message, {
 				'error.count' => error_count
 			})
 

data/lib/fingerprint/record.rb

@@ -67,7 +67,7 @@ module Fingerprint
 			options = {}
 			
 			options[:extended] = true if @metadata['options.extended'] == 'true'
-			options[:checksum] = @metadata['options.checksums'].split(/[\s,]+/) if @metadata['options.checksums']
+			options[:checksums] = @metadata['options.checksums'].split(/[\s,]+/) if @metadata['options.checksums']
 			
 			return options
 		end

data/lib/fingerprint/scanner.rb

@@ -264,9 +264,11 @@ module Fingerprint
 					end
 				end
 			end
+			
+			summary_message = "#{processed_count} files processed."
 
 			# Output summary
-			recordset << Record.new(:summary, nil, {
+			recordset << Record.new(:summary, summary_message, {
 				'summary.directories' => directory_count,
 				'summary.files' => processed_count,
 				'summary.size' => processed_size,

data/lib/fingerprint/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fingerprint
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Samuel Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-05 00:00:00 Z
+date: 2011-10-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: lockfile