lib/covered/files.rb in covered-0.9.0 vs lib/covered/files.rb in covered-0.10.0

@@ -42,32 +42,31 @@
 			coverage.mark(*args)
 			
 			return coverage
 		end
 		
-		def each
-			return to_enum unless block_given?
-			
-			@paths.each do |path, coverage|
-				yield coverage
-			end
+		def each(&block)
+			@paths.each_value(&block)
 		end
 	end
 	
 	class Include < Wrapper
-		def initialize(output, pattern)
+		def initialize(output, pattern, base = "")
 			super(output)
 			
 			@pattern = pattern
+			@base = base
 		end
 		
 		attr :pattern
 		
 		def glob
 			paths = Set.new
+			root = self.expand_path(@base)
+			pattern = File.expand_path(@pattern, root)
 			
-			Dir.glob(@pattern) do |path|
+			Dir.glob(pattern) do |path|
 				unless File.directory?(path)
 					paths << File.realpath(path)
 				end
 			end
 			
@@ -98,25 +97,34 @@
 			super if accept?(path)
 		end
 		
 		def each(&block)
 			super do |coverage|
-				yield coverage if accept?(coverage.path)
+				if accept?(coverage.path)
+					yield coverage
+				else
+					puts "Skipping #{coverage.path} #{self.class}"
+				end
 			end
 		end
 	end
 	
 	class Skip < Filter
-		def initialize(output, pattern)
+		def initialize(output, pattern, base = "")
 			super(output)
 			
 			@pattern = pattern
+			@base = self.expand_path(base)
 		end
 		
 		attr :pattern
 		
 		def accept? path
+			if @base
+				path = relative_path(path)
+			end
+			
 			!(@pattern === path)
 		end
 	end
 	
 	class Only < Filter
@@ -139,9 +147,21 @@
 			
 			@path = path
 		end
 		
 		attr :path
+		
+		def expand_path(path)
+			File.expand_path(super, @path)
+		end
+		
+		def relative_path(path)
+			if path.start_with?(@path)
+				path[@path.size+1..-1]
+			else
+				super
+			end
+		end
 		
 		def accept?(path)
 			path.start_with?(@path)
 		end
 	end