simplecov 0.9.1 → 0.10.0

data/lib/simplecov/source_file.rb

@@ -25,26 +25,26 @@ module SimpleCov
       alias_method :number, :line_number
 
       def initialize(src, line_number, coverage)
-        raise ArgumentError, "Only String accepted for source" unless src.kind_of?(String)
-        raise ArgumentError, "Only Fixnum accepted for line_number" unless line_number.kind_of?(Fixnum)
-        raise ArgumentError, "Only Fixnum and nil accepted for coverage" unless coverage.kind_of?(Fixnum) or coverage.nil?
+        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
       end
 
       # Returns true if this is a line that should have been covered, but was not
       def missed?
-        not never? and not skipped? and coverage == 0
+        !never? && !skipped? && coverage.zero?
       end
 
       # Returns true if this is a line that has been covered
       def covered?
-        not never? and not skipped? and coverage > 0
+        !never? && !skipped? && coverage > 0
       end
 
       # Returns true if this line is not relevant for coverage
       def never?
-        not skipped? and coverage.nil?
+        !skipped? && coverage.nil?
       end
 
       # Flags this line as skipped
@@ -55,16 +55,16 @@ module SimpleCov
       # Returns true if this line was skipped, false otherwise. Lines are skipped if they are wrapped with
       # # :nocov: comment lines.
       def skipped?
-	      !!skipped
+        !!skipped
       end
 
       # The status of this line - either covered, missed, skipped or never. Useful i.e. for direct use
       # as a css class in report generation
       def status
-        return 'skipped' if skipped?
-        return 'never' if never?
-        return 'missed' if missed?
-        return 'covered' if covered?
+        return "skipped" if skipped?
+        return "never" if never?
+        return "missed" if missed?
+        return "covered" if covered?
       end
     end
 
@@ -78,7 +78,7 @@ module SimpleCov
 
     def initialize(filename, coverage)
       @filename, @coverage = filename, coverage
-      File.open(filename, "rb") {|f| @src = f.readlines }
+      File.open(filename, "rb") { |f| @src = f.readlines }
     end
 
     # Returns all source lines for this file as instances of SimpleCov::SourceFile::Line,
@@ -94,7 +94,7 @@ module SimpleCov
       # Initialize lines
       @lines = []
       src.each_with_index do |src, i|
-        @lines << SimpleCov::SourceFile::Line.new(src, i+1, coverage[i])
+        @lines << SimpleCov::SourceFile::Line.new(src, i + 1, coverage[i])
       end
       process_skipped_lines!
       @lines
@@ -103,14 +103,14 @@ module SimpleCov
 
     # Access SimpleCov::SourceFile::Line source lines by line number
     def line(number)
-      lines[number-1]
+      lines[number - 1]
     end
 
     # The coverage for this file in percent. 0 if the file has no relevant lines
     def covered_percent
-      return 100.0 if lines.length == 0 or lines.length == never_lines.count
+      return 100.0 if lines.length.zero? || lines.length == never_lines.count
       relevant_lines = lines.count - never_lines.count - skipped_lines.count
-      if relevant_lines == 0
+      if relevant_lines.zero?
         0.0
       else
         Float((covered_lines.count) * 100.0 / relevant_lines.to_f)
@@ -118,7 +118,7 @@ module SimpleCov
     end
 
     def covered_strength
-      return 0.0 if lines.length == 0 or lines.length == never_lines.count
+      return 0.0 if lines.length.zero? || lines.length == never_lines.count
 
       lines_strength = 0
       lines.each do |c|
@@ -127,7 +127,7 @@ module SimpleCov
 
       effective_lines_count = Float(lines.count - never_lines.count - skipped_lines.count)
 
-      if effective_lines_count == 0
+      if effective_lines_count.zero?
         0.0
       else
         strength = lines_strength / effective_lines_count
@@ -137,24 +137,24 @@ module SimpleCov
 
     # Returns all covered lines as SimpleCov::SourceFile::Line
     def covered_lines
-      @covered_lines ||= lines.select {|c| c.covered? }
+      @covered_lines ||= lines.select(&:covered?)
     end
 
     # Returns all lines that should have been, but were not covered
     # as instances of SimpleCov::SourceFile::Line
     def missed_lines
-      @missed_lines ||= lines.select {|c| c.missed? }
+      @missed_lines ||= lines.select(&:missed?)
     end
 
     # Returns all lines that are not relevant for coverage as
     # SimpleCov::SourceFile::Line instances
     def never_lines
-      @never_lines ||= lines.select {|c| c.never? }
+      @never_lines ||= lines.select(&:never?)
     end
 
     # Returns all lines that were skipped as SimpleCov::SourceFile::Line instances
     def skipped_lines
-      @skipped_lines ||= lines.select {|c| c.skipped? }
+      @skipped_lines ||= lines.select(&:skipped?)
     end
 
     # Returns the number of relevant lines (covered + missed)
@@ -175,7 +175,7 @@ module SimpleCov
       end
     end
 
-    private
+  private
 
     # ruby 1.9 could use Float#round(places) instead
     # @return [Float]
@@ -185,4 +185,3 @@ module SimpleCov
     end
   end
 end
-

data/lib/simplecov/version.rb

@@ -1,3 +1,22 @@
 module SimpleCov
-  VERSION = "0.9.1"
+  VERSION = "0.10.0"
+  def VERSION.to_a
+    split(".").map(&:to_i)
+  end
+
+  def VERSION.major
+    to_a[0]
+  end
+
+  def VERSION.minor
+    to_a[1]
+  end
+
+  def VERSION.patch
+    to_a[2]
+  end
+
+  def VERSION.pre
+    to_a[3]
+  end
 end

data/lib/simplecov.rb

@@ -1,9 +1,20 @@
 #
 # Code coverage for ruby 1.9. Please check out README for a full introduction.
 #
+# Coverage may be inaccurate under JRUBY.
+if defined?(JRUBY_VERSION)
+  if ENV["JRUBY_OPTS"].to_s !~ /-Xcli.debug=true/
+    warn "Coverage may be inaccurate; Try setting JRUBY_OPTS=\"-Xcli.debug=true --debug\""
+    # see https://github.com/metricfu/metric_fu/pull/226
+    #     https://github.com/jruby/jruby/issues/1196
+    #     https://jira.codehaus.org/browse/JRUBY-6106
+    #     https://github.com/colszowka/simplecov/issues/86
+  end
+end
 module SimpleCov
   class << self
     attr_accessor :running
+    attr_accessor :pid
 
     #
     # Sets up SimpleCov to run against your project.
@@ -22,12 +33,13 @@ module SimpleCov
     #
     # Please check out the RDoc for SimpleCov::Configuration to find about available config options
     #
-    def start(profile=nil, &block)
+    def start(profile = nil, &block)
       if SimpleCov.usable?
         load_profile(profile) if profile
         configure(&block) if block_given?
         @result = nil
         self.running = true
+        self.pid = Process.pid
         Coverage.start
       else
         warn "WARNING: SimpleCov is activated, but you're not running Ruby 1.9+ - no coverage analysis will happen"
@@ -59,7 +71,7 @@ module SimpleCov
     # Otherwise, returns the result
     #
     def result?
-      defined? @result and @result
+      defined?(@result) && @result
     end
 
     #
@@ -68,7 +80,7 @@ module SimpleCov
     def filtered(files)
       result = files.clone
       filters.each do |filter|
-        result = result.reject {|source_file| filter.matches?(source_file) }
+        result = result.reject { |source_file| filter.matches?(source_file) }
       end
       SimpleCov::FileList.new result
     end
@@ -80,10 +92,10 @@ module SimpleCov
       grouped = {}
       grouped_files = []
       groups.each do |name, filter|
-        grouped[name] = SimpleCov::FileList.new(files.select {|source_file| filter.matches?(source_file)})
+        grouped[name] = SimpleCov::FileList.new(files.select { |source_file| filter.matches?(source_file) })
         grouped_files += grouped[name]
       end
-      if groups.length > 0 and (other_files = files.reject {|source_file| grouped_files.include?(source_file)}).length > 0
+      if groups.length > 0 && (other_files = files.reject { |source_file| grouped_files.include?(source_file) }).length > 0
         grouped["Ungrouped"] = SimpleCov::FileList.new(other_files)
       end
       grouped
@@ -106,11 +118,11 @@ module SimpleCov
     # provides coverage support
     #
     def usable?
-      return @usable if defined? @usable and !@usable.nil?
+      return @usable if defined?(@usable) && !@usable.nil?
 
       @usable = begin
-        require 'coverage'
-        require 'simplecov/jruby_fix'
+        require "coverage"
+        require "simplecov/jruby_fix"
         true
       rescue LoadError
         false
@@ -120,24 +132,23 @@ module SimpleCov
 end
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__)))
-require 'simplecov/configuration'
+require "simplecov/configuration"
 SimpleCov.send :extend, SimpleCov::Configuration
-require 'simplecov/exit_codes'
-require 'simplecov/json'
-require 'simplecov/profiles'
-require 'simplecov/source_file'
-require 'simplecov/file_list'
-require 'simplecov/result'
-require 'simplecov/filter'
-require 'simplecov/formatter'
-require 'simplecov/last_run'
-require 'simplecov/merge_helpers'
-require 'simplecov/result_merger'
-require 'simplecov/command_guesser'
-require 'simplecov/version'
+require "simplecov/exit_codes"
+require "simplecov/profiles"
+require "simplecov/source_file"
+require "simplecov/file_list"
+require "simplecov/result"
+require "simplecov/filter"
+require "simplecov/formatter"
+require "simplecov/last_run"
+require "simplecov/merge_helpers"
+require "simplecov/result_merger"
+require "simplecov/command_guesser"
+require "simplecov/version"
 
 # Load default config
-require 'simplecov/defaults' unless ENV['SIMPLECOV_NO_DEFAULTS']
+require "simplecov/defaults" unless ENV["SIMPLECOV_NO_DEFAULTS"]
 
 # Load Rails integration (only for Rails 3, see #113)
-require 'simplecov/railtie' if defined? Rails::Railtie
+require "simplecov/railtie" if defined? Rails::Railtie

data/simplecov.gemspec

@@ -1,24 +1,27 @@
-# encoding: utf-8
-$:.push File.expand_path('../lib', __FILE__)
-require 'simplecov/version'
+$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+require "simplecov/version"
 
 Gem::Specification.new do |gem|
-  gem.name        = 'simplecov'
+  gem.name        = "simplecov"
   gem.version     = SimpleCov::VERSION
   gem.platform    = Gem::Platform::RUBY
   gem.authors     = ["Christoph Olszowka"]
-  gem.email       = ['christoph at olszowka de']
-  gem.homepage    = 'http://github.com/colszowka/simplecov'
-  gem.description = %Q{Code coverage for Ruby 1.9+ with a powerful configuration library and automatic merging of coverage across test suites}
+  gem.email       = ["christoph at olszowka de"]
+  gem.homepage    = "http://github.com/colszowka/simplecov"
+  gem.description = %(Code coverage for Ruby 1.9+ with a powerful configuration library and automatic merging of coverage across test suites)
   gem.summary     = gem.description
   gem.license     = "MIT"
 
-  gem.add_dependency 'multi_json', '~> 1.0'
-  gem.add_dependency 'simplecov-html', '~> 0.8.0'
-  gem.add_dependency 'docile', '~> 1.1.0'
+  gem.required_ruby_version = ">= 1.8.7"
+
+  gem.add_dependency "json", "~> 1.8"
+  gem.add_dependency "simplecov-html", "~> 0.10.0"
+  gem.add_dependency "docile", "~> 1.1.0"
+
+  gem.add_development_dependency "bundler", "~> 1.9"
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.require_paths = ['lib']
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  gem.require_paths = ["lib"]
 end

data/test/faked_project/Gemfile

@@ -1,6 +1,6 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'simplecov', :path => '../../../'
-gem 'rake'
-gem 'rspec', '>= 2.6.0'
-gem 'cucumber'
+gem "simplecov", :path => "../../../"
+gem "rake"
+gem "rspec", ">= 2.6.0"
+gem "cucumber"

data/test/faked_project/Rakefile

@@ -1,8 +1,8 @@
-require 'bundler'
+require "bundler"
 
-require 'rake/testtask'
+require "rake/testtask"
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.test_files = FileList['test/**/*_test.rb'].sort
+  test.libs << "lib" << "test"
+  test.test_files = FileList["test/**/*_test.rb"].sort
   test.verbose = true
 end

data/test/faked_project/features/step_definitions/my_steps.rb

@@ -7,7 +7,7 @@ When /^I write my cukes for the fake project$/ do
 end
 
 Then /^I make all neccessary tests in a single step$/ do
-  expect(FakedProject.foo).to eq('bar')
+  expect(FakedProject.foo).to eq("bar")
 
   expect(FrameworkSpecific.cucumber).to eq("Only tested in Cucumber")
 
@@ -17,7 +17,6 @@ Then /^I make all neccessary tests in a single step$/ do
   expect(FakedProject.new.dynamic).to eq("A dynamically defined instance method")
 
   something = SomeClass.new("foo")
-  expect(something.reverse).to eq('oof')
-  expect(something.compare_with('foo')).to be true
+  expect(something.reverse).to eq("oof")
+  expect(something.compare_with("foo")).to be true
 end
-

data/test/faked_project/features/support/env.rb

@@ -1,12 +1,12 @@
-require 'bundler/setup'
+require "bundler/setup"
 
 # We're injecting simplecov_config via aruba in cucumber here
 # depending on what the test case is...
 begin
-  require File.join(File.dirname(__FILE__), 'simplecov_config')
-rescue LoadError => err
+  require File.join(File.dirname(__FILE__), "simplecov_config")
+rescue LoadError
   $stderr.puts "No SimpleCov config file found!"
 end
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '/../../lib'))
-require 'faked_project'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "/../../lib"))
+require "faked_project"

data/test/faked_project/lib/faked_project/some_class.rb

@@ -14,14 +14,13 @@ class SomeClass
     if item == label
       return true
     else
-      raise "Item does not match label"
+      fail "Item does not match label"
     end
-
-  rescue => err
+  rescue
     false
   end
 
-  private
+private
 
   def uncovered
     "private method"

data/test/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")].each do |file|
   require file # Require all source files in project dynamically so we can inject some stuff depending on test situation
 end
 

data/test/faked_project/spec/faked_spec.rb

@@ -1,8 +1,8 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe FakedProject do
   it "should return proper foo" do
-    expect(FakedProject.foo).to eq('bar')
+    expect(FakedProject.foo).to eq("bar")
   end
 
   it "should test it's framework specific method" do

data/test/faked_project/spec/forking_spec.rb

@@ -0,0 +1,7 @@
+require "spec_helper"
+
+describe "forking" do
+  it do
+    Process.waitpid(Kernel.fork {})
+  end
+end

data/test/faked_project/spec/meta_magic_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe FakedProject do
   it "should have added a class method to FakedProject" do

data/test/faked_project/spec/some_class_spec.rb

@@ -1,13 +1,13 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe SomeClass do
   subject { SomeClass.new("foo") }
 
   it "should be reversible" do
-    expect(subject.reverse).to eq('oof')
+    expect(subject.reverse).to eq("oof")
   end
 
   it "should compare with 'foo'" do
-    expect(subject.compare_with('foo')).to be true
+    expect(subject.compare_with("foo")).to be true
   end
 end

data/test/faked_project/spec/spec_helper.rb

@@ -1,15 +1,11 @@
-require 'bundler/setup'
+require "bundler/setup"
 
 # We're injecting simplecov_config via aruba in cucumber here
 # depending on what the test case is...
 begin
-  require File.join(File.dirname(__FILE__), 'simplecov_config')
-rescue LoadError => err
+  require File.join(File.dirname(__FILE__), "simplecov_config")
+rescue LoadError
   $stderr.puts "No SimpleCov config file found!"
 end
 
-require 'faked_project'
-
-RSpec.configure do |config|
-  # some (optional) config here
-end
+require "faked_project"

data/test/faked_project/test/faked_test.rb

@@ -1,8 +1,8 @@
-require 'test_helper'
+require "test_helper"
 
 class FakedTest < Test::Unit::TestCase
   def test_something
-    assert_equal 'bar', FakedProject.foo
+    assert_equal "bar", FakedProject.foo
   end
 
   def test_framework_specific

data/test/faked_project/test/meta_magic_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class MetaMagicTest < Test::Unit::TestCase
   def test_class_methods

data/test/faked_project/test/some_class_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class SomeClassTest < Test::Unit::TestCase
   def setup
@@ -6,10 +6,10 @@ class SomeClassTest < Test::Unit::TestCase
   end
 
   def test_reverse
-    assert_equal 'oof', @instance.reverse
+    assert_equal "oof", @instance.reverse
   end
 
   def test_comparison
-    assert @instance.compare_with('foo')
+    assert @instance.compare_with("foo")
   end
 end

data/test/faked_project/test/test_helper.rb

@@ -1,16 +1,12 @@
-require 'bundler/setup'
+require "bundler/setup"
 
 # We're injecting simplecov_config via aruba in cucumber here
 # depending on what the test case is...
 begin
-  require File.join(File.dirname(__FILE__), 'simplecov_config')
-rescue LoadError => err
+  require File.join(File.dirname(__FILE__), "simplecov_config")
+rescue LoadError
   $stderr.puts "No SimpleCov config file found!"
 end
 
-require 'faked_project'
-
-require 'test/unit'
-
-class Test::Unit::TestCase
-end
+require "faked_project"
+require "test/unit"

data/test/fixtures/app/controllers/sample_controller.rb

@@ -1,7 +1,7 @@
 # Foo class
 class Foo
   def initialize
-    @foo = 'baz'
+    @foo = "baz"
   end
 
   def bar

data/test/fixtures/app/models/user.rb

@@ -1,7 +1,7 @@
 # Foo class
 class Foo
   def initialize
-    @foo = 'baz'
+    @foo = "baz"
   end
 
   def bar

data/test/fixtures/deleted_source_sample.rb

@@ -1,5 +1,5 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..'))
-require 'lib/simplecov'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", ".."))
+require "lib/simplecov"
 SimpleCov.start { command_name "Test" }
 
 dir = File.expand_path(File.dirname(__FILE__))
@@ -12,4 +12,4 @@ code = %{
 File.open(file, "w") { |f| f.print code }
 load file
 File.unlink file
-raise unless kill_the_buddha(3) == 27
+fail unless kill_the_buddha(3) == 27

data/test/fixtures/frameworks/rspec_bad.rb

@@ -1,8 +1,8 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
-require 'lib/simplecov'
-require 'rspec'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "..", ".."))
+require "lib/simplecov"
+require "rspec"
 SimpleCov.start
-describe 'exit status' do
+describe "exit status" do
   it "should exit with a non-zero exit status when assertion fails" do
     expect(1).to eq(2)
   end

data/test/fixtures/frameworks/rspec_good.rb

@@ -1,8 +1,8 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
-require 'lib/simplecov'
-require 'rspec'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "..", ".."))
+require "lib/simplecov"
+require "rspec"
 SimpleCov.start
-describe 'exit status' do
+describe "exit status" do
   it "should exit with a zero exit status when assertion fails" do
     expect(1).to eq(1)
   end

data/test/fixtures/frameworks/testunit_bad.rb

@@ -1,7 +1,7 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
-require 'lib/simplecov'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "..", ".."))
+require "lib/simplecov"
 SimpleCov.start
-require 'test/unit'
+require "test/unit"
 class FooTest < Test::Unit::TestCase
   def test_foo
     assert false

data/test/fixtures/frameworks/testunit_good.rb

@@ -1,7 +1,7 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
-require 'lib/simplecov'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "..", ".."))
+require "lib/simplecov"
 SimpleCov.start
-require 'test/unit'
+require "test/unit"
 class FooTest < Test::Unit::TestCase
   def test_foo
     assert true

data/test/fixtures/resultset2.rb

@@ -2,4 +2,3 @@
 class Resultset
   VERSION = 2
 end
-