Add improvement when 2 revisions explicitly specified

Author: bogdan

Diff for: lib/diffbench.rb

@@ -76,10 +76,9 @@ def print_results(results)
         results.each do |revision, benchmark|
           output "#{revision}: #{benchmark[test].format}"
         end
-        #TODO set improvement
-        #improvement = improvement_percentage(before_patch, after_patch)
-        #color_string = result_color(improvement)
-        #output self.class.color("Improvement: #{improvement}%", color_string).strip
+        if results.size == 2
+          output_improvement(*results.values.map {|b| b[test]})
+        end
         output ""
       end
     end
@@ -117,15 +116,19 @@ def run_current_head
         output(("-" * (caption.size - test.size)) + test)
         before_patch = second_run[test]
         after_patch = first_run[test]
-        improvement = improvement_percentage(before_patch, after_patch)
-        color_string = result_color(improvement)
         output "After patch:  #{after_patch.format}"
         output "Before patch: #{before_patch.format}"
-        output self.class.color("Improvement: #{improvement}%", color_string).strip
+        output_improvement(before_patch, after_patch)
         output ""
       end
     end
 
+    def output_improvement(before, after)
+      improvement = improvement_percentage(before, after)
+      color_string = result_color(improvement)
+      output self.class.color("Improvement: #{improvement}%", color_string).strip
+    end
+
     def improvement_percentage(before_patch, after_patch)
       (((before_patch.real - after_patch.real).to_f / before_patch.real) * 100).round
     end

Diff for: spec/diffbench_spec.rb

@@ -7,6 +7,10 @@ def to_regexp(output)
     Regexp.compile(Regexp.escape(output).gsub("NUM", "[0-9]+")) 
   end
 
+  def improvement_expression
+    DiffBench::Runner.color("Improvement: NUM%", :green)
+  end
+
   let(:repo) do
     "#{File.dirname(__FILE__)}/repo"
   end
@@ -44,14 +48,14 @@ def to_regexp(output)
 
                     user     system      total        real
 --------------------------------------------------Sleeper 1
-After patch:    0.000000   0.000000   0.000000 (  0.100NUM)
-Before patch:   0.000000   0.000000   0.000000 (  0.200NUM)
-#{DiffBench::Runner.color("Improvement: 50%", :green)}
+After patch:    0.000000   0.000000   0.000000 (  0.10NUM)
+Before patch:   0.000000   0.000000   0.000000 (  0.20NUM)
+#{improvement_expression}
 
 --------------------------------------------------Sleeper 2
-After patch:    0.000000   0.000000   0.000000 (  0.100NUM)
-Before patch:   0.000000   0.000000   0.000000 (  0.200NUM)
-#{DiffBench::Runner.color("Improvement: 50%", :green)}
+After patch:    0.000000   0.000000   0.000000 (  0.10NUM)
+Before patch:   0.000000   0.000000   0.000000 (  0.20NUM)
+#{improvement_expression}
 OUT
     end
 
@@ -81,19 +85,19 @@ def to_regexp(output)
 
                     user     system      total        real
 --------------------------------------------------Sleeper 1
-After patch:    0.000000   0.000000   0.000000 (  0.100NUM)
-Before patch:   0.000000   0.000000   0.000000 (  0.200NUM)
-#{DiffBench::Runner.color("Improvement: 50%", :green)}
+After patch:    0.000000   0.000000   0.000000 (  0.10NUM)
+Before patch:   0.000000   0.000000   0.000000 (  0.20NUM)
+#{improvement_expression}
 
 --------------------------------------------------Sleeper 2
-After patch:    0.000000   0.000000   0.000000 (  0.100NUM)
-Before patch:   0.000000   0.000000   0.000000 (  0.200NUM)
-#{DiffBench::Runner.color("Improvement: 50%", :green)}
+After patch:    0.000000   0.000000   0.000000 (  0.10NUM)
+Before patch:   0.000000   0.000000   0.000000 (  0.20NUM)
+#{improvement_expression}
 OUT
       end
 
       it "should run benchmark for specified revisions" do
-        revs = `cd #{repo};git log --pretty="%h"`.split("\n")
+        revs = `cd #{repo};git log --pretty="%h"`.split("\n").reverse
         output = `cd #{repo}; ./../../bin/diffbench -r #{revs.join(",")} bench.rb`
         output.should =~ to_regexp(<<-OUT)
 Checkout to #{revs.first}
@@ -108,12 +112,14 @@ def to_regexp(output)
 
                     user     system      total        real
 --------------------------------------------------Sleeper 1
-#{revs.first}:   0.000000   0.000000   0.000000 (  0.100NUM)
-#{revs.last }:   0.000000   0.000000   0.000000 (  0.200NUM)
+#{revs.first}:   0.000000   0.000000   0.000000 (  0.10NUM)
+#{revs.last }:   0.000000   0.000000   0.000000 (  0.20NUM)
+#{improvement_expression}
 
 --------------------------------------------------Sleeper 2
-#{revs.first}:   0.000000   0.000000   0.000000 (  0.100NUM)
-#{revs.last }:   0.000000   0.000000   0.000000 (  0.200NUM)
+#{revs.first}:   0.000000   0.000000   0.000000 (  0.10NUM)
+#{revs.last }:   0.000000   0.000000   0.000000 (  0.20NUM)
+#{improvement_expression}
 OUT
       end
     end