fingerprint 1.1.3 → 1.2.0

data/bin/fingerprint

@@ -21,13 +21,18 @@
 # THE SOFTWARE.
 
 require 'optparse'
+require 'pathname'
 require 'fingerprint'
 
+FINGERPRINT_NAME = "._fingerprint"
+
 OPTIONS = {
 	:root => "./",
 	:mode => :scan,
 	:output => nil,
-	:verbose => false
+	:verbose => false,
+	:force => false,
+	:name => "._fingerprint.txt"
 }
 
 ARGV.options do |o|
@@ -36,6 +41,30 @@ ARGV.options do |o|
 	o.banner = "Usage: #{script_name} [options] [path]"
 	o.define_head "This script is used to calculate and compare a basic file system fingerprint."
 
+	o.separator ""
+	o.separator "Directory analysis and verification:"
+	
+	o.on("--analyze [path]", String, "Generage a fingerprint of the given path and save it for later verification.") do |path|
+		OPTIONS[:mode] = :analyze
+		OPTIONS[:root] = path
+	end
+	
+	o.on("--verify [path]", String, "Verify a given path based on a previously saved fingerprint.") do |path|
+		OPTIONS[:mode] = :verify
+		OPTIONS[:root] = path
+	end
+	
+	o.on("-n name", String, "Specify the name of the fingerprint file (default #{OPTIONS[:name]}).") do |name|
+		OPTIONS[:name] = name
+	end
+	
+	o.on("-f", "Force any operation to complete despite warnings.") do
+		OPTIONS[:force] = true
+	end
+	
+	o.separator ""
+	o.separator "Low level operations:"
+
 	o.on("-c", "Compare the given fingerprints. Check that the second fingerprint is a superset of the first.") do
 		 OPTIONS[:mode] = :check
 	end
@@ -49,19 +78,59 @@ ARGV.options do |o|
 	end
 
 	o.separator ""
-	o.separator "Help and Copyright information"
+	o.separator "Help and Copyright information:"
 
 	o.on_tail("--copy", "Display copyright information") {
-		puts "#{script_name} v#{Fingerprint::VERSION::STRING}. Copyright (c) 2010 Samuel Williams. Released under the GPLv3."
-		puts "See http://www.oriontransfer.co.nz/ for more information."
+		$stderr.puts "#{script_name} v#{Fingerprint::VERSION::STRING}. Copyright (c) 2011 Samuel Williams. Released under the MIT license."
+		$stderr.puts "See http://www.oriontransfer.co.nz/ for more information."
 
 		exit
 	}
 
-	o.on_tail("-h", "--help", "Show this help message.") { puts o; exit }
+	o.on_tail("-h", "--help", "Show this help message.") { $stderr.puts o; exit }
 end.parse!
 
+unless File.directory? OPTIONS[:root]
+	$stderr.puts "Path #{OPTIONS[:root]} doesn't exist!"
+	exit(255)
+end
+
 case (OPTIONS[:mode])
+	when :analyze
+		output_file = Pathname.new(OPTIONS[:root]) + OPTIONS[:name]
+		
+		if output_file.exist? && !OPTIONS[:force]
+			$stderr.puts "Output file #{output_file} already exists. Aborting."
+			exit(2)
+		end
+		
+		options = {}
+		options[:verbose] = true if OPTIONS[:verbose]
+		
+		File.open(output_file, "w") do |io|
+			options[:output] = io
+			
+			Fingerprint::Scanner.scan_paths([OPTIONS[:root]], options)
+		end
+	when :verify
+		error_count = 0
+		
+		input_file = Pathname.new(OPTIONS[:root]) + OPTIONS[:name]
+		
+		scanner = Fingerprint::Scanner.scan_paths([OPTIONS[:root]])
+		scanner.output.seek(0)
+		
+		File.open(input_file, "r") do |io|
+			error_count += Fingerprint::Checker.check_files(io, scanner.output)
+		end
+		
+		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
 	when :scan
 		roots = ARGV
 		roots << Dir.pwd if roots.size == 0

data/lib/fingerprint/checker.rb

@@ -92,17 +92,21 @@ module Fingerprint
 		# Helper function to check two fingerprint files.
 		def self.check_files(master, copy, &block)
 			error_count = 0 
-			checker = Checker.new(File.open(master), File.open(copy))
+			
+			master = File.open(master) unless master.respond_to? :read
+			copy = File.open(copy) unless copy.respond_to? :read
+			
+			checker = Checker.new(master, copy)
 
 			checker.check do |hash, path|
 				error_count += 1
 
 				if !checker.file_paths[path]
-					$stderr.puts "Source file: #{path.dump} does not exist in destination!"
+					$stderr.puts "File #{path.dump} is missing!"
 				elsif checker.file_paths[path] != hash
-					$stderr.puts "Destination file: #{path.dump} is different!"
+					$stderr.puts "File #{path.dump} is different!"
 				else
-					$stderr.puts "Unknown error for path: #{path.dump}"
+					$stderr.puts "Unknown error for path #{path.dump}"
 				end
 			end
 

data/lib/fingerprint/version.rb

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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
-  - 3
-  version: 1.1.3
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Samuel Williams
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-17 00:00:00 +12:00
+date: 2011-07-20 00:00:00 +12:00
 default_executable: fingerprint
 dependencies: []