simplecov-json 0.1.1 → 0.2

data/lib/simplecov-json.rb

@@ -2,48 +2,57 @@ require 'simplecov'
 require 'json'
 
 class SimpleCov::Formatter::JSONFormatter
+  
   def format(result)
-    puts result.inspect
     data = {}
     data[:timestamp] = result.created_at.to_i
     data[:command_name] = result.command_name
     data[:files] = []
-    result.original_result.each do |filename,coverage| 
-      next unless result.filenames.include? filename
+    result.files.each do |sourceFile|
+      next unless result.filenames.include? sourceFile.filename
       data[:files] << {
-        filename: filename,
-        coverage: coverage,
+        filename: sourceFile.filename,
+        covered_percent: sourceFile.covered_percent,
+        coverage: sourceFile.coverage,
+        covered_strength: sourceFile.covered_strength.nan? ? 0.0 : sourceFile.covered_strength, 
+        covered_lines: sourceFile.covered_lines.count, 
+        lines_of_code: sourceFile.lines_of_code, 
       }
     end
-    data[:groups] = result.groups
     data[:metrics] = {
       covered_percent: result.covered_percent,
-      covered_strength: result.covered_strength,
+      covered_strength: result.covered_strength.nan? ? 0.0 : result.covered_strength,
       covered_lines: result.covered_lines,
-      total_lines: result.total_lines,
+      total_lines: result.total_lines
     }
-    File.open(File.join(output_path, output_filename), "w+") do |file|
-      file.puts data.to_json
+    
+    json = data.to_json
+    
+    File.open(output_filepath, "w+") do |file|
+      file.puts json
     end
+    
     puts output_message(result)
-    data.to_json
+    
+    json
   end
-
+  
   def output_filename
     'coverage.json'
   end
-
+  
   def output_filepath
     File.join(output_path, output_filename)
   end
-
+  
   def output_message(result)
     "Coverage report generated for #{result.command_name} to #{output_filepath}. #{result.covered_lines} / #{result.total_lines} LOC (#{result.covered_percent.round(2)}%) covered."
   end
-
-  private 
+  
+private
   
   def output_path
     SimpleCov.coverage_path
   end
+  
 end

data/test/helper.rb

@@ -4,7 +4,7 @@ require 'simplecov'
 require 'simplecov-json'
 
 require 'test/unit'
-require 'mocha'
+require 'mocha/setup'
 
 class Test::Unit::TestCase
 end

data/test/test_simplecov_json.rb

@@ -4,21 +4,36 @@ class TestSimpleCovHtml < Test::Unit::TestCase
   def test_format
     formatter = SimpleCov::Formatter::JSONFormatter.new
     result = mock()
+    foo = mock()
+    bar = mock()
     created_at = DateTime.now.to_s
-    
     result.expects(:created_at).returns(created_at)
     result.expects(:command_name).returns('RSpec')
-    result.expects(:original_result).returns({
-      '/lib/foo.rb' => [1, nil, 0, 0, nil, 1, nil],
-      '/lib/bar.rb' => [nil, 1, nil, 1, 1, 1, 0, 0, nil, 1, nil],
-      '/test/test.rb' => [nil, 1, 1, 1, 1]
-    })
-    result.expects(:filenames).returns(['/lib/foo.rb', '/lib/bar.rb'])
-    result.expects(:filenames).returns(['/lib/foo.rb', '/lib/bar.rb'])
-    result.expects(:filenames).returns(['/lib/foo.rb', '/lib/bar.rb'])
-    result.expects(:groups).returns(['controllers', 'models'])
+    
+    fooLineList = mock()
+    fooLineList.expects(:count).returns(2)
+
+    barLineList = mock()
+    barLineList.expects(:count).returns(5)
+
+    foo.expects(:filename).twice.returns('/lib/foo.rb')
+    foo.expects(:covered_percent).returns(50.0)
+    foo.expects(:coverage).returns([1, nil, 0, 0, nil, 1, nil])
+    foo.expects(:covered_strength).twice.returns(0.50)
+    foo.expects(:covered_lines).returns(fooLineList)
+    foo.expects(:lines_of_code).returns(4)
+    
+    bar.expects(:filename).twice.returns('/lib/bar.rb')
+    bar.expects(:covered_percent).returns(71.42)
+    bar.expects(:coverage).returns([nil, 1, nil, 1, 1, 1, 0, 0, nil, 1, nil])
+    bar.expects(:covered_strength).twice.returns(0.71)
+    bar.expects(:covered_lines).returns(barLineList)
+    bar.expects(:lines_of_code).returns(7)
+
+    result.expects(:files).returns([foo, bar])
+    result.expects(:filenames).twice.returns(['/lib/foo.rb', '/lib/bar.rb'])
     result.expects(:covered_percent).returns(73.33)
-    result.expects(:covered_strength).returns(0.87)
+    result.expects(:covered_strength).twice.returns(0.87)
     result.expects(:covered_lines).returns(11)
     result.expects(:total_lines).returns(15)
 
@@ -27,14 +42,32 @@ class TestSimpleCovHtml < Test::Unit::TestCase
     result.expects(:total_lines).returns(15)
     result.expects(:covered_percent).returns(73.33)
 
+
+    # filename
+    # covered_percent
+    # coverage
+    # covered_strength
+    # covered_lines
+    # lines_of_code
     assert_equal(formatter.format(result), {
       'timestamp' => created_at.to_i, 
       'command_name' => 'RSpec', 
       'files' => [
-        {'filename' => '/lib/foo.rb', 'coverage' => [1, nil, 0, 0, nil, 1, nil]},
-        {'filename' => '/lib/bar.rb', 'coverage' => [nil, 1, nil, 1, 1, 1, 0, 0, nil, 1, nil]},
+        {'filename' => '/lib/foo.rb',
+          'covered_percent' => 50.0,
+          'coverage' => [1, nil, 0, 0, nil, 1, nil],
+          'covered_strength' => 0.50,
+          'covered_lines' => 2,
+          'lines_of_code' => 4
+        },
+        {'filename' => '/lib/bar.rb',
+          'covered_percent' => 71.42,
+          'coverage' => [nil, 1, nil, 1, 1, 1, 0, 0, nil, 1, nil],
+          'covered_strength' => 0.71,
+          'covered_lines' => 5,
+          'lines_of_code' => 7
+        },
       ],
-      'groups' =>['controllers', 'models'],
       'metrics' => {
         'covered_percent' => 73.33,
         'covered_strength' => 0.87,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplecov-json
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &18020520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18020520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &18019880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,28 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18019880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: JSON formatter for SimpleCov code coverage tool for ruby 1.9+
 email:
 - villosil@gmail.com
@@ -55,15 +81,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 884864916759468203
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 884864916759468203
 requirements: []
 rubyforge_project: simplecov-json
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: JSON formatter for SimpleCov code coverage tool for ruby 1.9+