benches 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0a31536816bbaf808af25fe99966c2d8968f6c6
-  data.tar.gz: d826ff23eebf397bf7c853ab12b226e67163a52e
+  metadata.gz: 289a188d0ee7e80411be4e9d4812c49e98496ea0
+  data.tar.gz: d8798a409099b2a5a9e5bb0ef177ed93142957ba
 SHA512:
-  metadata.gz: b12382125632d996603f544e0f3ce547c5db085eaf28d5282b060ce6168271c3bbb7f131a657b5d37f9d29d6fc716416b4d8f0f48d39419e53b55bc094b91999
-  data.tar.gz: 7c9f41a9839e4a08081414f26b5b909f70bbbbdfa57c7a6114a16d1410db7ecbcebf1151066f88791daa84ec6f2984d6a269489ce9f6d721046eb660cd793341
+  metadata.gz: 798b63c764e81844813d278b3c74692fcba823cc1443cd6dd3b70af6292ec1e09e3c85fa7d7ebbf13f92c548819dc9a2d0eaf23634058afacc7c099e65746cc4
+  data.tar.gz: 5e22ea4b6deb9d7350103f12f8f76432089d2428f12de1664b465571855692510ea25b454d7a3cf93fbafdc56508189470bb306b469c701f7130958132fa62aa

data/README.md

@@ -5,28 +5,32 @@ Benches defines a simple benchmarking DSL that allows you to create benchmark ro
 ## Defining a Routine
 
 Create a folder called regimens. For each class that you want to benchmark,
-create a file like integer.rb
+create a file like integer_regimen.rb
 
-integer_routine.rb
+integer_regimen.rb
 ```ruby
-routine 4, 'benches 400 reps of to_s' # no arguments
-routine 30, 'benches 300 reps of * with (400)' # one argument
-routine 'test_string', "benches 500 reps of gsub with (s, '')" # two arguments
+subject 5 do
+  benches '500 reps of to_s in less than 5 seconds'
+  benches '400 reps of + in less than 2 seconds', 3
+  benches '300 reps of * in less than 3 seconds', 400
+end
+
+subject 20 do
+  benches '500 reps of to_s in less than 5 seconds'
+  benches '400 reps of + in less than 2 seconds', 3
+  benches '300 reps of * in less than 3 seconds', 400
+end
 ```
 
-This will return the benchmark results of running `4.to_s` 400 times,
-`30 * 400` 300 times, and `'test_string'.gsub('s', '')` 500 times.
+If the benchmarks runs within the allotted time, it will
+be printed green, otherwise it will be printed red.
 
-The command `benchpress` will run all of the regimens.
+The command `benchpress` runs all of the regimen files
 
 ## Testing
 
 Simply run `rspec` to run the test suite.
 
-## Future Work
-
-- Allow benchmark results to be tested in block passed to routine
-
 ## Credits
 
 All code (c) Evan Hemsley 2014

data/bin/benchpress

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 
 require 'benches'
+load 'regimens/regimen_helper.rb'
 
-Dir["regimens/*_routine.rb"].each do |file|
-  puts "Performing #{File.basename(file).gsub("_routine.rb", "")} regimen: "
+Dir["regimens/*_regimen.rb"].each do |file|
+  puts "Performing #{File.basename(file).gsub("_regimen.rb", "")} regimen: "
   load file
+  puts "\n"
 end

data/lib/benches/dsl.rb

@@ -1,32 +1,9 @@
-#input: instance_name benches n reps of method_name (with *args)
-#example: graph benches 50000 reps of dfs
-def routine(instance, input)
-  params = input.split(" ")
-  if params.last == params[4]
-    args = nil
-  else
-    args = coerce_args(input[/\(.*?\)/].gsub(/[()]/, "").split(","))
-  end
-
-  Benches::Routine.new(instance, params[4], params[1].to_i, *args).call
-end
-
-def coerce_args(args)
-  args.map do |arg|
-    if integer?(arg)
-      arg.to_i
-    elsif float?(arg)
-      arg.to_f
-    else
-      arg
-    end
-  end
-end
-
-def integer?(input)
-  !!(/^\d+$/ =~ input)
+def subject(instance, &block)
+  @regimen = Benches::Regimen.new(instance)
+  block.call
+  @regimen.call
 end
 
-def float?(input)
-  !!(/^\d+(.\d+)$/ =~ input)
+def benches(input, *args)
+  @regimen.add_input(input, args)
 end

data/lib/benches/regimen.rb

@@ -0,0 +1,33 @@
+require 'colorize'
+
+module Benches
+  class Regimen
+    def initialize(subject)
+      @subject = subject
+      @inputs = []
+    end
+
+    def add_input(input, args)
+      @inputs << [input, args]
+    end
+
+    def call
+      puts @subject.to_s.blue
+      @inputs.each do |input|
+        input_string = input.first
+        args = input.last
+        routine(@subject, input_string, args) ? puts("  #{input_string}".green) : puts("  #{input_string}".red)
+      end
+    end
+
+    private
+
+    def routine(instance, input, args)
+      params = input.split(" ")
+
+      result = Benches::Routine.new(instance, params[3], params[0].to_i, *args).call
+      result.utime < params[7].to_f
+    end
+
+  end
+end

data/lib/benches/routine.rb

@@ -8,11 +8,9 @@ module Benches
     end
 
     def call
-      Benchmark.bm(@method.length) do |x|
-        x.report("#{@method}:") do
-          @repetitions.times do
-            @instance.send(@method, *@args)
-          end
+      Benchmark.measure do
+        @repetitions.times do
+          @instance.send(@method, *@args)
         end
       end
     end

data/lib/benches/version.rb

@@ -1,3 +1,3 @@
 module Benches
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/benches.rb

@@ -1,3 +1,4 @@
 require 'benchmark'
 require 'benches/routine'
+require 'benches/regimen'
 require 'benches/dsl'

data/spec/dsl_spec.rb

@@ -1,73 +1,5 @@
 require 'spec_helper'
 
-describe 'routine' do
-  context 'no method arguments' do
-    it 'returns benchmark result' do
-      expect((routine 'test_string', 'benches 20 reps of split').first).to be_a Benchmark::Tms
-    end
-  end
-
-  context 'method has integer argument' do
-    it 'returns benchmark result' do
-      expect((routine 'test_string', "benches 20 reps of insert with (0,a)").first).to be_a Benchmark::Tms
-    end
-  end
-
-  context 'method has float argument' do
-    it 'returns benchmark result' do
-      expect((routine 32.444, 'benches 20 reps of + with (4.43)').first).to be_a Benchmark::Tms
-    end
-  end
-end
-
-describe 'float?' do
-  context 'input string contains only a float' do
-    it 'returns true' do
-      expect(float?('32.555')).to eql true
-    end
-  end
-
-  context 'input string contains letters and numbers' do
-    it 'returns false' do
-      expect(float?('ab321')).to eql false
-    end
-  end
-
-  context 'input string contains an integer' do
-    it 'returns false' do
-      expect(float?('32')).to eql false
-    end
-  end
-
-  context 'input string does not contain any numbers' do
-    it 'returns false' do
-      expect(float?('stuff')).to eql false
-    end
-  end
-end
-
-describe 'integer?' do
-  context 'input string contains only an integer' do
-    it 'returns true' do
-      expect(integer?('32')).to eql true
-    end
-  end
-
-  context 'input string contains a float' do
-    it 'returns false' do
-      expect(integer?('32.423')).to eql false
-    end
-  end
-
-  context 'input string contains letters and numbers' do
-    it 'returns false' do
-      expect(integer?('abc123')).to eql false
-    end
-  end
-
-  context 'input string does not contain any numbers' do
-    it 'returns false' do
-      expect(integer?('abc')).to eql false
-    end
-  end
+describe 'subject' do
+  
 end

data/spec/routine_spec.rb

@@ -48,7 +48,7 @@ describe Benches::Routine do
       let(:bench) { Benches::Routine.new("test_string", 'split', 20) }
 
       it 'performs benchmark' do
-        expect(bench.call.first).to be_a Benchmark::Tms
+        expect(bench.call).to be_a Benchmark::Tms
       end
     end
 
@@ -56,7 +56,7 @@ describe Benches::Routine do
       let(:bench) { Benches::Routine.new("test_string", 'insert', 20, 1, 'a') }
 
       it 'performs benchmark' do
-        expect(bench.call.first).to be_a Benchmark::Tms
+        expect(bench.call).to be_a Benchmark::Tms
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: benches
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Evan Hemsley
@@ -26,6 +26,7 @@ files:
 - bin/benchpress
 - lib/benches.rb
 - lib/benches/dsl.rb
+- lib/benches/regimen.rb
 - lib/benches/routine.rb
 - lib/benches/version.rb
 - license.md