Compare commits

..

No commits in common. "master" and "v0.2" have entirely different histories.
master ... v0.2

5 changed files with 7 additions and 13 deletions

View File

@ -4,5 +4,4 @@ gemspec
group :development do group :development do
gem "mocha", "~> 0.14", :require => false gem "mocha", "~> 0.14", :require => false
gem 'test-unit', '~> 3.3', :require => false
end end

View File

@ -1,5 +1,3 @@
MIT License
Copyright (c) 2012 Vicent Llongo Silla Copyright (c) 2012 Vicent Llongo Silla
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining

View File

@ -10,14 +10,10 @@ class SimpleCov::Formatter::JSONFormatter
data[:files] = [] data[:files] = []
result.files.each do |sourceFile| result.files.each do |sourceFile|
next unless result.filenames.include? sourceFile.filename next unless result.filenames.include? sourceFile.filename
# Compatible with older versions of simplecov.
coverage_data = (defined? sourceFile.coverage) ? sourceFile.coverage : sourceFile.coverage_data
data[:files] << { data[:files] << {
filename: sourceFile.filename, filename: sourceFile.filename,
covered_percent: sourceFile.covered_percent, covered_percent: sourceFile.covered_percent,
coverage: coverage_data, coverage: sourceFile.coverage,
covered_strength: sourceFile.covered_strength.nan? ? 0.0 : sourceFile.covered_strength, covered_strength: sourceFile.covered_strength.nan? ? 0.0 : sourceFile.covered_strength,
covered_lines: sourceFile.covered_lines.count, covered_lines: sourceFile.covered_lines.count,
lines_of_code: sourceFile.lines_of_code, lines_of_code: sourceFile.lines_of_code,

View File

@ -3,8 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = "simplecov-json" s.name = "simplecov-json"
s.version = '0.2.3' s.version = '0.2'
s.licenses = ['MIT']
s.platform = Gem::Platform::RUBY s.platform = Gem::Platform::RUBY
s.authors = ["Vicent Llongo"] s.authors = ["Vicent Llongo"]
s.email = ["villosil@gmail.com"] s.email = ["villosil@gmail.com"]
@ -16,7 +15,9 @@ Gem::Specification.new do |s|
s.files = ['lib/simplecov-json.rb'] s.files = ['lib/simplecov-json.rb']
s.test_files = ['test/helper.rb', 'test/test_simplecov_json.rb'] s.test_files = ['test/helper.rb', 'test/test_simplecov_json.rb']
s.require_paths = ["lib"] s.require_paths = ["lib"]
s.add_dependency "simplecov" s.add_dependency "simplecov"
s.add_dependency "json"
s.add_development_dependency "rake" s.add_development_dependency "rake"
end end

View File

@ -18,14 +18,14 @@ class TestSimpleCovHtml < Test::Unit::TestCase
foo.expects(:filename).twice.returns('/lib/foo.rb') foo.expects(:filename).twice.returns('/lib/foo.rb')
foo.expects(:covered_percent).returns(50.0) foo.expects(:covered_percent).returns(50.0)
foo.expects(:coverage_data).returns([1, nil, 0, 0, nil, 1, nil]) foo.expects(:coverage).returns([1, nil, 0, 0, nil, 1, nil])
foo.expects(:covered_strength).twice.returns(0.50) foo.expects(:covered_strength).twice.returns(0.50)
foo.expects(:covered_lines).returns(fooLineList) foo.expects(:covered_lines).returns(fooLineList)
foo.expects(:lines_of_code).returns(4) foo.expects(:lines_of_code).returns(4)
bar.expects(:filename).twice.returns('/lib/bar.rb') bar.expects(:filename).twice.returns('/lib/bar.rb')
bar.expects(:covered_percent).returns(71.42) bar.expects(:covered_percent).returns(71.42)
bar.expects(:coverage_data).returns([nil, 1, nil, 1, 1, 1, 0, 0, nil, 1, nil]) 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_strength).twice.returns(0.71)
bar.expects(:covered_lines).returns(barLineList) bar.expects(:covered_lines).returns(barLineList)
bar.expects(:lines_of_code).returns(7) bar.expects(:lines_of_code).returns(7)