simplecov 0.8.0.pre → 0.8.0.pre2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7768d38b9aeb395f607dda4c66716e0d2666e16a
+  data.tar.gz: 3cf5925dbcaf7506be09faaad38edca5bad8f488
+SHA512:
+  metadata.gz: bd3a2f25dc14d3cc3b65309aa06ea37563929d0951fa7d6ec90f9b1b6868ea8a670764230cbb5e7cbf0807c8b04d22a16d051204159a56d8231af909aa4b67f1
+  data.tar.gz: 27f202f8386e4478fed7a746e7e464106220ffcf716f506e3dac4914cd7f186fda21b794637ff9b7b52381fcdacfce3bd6af24c14a998d98047888d33ebfdf01

data/.travis.yml

@@ -12,9 +12,9 @@ rvm:
   - 2.0.0
   - rbx-18mode
   - rbx-19mode
-  - jruby-18mode
-  - jruby-19mode
-  - jruby-head
+#  - jruby-18mode
+#  - jruby-19mode
+#  - jruby-head
   - ruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -15,6 +15,8 @@ Unreleased ([changes](https://github.com/colszowka/simplecov/compare/v0.7.1...ma
     See [#212](https://github.com/colszowka/simplecov/pull/212) (thanks to @ersatzryan and @betelgeuse)
   * [REFACTORING] The internal cucumber test suite now uses Capybara 2.
     See [#206](https://github.com/colszowka/simplecov/pull/206) (thanks to @infertux)
+  * [FEATURE] Automatically detect the usage of parallel_tests.
+    See https://github.com/colszowka/simplecov/issues/64
 
 v0.7.1, 2012-10-12 ([changes](https://github.com/colszowka/simplecov/compare/v0.7.0...v0.7.1))
 -------------------

data/README.md

@@ -511,7 +511,7 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
 Apart from the direct companion [simplecov-html], there are other formatters
 available:
 
-### [simplecov-rcov](https://github.com/fguillen/simplecov-rcov)
+#### [simplecov-rcov](https://github.com/fguillen/simplecov-rcov)
 *by Fernando Guillen*
 
 "The target of this formatter is to cheat on Hudson so I can use the Ruby metrics plugin with SimpleCov."
@@ -531,6 +531,16 @@ A formatter for Simplecov that emits a Vim script to mark up code files with cov
 
 A formatter that prints the coverage of the file under test when you run a single test file.
 
+#### [simplecov-json](https://github.com/vicentllongo/simplecov-json)
+*by Vicent Llongo*
+
+JSON formatter for SimpleCov
+
+#### [simplecov-badge](https://github.com/matthew342/simplecov-badge)
+*by Matt Hale*
+
+A formatter that generates a coverage badge for use in your project's readme using ImageMagick.
+
 ## Ruby version compatibility
 
 [![Build Status](https://secure.travis-ci.org/colszowka/simplecov.png)](http://travis-ci.org/colszowka/simplecov)

data/features/config_coverage_dir.feature

@@ -18,3 +18,16 @@ Feature:
     When I successfully run `bundle exec rake test`
     Then a coverage report should have been generated in "test/simplecov"
     And a directory named "coverage" should not exist
+
+  Scenario:
+    Given SimpleCov for Test/Unit is configured with:
+      """
+      require 'simplecov'
+      SimpleCov.start do
+        coverage_dir '/tmp/test/simplecov'
+      end
+      """
+
+    When I successfully run `bundle exec rake test`
+    Then a coverage report should have been generated in "/tmp/test/simplecov"
+    And a directory named "coverage" should not exist

data/features/config_styles.feature

@@ -24,6 +24,34 @@ Feature:
     Then I should see "4 files in total."
     And I should see "using Config Test Runner" within "#footer"
 
+  Scenario: Inside start block, using instance var from outside
+    Given a file named ".simplecov" with:
+      """
+      @filter = 'test'
+      SimpleCov.start do
+        add_filter @filter
+        command_name 'Config Test Runner'
+      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 Config Test Runner" within "#footer"
+
+  Scenario: Inside start block, using local var from outside
+    Given a file named ".simplecov" with:
+      """
+      filter = 'test'
+      SimpleCov.start do
+        add_filter filter
+        command_name 'Config Test Runner'
+      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 Config Test Runner" within "#footer"
+
   Scenario: Explicitly before start block
     Given a file named ".simplecov" with:
       """

data/lib/simplecov.rb

@@ -1,6 +1,8 @@
 #
 # Code coverage for ruby 1.9. Please check out README for a full introduction.
 #
+require 'lockfile'
+
 module SimpleCov
   class << self
     attr_accessor :running
@@ -31,6 +33,7 @@ module SimpleCov
         Coverage.start
       else
         warn "WARNING: SimpleCov is activated, but you're not running Ruby 1.9+ - no coverage analysis will happen"
+        warn "Starting with SimpleCov 1.0.0, even no-op compatibility with Ruby <= 1.8 will be entirely dropped."
         false
       end
     end
@@ -44,8 +47,12 @@ module SimpleCov
       # If we're using merging of results, store the current result
       # first, then merge the results and return those
       if use_merging
-        SimpleCov::ResultMerger.store_result(@result) if @result
-        return SimpleCov::ResultMerger.merged_result
+        lockfile = ::Lockfile.new ResultMerger.resultset_path + '.lockfile'
+
+        lockfile.lock do
+          SimpleCov::ResultMerger.store_result(@result) if @result
+          return SimpleCov::ResultMerger.merged_result
+        end
       else
         return @result if defined? @result
       end

data/lib/simplecov/command_guesser.rb

@@ -11,10 +11,19 @@ module SimpleCov::CommandGuesser
     attr_accessor :original_run_command
     
     def guess
-      from_command_line_options || from_defined_constants
+      from_env || from_command_line_options || from_defined_constants
     end
     
     private
+
+    def from_env
+      # If being run from inside parallel_tests set the command name according to the process number
+      if ENV['PARALLEL_TEST_GROUPS'] && ENV['TEST_ENV_NUMBER']
+        number = ENV['TEST_ENV_NUMBER']
+        number = '1' if number == ''
+        "(#{number}/#{ENV['PARALLEL_TEST_GROUPS']})"
+      end
+    end
     
     def from_command_line_options
       case original_run_command

data/lib/simplecov/configuration.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'docile'
 #
 # Bundles the configuration options used for SimpleCov. All methods
 # defined here are usable from SimpleCov directly. Please check out
@@ -34,7 +35,7 @@ module SimpleCov::Configuration
   # values. Will create the directory if it's missing
   #
   def coverage_path
-    coverage_path = File.join(root, coverage_dir)
+    coverage_path = File.expand_path(coverage_dir, root)
     FileUtils.mkdir_p coverage_path
     coverage_path
   end
@@ -118,7 +119,7 @@ module SimpleCov::Configuration
   #
   def configure(&block)
     return false unless SimpleCov.usable?
-    instance_exec(&block)
+    Docile.dsl_eval(self, &block)
   end
 
   #

data/lib/simplecov/defaults.rb

@@ -4,7 +4,7 @@ require 'simplecov-html'
 SimpleCov.profiles.define 'root_filter' do
   # Exclude all files outside of simplecov root
   add_filter do |src|
-    !(src.filename =~ /^#{SimpleCov.root}/)
+    !(src.filename =~ /^#{Regexp.escape(SimpleCov.root)}/)
   end
 end
 
@@ -47,6 +47,8 @@ at_exit do
     #otherwise set a non-zero status representing termination by some other exception
     #(see github issue 41)
     @exit_status = $!.is_a?(SystemExit) ? $!.status : SimpleCov::ExitCodes::EXCEPTION
+  else
+    @exit_status = 0
   end
 
   SimpleCov.at_exit.call
@@ -54,7 +56,7 @@ at_exit do
   if SimpleCov.result? # Result has been computed
     covered_percent = SimpleCov.result.covered_percent.round(2)
 
-    if @exit_status.to_i == 0 # No other errors
+    if @exit_status == 0 # No other errors
       @exit_status = if covered_percent < SimpleCov.minimum_coverage
         $stderr.puts "Coverage (%.2f%%) is below the expected minimum coverage (%.2f%%)." % \
                      [covered_percent, SimpleCov.minimum_coverage]

data/lib/simplecov/version.rb

@@ -1,3 +1,3 @@
 module SimpleCov
-  VERSION = "0.8.0.pre"
+  VERSION = "0.8.0.pre2"
 end

data/simplecov.gemspec

@@ -14,7 +14,9 @@ Gem::Specification.new do |gem|
   gem.license     = "MIT"
 
   gem.add_dependency 'multi_json'
+  gem.add_dependency 'lockfile', '>= 2.1.0'
   gem.add_dependency 'simplecov-html', '~> 0.7.1'
+  gem.add_dependency 'docile', '~> 1.1.0'
 
   gem.add_development_dependency 'appraisal', '~> 0.5.1'
   gem.add_development_dependency 'rake', '~> 10.0.3'

metadata

@@ -1,36 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: simplecov
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre
-  prerelease: 6
+  version: 0.8.0.pre2
 platform: ruby
 authors:
 - Christoph Olszowka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: lockfile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: simplecov-html
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,15 +48,27 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: docile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -229,30 +244,26 @@ files:
 homepage: http://github.com/colszowka/simplecov
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -263830053031088353
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Code coverage for Ruby 1.9+ with a powerful configuration library and automatic
   merging of coverage across test suites
 test_files: []