simplecov 0.9.2 → 0.10.0

data/lib/simplecov/railties/tasks.rake

@@ -1,11 +1,11 @@
-require 'rake/testtask'
+require "rake/testtask"
 Rake::TestTask.new do |t|
-  t.name = 'simplecov'
+  t.name = "simplecov"
   t.loader = :direct # uses require() which skips PWD in Ruby 1.9
-  t.libs.push 'test', 'spec', Dir.pwd
-  t.test_files = FileList['{test,spec}/**/*_{test,spec}.rb']
-  t.ruby_opts.push '-r', 'simplecov', '-e', 'SimpleCov.start(:rails)'.inspect
+  t.libs.push "test", "spec", Dir.pwd
+  t.test_files = FileList["{test,spec}/**/*_{test,spec}.rb"]
+  t.ruby_opts.push "-r", "simplecov", "-e", "SimpleCov.start(:rails)".inspect
 end
 
-require 'rake/clean'
-CLOBBER.include 'coverage'
+require "rake/clean"
+CLOBBER.include "coverage"

data/lib/simplecov/result.rb

@@ -1,5 +1,5 @@
-require 'digest/sha1'
-require 'forwardable'
+require "digest/sha1"
+require "forwardable"
 
 module SimpleCov
   #
@@ -57,9 +57,9 @@ module SimpleCov
       @command_name ||= SimpleCov.command_name
     end
 
-    # Returns a hash representation of this Result that can be used for marshalling it into YAML
+    # Returns a hash representation of this Result that can be used for marshalling it into JSON
     def to_hash
-      {command_name => {"coverage" => original_result.reject {|filename, result| !filenames.include?(filename) }, "timestamp" => created_at.to_i}}
+      {command_name => {"coverage" => original_result.reject { |filename, _| !filenames.include?(filename) }, "timestamp" => created_at.to_i}}
     end
 
     # Loads a SimpleCov::Result#to_hash dump
@@ -71,7 +71,7 @@ module SimpleCov
       result
     end
 
-    private
+  private
 
     # Applies all configured SimpleCov filters on this result's source files
     def filter!

data/lib/simplecov/result_merger.rb

@@ -1,85 +1,88 @@
+require "json"
+
 #
 # Singleton that is responsible for caching, loading and merging
 # SimpleCov::Results into a single result for coverage analysis based
 # upon multiple test suites.
 #
-module SimpleCov::ResultMerger
-  class << self
-    # The path to the .resultset.json cache file
-    def resultset_path
-      File.join(SimpleCov.coverage_path, '.resultset.json')
-    end
+module SimpleCov
+  module ResultMerger
+    class << self
+      # The path to the .resultset.json cache file
+      def resultset_path
+        File.join(SimpleCov.coverage_path, ".resultset.json")
+      end
 
-    def resultset_writelock
-      File.join(SimpleCov.coverage_path, '.resultset.json.lock')
-    end
+      def resultset_writelock
+        File.join(SimpleCov.coverage_path, ".resultset.json.lock")
+      end
 
-    # Loads the cached resultset from YAML and returns it as a Hash
-    def resultset
-      if stored_data
-        begin
-          SimpleCov::JSON.parse(stored_data)
-        rescue
+      # Loads the cached resultset from JSON and returns it as a Hash
+      def resultset
+        if stored_data
+          begin
+            JSON.parse(stored_data)
+          rescue
+            {}
+          end
+        else
           {}
         end
-      else
-        {}
       end
-    end
 
-    # Returns the contents of the resultset cache as a string or if the file is missing or empty nil
-    def stored_data
-      if File.exist?(resultset_path) and stored_data = File.read(resultset_path) and stored_data.length >= 2
-        stored_data
-      else
-        nil
+      # Returns the contents of the resultset cache as a string or if the file is missing or empty nil
+      def stored_data
+        return unless File.exist?(resultset_path)
+        data = File.read(resultset_path)
+        return if data.nil? || data.length < 2
+        data
       end
-    end
 
-    # Gets the resultset hash and re-creates all included instances
-    # of SimpleCov::Result from that.
-    # All results that are above the SimpleCov.merge_timeout will be
-    # dropped. Returns an array of SimpleCov::Result items.
-    def results
-      results = []
-      resultset.each do |command_name, data|
-        result = SimpleCov::Result.from_hash(command_name => data)
-        # Only add result if the timeout is above the configured threshold
-        if (Time.now - result.created_at) < SimpleCov.merge_timeout
-          results << result
+      # Gets the resultset hash and re-creates all included instances
+      # of SimpleCov::Result from that.
+      # All results that are above the SimpleCov.merge_timeout will be
+      # dropped. Returns an array of SimpleCov::Result items.
+      def results
+        results = []
+        resultset.each do |command_name, data|
+          result = SimpleCov::Result.from_hash(command_name => data)
+          # Only add result if the timeout is above the configured threshold
+          if (Time.now - result.created_at) < SimpleCov.merge_timeout
+            results << result
+          end
         end
+        results
       end
-      results
-    end
 
-    #
-    # Gets all SimpleCov::Results from cache, merges them and produces a new
-    # SimpleCov::Result with merged coverage data and the command_name
-    # for the result consisting of a join on all source result's names
-    #
-    def merged_result
-      merged = {}
-      results.each do |result|
-        merged = result.original_result.merge_resultset(merged)
+      #
+      # Gets all SimpleCov::Results from cache, merges them and produces a new
+      # SimpleCov::Result with merged coverage data and the command_name
+      # for the result consisting of a join on all source result's names
+      #
+      def merged_result
+        merged = {}
+        results.each do |result|
+          merged = result.original_result.merge_resultset(merged)
+        end
+        result = SimpleCov::Result.new(merged)
+        # Specify the command name
+        result.command_name = results.map(&:command_name).sort.join(", ")
+        result
       end
-      result = SimpleCov::Result.new(merged)
-      # Specify the command name
-      result.command_name = results.map(&:command_name).sort.join(", ")
-      result
-    end
 
-    # Saves the given SimpleCov::Result in the resultset cache
-    def store_result(result)
-      File.open(resultset_writelock, "w+") do |f|
-        f.flock(File::LOCK_EX)
-        new_set = resultset
-        command_name, data = result.to_hash.first
-        new_set[command_name] = data
-        File.open(resultset_path, "w+") do |f_|
-          f_.puts SimpleCov::JSON.dump(new_set)
+      # Saves the given SimpleCov::Result in the resultset cache
+      def store_result(result)
+        File.open(resultset_writelock, "w+") do |f|
+          f.flock(File::LOCK_EX)
+          new_set = resultset
+          command_name, data = result.to_hash.first
+          new_set[command_name] = data
+          File.open(resultset_path, "w+") do |f_|
+            f_.puts JSON.pretty_generate(new_set)
+          end
         end
+        true
       end
-      true
     end
   end
 end

data/lib/simplecov/source_file.rb

@@ -25,26 +25,26 @@ module SimpleCov
       alias_method :number, :line_number
 
       def initialize(src, line_number, coverage)
-        raise ArgumentError, "Only String accepted for source" unless src.kind_of?(String)
-        raise ArgumentError, "Only Fixnum accepted for line_number" unless line_number.kind_of?(Fixnum)
-        raise ArgumentError, "Only Fixnum and nil accepted for coverage" unless coverage.kind_of?(Fixnum) or coverage.nil?
+        fail ArgumentError, "Only String accepted for source" unless src.is_a?(String)
+        fail ArgumentError, "Only Fixnum accepted for line_number" unless line_number.is_a?(Fixnum)
+        fail ArgumentError, "Only Fixnum and nil accepted for coverage" unless coverage.is_a?(Fixnum) || coverage.nil?
         @src, @line_number, @coverage = src, line_number, coverage
         @skipped = false
       end
 
       # Returns true if this is a line that should have been covered, but was not
       def missed?
-        not never? and not skipped? and coverage == 0
+        !never? && !skipped? && coverage.zero?
       end
 
       # Returns true if this is a line that has been covered
       def covered?
-        not never? and not skipped? and coverage > 0
+        !never? && !skipped? && coverage > 0
       end
 
       # Returns true if this line is not relevant for coverage
       def never?
-        not skipped? and coverage.nil?
+        !skipped? && coverage.nil?
       end
 
       # Flags this line as skipped
@@ -55,16 +55,16 @@ module SimpleCov
       # Returns true if this line was skipped, false otherwise. Lines are skipped if they are wrapped with
       # # :nocov: comment lines.
       def skipped?
-	      !!skipped
+        !!skipped
       end
 
       # The status of this line - either covered, missed, skipped or never. Useful i.e. for direct use
       # as a css class in report generation
       def status
-        return 'skipped' if skipped?
-        return 'never' if never?
-        return 'missed' if missed?
-        return 'covered' if covered?
+        return "skipped" if skipped?
+        return "never" if never?
+        return "missed" if missed?
+        return "covered" if covered?
       end
     end
 
@@ -78,7 +78,7 @@ module SimpleCov
 
     def initialize(filename, coverage)
       @filename, @coverage = filename, coverage
-      File.open(filename, "rb") {|f| @src = f.readlines }
+      File.open(filename, "rb") { |f| @src = f.readlines }
     end
 
     # Returns all source lines for this file as instances of SimpleCov::SourceFile::Line,
@@ -94,7 +94,7 @@ module SimpleCov
       # Initialize lines
       @lines = []
       src.each_with_index do |src, i|
-        @lines << SimpleCov::SourceFile::Line.new(src, i+1, coverage[i])
+        @lines << SimpleCov::SourceFile::Line.new(src, i + 1, coverage[i])
       end
       process_skipped_lines!
       @lines
@@ -103,14 +103,14 @@ module SimpleCov
 
     # Access SimpleCov::SourceFile::Line source lines by line number
     def line(number)
-      lines[number-1]
+      lines[number - 1]
     end
 
     # The coverage for this file in percent. 0 if the file has no relevant lines
     def covered_percent
-      return 100.0 if lines.length == 0 or lines.length == never_lines.count
+      return 100.0 if lines.length.zero? || lines.length == never_lines.count
       relevant_lines = lines.count - never_lines.count - skipped_lines.count
-      if relevant_lines == 0
+      if relevant_lines.zero?
         0.0
       else
         Float((covered_lines.count) * 100.0 / relevant_lines.to_f)
@@ -118,7 +118,7 @@ module SimpleCov
     end
 
     def covered_strength
-      return 0.0 if lines.length == 0 or lines.length == never_lines.count
+      return 0.0 if lines.length.zero? || lines.length == never_lines.count
 
       lines_strength = 0
       lines.each do |c|
@@ -127,7 +127,7 @@ module SimpleCov
 
       effective_lines_count = Float(lines.count - never_lines.count - skipped_lines.count)
 
-      if effective_lines_count == 0
+      if effective_lines_count.zero?
         0.0
       else
         strength = lines_strength / effective_lines_count
@@ -137,24 +137,24 @@ module SimpleCov
 
     # Returns all covered lines as SimpleCov::SourceFile::Line
     def covered_lines
-      @covered_lines ||= lines.select {|c| c.covered? }
+      @covered_lines ||= lines.select(&:covered?)
     end
 
     # Returns all lines that should have been, but were not covered
     # as instances of SimpleCov::SourceFile::Line
     def missed_lines
-      @missed_lines ||= lines.select {|c| c.missed? }
+      @missed_lines ||= lines.select(&:missed?)
     end
 
     # Returns all lines that are not relevant for coverage as
     # SimpleCov::SourceFile::Line instances
     def never_lines
-      @never_lines ||= lines.select {|c| c.never? }
+      @never_lines ||= lines.select(&:never?)
     end
 
     # Returns all lines that were skipped as SimpleCov::SourceFile::Line instances
     def skipped_lines
-      @skipped_lines ||= lines.select {|c| c.skipped? }
+      @skipped_lines ||= lines.select(&:skipped?)
     end
 
     # Returns the number of relevant lines (covered + missed)
@@ -175,7 +175,7 @@ module SimpleCov
       end
     end
 
-    private
+  private
 
     # ruby 1.9 could use Float#round(places) instead
     # @return [Float]
@@ -185,4 +185,3 @@ module SimpleCov
     end
   end
 end
-

data/lib/simplecov/version.rb

@@ -1,3 +1,22 @@
 module SimpleCov
-  VERSION = "0.9.2"
+  VERSION = "0.10.0"
+  def VERSION.to_a
+    split(".").map(&:to_i)
+  end
+
+  def VERSION.major
+    to_a[0]
+  end
+
+  def VERSION.minor
+    to_a[1]
+  end
+
+  def VERSION.patch
+    to_a[2]
+  end
+
+  def VERSION.pre
+    to_a[3]
+  end
 end

data/simplecov.gemspec

@@ -1,25 +1,27 @@
-# encoding: utf-8
-$:.push File.expand_path('../lib', __FILE__)
-require 'simplecov/version'
+$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+require "simplecov/version"
 
 Gem::Specification.new do |gem|
-  gem.name        = 'simplecov'
+  gem.name        = "simplecov"
   gem.version     = SimpleCov::VERSION
   gem.platform    = Gem::Platform::RUBY
   gem.authors     = ["Christoph Olszowka"]
-  gem.email       = ['christoph at olszowka de']
-  gem.homepage    = 'http://github.com/colszowka/simplecov'
-  gem.description = %Q{Code coverage for Ruby 1.9+ with a powerful configuration library and automatic merging of coverage across test suites}
+  gem.email       = ["christoph at olszowka de"]
+  gem.homepage    = "http://github.com/colszowka/simplecov"
+  gem.description = %(Code coverage for Ruby 1.9+ with a powerful configuration library and automatic merging of coverage across test suites)
   gem.summary     = gem.description
   gem.license     = "MIT"
 
   gem.required_ruby_version = ">= 1.8.7"
-  gem.add_dependency 'multi_json', '~> 1.0'
-  gem.add_dependency 'simplecov-html', '~> 0.9.0'
-  gem.add_dependency 'docile', '~> 1.1.0'
+
+  gem.add_dependency "json", "~> 1.8"
+  gem.add_dependency "simplecov-html", "~> 0.10.0"
+  gem.add_dependency "docile", "~> 1.1.0"
+
+  gem.add_development_dependency "bundler", "~> 1.9"
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.require_paths = ['lib']
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  gem.require_paths = ["lib"]
 end

data/test/faked_project/Gemfile

@@ -1,6 +1,6 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'simplecov', :path => '../../../'
-gem 'rake'
-gem 'rspec', '>= 2.6.0'
-gem 'cucumber'
+gem "simplecov", :path => "../../../"
+gem "rake"
+gem "rspec", ">= 2.6.0"
+gem "cucumber"

data/test/faked_project/Rakefile

@@ -1,8 +1,8 @@
-require 'bundler'
+require "bundler"
 
-require 'rake/testtask'
+require "rake/testtask"
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.test_files = FileList['test/**/*_test.rb'].sort
+  test.libs << "lib" << "test"
+  test.test_files = FileList["test/**/*_test.rb"].sort
   test.verbose = true
 end

data/test/faked_project/features/step_definitions/my_steps.rb

@@ -7,7 +7,7 @@ When /^I write my cukes for the fake project$/ do
 end
 
 Then /^I make all neccessary tests in a single step$/ do
-  expect(FakedProject.foo).to eq('bar')
+  expect(FakedProject.foo).to eq("bar")
 
   expect(FrameworkSpecific.cucumber).to eq("Only tested in Cucumber")
 
@@ -17,7 +17,6 @@ Then /^I make all neccessary tests in a single step$/ do
   expect(FakedProject.new.dynamic).to eq("A dynamically defined instance method")
 
   something = SomeClass.new("foo")
-  expect(something.reverse).to eq('oof')
-  expect(something.compare_with('foo')).to be true
+  expect(something.reverse).to eq("oof")
+  expect(something.compare_with("foo")).to be true
 end
-