From 9f4c7ab7553f9be7c9d14da0ba7462ad746c2f5d Mon Sep 17 00:00:00 2001 From: murphy Date: Mon, 10 Jul 2006 00:32:57 +0000 Subject: Big re-indenting - no more tabs! --- rake_helpers/ca.rb | 60 ++++---- rake_helpers/code_statistics.rb | 262 ++++++++++++++++----------------- rake_helpers/coderay_rdoc_template.rb | 6 +- rake_helpers/del_vim_orphans.rb | 60 ++++---- rake_helpers/ftp.rb | 42 +++--- rake_helpers/html_coderay_generator.rb | 34 ++--- 6 files changed, 232 insertions(+), 232 deletions(-) (limited to 'rake_helpers') diff --git a/rake_helpers/ca.rb b/rake_helpers/ca.rb index ccb5a4c..ba6fe1e 100644 --- a/rake_helpers/ca.rb +++ b/rake_helpers/ca.rb @@ -2,39 +2,39 @@ # Hy-Ca 0.2 by murphy module Hy - def self.ca str - str.gsub! %r-^(\s*)(?://)(.*)?-, '\1/*\2*/' - str.gsub! %r-\s*/\*.*?\*/\n?-m, '' - str.gsub!(/<<(.*?)>>/m) do - begin - eval $1 - '' - rescue Exception => boom - "<<\n#{boom}\n>>" - end - end - - str.gsub!(/\$([\w_]+)/m) do - begin - eval $1 - rescue - '' - end - end + def self.ca str + str.gsub! %r-^(\s*)(?://)(.*)?-, '\1/*\2*/' + str.gsub! %r-\s*/\*.*?\*/\n?-m, '' + str.gsub!(/<<(.*?)>>/m) do + begin + eval $1 + '' + rescue Exception => boom + "<<\n#{boom}\n>>" + end + end + + str.gsub!(/\$([\w_]+)/m) do + begin + eval $1 + rescue + '' + end + end - str - end + str + end end begin - if file = ENV['PATH_TRANSLATED'] - puts "Content-Type: text/css" - puts - ca = File.read file - else - ca = ARGF.read - end - print Hy.ca(ca) + if file = ENV['PATH_TRANSLATED'] + puts "Content-Type: text/css" + puts + ca = File.read file + else + ca = ARGF.read + end + print Hy.ca(ca) rescue => boom - p boom + p boom end if __FILE__ == $0 diff --git a/rake_helpers/code_statistics.rb b/rake_helpers/code_statistics.rb index b015403..09463bf 100644 --- a/rake_helpers/code_statistics.rb +++ b/rake_helpers/code_statistics.rb @@ -3,72 +3,72 @@ # Improved by murphy class CodeStatistics - TEST_TYPES = /\btest/i - - # Create a new Code Statistic. - # - # Rakefile Example: - # - # desc 'Report code statistics (LOC) from the application' - # task :stats => :copy_files do - # require 'rake_helpers/code_statistics' - # CodeStatistics.new( - # ["Main", "lib"], - # ["Tests", "test"], - # ["Demos", "demo"] - # ).to_s - # end - def initialize(*pairs) - @pairs = pairs - @statistics = calculate_statistics - @total = if pairs.empty? then nil else calculate_total end - end - - # Print a textual table viewing the stats - # - # Intended for console output. - def print - print_header - @pairs.each { |name, path| print_line name, @statistics[name] } - print_splitter - - if @total - print_line 'Total', @total - print_splitter - end - - print_code_test_stats - end + TEST_TYPES = /\btest/i + + # Create a new Code Statistic. + # + # Rakefile Example: + # + # desc 'Report code statistics (LOC) from the application' + # task :stats => :copy_files do + # require 'rake_helpers/code_statistics' + # CodeStatistics.new( + # ["Main", "lib"], + # ["Tests", "test"], + # ["Demos", "demo"] + # ).to_s + # end + def initialize(*pairs) + @pairs = pairs + @statistics = calculate_statistics + @total = if pairs.empty? then nil else calculate_total end + end + + # Print a textual table viewing the stats + # + # Intended for console output. + def print + print_header + @pairs.each { |name, path| print_line name, @statistics[name] } + print_splitter + + if @total + print_line 'Total', @total + print_splitter + end + + print_code_test_stats + end private - DEFAULT_FILE_PATTERN = /\.rb$/ + DEFAULT_FILE_PATTERN = /\.rb$/ - def calculate_statistics - @pairs.inject({}) do |stats, (name, path, pattern, is_ruby_code)| - pattern ||= DEFAULT_FILE_PATTERN - path = File.join path, '*.rb' - stats[name] = calculate_directory_statistics path, pattern, is_ruby_code - stats - end - end + def calculate_statistics + @pairs.inject({}) do |stats, (name, path, pattern, is_ruby_code)| + pattern ||= DEFAULT_FILE_PATTERN + path = File.join path, '*.rb' + stats[name] = calculate_directory_statistics path, pattern, is_ruby_code + stats + end + end - def calculate_directory_statistics directory, pattern = DEFAULT_FILE_PATTERN, is_ruby_code = true + def calculate_directory_statistics directory, pattern = DEFAULT_FILE_PATTERN, is_ruby_code = true is_ruby_code = true if is_ruby_code.nil? - stats = Hash.new 0 - - Dir[directory].each do |file_name| - p "Scanning #{file_name}..." if $DEBUG - next unless file_name =~ pattern - - lines = codelines = classes = modules = methods = 0 - empty_lines = comment_lines = 0 - in_comment_block = false - - File.readlines(file_name).each do |line| - lines += 1 - if line[/^\s*$/] - empty_lines += 1 + stats = Hash.new 0 + + Dir[directory].each do |file_name| + p "Scanning #{file_name}..." if $DEBUG + next unless file_name =~ pattern + + lines = codelines = classes = modules = methods = 0 + empty_lines = comment_lines = 0 + in_comment_block = false + + File.readlines(file_name).each do |line| + lines += 1 + if line[/^\s*$/] + empty_lines += 1 elsif is_ruby_code case line when /^=end\b/ @@ -85,83 +85,83 @@ private comment_lines += 1 when /^__END__$/ in_comment_block = true - end + end end - end + end - codelines = lines - comment_lines - empty_lines + codelines = lines - comment_lines - empty_lines - stats[:lines] += lines + stats[:lines] += lines stats[:comments] += comment_lines - stats[:codelines] += codelines - stats[:classes] += classes - stats[:modules] += modules - stats[:methods] += methods - stats[:files] += 1 - end - - stats - end - - def calculate_total - total = Hash.new 0 - @statistics.each_value { |pair| pair.each { |k, v| total[k] += v } } - total - end - - def calculate_code - code_loc = 0 - @statistics.each { |k, v| code_loc += v[:codelines] unless k[TEST_TYPES] } - code_loc - end - - def calculate_tests - test_loc = 0 - @statistics.each { |k, v| test_loc += v[:codelines] if k[TEST_TYPES] } - test_loc - end - - def print_header - print_splitter - puts "| T=Test Name | Files | Lines | LOC | Comments | Classes | Modules | Methods | M/C | LOC/M |" - print_splitter - end - - def print_splitter - puts "+---------------------------+-------+-------+-------+----------+---------+---------+---------+-----+-------+" - end - - def print_line name, statistics - m_over_c = (statistics[:methods] / (statistics[:classes] + statistics[:modules])) rescue m_over_c = 0 - loc_over_m = (statistics[:codelines] / statistics[:methods]) - 2 rescue loc_over_m = 0 - - if name[TEST_TYPES] - name = "T #{name}" - else - name = " #{name}" - end - - line = "| %-25s | %5d | %5d | %5d | %8d | %7d | %7d | %7d | %3d | %5d |" % ( - [name, *statistics.values_at(:files, :lines, :codelines, :comments, :classes, :modules, :methods)] + - [m_over_c, loc_over_m] ) - - puts line - end - - def print_code_test_stats - code = calculate_code - tests = calculate_tests - - puts " Code LOC = #{code} Test LOC = #{tests} Code:Test Ratio = [1 : #{sprintf("%.2f", tests.to_f/code)}]" - puts "" - end - + stats[:codelines] += codelines + stats[:classes] += classes + stats[:modules] += modules + stats[:methods] += methods + stats[:files] += 1 + end + + stats + end + + def calculate_total + total = Hash.new 0 + @statistics.each_value { |pair| pair.each { |k, v| total[k] += v } } + total + end + + def calculate_code + code_loc = 0 + @statistics.each { |k, v| code_loc += v[:codelines] unless k[TEST_TYPES] } + code_loc + end + + def calculate_tests + test_loc = 0 + @statistics.each { |k, v| test_loc += v[:codelines] if k[TEST_TYPES] } + test_loc + end + + def print_header + print_splitter + puts "| T=Test Name | Files | Lines | LOC | Comments | Classes | Modules | Methods | M/C | LOC/M |" + print_splitter + end + + def print_splitter + puts "+---------------------------+-------+-------+-------+----------+---------+---------+---------+-----+-------+" + end + + def print_line name, statistics + m_over_c = (statistics[:methods] / (statistics[:classes] + statistics[:modules])) rescue m_over_c = 0 + loc_over_m = (statistics[:codelines] / statistics[:methods]) - 2 rescue loc_over_m = 0 + + if name[TEST_TYPES] + name = "T #{name}" + else + name = " #{name}" + end + + line = "| %-25s | %5d | %5d | %5d | %8d | %7d | %7d | %7d | %3d | %5d |" % ( + [name, *statistics.values_at(:files, :lines, :codelines, :comments, :classes, :modules, :methods)] + + [m_over_c, loc_over_m] ) + + puts line + end + + def print_code_test_stats + code = calculate_code + tests = calculate_tests + + puts " Code LOC = #{code} Test LOC = #{tests} Code:Test Ratio = [1 : #{sprintf("%.2f", tests.to_f/code)}]" + puts "" + end + end # Run a test script. if $0 == __FILE__ - $VERBOSE = true - CodeStatistics.new( - ['This dir', File.dirname(__FILE__)] - ).print + $VERBOSE = true + CodeStatistics.new( + ['This dir', File.dirname(__FILE__)] + ).print end diff --git a/rake_helpers/coderay_rdoc_template.rb b/rake_helpers/coderay_rdoc_template.rb index 479df81..f37f89b 100644 --- a/rake_helpers/coderay_rdoc_template.rb +++ b/rake_helpers/coderay_rdoc_template.rb @@ -8,7 +8,7 @@ require 'rake_helpers/ca.rb' Hy.ca <> CA @@ -560,7 +560,7 @@ FILE_INDEX = XHTML_PREAMBLE + < File.mtime(file) - 'changed' - else - 'deprecated' - end - deprecated = (status == 'deprecated' or ARGV.include? '-A') + file = File.join(File.dirname(sw), File.basename(sw)[/^.(.*).sw.$/, 1]) - size = File.size(sw).to_f / 1024 - $saveable += size if deprecated + status = + if not File.exist? file + 'MISSING!' + elsif File.mtime(sw) > File.mtime(file) + 'changed' + else + 'deprecated' + end + deprecated = (status == 'deprecated' or ARGV.include? '-A') - action = - if ARGV.include? '-D' - if deprecated - begin - File.delete sw - rescue => boom - boom.class.name - else - 'delete' - end - end - else - '' - end - - puts " %-13s [%3.0f KB] %-60s %-13s" % [ - status, size, file, action] + size = File.size(sw).to_f / 1024 + $saveable += size if deprecated + + action = + if ARGV.include? '-D' + if deprecated + begin + File.delete sw + rescue => boom + boom.class.name + else + 'delete' + end + end + else + '' + end + + puts " %-13s [%3.0f KB] %-60s %-13s" % [ + status, size, file, action] end puts diff --git a/rake_helpers/ftp.rb b/rake_helpers/ftp.rb index c66f765..1127c71 100644 --- a/rake_helpers/ftp.rb +++ b/rake_helpers/ftp.rb @@ -11,37 +11,37 @@ def prepare_ftp end def cYcnus_ftp - prepare_ftp unless $password - Net::FTP.open(FTP_DOMAIN) do |ftp| - g "login for #$username..." - ftp.login $username, $password - gn 'logged in.' - yield ftp - end + prepare_ftp unless $password + Net::FTP.open(FTP_DOMAIN) do |ftp| + g "login for #$username..." + ftp.login $username, $password + gn 'logged in.' + yield ftp + end end def uploader_for ftp - proc do |l, *r| - r = r.first || l - raise 'File %s not found!' % l unless File.exist? l - if l == r - g 'Uploading %s...' % [l] - else - g 'Uploading %s to %s...' % [l, r] - end - ftp.putbinaryfile l, r - gd - end + proc do |l, *r| + r = r.first || l + raise 'File %s not found!' % l unless File.exist? l + if l == r + g 'Uploading %s...' % [l] + else + g 'Uploading %s to %s...' % [l, r] + end + ftp.putbinaryfile l, r + gd + end end def g msg - $stderr.print msg + $stderr.print msg end def gn msg = '' - $stderr.puts msg + $stderr.puts msg end def gd - gn 'done.' + gn 'done.' end diff --git a/rake_helpers/html_coderay_generator.rb b/rake_helpers/html_coderay_generator.rb index 4f872e3..4216865 100644 --- a/rake_helpers/html_coderay_generator.rb +++ b/rake_helpers/html_coderay_generator.rb @@ -325,7 +325,7 @@ module Generators meths = @methods.sort res = [] meths.each do |meth| - res << { + res << { "name" => CGI.escapeHTML(meth.name), "aref" => "#{path_prefix}\##{meth.aref}" } @@ -713,19 +713,19 @@ module Generators parent_class = @context.superclass if parent_class - @values["parent"] = CGI.escapeHTML(parent_class) + @values["parent"] = CGI.escapeHTML(parent_class) - if parent_name - lookup = parent_name + "::" + parent_class - else - lookup = parent_class - end + if parent_name + lookup = parent_name + "::" + parent_class + else + lookup = parent_class + end - parent_url = AllReferences[lookup] || AllReferences[parent_class] + parent_url = AllReferences[lookup] || AllReferences[parent_class] - if parent_url and parent_url.document_self - @values["par_url"] = aref_to(parent_url.path) - end + if parent_url and parent_url.document_self + @values["par_url"] = aref_to(parent_url.path) + end end files = [] @@ -963,9 +963,9 @@ module Generators def path if @options.all_one_file - aref + aref else - @html_class.path + "#" + aref + @html_class.path + "#" + aref end end @@ -1087,9 +1087,9 @@ module Generators def markup_code(tokens) code = tokens.map { |t| t.text }.join options = { - :css => :class, - :line_numbers_start => code[/\A.*?, line (\d+)/,1].to_i - 1, - :bold_every => :no_bolding, + :css => :class, + :line_numbers_start => code[/\A.*?, line (\d+)/,1].to_i - 1, + :bold_every => :no_bolding, } options[:line_numbers] = nil unless Options.instance.include_line_numbers out = CodeRay.scan(code, :ruby).div(options) @@ -1134,7 +1134,7 @@ module Generators end ##################################################################### - + class HTMLGenerator include MarkUp -- cgit v1.2.1