fingerprint 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29779cfa264198432f16e421ed412e812a464332c4499d65e6a8039d0c08522f
-  data.tar.gz: 97dc135381bfa725ab41d34fbaf58ff56a16c89bb2bb8749b1539c90abe30cd1
+  metadata.gz: c8ad0fb2f50f482dc7dc06185001d5eefd60ea136069d0e0c2004eaefdba4351
+  data.tar.gz: a0256e102d7628d5410fa94bb9f23b8f0858155a10d4dbef108097b76129ec78
 SHA512:
-  metadata.gz: a8f9fdb7259e57057bc10f9e412b0444393ab2bcd90d11b7091fffa40800759f2a52f7fcc25a2f8edafe8cebbc199ae6a81eb95401e2e2204f2bb28d1ab611d0
-  data.tar.gz: 418347660a6002e3e1cc5092a0e50c6d4462a034a6ccb1afe5e74f2912d2bb1d9dc3eda892fe4342a2db151d2952410461cbdde5f954fa6e881dc59e2df6d251
+  metadata.gz: d0aff09d12a3c2f5c683433aa1e6ed0f9f2a8d77be668cdd1aac6d20899821d091f1edce2be721bc5889b12cfe69bfd1248fed6e275ab6a941c7da6b416d2457
+  data.tar.gz: 1ac6617e297ed4395fb05fd8cb6e785f98b9f298b0b1326235b034d450c78858cdbcab7370b781150c8acc06ff6cb7df444703632321374d426a02dfaf0f14c7

data/lib/fingerprint/command/duplicates.rb

@@ -42,10 +42,8 @@ module Fingerprint
 			attr :duplicates_recordset
 			
 			def call
-				@options[:output] = @parent.output
-				
 				@duplicates_recordset = RecordSet.new
-				results = RecordSetPrinter.new(duplicates_recordset, @options[:output])
+				results = RecordSetPrinter.new(@duplicates_recordset, @parent.output)
 				
 				master_file_path = @master
 				File.open(master_file_path) do |master_file|
@@ -67,7 +65,11 @@ module Fingerprint
 							copy_recordset.parse(copy_file)
 							
 							copy_recordset.records.each do |record|
+								next unless record.file?
+								
 								record.metadata['fingerprint'] = copy_file_path
+								record.metadata['full_path'] = copy_recordset.full_path(record.path)
+								
 								# We need to see if the record exists in the master
 								
 								if @options[:verbose]

data/lib/fingerprint/record.rb

@@ -46,6 +46,10 @@ module Fingerprint
 		attr :metadata
 		attr :keys
 
+		def file?
+			@mode == :file
+		end
+
 		def [](key)
 			@metadata[key]
 		end
@@ -95,29 +99,42 @@ module Fingerprint
 			self.new.tap{|record_set| record_set.parse(io)}
 		end
 		
-		def initialize
+		def initialize(root = nil)
+			@root = root
 			@records = []
 			@paths = {}
 			@keys = {}
 			
 			@configuration = nil
-
+			
 			@callback = nil
 		end
-
+		
+		attr :root
+		
 		attr :records
 		attr :paths
 		attr :keys
-
+		
 		attr :configuration
-
+		
+		def full_path(path)
+			Build::Files::Path.join(@root, path)
+		end
+		
 		def <<(record)
 			@records << record
+			
 			if record.mode == :configuration
-				# What should we do if we get multiple configurations?
+				if @configuration
+					raise "Multiple configurations detected!"
+				end
+				
 				@configuration = record
+				@root = @configuration.path
 			else
 				@paths[record.path] = record
+				
 				record.keys.each do |key|
 					@keys[key] ||= {}
 					
@@ -125,7 +142,7 @@ module Fingerprint
 				end
 			end
 		end
-
+		
 		def include?(path)
 			@paths.include?(path)
 		end

data/lib/fingerprint/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Fingerprint
-	VERSION = "3.2.0"
+	VERSION = "3.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fingerprint
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Samuel Williams