rbm 0.0.3 → 1.0.0

data/bin/rbm

@@ -2,4 +2,4 @@
 
 require "rbm"
 
-RBM.start
+RBM.start(ARGV)

data/lib/rbm.rb

@@ -1,14 +1,16 @@
 require "optparse"
-require "rbm/benchmarker"
-require "rbm/version"
 
 module RBM
+  require "rbm/benchmarker"
+  require "rbm/fragment"
+  require "rbm/version"
+
   class << self
-    def start
-      fragments, options = parse_options(ARGV)
+    def start(args)
+      fragments, options = parse_options(args)
 
       if load_paths = options.delete(:load_paths)
-        $LOAD_PATH.concat(load_paths)
+        $LOAD_PATH.unshift(load_paths)
       end
 
       begin
@@ -16,8 +18,8 @@ module RBM
           requires.each { |r| require(r) }
         end
       rescue LoadError => e
-        puts e
-        exit
+        $stderr.puts(e)
+        exit 1
       end
 
       Benchmarker.new(fragments, options).run
@@ -25,7 +27,8 @@ module RBM
 
     private
       def parse_options(args)
-        fragments, options = [], { :requires => [], :load_paths => [] }
+        fragments = []
+        options = { :requires => [], :load_paths => [] }
         current_name, current_prerun, current_postrun = nil, nil, nil
 
         op = OptionParser.new do |op|
@@ -37,9 +40,6 @@ module RBM
           op.on("-r", "--require file[,file]", Array, "Files to require before benchmarking") { |a| options[:requires].concat(a) }
           op.on("-I", "--load-path path[,path]", Array, "Paths to append to $LOAD_PATH") { |a| options[:load_paths].concat(a) }
 
-          # op.separator ""
-          # op.separator "Benchmark Options:"
-
           op.separator ""
           op.separator "Code Fragment Options:"
 
@@ -62,15 +62,15 @@ module RBM
             exit
           end
         end
-        op.order!(args) do |fragment|
+        op.order!(args) do |code|
           # block gets run for each non-option argument
-          fragments << { :name => current_name, :prerun => current_prerun, :postrun => current_postrun, :fragment => fragment }
+          fragments << Fragment.new(code, current_name, current_prerun, current_postrun)
           current_name, current_prerun, current_postrun = nil, nil, nil
         end
 
         if fragments.empty?
           puts op
-          exit
+          exit 1
         end
 
         [fragments, options]

data/lib/rbm/benchmarker.rb

@@ -1,4 +1,4 @@
-require 'benchmark'
+require "benchmark"
 
 module RBM
   class Benchmarker
@@ -8,31 +8,15 @@ module RBM
 
     attr_reader :fragments, :options
 
-    def initialize(fragments, options)
-      @fragments, @options = fragments, DEFAULT_OPTIONS.merge(options)
+    def initialize(fragments, options = {})
+      @fragments = fragments
+      @options = self.class::DEFAULT_OPTIONS.merge(options)
     end
 
     def run
-      width = fragments.map { |fragment| (fragment[:name] || "").length }.max
-      Benchmark.bm(width) do |bm|
+      Benchmark.bmbm do |bm|
         fragments.each do |fragment|
-          name = fragment[:name] || ""
-          fragment_name = (fragment[:name] || (@unnamed_fragment ||= "fragment_0").succ!).gsub(/\s+/, "_")
-
-          object = Object.new
-          binding = object.send(:binding)
-
-          bm.report(name) do
-            eval options[:init], binding, "init", 1 if options[:init]
-            eval fragment[:prerun], binding, "#{fragment_name}_prerun", 1 if fragment[:prerun]
-            eval <<-EVAL, binding, fragment_name, 0
-              #{options[:times]}.times do
-                #{fragment[:fragment]}
-              end
-            EVAL
-            eval fragment[:postrun], binding, "#{fragment_name}_postrun", 1 if fragment[:postrun]
-            eval options[:cleanup], binding, "cleanup", 1 if options[:cleanup]
-          end
+          fragment.run(bm, options[:times], options[:init], options[:cleanup])
         end
       end
     end

data/lib/rbm/fragment.rb

@@ -0,0 +1,24 @@
+module RBM
+  class Fragment
+    @@unnamed_fragment = "fragment_0"
+
+    attr_reader :code, :name, :prerun, :postrun
+
+    def initialize(code, name = nil, prerun = nil, postrun = nil)
+      @code, @name, @prerun, @postrun = code, name, prerun, postrun
+    end
+
+    def run(bm, times, init = nil, cleanup = nil)
+      fragment_name = (name || @@unnamed_fragment.succ!).gsub(/\s+/, "_")
+      object = Object.new
+
+      bm.report(name) do
+        object.instance_eval(init, "#{fragment_name}_init", 0) if init
+        object.instance_eval(prerun, "#{fragment_name}_prerun", 0) if prerun
+        object.instance_eval("#{times}.times { #{code} }", "#{fragment_name}", 0)
+        object.instance_eval(postrun, "#{fragment_name}_postrun", 0) if postrun
+        object.instance_eval(cleanup, "#{fragment_name}_cleanup", 0) if cleanup
+      end
+    end
+  end
+end

data/lib/rbm/version.rb

@@ -1,3 +1,3 @@
 module RBM
-  VERSION = "0.0.3"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,62 +1,53 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rbm
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.0
   prerelease: 
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Samuel Kadolph
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-13 00:00:00 -04:00
-default_executable: 
+date: 2012-06-14 00:00:00.000000000 Z
 dependencies: []
-
-description: Command line tool for doing quick ruby benchmarks. Provide each code fragment to run as a separate code fragment to rbm. See rbm --help for more information.
-email: 
+description: rbm lets you benchmark varies code fragments by running them a specified
+  number of times along with code fragments before and after all of the fragments
+  or an individual fragment. See rbm --help for more information.
+email:
 - samuel@kadolph.com
-executables: 
+executables:
 - rbm
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/rbm
 - lib/rbm/benchmarker.rb
+- lib/rbm/fragment.rb
 - lib/rbm/version.rb
 - lib/rbm.rb
-- README.md
-- UNLICENSE
-has_rdoc: true
-homepage: https://github.com/samuelkadolph/rbm
+homepage: http://samuelkadolph.github.com/rbm/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: Simple command line tool for quick ruby benchmarks.
+summary: rbm is a command line tool for doing quick benchmarks of ruby code.
 test_files: []
-

data/README.md

@@ -1,51 +0,0 @@
-# Ruby Benchmark
-
-rbm is a command line tool for doing quick benchmarks of ruby code.
-
-# Installing
-
-## Recommended
-
-    gem install rbm
-
-## Edge
-
-    git clone https://github.com/samuelkadolp/rbm.git
-    cd rbm && rake install
-
-# Usage
-
-Using rbm is quite simple. Just pass in each code fragment you want to test as a separate argument.
-
-    rbm "sleep 1" "sleep 5"
-
-You can specify the number of times to run each code fragment.
-You can also provide a code fragment to be run before all code fragments or before a code fragment.
-
-    rbm --times 1000 "5 / 5"
-    rbm --times 1000 --init "n = 5" "n / 5"
-    rbm --times 1000 --init "n = 5" --pre "m = 5" "n / m"
-
-You may provide a name to each code fragment to be displayed on the benchmark.
-
-    rbm --name "sleep for 5" "sleep 5" --name "sleep for 2" "sleep 2"
-
-You can see the full usage statement at any time with `rbm --help`
-
-    Usage: rbm [options] [--name name] [--pre code] code [[--name name] [--pre code] code...]
-
-    Ruby Options:
-        -r, --require file[,file]        Files to require before benchmarking
-        -I, --load-path path[,path]      Paths to append to $LOAD_PATH
-
-    Code Fragment Options:
-        -n, --times n                    Number of times to run each code fragment
-        -i, --init code                  Code to run before every code fragment
-        -c, --cleanup code               Code to run after each code fragment
-        -N, --name name                  Names the following code fragment
-        -p, --pre code                   Code to run before the follow code fragment
-        -P, --post code                  Code to run after the follow code fragment
-
-    General Options:
-        -v, --version                    Print the version and exit
-        -h, --help                       Print this message and exit

data/UNLICENSE

@@ -1,22 +0,0 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.