examples/diff.git examples/diff.svn examples/test_git_diff.rb examples/test_svn_diff.rb nbproject/project.properties nbproject/project.xml @@ -17,19 +17,17 @@ things to improve, so contribution/patches are very welcome. to copy it to your project's dir to use it. * To use in Rails project: - require 'diff_to_html' - ... - converter = DiffToHtml.new - ... + require 'diff_to_html' + diff = `cat #{File.join(File.dirname(__FILE__), 'diff.svn')}` + converter = SvnDiffToHtml.new #there's also GitDiffToHtml + puts converter.composite_to_html(diff) * to use in any Ruby program: - require 'rubygems' - require 'diff_to_html' - ... - -(just like in test.rb) - + require 'rubygems' + require 'diff_to_html' + ... + == License diff_to_html is released under the MIT license. README.rdoc @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'diff_to_html' - s.version = '1.0.2' + s.version = '1.0.3' s.date = '2008-05-23' s.summary = "Unified diff to HTML converter" @@ -15,5 +15,5 @@ Gem::Specification.new do |s| s.rdoc_options << '--inline-source' << '--charset=UTF-8' s.extra_rdoc_files = ['README.rdoc'] - s.files = %w(lib/diff_to_html.rb examples/diff.css examples/test.rb examples/test.sh lib README.rdoc) + s.files = %w(lib/diff_to_html.rb examples/diff.css examples/diff.git examples/diff.svn examples/test_git_diff.rb examples/test_svn_diff.rb examples/test.rb examples/test.sh lib README.rdoc) end \ No newline at end of file diff_to_html.rb.gemspec @@ -1,68 +1,75 @@ -ul.diff { - padding:0; -} - -.diff table col.lineno { - width:4em; -} - -.diff h2, .diff h2 a { - color:#333333; - font-size:14px; - letter-spacing:normal; - margin:0pt auto; -} - -.diff h2 { - padding:0.1em 0pt 0.25em 0.5em; -} - -table.diff { - font-size : 9pt; - font-family : "lucida console", "courier new", monospace; - white-space : pre; - border : 1px solid #D7D7D7; - border-collapse : collapse; - line-height : 110%; - width: 100%; -} - -.diff tr { - background: white; -} - -.diff td { - border : none; - padding : 0px 10px; - margin : 0px; -} - -.diff td a { - text-decoration: none; -} - -tr.a { background : #ddffdd; } - -tr.r { background : #ffdddd; } - -tr.range { background : #EAF2F5; color : #999; } - -td.ln { - background : #ECECEC; - color : #aaa; - border-top:1px solid #999988; - border-bottom:1px solid #999988; - border-right:1px solid #D7D7D7; -} - -.diff li { - background:#F7F7F7 none repeat scroll 0%; - border:1px solid #D7D7D7; - list-style-type:none; - margin:0pt 0pt 2em; - padding:2px; -} - -.ln a { - color: #aaa; +body, p, ol, ul, td { + font-family:verdana,arial,helvetica,sans-serif; + font-size:13px; +} + +a, a:link, a:visited { +color:#507EC0; +text-decoration:none; +} + +ul.diff { + padding:0; +} + +.diff table col.lineno { + width:4em; +} + +.diff h2 { + color:#333333; + font-size:14px; + letter-spacing:normal; + margin:0pt auto; + padding:0.1em 0pt 0.25em 0.5em; +} + +table.diff { + font-size : 9pt; + font-family : "lucida console", "courier new", monospace; + white-space : pre; + border : 1px solid #D7D7D7; + border-collapse : collapse; + line-height : 110%; + width: 100%; +} + +.diff tr { + background: white; +} + +.diff td { + border : none; + padding : 0px 10px; + margin : 0px; +} + +.diff td a { + text-decoration: none; +} + +tr.a { background : #ddffdd; } + +tr.r { background : #ffdddd; } + +tr.range { background : #EAF2F5; color : #999; } + +td.ln { + background : #ECECEC; + color : #aaa; + border-top:1px solid #999988; + border-bottom:1px solid #999988; + border-right:1px solid #D7D7D7; +} + +.diff li { + background:#F7F7F7 none repeat scroll 0%; + border:1px solid #D7D7D7; + list-style-type:none; + margin:0pt 0pt 2em; + padding:2px; +} + +.ln a { + color: #aaa; } \ No newline at end of file examples/diff.css @@ -1,18 +1,94 @@ -require 'rubygems' -require 'diff_to_html' -#require '../lib/diff_to_html.rb' -diff = `svn diff -r 46:47 svn://hamptoncatlin.com/haml --diff-cmd diff -x "-U 2"` -#diff = `cat diff` -puts <<EOF -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> -<head> - <link type="text/css" rel="stylesheet" href="diff.css"> - <title>diff of HAML revision 47</title> -</head> -<body> -#{DiffToHtml.new.get_diff(diff)} -</body> -</html> -EOF \ No newline at end of file +def out(diff, converter, title) + puts <<-EOF + <?xml version="1.0" encoding="UTF-8"?> + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>#{title}</title> + <style type="text/css"> +  + </style> + </head> + <body> + #{converter.composite_to_html(diff)} + </body> + </html> + EOF +end examples/test.rb @@ -3,10 +3,6 @@ require 'cgi' class DiffToHtml attr_accessor :file_prefix - - # - # globals - # def ln_cell(ln, side = nil) anchor = "f#{@filenum}#{side}#{ln}" @@ -17,10 +13,10 @@ class DiffToHtml result += "</td>" result end + # # helper for building the next row in the diff # - def get_diff_row(left_ln, right_ln) result = [] if @left.length > 0 or @right.length > 0 @@ -56,10 +52,6 @@ class DiffToHtml return result.join("\n"), left_ln, right_ln end - # - # build the diff - # - def range_row(range) "<tr class='range'><td>...</td<td>...</td><td>#{range}</td></tr>" end @@ -72,16 +64,14 @@ class DiffToHtml end def begin_file(file) - @filenum ||=0 result = <<EOF -<li><h2><a name="F#{@filenum}" href="#F#{@filenum}">#{@file_prefix}#{file}</a></h2><table class='diff'> +<li><h2><a name="F#{@filenum}" href="#F#{@filenum}">#{file}</a></h2><table class='diff'> <colgroup> <col class="lineno"/> <col class="lineno"/> <col class="content"/> </colgroup> EOF - @filenum += 1 result end @@ -93,7 +83,7 @@ EOF return left_ln, right_ln end - def get_diff(diff_file) + def get_single_file_diff(file_name, diff_file) @last_op = ' ' @left = [] @right = [] @@ -102,61 +92,118 @@ EOF diff = diff_file.split("\n") - index = diff.shift - file = index[7..-1] - diff.shift #equals - header1 = diff.shift - if header1 =~ /^---/ - diff.shift + diff.shift #index + line = nil + while line !~ /^---/ && !diff.empty? + line = diff.shift + end + header_old = line + if line =~ /^---/ + diff.shift #+++ - result << "<ul class='diff'>#{begin_file(file)}" + result << begin_file(file_name) range = diff.shift left_ln, right_ln = range_info(range) result << range_row(range) - skip = 0 diff.each do |line| - if skip > 0 - skip -= 1 + op = line[0,1] + line = line[1..-1] || '' + if op == '\\' + line = op + line + op = ' ' + end + + if ((@last_op != ' ' and op == ' ') or (@last_op == ' ' and op != ' ')) + left_ln, right_ln = flush_changes(result, left_ln, right_ln) + end + + # truncate and escape + line = CGI.escapeHTML(line) + + case op + when ' ' + @left.push(line) + @right.push(line) + when '-' then @left.push(line) + when '+' then @right.push(line) + when '@' + range = '@' + line + flush_changes(result, left_ln, right_ln) + left_ln, right_ln = range_info(range) + result << range_row(range) else - op = line[0,1] - line = line[1..-1] - - if ((@last_op != ' ' and op == ' ') or (@last_op == ' ' and op != ' ')) - left_ln, right_ln = flush_changes(result, left_ln, right_ln) - end - - # truncate and escape - line = CGI.escapeHTML(line) - - case op - when ' ' - @left.push(line) - @right.push(line) - when '-' then @left.push(line) - when '+' then @right.push(line) - when '@' - range = '@' + line - flush_changes(result, left_ln, right_ln) - left_ln, right_ln = range_info(range) - result << range_row(range) - when 'I' - file = line[6..-1] - flush_changes(result, left_ln, right_ln) - result << "</table></li>#{begin_file(file)}" - skip = 3 - end - @last_op = op + flush_changes(result, left_ln, right_ln) + result << "</table></li>" + break end + @last_op = op end flush_changes(result, left_ln, right_ln) - result << "</table></li></ul>" + result << "</table></li>" else - result = "<div class='error'>#{header1}</div>" + #"<div class='error'>#{header_old}</div>" + result =%Q{<li><h2><a name="F#{@filenum}" href="#F#{@filenum}">#{file_name}</a></h2>#{header_old}</li>} end result end + def file_header_pattern + raise "Method to be implemented in VCS-specific class" + end + + def get_diffs(composite_diff) + pattern = file_header_pattern + files = composite_diff.split(pattern) + headers = composite_diff.scan(pattern) #huh can't find a way to get both at once + files.shift if files[0] == '' #first one is junk usually + result = [] + i = 0 + files.each do |file| + result << {:filename => "#{file_prefix}#{get_filename(headers[i])}", :file => file} + i += 1 + end + result + end + + def diffs_to_html(diffs) + result = '<ul class="diff">' + @filenum = 0 + diffs.each do |file_map| + result << get_single_file_diff(file_map[:filename], file_map[:file]) + @filenum += 1 + end + result << '</ul>' + result + end + + def composite_to_html(composite_diff) + diffs_to_html get_diffs(composite_diff) + end +end + +class GitDiffToHtml < DiffToHtml + def file_header_pattern + /^diff --git.+/ + end + + def get_filename(file_diff) + match = (file_diff =~ / b\/(.+)/) + raise "not matched!" if !match + $1 + end +end + +class SvnDiffToHtml < DiffToHtml + def file_header_pattern + /^Index: .+/ + end + + def get_filename(header) + match = (header =~ /^Index: (.+)/) #if we use this pattern file_header_pattern files split doesn't work + raise "header '#{header}' not matched!" if !match + $1 + end end lib/diff_to_html.rb 5aa681feb8eb31307aa1d35ffb60a9796cc0afd7 Artem Vasiliev artem.vasiliev@texunatech.com http://github.com/artemv/diff_to_html.rb/commit/29447ffd38671d59d88f423798111250cdf7378b 29447ffd38671d59d88f423798111250cdf7378b

2008-11-25T09:03:57-08:00

Some changes towards Git support 9715dfbb1881b8ec3b5bed1fc787a94449f87d48 Artem Vasiliev artem.vasiliev@texunatech.com