simplecov 0.10.0 → 0.11.0

data/lib/simplecov/file_list.rb

@@ -26,6 +26,17 @@ module SimpleCov
       map { |f| f.skipped_lines.count }.inject(&:+)
     end
 
+    # Computes the coverage based upon lines covered and lines missed for each file
+    # Returns an array with all coverage percentages
+    def covered_percentages
+      map(&:covered_percent)
+    end
+
+    # Finds the least covered file and returns that file's name
+    def least_covered_file
+      sort_by(&:covered_percent).first.filename
+    end
+
     # Returns the overall amount of relevant lines of code across all files in this list
     def lines_of_code
       covered_lines + missed_lines

data/lib/simplecov/filter.rb

@@ -21,7 +21,7 @@ module SimpleCov
     end
 
     def passes?(source_file)
-      warn "DEPRECATION: SimpleCov::Filter#passes?(x) has been renamed to #matches?. Please update your custom filters accordingly!"
+      warn "#{Kernel.caller.first}: [DEPRECATION] #passes? is deprecated. Use #matches? instead."
       matches?(source_file)
     end
   end

data/lib/simplecov/formatter/multi_formatter.rb

@@ -1,27 +1,31 @@
 module SimpleCov
   module Formatter
     class MultiFormatter
-      def self.[](*args)
-        Class.new(self) do
-          define_method :formatters do
-            @formatters ||= args
+      module InstanceMethods
+        def format(result)
+          formatters.map do |formatter|
+            begin
+              formatter.new.format(result)
+            rescue => e
+              STDERR.puts("Formatter #{formatter} failed with #{e.class}: #{e.message} (#{e.backtrace.first})")
+              nil
+            end
           end
         end
       end
 
-      def format(result)
-        formatters.map do |formatter|
-          begin
-            formatter.new.format(result)
-          rescue => e
-            STDERR.puts("Formatter #{formatter} failed with #{e.class}: #{e.message} (#{e.backtrace.first})")
-            nil
+      def self.new(formatters = nil)
+        Class.new do
+          define_method :formatters do
+            @formatters ||= Array(formatters)
           end
+          include InstanceMethods
         end
       end
 
-      def formatters
-        @formatters ||= []
+      def self.[](*args)
+        warn "#{Kernel.caller.first}: [DEPRECATION] ::[] is deprecated. Use ::new instead."
+        new(*args)
       end
     end
   end

data/lib/simplecov/result.rb

@@ -18,7 +18,7 @@ module SimpleCov
     # Explicitly set the command name that was used for this coverage result. Defaults to SimpleCov.command_name
     attr_writer :command_name
 
-    def_delegators :files, :covered_percent, :covered_strength, :covered_lines, :missed_lines
+    def_delegators :files, :covered_percent, :covered_percentages, :least_covered_file, :covered_strength, :covered_lines, :missed_lines
     def_delegator :files, :lines_of_code, :total_lines
 
     # Initialize a new SimpleCov::Result from given Coverage.result (a Hash of filenames each containing an array of

data/lib/simplecov/source_file.rb

@@ -28,8 +28,10 @@ module SimpleCov
         fail ArgumentError, "Only String accepted for source" unless src.is_a?(String)
         fail ArgumentError, "Only Fixnum accepted for line_number" unless line_number.is_a?(Fixnum)
         fail ArgumentError, "Only Fixnum and nil accepted for coverage" unless coverage.is_a?(Fixnum) || coverage.nil?
-        @src, @line_number, @coverage = src, line_number, coverage
-        @skipped = false
+        @src         = src
+        @line_number = line_number
+        @coverage    = coverage
+        @skipped     = false
       end
 
       # Returns true if this is a line that should have been covered, but was not
@@ -77,7 +79,8 @@ module SimpleCov
     alias_method :source, :src
 
     def initialize(filename, coverage)
-      @filename, @coverage = filename, coverage
+      @filename = filename
+      @coverage = coverage
       File.open(filename, "rb") { |f| @src = f.readlines }
     end
 

data/lib/simplecov/version.rb

@@ -1,5 +1,5 @@
 module SimpleCov
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
   def VERSION.to_a
     split(".").map(&:to_i)
   end

data/spec/1_8_fallbacks_spec.rb

@@ -0,0 +1,29 @@
+require "helper"
+
+# Tests that verify that on 1.8 versions of ruby, simplecov simply
+# does not launch and does not cause errors on the way
+#
+# TODO: This should be expanded upon all methods that could potentially
+# be called in a test/spec-helper simplecov config block
+#
+describe "Ruby 1.8 fallback" do
+  it "return false when calling SimpleCov.start" do
+    expect(SimpleCov.start).to be false
+  end
+
+  it "return false when calling SimpleCov.start with a block" do
+    expect(SimpleCov.start { fail "Shouldn't reach this!" }).to be false
+  end
+
+  it "return false when calling SimpleCov.configure with a block" do
+    expect(SimpleCov.configure { fail "Shouldn't reach this!" }).to be false
+  end
+
+  it "allow to define a profile" do
+    expect do
+      SimpleCov.profiles.define "testprofile" do
+        add_filter "/config/"
+      end
+    end.not_to raise_error
+  end
+end if RUBY_VERSION.start_with? "1.8"

data/spec/command_guesser_spec.rb

@@ -0,0 +1,46 @@
+require "helper"
+
+describe SimpleCov::CommandGuesser do
+  subject { SimpleCov::CommandGuesser }
+  it 'correctly guesses "Unit Tests" for unit tests' do
+    subject.original_run_command = "/some/path/test/units/foo_bar_test.rb"
+    expect(subject.guess).to eq("Unit Tests")
+    subject.original_run_command = "test/units/foo.rb"
+    expect(subject.guess).to eq("Unit Tests")
+    subject.original_run_command = "test/foo.rb"
+    expect(subject.guess).to eq("Unit Tests")
+    subject.original_run_command = "test/{models,helpers,unit}/**/*_test.rb"
+    expect(subject.guess).to eq("Unit Tests")
+  end
+
+  it 'correctly guesses "Functional Tests" for functional tests' do
+    subject.original_run_command = "/some/path/test/functional/foo_bar_controller_test.rb"
+    expect(subject.guess).to eq("Functional Tests")
+    subject.original_run_command = "test/{controllers,mailers,functional}/**/*_test.rb"
+    expect(subject.guess).to eq("Functional Tests")
+  end
+
+  it 'correctly guesses "Integration Tests" for integration tests' do
+    subject.original_run_command = "/some/path/test/integration/foo_bar_controller_test.rb"
+    expect(subject.guess).to eq("Integration Tests")
+    subject.original_run_command = "test/integration/**/*_test.rb"
+    expect(subject.guess).to eq("Integration Tests")
+  end
+
+  it 'correctly guesses "Cucumber Features" for cucumber features' do
+    subject.original_run_command = "features"
+    expect(subject.guess).to eq("Cucumber Features")
+    subject.original_run_command = "cucumber"
+    expect(subject.guess).to eq("Cucumber Features")
+  end
+
+  it 'correctly guesses "RSpec" for RSpec' do
+    subject.original_run_command = "/some/path/spec/foo.rb"
+    expect(subject.guess).to eq("RSpec")
+  end
+
+  it "defaults to RSpec because RSpec constant is defined" do
+    subject.original_run_command = "some_arbitrary_command with arguments"
+    expect(subject.guess).to eq("RSpec")
+  end
+end if SimpleCov.usable?

data/spec/deleted_source_spec.rb

@@ -0,0 +1,12 @@
+require "helper"
+
+# Test to verify correct handling of deleted files
+# See https://github.com/colszowka/simplecov/issues/9
+describe "A source file which is subsequently deleted" do
+  it "does not cause an error" do
+    Dir.chdir(File.join(File.dirname(__FILE__), "fixtures")) do
+      `ruby deleted_source_sample.rb`
+      expect($?.exitstatus).to be_zero
+    end
+  end
+end

data/{test → spec}/faked_project/lib/faked_project.rb

@@ -4,7 +4,7 @@ class FakedProject
   end
 end
 
-Dir[File.join(File.dirname(__FILE__), "faked_project/*.rb")].each do |file|
+Dir[File.join(File.dirname(__FILE__), "faked_project/*.rb")].reject { |f| /untested/.match(f) }.each do |file|
   require file # Require all source files in project dynamically so we can inject some stuff depending on test situation
 end
 

data/spec/faked_project/lib/faked_project/untested_class.rb

@@ -0,0 +1,11 @@
+class UntestedClass
+  def initialize(yogurts)
+    @yogurts = yogurts
+  end
+
+  def power_level
+    @yogurts.map do |yo|
+      yo.experience_points**2
+    end.reduce(0, &:+)
+  end
+end

data/spec/file_list_spec.rb

@@ -0,0 +1,48 @@
+require "helper"
+
+describe SimpleCov::Result do
+  subject do
+    original_result = {
+      source_fixture("sample.rb") => [nil, 1, 1, 1, nil, nil, 1, 1, nil, nil],
+      source_fixture("app/models/user.rb") => [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil],
+      source_fixture("app/controllers/sample_controller.rb") => [nil, 2, 2, 0, nil, nil, 0, nil, nil, nil],
+    }
+    SimpleCov::Result.new(original_result).files
+  end
+
+  it "has 11 covered lines" do
+    expect(subject.covered_lines).to eq(11)
+  end
+
+  it "has 3 missed lines" do
+    expect(subject.missed_lines).to eq(3)
+  end
+
+  it "has 19 never lines" do
+    expect(subject.never_lines).to eq(19)
+  end
+
+  it "has 14 lines of code" do
+    expect(subject.lines_of_code).to eq(14)
+  end
+
+  it "has 3 skipped lines" do
+    expect(subject.skipped_lines).to eq(3)
+  end
+
+  it "has the correct covered percent" do
+    expect(subject.covered_percent).to eq(78.57142857142857)
+  end
+
+  it "has the correct covered percentages" do
+    expect(subject.covered_percentages).to eq([50.0, 80.0, 100.0])
+  end
+
+  it "has the correct least covered file" do
+    expect(subject.least_covered_file).to match(/sample_controller.rb/)
+  end
+
+  it "has the correct covered strength" do
+    expect(subject.covered_strength).to eq(0.9285714285714286)
+  end
+end if SimpleCov.usable?

data/spec/filters_spec.rb

@@ -0,0 +1,96 @@
+require "helper"
+
+describe SimpleCov::SourceFile do
+  subject do
+    SimpleCov::SourceFile.new(source_fixture("sample.rb"), [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil])
+  end
+
+  it "doesn't match a new SimpleCov::StringFilter 'foobar'" do
+    expect(SimpleCov::StringFilter.new("foobar")).not_to be_matches subject
+  end
+
+  it "doesn't match a new SimpleCov::StringFilter 'some/path'" do
+    expect(SimpleCov::StringFilter.new("some/path")).not_to be_matches subject
+  end
+
+  it "matches a new SimpleCov::StringFilter 'spec/fixtures'" do
+    expect(SimpleCov::StringFilter.new("spec/fixtures")).to be_matches subject
+  end
+
+  it "matches a new SimpleCov::StringFilter 'spec/fixtures/sample.rb'" do
+    expect(SimpleCov::StringFilter.new("spec/fixtures/sample.rb")).to be_matches subject
+  end
+
+  it "matches a new SimpleCov::StringFilter 'sample.rb'" do
+    expect(SimpleCov::StringFilter.new("sample.rb")).to be_matches subject
+  end
+
+  it "doesn't match a new SimpleCov::BlockFilter that is not applicable" do
+    expect(SimpleCov::BlockFilter.new(proc { |s| File.basename(s.filename) == "foo.rb" })).not_to be_matches subject
+  end
+
+  it "matches a new SimpleCov::BlockFilter that is applicable" do
+    expect(SimpleCov::BlockFilter.new(proc { |s| File.basename(s.filename) == "sample.rb" })).to be_matches subject
+  end
+
+  it "matches a new SimpleCov::ArrayFilter when 'sample.rb' is passed as array" do
+    expect(SimpleCov::ArrayFilter.new(["sample.rb"])).to be_matches subject
+  end
+
+  it "doesn't match a new SimpleCov::ArrayFilter when a file path different than 'sample.rb' is passed as array" do
+    expect(SimpleCov::ArrayFilter.new(["other_file.rb"])).not_to be_matches subject
+  end
+
+  it "matches a new SimpleCov::ArrayFilter when two file paths including 'sample.rb' are passed as array" do
+    expect(SimpleCov::ArrayFilter.new(["sample.rb", "other_file.rb"])).to be_matches subject
+  end
+
+  context "with no filters set up and a basic source file in an array" do
+    before do
+      @prev_filters = SimpleCov.filters
+      SimpleCov.filters = []
+    end
+
+    subject do
+      [SimpleCov::SourceFile.new(source_fixture("sample.rb"), [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil])]
+    end
+
+    after do
+      SimpleCov.filters = @prev_filters
+    end
+
+    it 'returns 0 items after executing SimpleCov.filtered on files when using a "sample" string filter' do
+      SimpleCov.add_filter "sample"
+      expect(SimpleCov.filtered(subject).count).to be_zero
+    end
+
+    it 'returns 0 items after executing SimpleCov.filtered on files when using a "spec/fixtures" string filter' do
+      SimpleCov.add_filter "spec/fixtures"
+      expect(SimpleCov.filtered(subject).count).to be_zero
+    end
+
+    it 'returns 1 item after executing SimpleCov.filtered on files when using a "fooo" string filter' do
+      SimpleCov.add_filter "fooo"
+      expect(SimpleCov.filtered(subject).count).to eq(1)
+    end
+
+    it "returns 0 items after executing SimpleCov.filtered on files when using a block filter that returns true" do
+      SimpleCov.add_filter do
+        true
+      end
+      expect(SimpleCov.filtered(subject).count).to be_zero
+    end
+
+    it "returns 1 item after executing SimpleCov.filtered on files when using an always-false block filter" do
+      SimpleCov.add_filter do
+        false
+      end
+      expect(SimpleCov.filtered(subject).count).to eq(1)
+    end
+
+    it "returns a FileList after filtering" do
+      SimpleCov.add_filter "fooo"
+      expect(SimpleCov.filtered(subject)).to be_a SimpleCov::FileList
+    end
+  end
+end if SimpleCov.usable?

data/{test → spec}/helper.rb

@@ -1,7 +1,5 @@
-require "bundler/setup"
 require "simplecov"
-require "minitest/autorun"
-require "shoulda"
+require "rspec"
 
 SimpleCov.coverage_dir("tmp/coverage")
 
@@ -9,9 +7,6 @@ def source_fixture(filename)
   File.expand_path(File.join(File.dirname(__FILE__), "fixtures", filename))
 end
 
-require "shoulda_macros"
-Minitest::Test.send :extend, ShouldaMacros
-
 # Taken from http://stackoverflow.com/questions/4459330/how-do-i-temporarily-redirect-stderr-in-ruby
 require "stringio"
 
@@ -19,7 +14,8 @@ def capture_stderr
   # The output stream must be an IO-like object. In this case we capture it in
   # an in-memory IO object so we can return the string value. You can assign any
   # IO object here.
-  previous_stderr, $stderr = $stderr, StringIO.new
+  previous_stderr = $stderr
+  $stderr = StringIO.new
   yield
   $stderr.string
 ensure