simplecov 0.7.1 → 0.8.0.pre

data/Rakefile

@@ -21,7 +21,12 @@ Rake::TestTask.new(:test) do |test|
   test.warning = true
 end
 
-require 'cucumber/rake/task'
-Cucumber::Rake::Task.new
+# Cucumber integration test suite is for impls that work with simplecov only - a.k.a. 1.9+
+if '1.9+'.respond_to? :encoding
+  require 'cucumber/rake/task'
+  Cucumber::Rake::Task.new
+  task :default => [:test, :cucumber]
+else
+  task :default => [:test]
+end
 
-task :default => [:test, :cucumber]

data/features/config_command_name.feature

@@ -31,3 +31,15 @@ Feature: Custom names for individual test suites
       | Dreck macht Speck |
       | I'm in UR Unitz   |
 
+  Scenario: RSpec auto detection with spec/features
+    Given SimpleCov for RSpec is configured with:
+      """
+      require 'simplecov'
+      SimpleCov.start
+      """
+    And a file named "spec/features/foobar_spec.rb" with:
+      """
+      """
+    When I open the coverage report generated with `bundle exec rspec spec`
+    Then the report should be based upon:
+      | RSpec |

data/features/config_merge_timeout.feature

@@ -17,14 +17,14 @@ Feature:
       """
       require 'simplecov'
       SimpleCov.start do
-        merge_timeout 1
+        merge_timeout 5
       end
       """
     Given SimpleCov for RSpec is configured with:
       """
       require 'simplecov'
       SimpleCov.start do
-        merge_timeout 1
+        merge_timeout 5
       end
       """
 
@@ -32,7 +32,7 @@ Feature:
     Then the report should be based upon:
       | Unit Tests |
 
-    When I wait for 2 seconds
+    When I wait for 5 seconds
     And I open the coverage report generated with `bundle exec rspec spec`
     Then the report should be based upon:
       | RSpec |

data/features/config_profiles.feature

@@ -0,0 +1,44 @@
+@test_unit @config @profiles
+Feature:
+
+  In order to re-use SimpleCov settings across projects,
+  profiles can be defined that hold configuration settings
+  that can be loaded at once.
+
+  Background:
+    Given SimpleCov for Test/Unit is configured with:
+      """
+      require 'simplecov'
+      """
+
+  Scenario: Defining and using a custom profile
+    Given a file named ".simplecov" with:
+      """
+      SimpleCov.profiles.define 'custom_command' do
+        command_name "Profile Command"
+      end
+
+      SimpleCov.start do
+        load_profile 'test_frameworks'
+        load_profile 'custom_command'
+      end
+      """
+
+    When I open the coverage report generated with `bundle exec rake test`
+    Then I should see "4 files in total."
+    And I should see "using Profile Command" within "#footer"
+
+  Scenario: Using existing profile in custom profile and supplying profile to start command
+    Given a file named ".simplecov" with:
+      """
+      SimpleCov.profiles.define 'my_profile' do
+        load_profile 'test_frameworks'
+        command_name "My Profile"
+      end
+
+      SimpleCov.start 'my_profile'
+      """
+
+    When I open the coverage report generated with `bundle exec rake test`
+    Then I should see "4 files in total."
+    And I should see "using My Profile" within "#footer"

data/features/config_project_name.feature

@@ -14,7 +14,7 @@ Feature:
       """
 
     When I open the coverage report generated with `bundle exec rake test`
-    Then I should see "Code coverage for Project"
+    Then I should see "Code coverage for Project" within "title"
 
   Scenario: Custom name
     Given SimpleCov for Test/Unit is configured with:
@@ -24,4 +24,4 @@ Feature:
       """
 
     When I open the coverage report generated with `bundle exec rake test`
-    Then I should see "Code coverage for Superfancy 2.0"
+    Then I should see "Code coverage for Superfancy 2.0" within "title"

data/features/cucumber_basic.feature

@@ -19,7 +19,7 @@ Feature:
     And I should see the source files:
       | name                                    | coverage |
       | lib/faked_project.rb                    | 100.0 %  |
-      | lib/faked_project/some_class.rb         | 80.0 %  |
+      | lib/faked_project/some_class.rb         | 80.0 %   |
       | lib/faked_project/framework_specific.rb | 75.0 %   |
       | lib/faked_project/meta_magic.rb         | 100.0 %  |
       | features/step_definitions/my_steps.rb   | 100.0 %  |

data/features/step_definitions/html_steps.rb

@@ -35,7 +35,7 @@ Then /^I should see the source files:$/ do |table|
   expected_files.length.should == available_source_files.count
 
   # Find all filenames and their coverage present in coverage report
-  files = available_source_files.map {|f| {"name" => f.find('h3').text, "coverage" => f.find('.header span').text} }
+  files = available_source_files.map {|f| {"name" => f.find('h3').text, "coverage" => f.find('h4 > span').text} }
 
   files.sort_by {|hsh| hsh["name"] }.should == expected_files.sort_by {|hsh| hsh["name"] }
 end

data/features/support/env.rb

@@ -1,26 +1,44 @@
-unless RUBY_VERSION =~ /1\.9/
-  $stderr.puts "Sorry, Cucumber features are only meant to run on Ruby 1.9 for now :("
+unless '1.9'.respond_to?(:encoding)
+  $stderr.puts "Sorry, Cucumber features are only meant to run on Ruby 1.9+ :("
   exit 0
 end
 
 require 'bundler'
 Bundler.setup
 require 'aruba/cucumber'
+require 'aruba/jruby' if RUBY_ENGINE == 'jruby'
 require 'capybara/cucumber'
+require 'phantomjs/poltergeist'
 
 # Fake rack app for capybara that just returns the latest coverage report from aruba temp project dir
-Capybara.app = lambda {|env|
+Capybara.app = lambda { |env|
+  request_path = env['REQUEST_PATH'] || '/'
+  request_path = '/index.html' if request_path == '/'
+
   [200, {'Content-Type' => 'text/html'},
-    [File.read(File.join(File.dirname(__FILE__), '../../tmp/aruba/project', 'coverage/index.html'))]]
+    [File.read(File.join(File.dirname(__FILE__), '../../tmp/aruba/project/coverage', request_path))]]
 }
 
+Capybara.default_driver = Capybara.javascript_driver = :poltergeist
+
 Before do
-  @aruba_timeout_seconds = 20
+  # JRuby takes it's time... See https://github.com/cucumber/aruba/issues/134
+  @aruba_timeout_seconds = RUBY_ENGINE == 'jruby' ? 60 : 20
+
   this_dir = File.dirname(__FILE__)
+
   # Clean up and create blank state for fake project
   in_current_dir do
     FileUtils.rm_rf 'project'
     FileUtils.cp_r File.join(this_dir, '../../test/faked_project/'), 'project'
   end
+
   step 'I cd to "project"'
 end
+
+# Workaround for https://github.com/cucumber/aruba/pull/125
+Aruba.configure do |config|
+  config.before_cmd do
+    set_env('JRUBY_OPTS', '-X-C --1.9')
+  end
+end

data/gemfiles/multi_json_legacy.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "aruba", "~> 0.5.1"
+gem "capybara", "~> 2.0"
+gem "poltergeist", "~> 1.1.0"
+gem "phantomjs", "~> 1.8.1"
+gem "cucumber", ">= 1.1.0"
+gem "multi_json", "~> 1.0.0"
+
+gemspec :path=>"../"

data/gemfiles/multi_json_new.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "aruba", "~> 0.5.1"
+gem "capybara", "~> 2.0"
+gem "poltergeist", "~> 1.1.0"
+gem "phantomjs", "~> 1.8.1"
+gem "cucumber", ">= 1.1.0"
+gem "multi_json", ">= 1.3.4"
+
+gemspec :path=>"../"

data/lib/simplecov.rb

@@ -2,18 +2,15 @@
 # Code coverage for ruby 1.9. Please check out README for a full introduction.
 #
 module SimpleCov
-  # Indicates invalid coverage data
-  class CoverageDataError < StandardError; end;
-
   class << self
-    attr_accessor :running#, :result # TODO: Remove result?
+    attr_accessor :running
 
     #
     # Sets up SimpleCov to run against your project.
-    # You can optionally specify an adapter to use as well as configuration with a block:
+    # You can optionally specify a profile to use as well as configuration with a block:
     #   SimpleCov.start
     #    OR
-    #   SimpleCov.start 'rails' # using rails adapter
+    #   SimpleCov.start 'rails' # using rails profile
     #    OR
     #   SimpleCov.start do
     #     add_filter 'test'
@@ -25,15 +22,17 @@ module SimpleCov
     #
     # Please check out the RDoc for SimpleCov::Configuration to find about available config options
     #
-    def start(adapter=nil, &block)
-      return false unless SimpleCov.usable?
-
-      require 'coverage'
-      load_adapter(adapter) unless adapter.nil?
-      Coverage.start
-      configure(&block) if block_given?
-      @result = nil
-      self.running = true
+    def start(profile=nil, &block)
+      if SimpleCov.usable?
+        load_profile(profile) if profile
+        configure(&block) if block_given?
+        @result = nil
+        self.running = true
+        Coverage.start
+      else
+        warn "WARNING: SimpleCov is activated, but you're not running Ruby 1.9+ - no coverage analysis will happen"
+        false
+      end
     end
 
     #
@@ -90,22 +89,31 @@ module SimpleCov
     end
 
     #
-    # Applies the adapter of given name on SimpleCov configuration
+    # Applies the profile of given name on SimpleCov configuration
     #
+    def load_profile(name)
+      profiles.load(name)
+    end
+
     def load_adapter(name)
-      adapters.load(name)
+      warn "method load_adapter is deprecated. use load_profile instead"
+      load_profile(name)
     end
 
     #
-    # Checks whether we're on a proper version of ruby (1.9+) and returns false if this is not the case,
-    # also printing an appropriate warning
+    # Checks whether we're on a proper version of Ruby (likely 1.9+) which
+    # provides coverage support
     #
     def usable?
-      unless "1.9".respond_to?(:encoding)
-        warn "WARNING: SimpleCov is activated, but you're not running Ruby 1.9+ - no coverage analysis will happen"
-        return false
+      return @usable if defined? @usable and !@usable.nil?
+
+      @usable = begin
+        require 'coverage'
+        require 'simplecov/jruby16_fix'
+        true
+      rescue LoadError
+        false
       end
-      true
     end
   end
 end
@@ -115,7 +123,7 @@ require 'simplecov/configuration'
 SimpleCov.send :extend, SimpleCov::Configuration
 require 'simplecov/exit_codes'
 require 'simplecov/json'
-require 'simplecov/adapters'
+require 'simplecov/profiles'
 require 'simplecov/source_file'
 require 'simplecov/file_list'
 require 'simplecov/result'
@@ -128,7 +136,7 @@ require 'simplecov/command_guesser'
 require 'simplecov/version'
 
 # Load default config
-require 'simplecov/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

data/lib/simplecov/command_guesser.rb

@@ -18,16 +18,16 @@ module SimpleCov::CommandGuesser
     
     def from_command_line_options
       case original_run_command
-        when /#{'test/functional/'}/
+        when /test\/functional\//, /test\/{.*?functional.*?}\//
           "Functional Tests"
-        when /#{'test/integration/'}/
+        when /test\/integration\//
           "Integration Tests"
-        when /#{'test/'}/
+        when /test\//
           "Unit Tests"
-        when /cucumber/, /features/
-          "Cucumber Features"
         when /spec/
           "RSpec"
+        when /cucumber/, /features/
+          "Cucumber Features"
         else
           nil
       end
@@ -46,4 +46,4 @@ module SimpleCov::CommandGuesser
       end
     end
   end
-end
+end

data/lib/simplecov/configuration.rb

@@ -94,10 +94,15 @@ module SimpleCov::Configuration
   end
 
   #
-  # Returns the hash of available adapters
+  # Returns the hash of available profiles
   #
+  def profiles
+    @profiles ||= SimpleCov::Profiles.new
+  end
+
   def adapters
-    @adapters ||= SimpleCov::Adapters.new
+    warn "method adapters is deprecated. use profiles instead"
+    profiles
   end
 
   #

data/lib/simplecov/defaults.rb

@@ -1,22 +1,22 @@
 # Load default formatter gem
 require 'simplecov-html'
 
-SimpleCov.adapters.define 'root_filter' do
+SimpleCov.profiles.define 'root_filter' do
   # Exclude all files outside of simplecov root
   add_filter do |src|
     !(src.filename =~ /^#{SimpleCov.root}/)
   end
 end
 
-SimpleCov.adapters.define 'test_frameworks' do
+SimpleCov.profiles.define 'test_frameworks' do
   add_filter '/test/'
   add_filter '/features/'
   add_filter '/spec/'
   add_filter '/autotest/'
 end
 
-SimpleCov.adapters.define 'rails' do
-  load_adapter 'test_frameworks'
+SimpleCov.profiles.define 'rails' do
+  load_profile 'test_frameworks'
 
   add_filter '/config/'
   add_filter '/db/'
@@ -34,7 +34,7 @@ end
 SimpleCov.configure do
   formatter SimpleCov::Formatter::HTMLFormatter
   # Exclude files outside of SimpleCov.root
-  load_adapter 'root_filter'
+  load_profile 'root_filter'
 end
 
 # Gotta stash this a-s-a-p, see the CommandGuesser class and i.e. #110 for further info
@@ -81,6 +81,10 @@ at_exit do
   exit @exit_status if @exit_status # Force exit with stored status (see github issue #5)
 end
 
+# Autoload config from ~/.simplecov if present
+global_config_path = File.join(File.expand_path("~"), '.simplecov')
+load global_config_path if File.exist?(global_config_path)
+
 # Autoload config from .simplecov if present
 config_path = File.join(SimpleCov.root, '.simplecov')
 load config_path if File.exist?(config_path)

data/lib/simplecov/file_list.rb

@@ -39,6 +39,6 @@ class SimpleCov::FileList < Array
   # Computes the strength (hits / line) based upon lines covered and lines missed
   def covered_strength
     return 0 if empty? or lines_of_code == 0
-    map {|f| f.covered_strength }.inject(&:+) / size
+    map {|f| f.covered_strength }.inject(&:+).to_f / size
   end
 end

data/lib/simplecov/jruby16_fix.rb

@@ -0,0 +1,43 @@
+if defined?(JRUBY_VERSION) && JRUBY_VERSION.to_f < 1.7
+  require 'jruby'
+  java_import 'org.jruby.ast.NodeType'
+
+  # Coverage for JRuby < 1.7.0 does not work correctly
+  #
+  #  - does not distinguish lines that cannot be executed
+  #  - does (partial) coverage for files loaded before `Coverage.start`.
+  #  - does not expand a path like `lib/../spec` to `spec`.
+  #
+  # This monkey patches Coverage to address those issues
+  module Coverage
+    class << self
+      alias __broken_result__ result
+
+      def result
+        fixed = {}
+        __broken_result__.each do |path, executed_lines|
+          covered_lines = executed_lines.dup
+
+          process = lambda do |node|
+            if node.node_type == NodeType::NEWLINENODE
+              pos = node.position
+              covered_lines[pos.line] ||= 0
+            end
+            node.child_nodes.each(&process)
+          end
+
+          begin
+            process[JRuby.parse(File.read(path), path)]
+          rescue => e
+          end
+
+          if (first = covered_lines.detect { |x| x }) && first > 0
+            fixed[File.expand_path(path)] = covered_lines
+          end
+        end
+
+        fixed
+      end
+    end
+  end
+end