simplecov 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61f56fdda1d314c0237f6838847332be44bb24cf
-  data.tar.gz: 8774f7ed6c24a12d78c8ae14cf4281f9ce8e8552
+  metadata.gz: 4aee53c6d098222de6eef7ecc86e2ffc355b664d
+  data.tar.gz: f9b347700bdd580ecc4edba7a24d67c4b8c9e003
 SHA512:
-  metadata.gz: 164e46798ecc467c0affb93de2619573efff67f900897f11c96fa2404e40784134387698ab38cddc6c9c8df418b16d5511e233ae5b9f2d4a51e0e6d3fc4ba030
-  data.tar.gz: 07cabbfba38dc665fe26180cb66abcb1449d199c41c43dbe3db80a669d881ed459e017b03176d66d2200dbfbd25b2843943450bbb29c93d91bc8256e57439c68
+  metadata.gz: 8cb3e1de8a12231765a66cc56f036bef7aa2856d0b29990fb0e2a440d7878876c91b193d059306221e5b3ef4863d95ed80df53775cdb3275f6a1c52ce25006c9
+  data.tar.gz: 3a7fd5ed285ff6804d60a7ec5c644d727a1772f4510cbc93e6f934a43628f8703854ebddf6f879924420898b1585cde55f38dea86a14ab82bd9065f06660880d

data/CHANGELOG.md

@@ -1,6 +1,17 @@
-Unreleased ([changes](https://github.com/colszowka/simplecov/compare/v0.8.1...master))
+Unreleased ([changes](https://github.com/colszowka/simplecov/compare/v0.8.2...master))
 ====================
 
+v0.8.2, 2013-11-20 ([changes](https://github.com/colszowka/simplecov/compare/v0.8.1...v0.8.2))
+=====================
+
+## Bugfixes
+
+  * Replaced the locking behaviour [via lockfile gem](https://github.com/colszowka/simplecov/pull/185) with 
+    plain Ruby explicit file locking when merging results. This should make simplecov merging to behave well 
+    on Windows again. 
+    See [#258](https://github.com/colszowka/simplecov/issues/258) and 
+    [#223](https://github.com/colszowka/simplecov/pull/223) (thanks to @tomykaira)
+
 v0.8.1, 2013-11-10 ([changes](https://github.com/colszowka/simplecov/compare/v0.8.0...v0.8.1))
 =====================
 
@@ -12,6 +23,8 @@ v0.8.1, 2013-11-10 ([changes](https://github.com/colszowka/simplecov/compare/v0.
 v0.8.0, 2013-11-10 ([changes](https://github.com/colszowka/simplecov/compare/v0.7.1...v0.8.0))
 =====================
 
+**Note: Yanked the same day because of the regression that 0.8.1 fixes, see above**
+
 ## TL;DR
 
 It's been way too long since the last official release 0.7.1, but this was partly due to it proving itself

data/CONTRIBUTING.md

@@ -1,4 +1,18 @@
-# Making Contributions
+## Reporting Issues
+
+You can report issues at https://github.com/colszowka/simplecov/issues
+
+ * Search existing issues for your problem, chances are someone else already reported it.
+ * Please make sure you are running the latest version of simplecov. If that is not possible, 
+   please specify in your report why you can't update to the latest version.
+ * Include the SimpleCov version you are running in your report.
+ * Include your `ruby -e "puts RUBY_DESCRIPTION"`. Please also specify the gem versions of 
+   Rails and your testing framework, if applicable.
+   This is extremely important for narrowing down the cause of your problem.
+
+Thanks!
+   
+## Making Contributions
 
 To fetch & test the library for development, do:
 

data/README.md

@@ -294,6 +294,22 @@ Defining your own filters is pretty easy: Just inherit from SimpleCov::Filter an
 the filter, a true return value from this method will result in the removal of the given source_file. The filter_argument method
 is being set in the SimpleCov::Filter initialize method and thus is set to 5 in this example.
 
+## Default root filter and coverage for things outside of it
+
+By default, SimpleCov filters everything outside of the `SimpleCov.root` directory. However, sometimes you may want
+to include coverage reports for things you include as a gem, for example a Rails Engine.
+
+Here's an example by [@lsaffie](https://github.com/lsaffie) from [#221](https://github.com/colszowka/simplecov/issues/221)
+that shows how you can achieve just that:
+
+```ruby
+SimpleCov.start :rails do
+  filters.clear # This will remove the :root_filter that comes via simplecov's defaults
+  add_filter do |src|
+    !(src.filename =~ /^#{SimpleCov.root}/) unless src.filename =~ /my_engine/
+  end
+end
+```
 
 ## Groups
 

data/gemfiles/multi_json_legacy.gemfile

@@ -7,6 +7,7 @@ gem "capybara", "~> 2.0"
 gem "poltergeist", "~> 1.1.0"
 gem "phantomjs", "~> 1.8.1"
 gem "cucumber", ">= 1.1.0"
+gem "activesupport", "~> 3.2.0"
 gem "multi_json", "~> 1.0.0"
 
 gemspec :path=>"../"

data/gemfiles/multi_json_new.gemfile

@@ -7,6 +7,7 @@ gem "capybara", "~> 2.0"
 gem "poltergeist", "~> 1.1.0"
 gem "phantomjs", "~> 1.8.1"
 gem "cucumber", ">= 1.1.0"
+gem "activesupport", "~> 3.2.0"
 gem "multi_json", ">= 1.3.4"
 
 gemspec :path=>"../"

data/lib/simplecov.rb

@@ -1,8 +1,6 @@
 #
 # Code coverage for ruby 1.9. Please check out README for a full introduction.
 #
-require 'lockfile'
-
 module SimpleCov
   class << self
     attr_accessor :running
@@ -47,12 +45,8 @@ module SimpleCov
       # If we're using merging of results, store the current result
       # first, then merge the results and return those
       if use_merging
-        lockfile = ::Lockfile.new ResultMerger.resultset_path + '.lockfile'
-
-        lockfile.lock do
-          SimpleCov::ResultMerger.store_result(@result) if @result
-          return SimpleCov::ResultMerger.merged_result
-        end
+        SimpleCov::ResultMerger.store_result(@result) if @result
+        return SimpleCov::ResultMerger.merged_result
       else
         return @result if defined? @result
       end

data/lib/simplecov/result_merger.rb

@@ -13,7 +13,11 @@ module SimpleCov::ResultMerger
     # Loads the cached resultset from YAML and returns it as a Hash
     def resultset
       if stored_data
-        SimpleCov::JSON.parse(stored_data)
+        begin
+          SimpleCov::JSON.parse(stored_data)
+        rescue
+          {}
+        end
       else
         {}
       end
@@ -66,6 +70,7 @@ module SimpleCov::ResultMerger
       command_name, data = result.to_hash.first
       new_set[command_name] = data
       File.open(resultset_path, "w+") do |f|
+        f.flock(File::LOCK_EX)
         f.puts SimpleCov::JSON.dump(new_set)
       end
       true

data/lib/simplecov/version.rb

@@ -1,3 +1,3 @@
 module SimpleCov
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/simplecov.gemspec

@@ -14,7 +14,6 @@ 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.8.0'
   gem.add_dependency 'docile', '~> 1.1.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplecov
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Christoph Olszowka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -24,20 +24,6 @@ dependencies:
     - - '>='
       - !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