@@ -30,6 +30,7 @@ options.textmode = false options.skip = Rcov::BaseFormatter::DEFAULT_OPTS[:ignore] options.include = [] options.html = true +options.css = nil options.comments_run_by_default = false options.test_unit_only = false options.spec_only = false @@ -215,6 +216,10 @@ EOF options.html = val end + opts.on("--css relative/path/to/custom.css", "Use a custom CSS file for HTML output.", "Specified as a relative path.") do |val| + options.css = val + end + opts.on("--sort CRITERION", [:name, :loc, :coverage], "Sort files in the output by the specified", "field (name, loc, coverage)") do |criterion| options.sort = criterion end @@ -377,6 +382,7 @@ make_formatter = lambda do |klass| :comments_run_by_default => options.comments_run_by_default, :gcc_output => options.gcc_output, :charset => options.charset, + :css => options.css, :failure_threshold => options.failure_threshold ) end bin/rcov @@ -10,6 +10,7 @@ module Rcov options = DEFAULT_OPTS.clone.update(opts) super(options) @dest = options[:destdir] + @css = options[:css] @color = options[:color] @fsr = options[:fsr] @do_callsites = options[:callsites] @@ -28,6 +29,16 @@ module Rcov FileUtils.cp(_src, File.join(@dest, "#{_file}")) end + # Copy custom CSS, if any + if @css + begin + _src = File.expand_path("#{@dest}/../#{@css}") + FileUtils.cp(_src, File.join(@dest, "custom.css")) + rescue + @css = nil + end + end + create_index(File.join(@dest, "index.html")) each_file_pair_sorted do |filename, fileinfo| @@ -76,6 +87,7 @@ module Rcov doc = Rcov::Formatters::HtmlErbTemplate.new('index.html.erb', :project_name => project_name, :generated_on => Time.now, + :css => @css, :rcov => Rcov, :formatter => self, :output_threshold => @output_threshold, @@ -89,6 +101,7 @@ module Rcov doc = Rcov::Formatters::HtmlErbTemplate.new('detail.html.erb', :project_name => project_name, :page_title => fileinfo.name, + :css => @css, :generated_on => Time.now, :rcov => Rcov, :formatter => self, lib/rcov/formatters/html_coverage.rb @@ -4,6 +4,7 @@ <title><%= page_title %></title> <link href="screen.css" media="all" rel="stylesheet" type="text/css" /> <link href="print.css" media="print" rel="stylesheet" type="text/css" /> + <% if css %><link href="custom.css" media="all" rel="stylesheet" type="text/css" /><% end %> <meta http-equiv="Content-type" content="text/html;charset=UTF-8" /> <script type="text/javascript" src="rcov.js"></script> </head> lib/rcov/templates/detail.html.erb @@ -5,6 +5,7 @@ <title><%= "#{project_name} C0 Coverage Information - RCov" %></title> <link href="screen.css" media="all" rel="stylesheet" type="text/css" /> <link href="print.css" media="print" rel="stylesheet" type="text/css" /> + <% if css %><link href="custom.css" media="all" rel="stylesheet" type="text/css" /><% end %> <script type="text/javascript" src="jquery-1.3.2.min.js"></script> <script type="text/javascript" src="jquery.tablesorter.min.js"></script> <script type="text/javascript" src="rcov.js"></script> lib/rcov/templates/index.html.erb 512b8a15e60dba555170b95218de70284b6dfac2 Corey corey@seologic.com http://github.com/relevance/rcov/commit/3f399ef8edbfdac8ecb2f4b8f970aad49028f301 3f399ef8edbfdac8ecb2f4b8f970aad49028f301 2009-08-23T20:59:18-07:00 2009-08-23T20:59:18-07:00 Support for new command-line option --css which allows user to specify a custom CSS file to use for HTML output. f4354b1c676ba70ae85bc8682e20895b22b18cb3 Corey corey@seologic.com