somebee-rbench 0.1 → 0.2

data/lib/rbench/column.rb

@@ -0,0 +1,26 @@
+module RBench
+  class Column
+    attr_accessor :name, :title, :width, :compare, :default
+    
+    def initialize(runner, name, options = {})
+      @runner  = runner
+      @name    = name
+      @title   = options[:title] || (@name == :times ? "" : @name.to_s.upcase)
+      @width   = options[:width] || [@title.length,7].max
+      @compare = options[:compare]
+      @default = @compare ? @compare : options[:default]
+    end
+    
+    def to_s(value=title)
+      str = case value
+        when Array      then "%#{width-1}.2f" % (value[0] / value[1]) + "x"
+        when Float      then "%#{width}.3f" % value
+        when Integer    then "%#{width}.0f" % value
+        when TrueClass  then " "*(width/2.0).floor + "X" + " "*(width/2.0).floor
+        when String     then "%#{width}s" % (value)[0,width]
+        when Object     then " " * width
+      end
+      return " #{(str+" "*width)[0,width]} |"
+    end
+  end
+end

data/lib/rbench/group.rb

@@ -0,0 +1,42 @@
+module RBench
+  class Group
+    self.instance_methods.each do |m|
+      send(:undef_method, m) unless m =~ /^(__|is_a?|kind_of?|respond_to?|inspect|instance_eval)/
+    end
+    
+    attr_reader :name, :items, :block
+    
+    def initialize(runner, name, &block)
+      @runner = runner
+      @name    = name
+      @items = []
+      @block = block
+    end
+    
+    def prepare
+      # This just loops through and spawns the reports, and the summary (if exists)
+      self.instance_eval(&@block) if @block
+      # Now we want to make sure that the summary is 
+      @items << @items.shift if @items.first.is_a?(Summary)
+    end
+    
+    def run
+      # Put a separator with the group-name at the top. puts?
+      puts @runner.separator(@name)
+      # Now loop through the items in this group, and run them
+      @items.each{|item| item.run}
+    end
+
+    def report(name,times=nil,&block)
+      @items << Report.new(@runner,self,name,times,&block)
+    end
+    
+    def summary(name)
+      @items.unshift(Summary.new(@runner,self,name)) unless @items.detect{|i| i.is_a?(Summary)}
+    end
+    
+    def to_s
+      @runner.separator(@name) << @items.map { |item| item.to_s }.join
+    end
+  end
+end

data/lib/rbench/report.rb

@@ -0,0 +1,50 @@
+module RBench
+  class Report
+    self.instance_methods.each do |m|
+      send(:undef_method, m) unless m =~ /^(__|is_a?|kind_of?|respond_to?|inspect|instance_eval)/
+    end
+    
+    attr_reader :name, :cells
+    
+    def initialize(runner, group, name, times=nil,&block)
+      @runner = runner
+      @group  = group
+      @name   = name
+      @times  = (times || runner.times).ceil
+      @cells  = {}
+      @block  = block 
+      
+      # Setting the default for all cells
+      runner.columns.each {|c| @cells[c.name] = c.name == :times ? "x#{@times}" : c.default }
+      
+      new_self = (class << self; self end)
+      @runner.columns.each do |column|
+        new_self.class_eval <<-CLASS
+          def #{column.name}(val=nil,&block)
+            @cells[#{column.name.inspect}] = block ? Benchmark.measure { @times.times(&block) }.real : val
+          end
+        CLASS
+      end
+    end
+    
+    def run
+      # runs the actual benchmarks. If there is only one column, just evaluate the block itself.
+      if @runner.columns.length == 1
+        @cells[@runner.columns.first.name] = Benchmark.measure { @times.times(&@block) }.real
+      else
+        self.instance_eval(&@block)
+      end
+      # puts its row now that it is complete
+      puts to_s
+    end
+    
+    def to_s
+      out = "%-#{@runner.desc_width}s" % name
+      @runner.columns.each do |column|
+        value = @cells[column.name]
+        out << column.to_s(value.is_a?(Array) ? @cells.values_at(*value) : value )
+      end
+      out << @runner.newline
+    end
+  end
+end

data/lib/rbench/runner.rb

@@ -0,0 +1,109 @@
+module RBench
+  class Runner
+    attr_accessor :columns, :items, :times, :width
+    
+    def initialize(times)
+      @width = 0
+      @times = times
+      @columns = []
+      @items = []
+    end
+    
+    def run(&block)
+      
+      # initiate all the columns, groups, reports, and summaries on top level.
+      self.instance_eval(&block)
+      
+      # the groups has not run just yet, but when they do, we really only want
+      # to make them initiate their reports, not run them (just yet)
+      # when we only have two levels, _every_ report should now be initialized.
+      @items.each{|item| item.prepare if item.is_a?(Group)}
+      
+      # We are putting the summary to the back if its there.
+      @items << @items.shift if @items.first.is_a?(Summary)
+      
+      # if on columns were set, create a default column
+      column(:results, :title => "Results") if @columns.empty?
+      
+      # since we are about to start rendering, we put out the column-header
+      puts header
+      
+      # now we are ready to loop through our items and run!
+      items.each { |item| item.run if item.respond_to?(:run) }
+      
+      # returning self so people can output it in different formats.
+      self
+    end
+    
+    def format(options={})
+      @width = options.delete(:width) || @width
+    end
+    
+    def column(name,options={})
+      @columns << Column.new(self,name,options)
+    end
+    
+    def group(name,&block)
+      @items << Group.new(self,name,&block)
+    end
+    
+    def report(name,times=nil,&block)
+      # create an anonymous group, or add it to the last open group.
+      group(nil) unless @items.last.is_a?(Group) && !@items.last.block
+      # now create the report on the last group
+      @items.last.report(name,times,&block)
+    end
+    
+    def summary(name)
+      # adding the summary to the front, so it is easier to put it last later.
+      @items.unshift(Summary.new(self,nil,name)) unless @items.detect{|i| i.is_a?(Summary)}
+    end
+    
+    ##
+    # convenience-methods
+    ##
+    
+    def groups
+      @items.select{|item| item.is_a?(Group) }
+    end
+
+    def reports
+      # we now want _all_ reports, also those that are part of subgroups
+      groups.map{|g| g.items.select{|item| item.is_a?(Report) } }.flatten
+    end
+    
+    ##
+    # for rendering text. pull out in separate module when to_xml and to_html is in place
+    ##
+    
+    def newline
+      "\n"
+    end
+    
+    def header
+      " " * desc_width + @columns.map {|c| c.to_s }.join + newline
+    end
+    
+    def desc_width
+      @desc_width ||= [items.map{|i| (i.items.map{|r| r.name} << i.name) }.flatten.map{|i| i.to_s.length}.max+8,@width-columns_width].max
+    end
+    
+    def columns_width
+      @columns.inject(0){ |tot,c| tot += (c.to_s.length) }
+    end
+    
+    def width(value=nil)
+      header.length-1
+    end
+
+    def separator(title=nil,chr="-",length=width)
+      title ? chr*2 + title + chr * (width - title.length - 2) : chr * length
+    end
+    
+    def to_s
+      out = " " * desc_width + @columns.map {|c| c.to_s }.join + newline
+      out << @items.map {|item| item.to_s}.join
+    end
+    
+  end
+end

data/lib/rbench/summary.rb

@@ -0,0 +1,27 @@
+module RBench
+  class Summary < Report
+    attr_reader :name, :runner, :cells, :items
+    attr_accessor :lines
+    
+    def initialize(runner, group, name)
+      @runner = runner
+      @group  = group
+      @name   = name
+      @cells  = {}     # A hash with keys as columns, and values being the result
+      @items  = []
+    end
+    
+    def run
+      # maybe add convenience-method to group to. group == runner really.
+      items = @group ? @group.items.select{|i| i.is_a?(Report)} : @runner.reports
+
+      @runner.columns.each do |c|
+        # TODO: Get number of fields that was counted in, and /
+        value = items.inject(0){|tot,i| v = i.cells[c.name]; tot += v.kind_of?(Numeric) ? v : 0 }
+        @cells[c.name] = value == 0 ? "" : value
+      end
+      puts @runner.separator(nil,"=") unless @group
+      puts to_s
+    end
+  end
+end

data/lib/rbench.rb

@@ -1,7 +1,7 @@
 require 'pathname'
 require 'benchmark'
 
-dir = Pathname(__FILE__).dirname.expand_path + 'rbench'
+dir = Pathname(__FILE__).dirname.expand_path + 'rbench/'
 
 require dir + 'runner'
 require dir + 'column'
@@ -10,7 +10,7 @@ require dir + 'report'
 require dir + 'summary'
 
 module RBench
-  def self.run(times, &block)
+  def self.run(times=1, &block)
     Runner.new(times).run(&block)
   end
 end

data/spec/rbench_spec.rb

@@ -0,0 +1,141 @@
+require 'pathname'
+require Pathname(__FILE__).dirname.expand_path + 'spec_helper'
+
+TIMES = 100_000
+
+RBench.run(TIMES) do
+  
+  column :one
+  column :two
+
+  report "Squeezing with #squeeze" do
+    one { "abc//def//ghi//jkl".squeeze("/") }
+    two { "abc///def///ghi///jkl".squeeze("/") }
+  end
+
+  report "Squeezing with #gsub" do
+    one { "abc//def//ghi//jkl".gsub(/\/+/, "/") }
+    two { "abc///def///ghi///jkl".gsub(/\/+/, "/") }
+  end
+
+  report "Splitting with #split" do
+    one { "aaa/aaa/aaa.bbb.ccc.ddd".split(".") }
+    two { "aaa//aaa//aaa.bbb.ccc.ddd.eee".split(".") }
+  end
+
+  report "Splitting with #match" do
+    one { "aaa/aaa/aaa.bbb.ccc.ddd".match(/\.([^\.]*)$/) }
+    two { "aaa//aaa//aaa.bbb.ccc.ddd.eee".match(/\.([^\.]*)$/) }
+  end
+  
+end
+
+puts
+puts
+
+RBench.run(TIMES) do
+  
+  format :width => 80
+
+  report "Squeezing with #squeeze" do
+    "abc//def//ghi//jkl".squeeze("/")
+  end
+
+  report "Squeezing with #gsub" do
+    "abc//def//ghi//jkl".gsub(/\/+/, "/")
+  end
+
+  report "Splitting with #split" do
+    "aaa/aaa/aaa.bbb.ccc.ddd".split(".")
+  end
+
+  report "Splitting with #match" do
+    "aaa/aaa/aaa.bbb.ccc.ddd".match(/\.([^\.]*)$/)
+  end
+  
+end
+
+puts
+puts
+
+bench = RBench.run(TIMES) do
+
+  column :times
+  column :dm
+  column :ar
+  column :diff, :compare => [:dm,:ar]
+
+  group "This is a group" do
+
+    report "split", TIMES / 10 do
+      dm { "aaa/aaa/aaa.bbb.ccc.ddd".split(".") }
+      ar { "aaa//aaa//aaa.bbb.ccc.ddd.eee".split(".") }
+    end
+  
+    report "match" do
+      dm { "aaa/aaa/aaa.bbb.ccc.ddd".match(/\.([^\.]*)$/) }
+      ar { "aaa//aaa//aaa.bbb.ccc.ddd.eee".match(/\.([^\.]*)$/) }
+    end
+    
+    summary "methods (totals)" # should display total for all preceding rows within this group / scope
+  
+  end
+
+  group "This is a group" do
+
+    report "split", TIMES / 10 do
+      dm { "aaa/aaa/aaa.bbb.ccc.ddd".split(".") }
+      ar { "aaa//aaa//aaa.bbb.ccc.ddd.eee".split(".") }
+    end
+  
+    report "match" do
+      dm { "aaa/aaa/aaa.bbb.ccc.ddd".match(/\.([^\.]*)$/) }
+      ar { "aaa//aaa//aaa.bbb.ccc.ddd.eee".match(/\.([^\.]*)$/) }
+    end
+  
+  end
+  
+  report "testing" do
+    dm { "aaa/aaa/aaa.bbb.ccc.ddd".match(/\.([^\.]*)$/) }
+    ar { "aaa//aaa//aaa.bbb.ccc.ddd.eee".match(/\.([^\.]*)$/) }
+  end
+  
+  summary "Overall"
+
+end
+
+puts
+puts
+
+RBench.run(TIMES) do
+
+  column :times
+  column :one,  :title => "#1"
+  column :two,  :title => "#2"
+  column :diff, :title => "#1/#2", :compare => [:one,:two]
+
+  group("Squeezing") do
+    report "with #squeeze" do
+      one { "abc//def//ghi//jkl".squeeze("/") }
+      two { "abc///def///ghi///jkl".squeeze("/") }
+    end
+    report "with #gsub" do
+      one { "abc//def//ghi//jkl".gsub(/\/+/, "/") }
+      two { "abc///def///ghi///jkl".gsub(/\/+/, "/") }
+    end
+    
+    summary "all methods (totals)"
+  end
+ 
+  group("Splitting") do
+    report "with #split" do
+      one { "aaa/aaa/aaa.bbb.ccc.ddd".split(".") }
+      two { "aaa//aaa//aaa.bbb.ccc.ddd.eee".split(".") }
+    end
+    report "with #match", TIMES / 100 do
+      one { "aaa/aaa/aaa.bbb.ccc.ddd".match(/\.([^\.]*)$/) }
+      two { "aaa//aaa//aaa.bbb.ccc.ddd.eee".match(/\.([^\.]*)$/) }
+    end
+  end
+  
+end

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--format specdoc
+--colour

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+require 'rubygems'
+gem 'rspec', '>=1.1.3'
+require 'spec'
+require 'pathname'
+require Pathname(__FILE__).dirname.expand_path.parent + 'lib/rbench'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: somebee-rbench
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - Yehuda Katz & Sindre Aarsaether
@@ -24,11 +24,18 @@ extra_rdoc_files:
 - LICENSE
 - TODO
 files: 
-- LICENSE
 - README
-- Rakefile
-- lib/rbench.rb
+- LICENSE
 - TODO
+- spec/rbench_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- lib/rbench.rb
+- lib/rbench/summary.rb
+- lib/rbench/runner.rb
+- lib/rbench/report.rb
+- lib/rbench/group.rb
+- lib/rbench/column.rb
 has_rdoc: true
 homepage: http://www.rbench.org
 post_install_message: 

data/Rakefile

@@ -1,9 +0,0 @@
-require 'rubygems'
-require 'rake/gempackagetask'
-load File.join(File.dirname(__FILE__), 'rbench.gemspec')
-
-Rake::GemPackageTask.new(GEMSPEC).define
-
-task :install => [:package] do
-  sh %{sudo gem install pkg/#{GEM}-#{VERSION}}
-end