diffbench 0.2.1 → 0.3.0

data/Gemfile

@@ -2,8 +2,8 @@ source "http://rubygems.org"
 
 gem "git"
 group :development do
-  gem "rspec", "~> 2.8.0"
-  gem "bundler", "~> 1.1.0"
+  gem "rspec"
+  gem "bundler"
   gem "jeweler", "~> 1.8.3"
-  gem "debugger"
+  gem "debugger", :platform => "ruby_19"
 end

data/README.md

@@ -1,6 +1,6 @@
 # Diffbench
 
-Diffbench is a tool I end up during many performance patches to:
+Diffbench is a tool I made during many performance patches to:
 
 * Rails
   * ActiveRecord - [#5467](https://github.com/rails/rails/pull/5467)
@@ -79,6 +79,10 @@ Before patch:   0.020000   0.000000   0.020000 (  0.024283)
 After patch:    0.010000   0.000000   0.010000 (  0.002160)
 Before patch:   0.000000   0.000000   0.000000 (  0.002354)
 ```
+## Is DiffBench safe for my repo?
+
+DiffBench is using `git stash` and `git checkout "HEAD^"` commands to modify code in a repo.
+This means that you are able to **recover** your code even **after ruby segfaults**.
 
 
 ## Self-Promotion

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/diffbench.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "diffbench"
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2012-05-22"
+  s.date = "2013-06-08"
   s.description = "Diffbench is gem designed to benchmark the performance patches. It can run specified benchmark file before and after some changes made and show performance comparation result"
   s.email = "agresso@gmail.com"
   s.executables = ["diffbench"]
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/bogdan/diffbench"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.24"
   s.summary = "Benchmark your before and after some changes made"
 
   if s.respond_to? :specification_version then
@@ -50,21 +50,21 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<git>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<debugger>, [">= 0"])
     else
       s.add_dependency(%q<git>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.1.0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_dependency(%q<debugger>, [">= 0"])
     end
   else
     s.add_dependency(%q<git>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.1.0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     s.add_dependency(%q<debugger>, [">= 0"])
   end

data/lib/diffbench.rb

@@ -2,22 +2,89 @@ require "yaml"
 require "benchmark"
 require "git"
 require "base64"
+require "optparse"
 require "diffbench/encoder"
 require "diffbench/bm"
 
 class DiffBench
 
   class Runner
-    COLORS = {red: 31, green: 32}
+    COLORS = {:red => 31, :green => 32, :yellow => 33}
+
+    def initialize(*args)
+      parser = OptionParser.new do |opts|
+        opts.banner = <<-DOC
+Usage: diffbench [options] file
+
+When working tree is dirty default is run benchmark againts dirty tree and clean tree.
+When working tree is clean default is run benchmark against current head and previous commit.
+DOC
+        
+        opts.on("-r", '--revision [REVISIONS]', 'Specify revisions to run benchmark (comma separated). Example: master,f9a845,v3.1.4') do |value|
+          if tree_dirty?
+            raise Error, "Working tree is dirty."
+          end
+          @revisions = value.split(",")
+        end
+        opts.on("-b", '--before [COMMAND]', 'Specify command to run before each benchmark run. e.g. bundle install') do |value|
+          @before_command = value
+        end
 
-    def initialize(file, *args)
-      @file = file
-      unless @file
-        raise Error, "File not specified"
+        opts.on_tail('-h', '--help', 'Show this help') do
+          output opts
+          exit
+        end
       end
+      parser.parse!(args)
+      @file = args.first or raise Error, 'File not specified'
     end
 
     def run
+      if @revisions
+        run_revisions
+      else
+        run_current_head
+      end
+    end
+
+    def run_revisions
+      branch = current_head
+      
+      results = begin
+        @revisions.inject({}) do |result, revision|
+          output "Checkout to #{revision}"
+          output "Run benchmark with #{revision}"
+          git_run("checkout '#{revision}'")
+          result[revision] = run_file
+          result
+        end
+      ensure
+        output "Checkout to #{branch}"
+        git_run("checkout '#{branch}'")
+      end
+      print_results(results)
+    end
+
+    def print_results(results)
+      output ""
+      #TODO set caption the right way
+      caption = "Before patch: ".gsub(/./, " ") +  Benchmark::Tms::CAPTION
+      output caption
+      tests = results.values.first.keys
+      tests.each do |test|
+        output(("-" * (caption.size - test.size)) + test)
+        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
+        output ""
+      end
+    end
+
+    def run_current_head
       output "Running benchmark with current working tree"
       first_run = run_file
       if tree_dirty?
@@ -47,16 +114,14 @@ class DiffBench
       caption = "Before patch: ".gsub(/./, " ") +  Benchmark::Tms::CAPTION
       output caption
       first_run.keys.each do |test|
-        output ("-"* (caption.size - test.size)) + test
+        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}"
-        if color_string
-          output self.class.color("Improvement: #{improvement}%", color_string).strip
-        end
+        output self.class.color("Improvement: #{improvement}%", color_string).strip
         output ""
       end
     end
@@ -78,7 +143,7 @@ class DiffBench
 
     def result_color(improvement)
       if (-5..5).include?(improvement)
-        nil
+        :yellow
       else
         improvement > 0 ? :green : :red
       end
@@ -95,6 +160,7 @@ class DiffBench
     end
 
     def run_file
+      output `#{@before_command}` if @before_command
       output = `ruby -I#{File.dirname(__FILE__)} #{@file}`
       output.split("\n").select! do |line|
         if line.start_with?("diffbench:")

data/lib/diffbench/bm.rb

@@ -8,7 +8,7 @@ class DiffBench
         instance_eval(&block)
       end
 
-      print Encoder.encode(@measures)
+      puts Encoder.encode(@measures)
     end
 
     def report(label)

data/spec/diffbench_spec.rb

@@ -55,6 +55,11 @@ Before patch:   0.000000   0.000000   0.000000 (  0.200NUM)
 OUT
     end
 
+    it "should suppor before command option" do
+      output =  `cd #{repo}; ./../../bin/diffbench -b "echo hello" bench.rb`
+      output.should include("hello")
+    end
+
     describe "when changes got commit" do
 
       before(:each) do
@@ -84,9 +89,35 @@ Before patch:   0.000000   0.000000   0.000000 (  0.200NUM)
 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)}
+OUT
+      end
+
+      it "should run benchmark for specified revisions" do
+        revs = `cd #{repo};git log --pretty="%h"`.split("\n")
+        output = `cd #{repo}; ./../../bin/diffbench -r #{revs.join(",")} bench.rb`
+        output.should =~ to_regexp(<<-OUT)
+Checkout to #{revs.first}
+Run benchmark with #{revs.first}
+--> Sleeping
+--> Sleeping
+Checkout to #{revs.last}
+Run benchmark with #{revs.last}
+--> Sleeping
+--> Sleeping
+Checkout to master
+
+                    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)
+
+--------------------------------------------------Sleeper 2
+#{revs.first}:   0.000000   0.000000   0.000000 (  0.100NUM)
+#{revs.last }:   0.000000   0.000000   0.000000 (  0.200NUM)
 OUT
       end
     end
+
   end
 
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffbench
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2013-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &11887460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,32 +21,47 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11887460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11886460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11886460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11885500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11885500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &11884740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *11884740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &11902380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11902380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Diffbench is gem designed to benchmark the performance patches. It can
   run specified benchmark file before and after some changes made and show performance
   comparation result
@@ -112,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2188438229192875359
+      hash: -2803528317631854912
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -121,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Benchmark your before and after some changes made