simplecov 0.6.2 → 0.6.3

data/.travis.yml

@@ -1,6 +1,8 @@
-script: "bundle exec rake test && bundle exec cucumber features"
+script:
+  - bundle
+  - rake appraisal:install
+  - rake appraisal
 rvm:
-#  - 1.8.6 # Has trouble with rake 0.9+ :(
   - 1.8.7
   - 1.9.2
   - 1.9.3
@@ -10,4 +12,4 @@ rvm:
 notifications:
   email:
     on_success: always
-    on_failure: always
+    on_failure: always

data/Appraisals

@@ -0,0 +1,8 @@
+# See https://github.com/colszowka/simplecov/issues/132
+appraise "multi_json-new" do
+  gem "multi_json", ">= 1.3.4"
+end
+
+appraise "multi_json-legacy" do
+  gem "multi_json", "~> 1.0.0"
+end

data/CHANGELOG.md

@@ -1,7 +1,18 @@
+v0.6.3 (2012-05-10)
+===================
+
+  * Modified the API-changes for newer multi_json versions introduced with #122 and v0.6.2 so
+    they are backwards-compatible with older multi_json gems in order to avoid simplecov polluting
+    the multi_json minimum version requirement for entire applications.
+    See https://github.com/colszowka/simplecov/issues/132
+  * Added appraisal gem to the test setup in order to run the test suite against both 1.0 and 1.3
+    multi_json gems and ensure the above actually works :)
+
 v0.6.2 (2012-04-20)
 ===================
+**Note: Yanked 2012-05-10 because of backwards-incompatibilty of the updated multi_json api**
 
-  * Updated to latest version of MultiJSON and it's new API (thanks to @sferik and @ronen).
+  * Updated to latest version of MultiJSON and its new API (thanks to @sferik and @ronen).
     See https://github.com/colszowka/simplecov/pull/122
 
 v0.6.1 (2012-02-24)

data/Gemfile

@@ -1,9 +1,5 @@
 source "http://rubygems.org"
 gemspec
 
-# Use local copy of simplecov-html in development when checked out
-if File.directory?(File.dirname(__FILE__) + '/../simplecov-html')
-  gem 'simplecov-html', :path => File.dirname(__FILE__) + '/../simplecov-html'
-else
-  gem 'simplecov-html', :git => 'https://github.com/colszowka/simplecov-html'
-end
+# Uncomment this to use local copy of simplecov-html in development when checked out
+# gem 'simplecov-html', :path => File.dirname(__FILE__) + '/../simplecov-html'

data/README.md

@@ -94,7 +94,7 @@ care what kind of framework it is running in, it just looks at what code is bein
 
 ### Notes on specific frameworks and test utilities
 
-For some frameworks and testing tools there are quirks and problems you might want to know about if you want 
+For some frameworks and testing tools there are quirks and problems you might want to know about if you want
 to use SimpleCov with them. Here's an overview of the known ones:
 
 <table>
@@ -108,7 +108,7 @@ to use SimpleCov with them. Here's an overview of the known ones:
   <code>test-unit</code> releases 2.4.3+ (Dec 11th, 2011) should have this problem resolved.
  </td>
  <td>
-  <a href="https://github.com/colszowka/simplecov/issues/45">SimpleCov #45</a> & 
+  <a href="https://github.com/colszowka/simplecov/issues/45">SimpleCov #45</a> &
   <a href="https://github.com/test-unit/test-unit/pull/12">Test/Unit #12</a>
  </td>
 </tr>
@@ -452,12 +452,16 @@ SimpleCov is built in [Continuous Integration] on 1.8.7, ree, 1.9.2, 1.9.3.
 
 To fetch & test the library for development, do:
 
-    $ git clone https://github.com/colszowka/simplecov
+    $ git clone https://github.com/colszowka/simplecov.git
     $ cd simplecov
     $ bundle
-    $ bundle exec rake test && bundle exec cucumber features
+    $ rake appraisal:install
+    $ rake appraisal
 
-If you wont to contribute, please:
+For more information on the appraisal gem (for testing against multiple gem dependency versions), please see
+https://github.com/thoughtbot/appraisal/
+
+If you want to contribute, please:
 
   * Fork the project.
   * Make your feature addition or bug fix.

data/Rakefile

@@ -1,6 +1,8 @@
 #!/usr/bin/env rake
 
-require 'bundler'
+require 'rubygems'
+require 'bundler/setup'
+require 'appraisal'
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'

data/features/config_merge_timeout.feature

@@ -32,7 +32,8 @@ Feature:
     Then the report should be based upon:
       | Unit Tests |
 
-    When I open the coverage report generated with `bundle exec rspec spec`
+    When I wait for 2 seconds
+    And I open the coverage report generated with `bundle exec rspec spec`
     Then the report should be based upon:
       | RSpec |
 

data/features/step_definitions/simplecov_steps.rb

@@ -59,3 +59,8 @@ Then /^the report should be based upon:$/ do |table|
   }
 end
 
+# This is neccessary to ensure timing-dependant tests like the merge timeout
+# do not fail on powerful machines.
+When /^I wait for (\d+) seconds$/ do |seconds|
+  sleep seconds.to_i
+end

data/gemfiles/multi_json-legacy.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "multi_json", "~> 1.0.0"
+
+gemspec :path=>"../"

data/gemfiles/multi_json-legacy.gemfile.lock

@@ -0,0 +1,85 @@
+PATH
+  remote: /Users/colszowka/Projects/github/colszowka/simplecov
+  specs:
+    simplecov (0.6.2)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.8)
+    appraisal (0.4.1)
+      bundler
+      rake
+    aruba (0.4.11)
+      childprocess (>= 0.2.3)
+      cucumber (>= 1.1.1)
+      ffi (>= 1.0.11)
+      rspec (>= 2.7.0)
+    builder (3.0.0)
+    capybara (1.1.2)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.3.2)
+      ffi (~> 1.0.6)
+    cucumber (1.2.0)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.10.0)
+      json (>= 1.4.6)
+    diff-lcs (1.1.3)
+    ffi (1.0.11)
+    gherkin (2.10.0)
+      json (>= 1.4.6)
+    json (1.7.1)
+    libwebsocket (0.1.3)
+      addressable
+    mime-types (1.18)
+    multi_json (1.0.4)
+    nokogiri (1.5.2)
+    rack (1.4.1)
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rake (0.9.2.2)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.0)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    rubyzip (0.9.8)
+    selenium-webdriver (2.21.2)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
+      rubyzip
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
+    simplecov-html (0.5.3)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  aruba
+  capybara
+  cucumber (>= 1.1.4)
+  multi_json (~> 1.0.0)
+  rake
+  rspec
+  shoulda
+  simplecov!

data/gemfiles/multi_json-new.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "multi_json", ">= 1.3.4"
+
+gemspec :path=>"../"

data/gemfiles/multi_json-new.gemfile.lock

@@ -0,0 +1,85 @@
+PATH
+  remote: /Users/colszowka/Projects/github/colszowka/simplecov
+  specs:
+    simplecov (0.6.2)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.8)
+    appraisal (0.4.1)
+      bundler
+      rake
+    aruba (0.4.11)
+      childprocess (>= 0.2.3)
+      cucumber (>= 1.1.1)
+      ffi (>= 1.0.11)
+      rspec (>= 2.7.0)
+    builder (3.0.0)
+    capybara (1.1.2)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.3.2)
+      ffi (~> 1.0.6)
+    cucumber (1.2.0)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.10.0)
+      json (>= 1.4.6)
+    diff-lcs (1.1.3)
+    ffi (1.0.11)
+    gherkin (2.10.0)
+      json (>= 1.4.6)
+    json (1.7.1)
+    libwebsocket (0.1.3)
+      addressable
+    mime-types (1.18)
+    multi_json (1.3.4)
+    nokogiri (1.5.2)
+    rack (1.4.1)
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rake (0.9.2.2)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.0)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    rubyzip (0.9.8)
+    selenium-webdriver (2.21.2)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
+      rubyzip
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
+    simplecov-html (0.5.3)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  aruba
+  capybara
+  cucumber (>= 1.1.4)
+  multi_json (>= 1.3.4)
+  rake
+  rspec
+  shoulda
+  simplecov!

data/lib/simplecov/result_merger.rb

@@ -15,7 +15,12 @@ module SimpleCov::ResultMerger
     # Loads the cached resultset from YAML and returns it as a Hash
     def resultset
       if stored_data
-        MultiJson.load(stored_data)
+        # Detect and use available MultiJson API - it changed in v1.3
+        if MultiJson.respond_to?(:adapter)
+          MultiJson.load(stored_data)
+        else
+          MultiJson.decode(stored_data)
+        end
       else
         {}
       end
@@ -71,7 +76,12 @@ module SimpleCov::ResultMerger
         if defined? ::JSON
           f.puts JSON.pretty_generate(new_set)
         else
-          f.puts MultiJson.dump(new_set)
+          # Detect and use available MultiJson API - it changed in v1.3
+          if MultiJson.respond_to?(:adapter)
+            f.puts MultiJson.dump(new_set)
+          else
+            f.puts MultiJson.encode(new_set)
+          end
         end
       end
       true

data/lib/simplecov/version.rb

@@ -1,3 +1,3 @@
 module SimpleCov
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/simplecov.gemspec

@@ -12,10 +12,11 @@ Gem::Specification.new do |gem|
   gem.description = %Q{Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites}
   gem.summary     = gem.description
 
-  gem.add_dependency 'multi_json', '~> 1.3'
+  gem.add_dependency 'multi_json', '~> 1.0'
   gem.add_dependency 'simplecov-html', '~> 0.5.3'
   gem.add_development_dependency 'aruba'
   gem.add_development_dependency 'capybara'
+  gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'cucumber', '>= 1.1.4'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplecov
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70158866626880 !ruby/object:Gem::Requirement
+  requirement: &70307285759020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70158866626880
+  version_requirements: *70307285759020
 - !ruby/object:Gem::Dependency
   name: simplecov-html
-  requirement: &70158866626100 !ruby/object:Gem::Requirement
+  requirement: &70307285773100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *70158866626100
+  version_requirements: *70307285773100
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70158866625580 !ruby/object:Gem::Requirement
+  requirement: &70307285790800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70158866625580
+  version_requirements: *70307285790800
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70158866624800 !ruby/object:Gem::Requirement
+  requirement: &70307285820920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70158866624800
+  version_requirements: *70307285820920
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: &70307285819640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70307285819640
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70158866617760 !ruby/object:Gem::Requirement
+  requirement: &70307285818160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: 1.1.4
   type: :development
   prerelease: false
-  version_requirements: *70158866617760
+  version_requirements: *70307285818160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70158866616920 !ruby/object:Gem::Requirement
+  requirement: &70307285815960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70158866616920
+  version_requirements: *70307285815960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70158866616220 !ruby/object:Gem::Requirement
+  requirement: &70307285831700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70158866616220
+  version_requirements: *70307285831700
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70158866614920 !ruby/object:Gem::Requirement
+  requirement: &70307285827880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70158866614920
+  version_requirements: *70307285827880
 description: Code coverage for Ruby 1.9 with a powerful configuration library and
   automatic merging of coverage across test suites
 email:
@@ -110,6 +121,7 @@ files:
 - .gitignore
 - .rvmrc
 - .travis.yml
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -145,6 +157,10 @@ files:
 - features/test_unit_groups_using_filter_class.feature
 - features/test_unit_without_simplecov.feature
 - features/unicode_compatiblity.feature
+- gemfiles/multi_json-legacy.gemfile
+- gemfiles/multi_json-legacy.gemfile.lock
+- gemfiles/multi_json-new.gemfile
+- gemfiles/multi_json-new.gemfile.lock
 - lib/simplecov.rb
 - lib/simplecov/adapters.rb
 - lib/simplecov/command_guesser.rb
@@ -161,7 +177,6 @@ files:
 - lib/simplecov/result_merger.rb
 - lib/simplecov/source_file.rb
 - lib/simplecov/version.rb
-- simplecov-0.6.2.gem
 - simplecov.gemspec
 - test/faked_project/Gemfile
 - test/faked_project/Rakefile
@@ -216,12 +231,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4064525278113991582
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4064525278113991582
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16
@@ -300,4 +321,3 @@ test_files:
 - test/test_return_codes.rb
 - test/test_source_file.rb
 - test/test_source_file_line.rb
-has_rdoc: