simplecov 0.6.1 → 0.6.2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+v0.6.2 (2012-04-20)
+===================
+
+  * Updated to latest version of MultiJSON and it's new API (thanks to @sferik and @ronen).
+    See https://github.com/colszowka/simplecov/pull/122
+
 v0.6.1 (2012-02-24)
 ===================
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2011 Christoph Olszowka
+Copyright (c) 2010-2012 Christoph Olszowka
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -117,13 +117,12 @@ to use SimpleCov with them. Here's an overview of the known ones:
    <b>Spork</b>
  </td>
  <td>
-  SimpleCov currently does not correctly cope with the way Spork (and similar forking testing tools) 
-  works. With the right configuration this might be resolvable. 
-  To make sure your coverage is reported correctly you probably should fall back to running your test suite
-  without spork when you want a coverage report.
+  Because of the how Spork works internally (using preforking) there used to be trouble when using SimpleCov
+  with it, but that apparently has been resolved with a specific configuration strategy. See
+  <a href="https://github.com/colszowka/simplecov/issues/42#issuecomment-4440284">this</a> comment.
  </td>
  <td>
-  <a href="https://github.com/colszowka/simplecov/issues/42">SimpleCov #42</a>
+  <a href="https://github.com/colszowka/simplecov/issues/42#issuecomment-4440284">SimpleCov #42</a>
  </td>
 </tr>
 <tr>

data/lib/simplecov/result_merger.rb

@@ -15,7 +15,7 @@ module SimpleCov::ResultMerger
     # Loads the cached resultset from YAML and returns it as a Hash
     def resultset
       if stored_data
-        MultiJson.decode(stored_data)
+        MultiJson.load(stored_data)
       else
         {}
       end
@@ -71,7 +71,7 @@ module SimpleCov::ResultMerger
         if defined? ::JSON
           f.puts JSON.pretty_generate(new_set)
         else
-          f.puts MultiJson.encode(new_set)
+          f.puts MultiJson.dump(new_set)
         end
       end
       true

data/lib/simplecov/version.rb

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

data/simplecov.gemspec

@@ -12,7 +12,7 @@ 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.0'
+  gem.add_dependency 'multi_json', '~> 1.3'
   gem.add_dependency 'simplecov-html', '~> 0.5.3'
   gem.add_development_dependency 'aruba'
   gem.add_development_dependency 'capybara'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplecov
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70354056681600 !ruby/object:Gem::Requirement
+  requirement: &70158866626880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70354056681600
+  version_requirements: *70158866626880
 - !ruby/object:Gem::Dependency
   name: simplecov-html
-  requirement: &70354056680820 !ruby/object:Gem::Requirement
+  requirement: &70158866626100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *70354056680820
+  version_requirements: *70158866626100
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70354056680360 !ruby/object:Gem::Requirement
+  requirement: &70158866625580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354056680360
+  version_requirements: *70158866625580
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70354056679880 !ruby/object:Gem::Requirement
+  requirement: &70158866624800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354056679880
+  version_requirements: *70158866624800
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70354056679340 !ruby/object:Gem::Requirement
+  requirement: &70158866617760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.4
   type: :development
   prerelease: false
-  version_requirements: *70354056679340
+  version_requirements: *70158866617760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70354056678840 !ruby/object:Gem::Requirement
+  requirement: &70158866616920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354056678840
+  version_requirements: *70158866616920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70354056678360 !ruby/object:Gem::Requirement
+  requirement: &70158866616220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354056678360
+  version_requirements: *70158866616220
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70354056677880 !ruby/object:Gem::Requirement
+  requirement: &70158866614920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354056677880
+  version_requirements: *70158866614920
 description: Code coverage for Ruby 1.9 with a powerful configuration library and
   automatic merging of coverage across test suites
 email:
@@ -161,6 +161,7 @@ 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