fingerprint 1.3.3 → 1.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2c6867e9566430e12dc2d913a013c469e3b2bc47
+  data.tar.gz: 58d9a1812dcd041743816328ac3e71fc79496014
+SHA512:
+  metadata.gz: ac0bfcca4b51a31797849aa039c795626f78d7a5d0b5278aadbb9872b635d7ca3cd369b3cd08de77c48545ca58af4aad83ede79e99749b56e896a03b8e238e5e
+  data.tar.gz: 76f51cf43136114a35cafb99958da8e7099c98ee68a931efa7a1b853e76dc9025a2bedd6df697ebf69b7c7f47004f3616865514beea9c980d8a9e4798f7eec58

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fingerprint.gemspec
+gemspec

data/README.md

@@ -1,9 +1,4 @@
-Fingerprint
-===========
-
-* Author: Samuel G. D. Williams (<http://www.oriontransfer.co.nz>)
-* Copyright (C) 2010, 2011 Samuel G. D. Williams.
-* Released under the MIT license.
+# Fingerprint
 
 Fingerprint is primarily a command line tool to compare directory structures on 
 disk. It also provides a programmatic interface for this procedure.
@@ -14,10 +9,27 @@ used to check the integrity of a remote backup.
 
 For examples and documentation please see the main [project page][1].
 
-[1]: http://www.oriontransfer.co.nz/gems/fingerprint
+[1]: http://www.codeotaku.com/projects/fingerprint/index
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'fingerprint'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
 
-Todo
-----
+    $ gem install fingerprint
+
+## Usage
+
+Please refer to the [online documentation][http://www.codeotaku.com/projects/fingerprint/documentation/introduction].
+
+## Todo
 
 * Command line option to show files that have been created (e.g. don't exist in master fingerprint).
 * Command line option to show files that have changed but have the same modified time (hardware corrutpion).
@@ -28,10 +40,19 @@ Todo
 * Support general filenames for `--archive`, e.g. along with `-n`, maybe support a file called `index.fingerprint` by default: improved visibility for end user.
 * Because fingerprint is currently IO bound in terms of performance, single-threaded checksumming is fine, but for SSD and other fast storage, it might be possible to improve speed somewhat by using a map-reduce style approach.
 
-License
--------
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+## License
+
+Released under the MIT license.
 
-Copyright (c) 2010, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+Copyright, 2012, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/bin/fingerprint

@@ -23,7 +23,6 @@
 require 'optparse'
 require 'pathname'
 require 'fingerprint'
-require 'lockfile'
 require 'fileutils'
 
 OPTIONS = {
@@ -35,9 +34,8 @@ OPTIONS = {
 	:name => "index.fingerprint",
 	:extended => false,
 	:checksums => Fingerprint::DEFAULT_CHECKSUMS,
-	:lockfile => true,
 	:additions => false,
-	:failures_exit_status => 0,
+	:failures => :ignore,
 }
 
 ARGV.options do |o|
@@ -103,19 +101,15 @@ ARGV.options do |o|
 		OPTIONS[:progress] = true
 	end
 	
-	o.on("--no-lockfile", "Don't use a lockfile to validate access to the fingerprint.") do
-		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
+	o.on("--die", "Give a non-zero exit code if errors are detected by check or verify.") do
+		OPTIONS[:failures] = :die
 	end
 	
 	o.separator ""
 	o.separator "Help and Copyright information:"
 
 	o.on_tail("--copy", "Display copyright and warranty information") do
-		$stderr.puts "#{script_name} v#{Fingerprint::VERSION::STRING}. Copyright (c) 2011 Samuel Williams."
+		$stderr.puts "#{script_name} v#{Fingerprint::VERSION}. Copyright (c) 2011 Samuel Williams."
 		$stderr.puts "This software is released under the MIT license and comes with ABSOLUTELY NO WARRANTY."
 		$stderr.puts "See http://www.oriontransfer.co.nz/ for more information."
 		exit
@@ -136,121 +130,91 @@ if OPTIONS[:checksums].size == 0
 	OPTIONS[:checksums] = ['MD5', 'SHA2.256']
 end
 
-# Run some block with the given lock, if requested.
-def with_lock
-	lockfile_path = nil
-	if OPTIONS[:lockfile] == true
-		lockfile_path = Pathname.new(OPTIONS[:root]) + (OPTIONS[:name] + ".lock")
-	elsif OPTION[:lockfile] != false
-		lockfile_path = OPTIONS[:lockfile]
-	end
-	
-	if lockfile_path
-		begin
-			Lockfile.new(lockfile_path, :retries => 0) do
-				yield
-			end
-		rescue Lockfile::MaxTriesLockError
-			$stderr.puts "Could not acquire lock #{lockfile_path}."
-			
-			return false
-		end
-	else
-		yield
-	end
-	
-	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])
+		exit(OPTIONS[:failures] == :die ? 1 : 0)
 	end
 end
 
 case (OPTIONS[:mode])
-	when :analyze
-		result = with_lock do
-			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.dup
-			options[:excludes] = [OPTIONS[:name]]
-			
-			finished = false
-			begin
-				File.open(output_file, "w") do |io|
-					options[:output] = io
-			
-					Fingerprint::Scanner.scan_paths([OPTIONS[:root]], options)
-				end
-				finished = true
-			ensure
-				FileUtils.rm(output_file) unless finished
-			end
-		end
-		
-		unless result
-			# Lockfile failure
-			exit(4)
-		end
-	when :verify
-		error_count = 0
-		
-		input_file = Pathname.new(OPTIONS[:root]) + OPTIONS[:name]
-		
-		unless File.exist? input_file
-			$stderr.puts "Can't find index #{input_file}. Aborting."
-			exit(3)
-		end
-		
-		options = OPTIONS.dup
-		
-		master = Fingerprint::Recordset.new
-		
-		File.open(input_file, "r") do |io|
-			master.parse(io)
-		end
-		
-		if master.configuration
-			options.merge!(master.configuration.options)
+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.dup
+	options[:excludes] = [OPTIONS[:name]]
+
+	finished = false
+	begin
+		File.open(output_file, "w") do |io|
+			options[:output] = io
+
+			Fingerprint::Scanner.scan_paths([OPTIONS[:root]], options)
 		end
+		finished = true
+	ensure
+		FileUtils.rm(output_file) unless finished
+	end		
+when :verify
+	error_count = 0
+
+	input_file = Pathname.new(OPTIONS[:root]) + OPTIONS[:name]
+
+	unless File.exist? input_file
+		$stderr.puts "Can't find index #{input_file}. Aborting."
+		exit(3)
+	end
+
+	options = OPTIONS.dup
 
-		scanner = Fingerprint::Scanner.new([OPTIONS[:root]], options)
-		copy = Fingerprint::SparseRecordset.new(scanner)
-
-		error_count += Fingerprint::Checker::verify(master, copy, options)
-		
-		finish_check(error_count)
-	when :scan
-		roots = ARGV
-		roots << Dir.pwd if roots.size == 0
-		
-		# Check that all supplied paths exist
-		roots.delete_if do |root|
-			if File.exist? root
-				false
-			else
-				$stderr.puts "Path #{root} doesn't exist, skipping!"
-				true
-			end
+	master = Fingerprint::RecordSet.new
+
+	File.open(input_file, "r") do |io|
+		master.parse(io)
+	end
+
+	if master.configuration
+		options.merge!(master.configuration.options)
+	end
+
+	scanner = Fingerprint::Scanner.new([OPTIONS[:root]], options)
+	copy = Fingerprint::SparseRecordSet.new(scanner)
+
+	error_count += Fingerprint::Checker::verify(master, copy, options)
+
+	finish_check(error_count)
+when :scan
+	roots = ARGV
+	roots << Dir.pwd if roots.size == 0
+
+	# Check that all supplied paths exist
+	roots.delete_if do |root|
+		if File.exist? root
+			false
+		else
+			$stderr.puts "Path #{root} doesn't exist, skipping!"
+			true
 		end
+	end
+
+	options = OPTIONS.dup
+
+	# Discard output once it has been written to disk:
+	options[:recordset] = nil
+
+	Fingerprint::Scanner.scan_paths(roots, options)
+when :check
+	options = OPTIONS.dup
 
-		options = OPTIONS.dup
+	error_count = Fingerprint::Checker.check_files(ARGV[0], ARGV[1], options)
 
-		Fingerprint::Scanner.scan_paths(roots, options)
-	when :check
-		options = OPTIONS.dup
-		
-		error_count = Fingerprint::Checker.check_files(ARGV[0], ARGV[1], options)
-		
-		finish_check(error_count)
+	finish_check(error_count)
 end

data/bin/fingerprint-diff

@@ -0,0 +1,145 @@
+#!/usr/bin/env ruby
+
+# Copyright (c) 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'optparse'
+require 'pathname'
+require 'fingerprint'
+require 'lockfile'
+require 'fileutils'
+
+OPTIONS = {
+	:mode => nil,
+	:output => $stdout,
+	:verbose => false,
+	:force => false,
+	:extended => false,
+	:inverse => false
+}
+
+$options = nil
+
+ARGV.options do |o|
+	$options = o
+	
+	script_name = File.basename($0)
+
+	o.banner = "Usage: #{script_name} [options] [path]"
+	o.define_head "This script is used to calculate the differences between two fingerprints."
+
+	o.separator ""
+	o.separator "Set operations between fingerprints:"
+	
+	o.on("--duplicates", "Calculate files in copy that already exist in master") do |master, copy|
+		OPTIONS[:mode] = :duplicates
+	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
+	
+	o.on("--verbose", "Verbose output, include additional details in the file transcript.") do
+		OPTIONS[:verbose] = true
+	end
+	
+	o.on("--progress", "Print percentage progress to standard error.") do
+		OPTIONS[:progress] = true
+	end
+	
+	o.on("--inverse", "Show the inverse of the selected operation.") do
+		OPTIONS[:inverse] = true
+	end
+	
+	o.separator ""
+	o.separator "Help and Copyright information:"
+
+	o.on_tail("--copy", "Display copyright and warranty information") do
+		$stderr.puts "#{script_name} v#{Fingerprint::VERSION::STRING}. Copyright (c) 2011 Samuel Williams."
+		$stderr.puts "This software is released under the MIT license and comes with ABSOLUTELY NO WARRANTY."
+		$stderr.puts "See http://www.oriontransfer.co.nz/ for more information."
+		exit
+	end
+
+	o.on_tail("-h", "--help", "Show this help message.") do
+		$stderr.puts o
+		exit
+	end
+end.parse!
+
+case (OPTIONS[:mode])
+when :duplicates
+	options = OPTIONS.dup
+	
+	include Fingerprint
+	
+	duplicates_recordset = RecordSet.new
+	results = RecordSetPrinter.new(duplicates_recordset, OPTIONS[:output])
+	
+	master_file_path = ARGV.shift
+	File.open(master_file_path) do |master_file|
+		master_recordset = RecordSet.new
+		master_recordset.parse(master_file)
+		
+		ignore_similar = false
+		
+		copy_file_paths = ARGV
+		if copy_file_paths.size == 0
+			copy_file_paths = [master_file_path]
+			ignore_similar = true
+		end
+		
+		copy_file_paths.each do |copy_file_path|
+			File.open(copy_file_path) do |copy_file|
+				copy_recordset = RecordSet.new
+				copy_recordset.parse(copy_file)
+				
+				copy_recordset.records.each do |record|
+					record.metadata['fingerprint'] = copy_file_path
+					# We need to see if the record exists in the master
+					
+					if OPTIONS[:verbose]
+						$stderr.puts "Checking #{record.inspect}"
+					end
+					
+					main_record = master_recordset.find_by_key(record)
+					
+					# If we are scanning the same index, don't print out every file, just those that are duplicates within the single file.
+					if ignore_similar && main_record && (main_record.path == record.path)
+						main_record = nil
+					end
+					
+					if main_record
+						record.metadata['original.path'] = main_record.path
+						record.metadata['original.fingerprint'] = master_file_path
+						results << record if !OPTIONS[:inverse]
+					else
+						results << record if OPTIONS[:inverse]
+					end
+				end
+			end
+		end
+	end
+else
+	puts $options
+end

data/fingerprint.gemspec

@@ -0,0 +1,27 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'fingerprint/version'
+
+Gem::Specification.new do |spec|
+	spec.name          = "fingerprint"
+	spec.version       = Fingerprint::VERSION
+	spec.authors       = ["Samuel Williams"]
+	spec.email         = ["samuel.williams@oriontransfer.co.nz"]
+	spec.description   = <<-EOF
+		Fingerprint is a general purpose data integrity tool that uses cryptographic hashes to detect changes in files and directory trees. The fingerprint command scans a directory tree and generates a fingerprint file containing the names and cryptographic hashes of the files in the tree. This snapshot can be later used to generate a list of files that have been created, deleted or modified. If so much as a single bit in the file data has changed, Fingerprint will detect it.
+	EOF
+	spec.summary       = "Fingerprint is a tool for creating checksums of entire directory structures, and comparing them for inconsistencies."
+	spec.homepage      = "http://www.codeotaku.com/projects/fingerprint"
+	spec.license       = "MIT"
+
+	spec.files         = `git ls-files`.split($/)
+	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+	spec.require_paths = ["lib"]
+
+	spec.add_development_dependency "bundler", "~> 1.3"
+	spec.add_development_dependency "rake"
+
+	spec.add_dependency "lockfile"
+end

data/lib/fingerprint.rb

@@ -18,6 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'fingerprint/record'
 require 'fingerprint/version'
 require 'fingerprint/scanner'
 require 'fingerprint/checker'
@@ -28,8 +29,8 @@ module Fingerprint
 		master = Scanner.new([master_path])
 		copy = Scanner.new([copy_path])
 		
-		master_recordset = Recordset.new
-		copy_recordset = SparseRecordset.new(copy)
+		master_recordset = RecordSet.new
+		copy_recordset = SparseRecordSet.new(copy)
 		
 		master.scan(master_recordset)
 		

data/lib/fingerprint/checker.rb

@@ -45,7 +45,6 @@ module Fingerprint
 		def check (&block)
 			# For every file in the src, we check that it exists
 			# in the destination:
-			
 			total_count = @master.records.count
 			processed_size = 0
 			total_size = @master.records.inject(0) { |count, record| count + (record['file.size'] || 0).to_i }
@@ -97,14 +96,14 @@ module Fingerprint
 		attr :failures
 
 		def self.check_files(master, copy, options = {}, &block)
-			# New API that takes two Recordsets...
+			# New API that takes two RecordSets...
 			
 			File.open(master) do |master_file|
 				File.open(copy) do |copy_file|
-					master_recordset = Recordset.new
+					master_recordset = RecordSet.new
 					master_recordset.parse(master_file)
 					
-					copy_recordset = Recordset.new
+					copy_recordset = RecordSet.new
 					copy_recordset.parse(copy_file)
 
 					verify(master_recordset, copy_recordset, options, &block)
@@ -116,9 +115,9 @@ module Fingerprint
 		def self.verify(master, copy, options = {}, &block)
 			error_count = 0 
 
-			errors = options.delete(:recordset) || Recordset.new
+			errors = options.delete(:recordset) || RecordSet.new
 			if options[:output]
-				errors = RecordsetPrinter.new(errors, options[:output])
+				errors = RecordSetPrinter.new(errors, options[:output])
 			end
 
 			checker = Checker.new(master, copy, options)

data/lib/fingerprint/record.rb

@@ -83,12 +83,12 @@ module Fingerprint
 		end
 	end
 	
-	class Recordset
+	class RecordSet
 		def initialize
 			@records = []
 			@paths = {}
 			@keys = {}
-
+			
 			@configuration = nil
 
 			@callback = nil
@@ -107,8 +107,10 @@ module Fingerprint
 				@configuration = record
 			else
 				@paths[record.path] = record
-				record.keys.each do |key, value|
-					@keys[key] = value
+				record.keys.each do |key|
+					@keys[key] ||= {}
+					
+					@keys[key][record[key]] = record
 				end
 			end
 		end
@@ -117,12 +119,10 @@ module Fingerprint
 			return @paths[path]
 		end
 
-		def find(record)
-			result = lookup(record.path)
-
-			return result if result
-
-			@record.keys.each do |key, value|
+		def find_by_key(record)
+			record.keys.each do |key|
+				value = record[key]
+				
 				result = @keys[key][value]
 
 				return result if result
@@ -131,6 +131,14 @@ module Fingerprint
 			return nil
 		end
 
+		def find(record)
+			result = lookup(record.path)
+
+			return result if result
+
+			return find_by_key(record)
+		end
+
 		def compare(other)
 			main = lookup(other.path)
 
@@ -218,7 +226,7 @@ module Fingerprint
 	end
 	
 	# This record set dynamically computes data from the disk as required.
-	class SparseRecordset < Recordset
+	class SparseRecordSet < RecordSet
 		def initialize(scanner)
 			super()
 			
@@ -234,7 +242,7 @@ module Fingerprint
 		end
 	end
 	
-	class RecordsetWrapper
+	class RecordSetWrapper
 		def initialize(recordset)
 			@recordset = recordset
 		end
@@ -248,7 +256,7 @@ module Fingerprint
 		end
 	end
 	
-	class RecordsetPrinter < RecordsetWrapper
+	class RecordSetPrinter < RecordSetWrapper
 		def initialize(recordset, output)
 			super(recordset)
 			@output = output
@@ -256,7 +264,7 @@ module Fingerprint
 
 		def <<(record)
 			record.write(@output)
-			@recordset << record
+			@recordset << record if @recordset
 		end
 	end
 end

data/lib/fingerprint/scanner.rb

@@ -71,7 +71,7 @@ module Fingerprint
 				'options.extended' => @options[:extended] == true,
 				'options.checksums' => @options[:checksums].join(', '),
 				'summary.time.start' => Time.now,
-				'fingerprint.version' => Fingerprint::VERSION::STRING
+				'fingerprint.version' => Fingerprint::VERSION
 			})
 		end
 
@@ -282,7 +282,13 @@ module Fingerprint
 		# A helper function to scan a set of directories.
 		def self.scan_paths(paths, options = {})
 			if options[:output]
-				options[:recordset] = RecordsetPrinter.new(Recordset.new, options[:output])
+				if options.key? :recordset
+					recordset = options[:recordset]
+				else
+					recordset = RecordSet.new
+				end
+				
+				options[:recordset] = RecordSetPrinter.new(recordset, options[:output])
 			end
 
 			scanner = Scanner.new(paths, options)

data/lib/fingerprint/version.rb

@@ -20,11 +20,5 @@
 
 
 module Fingerprint
-  module VERSION
-    MAJOR = 1
-    MINOR = 3
-    TINY  = 3
-
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
+	VERSION = "1.4.0"
 end

data/rakefile.rb

@@ -0,0 +1,9 @@
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+	t.libs << 'test'
+end
+
+desc "Run tests"
+task :default => :test

data/test/test_fingerprint.rb

@@ -0,0 +1,61 @@
+#!/usr/bin/env ruby
+
+# Copyright (c) 2007, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'rubygems'
+
+require 'test/unit'
+require 'fileutils'
+require 'pathname'
+require 'fingerprint'
+
+require 'timeout'
+
+class TestFingerprint < Test::Unit::TestCase
+	def test_analyze_verify
+		File.open("junk.txt", "w") { |fp| fp.write("foobar") }
+		
+		result = system("fingerprint --analyze ./ -f")
+		
+		File.open("junk.txt", "w") { |fp| fp.write("foobar") }
+		
+		result = system("fingerprint --verify ./")
+		
+		assert_equal true, result
+		
+		File.open("junk.txt", "w") { |fp| fp.write("foobaz") }
+		
+		result = system("fingerprint -X --verify ./")
+		
+		assert_equal false, result
+	end
+
+	def test_check_paths
+		errors = 0
+		test_path = File.dirname(__FILE__)
+		
+		Fingerprint::check_paths(test_path, test_path) do |record, result, message|
+			errors += 1
+		end
+		
+		assert_equal errors, 0
+	end
+end

metadata

@@ -1,84 +1,107 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fingerprint
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 3
-  version: 1.3.3
+version: !ruby/object:Gem::Version
+  version: 1.4.0
 platform: ruby
-authors: 
+authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: lockfile
+date: 2013-09-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: lockfile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: 
-email: samuel@oriontransfer.org
-executables: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: "\t\tFingerprint is a general purpose data integrity tool that uses cryptographic
+  hashes to detect changes in files and directory trees. The fingerprint command scans
+  a directory tree and generates a fingerprint file containing the names and cryptographic
+  hashes of the files in the tree. This snapshot can be later used to generate a list
+  of files that have been created, deleted or modified. If so much as a single bit
+  in the file data has changed, Fingerprint will detect it.\n"
+email:
+- samuel.williams@oriontransfer.co.nz
+executables:
 - fingerprint
+- fingerprint-diff
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- Gemfile
+- README.md
 - bin/fingerprint
+- bin/fingerprint-diff
+- fingerprint.gemspec
+- lib/fingerprint.rb
 - lib/fingerprint/checker.rb
 - lib/fingerprint/record.rb
 - lib/fingerprint/scanner.rb
 - lib/fingerprint/version.rb
-- lib/fingerprint.rb
-- README.md
-homepage: http://www.oriontransfer.co.nz/projects/admin-toolbox/fingerprint
-licenses: []
-
+- rakefile.rb
+- test/test_fingerprint.rb
+homepage: http://www.codeotaku.com/projects/fingerprint
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
-summary: Fingerprint is a tool for creating checksums of entire directory structures, and comparing them for inconsistencies.
-test_files: []
-
+specification_version: 4
+summary: Fingerprint is a tool for creating checksums of entire directory structures,
+  and comparing them for inconsistencies.
+test_files:
+- test/test_fingerprint.rb