lib/daddy/cucumber/diff.rb in daddy-0.0.17 vs lib/daddy/cucumber/diff.rb in daddy-0.0.18
- old
+ new
@@ -8,11 +8,24 @@
git = Daddy::Git.new
a = File.read(local_file).gsub(/[<>]/, '<' => '<', '>' => '>')
b = git.show_previous(git_path, true).gsub(/[<>]/, '<' => '<', '>' => '>')
diff = Differ.diff(a, b)
+ diff_lines = diff.to_s.split("\n")
+ lines = []
+ puts diff_lines.size
+ diff_lines.each_with_index do |line, i|
+ if line.index('<ins ') and line.index('<del ')
+ split = line.split('<ins ')
+ lines << split[0]
+ lines << '<ins ' + split[1]
+ else
+ lines << line
+ end
+ end
+
puts local_file
- puts "<pre>#{diff}</pre>"
+ puts "<pre>#{lines.join("\n")}</pre>"
end
def show(file)
puts file
puts "<pre>#{File.read(file).gsub(/[<>]/, '<' => '<', '>' => '>')}</pre>"