From 59f23bd421656f8d754e43be6a62824d0b9824ac Mon Sep 17 00:00:00 2001 From: mame Date: Thu, 24 Jul 2008 17:47:34 +0000 Subject: * sample/coverage.rb: move from lib/coverage.rb because this remains in an early phase of development. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18200 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/coverage.rb | 58 ---------------------------------------------------- sample/coverage.rb | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 58 deletions(-) delete mode 100644 lib/coverage.rb create mode 100644 sample/coverage.rb diff --git a/ChangeLog b/ChangeLog index 8361a6250c..eefabb32f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jul 25 02:43:11 2008 Yusuke Endoh + + * sample/coverage.rb: move from lib/coverage.rb because this remains in + an early phase of development. + Fri Jul 25 00:10:23 2008 Nobuyoshi Nakada * file.c (rb_find_file_ext, rb_find_file): converts Windows style path diff --git a/lib/coverage.rb b/lib/coverage.rb deleted file mode 100644 index 1a405355ff..0000000000 --- a/lib/coverage.rb +++ /dev/null @@ -1,58 +0,0 @@ -require "coverage.so" - -ext = ENV["COVERUBY_EXT"] || ".cov" -accum = ENV["COVERUBY_ACCUM"] -accum = !accum || accum == "" || !(%w(f n 0).include?(accum[0])) -pwd = Dir.pwd - -at_exit do - Dir.chdir(pwd) do - Coverage.result.each do |sfile, covs| - cfile = sfile + ext - - writable = proc do |f| - File.writable?(f) || File.writable?(File.dirname(f)) - end - unless writable[cfile] - cfile = cfile.gsub(File.PATH_SEPARATOR, "#") - next unless writable[cfile] - end - - readlines = proc do |f| - File.read(f).force_encoding("ASCII-8BIT").lines.to_a - end - - sources = (readlines[sfile] rescue []) - - pcovs = [] - if accum - pcovs = (readlines[cfile] rescue []).map.with_index do |line, idx| - if line[/^\s*(?:(#####)|(\d+)|-):\s*\d+:(.*)$/n] - cov, line = $1 ? 0 : ($2 ? $2.to_i : nil), $3 - if !sources[idx] || sources[idx].chomp != line.chomp - warn("source file changed, ignoring: `#{ cfile }'") - break [] - end - cov - else - p line - warn("coverage file corrupted, ignoring: #{ cfile }") - break [] - end - end - unless pcovs.empty? || pcovs.size == covs.size - warn("coverage file changed, ignoring: `#{ cfile }'") - pcovs = [] - end - end - - open(cfile, "w") do |out| - covs.zip(sources, pcovs).each_with_index do |(cov, line, pcov), idx| - cov += pcov || 0 if cov - cov = (cov ? (cov == 0 ? "#####" : cov.to_s) : "-").rjust(9) - out.puts("%s:% 5d:%s" % [cov, idx + 1, line]) - end - end - end - end -end diff --git a/sample/coverage.rb b/sample/coverage.rb new file mode 100644 index 0000000000..3f45e9fc98 --- /dev/null +++ b/sample/coverage.rb @@ -0,0 +1,60 @@ +require "coverage.so" + +Coverage.start + +ext = ENV["COVERUBY_EXT"] || ".cov" +accum = ENV["COVERUBY_ACCUM"] +accum = !accum || accum == "" || !(%w(f n 0).include?(accum[0])) +pwd = Dir.pwd + +at_exit do + Dir.chdir(pwd) do + Coverage.result.each do |sfile, covs| + cfile = sfile + ext + + writable = proc do |f| + File.writable?(f) || File.writable?(File.dirname(f)) + end + unless writable[cfile] + cfile = cfile.gsub(File.PATH_SEPARATOR, "#") + next unless writable[cfile] + end + + readlines = proc do |f| + File.read(f).force_encoding("ASCII-8BIT").lines.to_a + end + + sources = (readlines[sfile] rescue []) + + pcovs = [] + if accum + pcovs = (readlines[cfile] rescue []).map.with_index do |line, idx| + if line[/^\s*(?:(#####)|(\d+)|-):\s*\d+:(.*)$/n] + cov, line = $1 ? 0 : ($2 ? $2.to_i : nil), $3 + if !sources[idx] || sources[idx].chomp != line.chomp + warn("source file changed, ignoring: `#{ cfile }'") + break [] + end + cov + else + p line + warn("coverage file corrupted, ignoring: #{ cfile }") + break [] + end + end + unless pcovs.empty? || pcovs.size == covs.size + warn("coverage file changed, ignoring: `#{ cfile }'") + pcovs = [] + end + end + + open(cfile, "w") do |out| + covs.zip(sources, pcovs).each_with_index do |(cov, line, pcov), idx| + cov += pcov || 0 if cov + cov = (cov ? (cov == 0 ? "#####" : cov.to_s) : "-").rjust(9) + out.puts("%s:% 5d:%s" % [cov, idx + 1, line]) + end + end + end + end +end -- cgit v1.2.3