lib/cucover/logging_config.rb tmp/.gitignore @@ -1,4 +1,6 @@ .coverage +*.data +*.log *.gem rerun coverage .gitignore @@ -7,10 +7,13 @@ gem 'spicycode-rcov', '>=0.8.1.5.0' require 'rcov' require 'spec' +require 'logging' + $:.unshift(File.dirname(__FILE__)) require 'cucover/commands/coverage_of' require 'cucover/commands/cucumber' require 'cucover/cli' +require 'cucover/logging_config' require 'cucover/monkey' require 'cucover/rails' require 'cucover/recording' @@ -218,6 +221,10 @@ module Cucover @current_recording = nil end + def logger + Logging::Logger['Cucover'] + end + private def recording? lib/cucover.rb @@ -17,7 +17,7 @@ module Cucover end def coverage(line_number) - @recordings.select{ |r| r.covers_line?(line_number) }.map{ |r| r.feature_filename } + @recordings.select{ |r| r.covers_line?(@filespec, line_number) }.map{ |r| r.feature_filename } end def recordings lib/cucover/commands/coverage_of.rb @@ -1,6 +1,16 @@ module Cucover class Recording - class Data < Struct.new(:file_colon_line, :covered_files) + class Data < Struct.new(:file_colon_line, :covered_files, :analyzer) + def feature_filename + file_colon_line.split(':').first + end + def covers_file?(source_file) + Cucover.logger.info("looking for source file #{source_file} amongst #{covered_files.join(',')}") + covered_files.include?(source_file) + end + def covers_line?(source_file, line_number) + true + end end def initialize(scenario_or_table_row) @@ -24,10 +34,13 @@ module Cucover def stop @analyzer.remove_hook @covered_files.concat @analyzer.analyzed_files + Cucover.logger.info("Finished recording #{file_colon_line}.") + Cucover.logger.debug("Covered files: #{@covered_files.join(',')}") + # Cucover.logger.debug("Analyzer: #{@analyzer.inspect}") end def to_data - Data.new(file_colon_line, @covered_files) + Data.new(file_colon_line, @covered_files, @analyzer) end end end lib/cucover/recording.rb @@ -2,12 +2,10 @@ module Cucover class Store def initialize if File.exists?(data_file) - puts "reading #{data_file}" File.open(data_file) do |f| @recordings = Marshal.load(f) end else - puts "no data - starting with a blank slate" @recordings = {} end at_exit do @@ -22,7 +20,9 @@ module Cucover end def fetch_recordings_covering(source_file) - [ FakeRecording.new ] + @recordings.values.select do |recording| + recording.covers_file?(source_file) + end end private @@ -31,15 +31,6 @@ module Cucover Dir.pwd + '/cucover.data' end - class FakeRecording - def feature_filename - "features/call_foo.feature" - end - def covers_line?(line_number) - true unless [5,6,7,8].include?(line_number) - end - end - end end lib/cucover/store.rb dc758e371257c3109a77c90c47090fa82f7ae802 Matt Wynne matt@mattwynne.net http://github.com/mattwynne/cucover/commit/461d4b2d23b7369b4ba8a0a79e27444a3d7579b0 461d4b2d23b7369b4ba8a0a79e27444a3d7579b0 2009-06-16T01:21:49-07:00 2009-06-16T01:21:49-07:00 Added logging a7717d0ddc39565471db0156788d3fa2ad370952 Matt Wynne matt@mattwynne.net