tryouts 0.8.4 → 0.8.5

data/CHANGES.txt

@@ -1,5 +1,25 @@
 TRYOUTS, CHANGES
 
+* TODO: consider having set create var= methods too. 
+* TODO: Support: "sergeant 30:52"
+* TODO: FIXED: output for quiet mode
+* TODO: Run clean after reports have been generated. See Gibbler 256 tryouts.
+* TODO: Load tryouts/setup.rb and tryouts/clean.rb
+* TODO: Support Hash syntax in set, 
+  set :name => value
+* TODO: Support tryouts/*_drills.rb and tryouts/*_tryout.rb
+* TODO: Clear stash between drills
+
+
+#### 0.8.5 (2009-10-07) ###############################
+
+NOTE: Benchmark tryouts must now use proc style dreams
+
+* CHANGE: Benchmark tryouts now display complex benchmark info
+  (utime, stime, cutime, cstime, total, real)
+* CHANGE: Benchmark tryouts now run a brief warmup
+* CHANGE: Improved startup time (via autoload)
+
 
 #### 0.8.4 (2009-07-20) ###############################
 

data/lib/tryouts/drill/sergeant/benchmark.rb

@@ -13,11 +13,15 @@ class Tryouts; class Drill; module Sergeant
     
     attr_reader :output
     
+    FIELDS = [:utime, :stime, :cutime, :cstime, :total, :real].freeze
+    
     # * +reps+ Number of times to execute drill (>= 0, <= 1000000). Default: 3
     #
     def initialize(reps=nil)
+      reps = 1 if reps.nil?
       @reps = (1..1000000).include?(reps) ? reps : 5
-      @stats = Tryouts::Stats.new
+      @warmups = reps < 10 ? 1 : 10
+      @stats = {}
     end
   
     def run(block, context, &inline)
@@ -30,12 +34,20 @@ class Tryouts; class Drill; module Sergeant
       else
         begin
           
+          @warmups.times do
+            tms = ::Benchmark.measure {
+              context.instance_eval &runtime
+            }
+          end
+          
+          @stats[:rtotal] = Tryouts::Stats.new(:rtotal)
           @reps.times do
-            run = ::Benchmark.realtime {
+            tms = ::Benchmark.measure {
               context.instance_eval &runtime
             }
-            @stats.sample run
+            process_tms(tms)
           end
+          @stats[:rtotal].tick
           
           # We add the output after we run the block so that
           # that it'll remain nil if an exception was raised
@@ -51,5 +63,14 @@ class Tryouts; class Drill; module Sergeant
       response
     end
     
+    def process_tms(tms)
+      FIELDS.each do |f|
+        @stats[f] ||= Tryouts::Stats.new(f)
+        @stats[f].sample tms.send(f)
+      end
+    end
+    
+    def self.fields() FIELDS end
+    
   end
 end; end; end

data/lib/tryouts/drill/sergeant/cli.rb

@@ -1,4 +1,4 @@
-
+autoload :Rye, 'rye'           # Make sure rye is loaded
 
 class Tryouts; class Drill; module Sergeant
   
@@ -17,7 +17,6 @@ class Tryouts; class Drill; module Sergeant
     attr_accessor :command
     
     def initialize(*args)
-      require 'rye'           # Make sure rye is loaded
       @command = args.shift
       @rbox_args = args
       @rbox = Rye::Box.new

data/lib/tryouts/drill.rb

@@ -15,7 +15,7 @@ class Tryouts
   require 'tryouts/drill/sergeant/cli'
   require 'tryouts/drill/sergeant/api'
   require 'tryouts/drill/sergeant/benchmark'
-  require 'tryouts/drill/sergeant/rbenchmark'
+  #require 'tryouts/drill/sergeant/rbenchmark'
   
   class NoSergeant < Tryouts::Exception; end
   class UnknownFormat < Tryouts::Exception; end
@@ -78,7 +78,7 @@ class Tryouts
         dream_output, format, reps = args[1], args[0], args[2]
       end
       @sergeant = Tryouts::Drill::Sergeant::Benchmark.new reps
-      @dreams << Tryouts::Drill::Dream.new(Tryouts::Stats, :class)
+      @dreams << Tryouts::Drill::Dream.new(Hash, :class)
       unless dream_output.nil?
         @dreams << Tryouts::Drill::Dream.new(dream_output, format)
       end
@@ -133,8 +133,14 @@ class Tryouts
     if Tryouts.verbose > 0
       if @dtype == :benchmark
         unless @reality.output.nil?
-          mean, sdev, sum = @reality.output.mean, @reality.output.sdev, @reality.output.sum
-          out.puts '%6s%.4f (sdev:%.4f sum:%.4f)'.color(@clr) % ['', mean, sdev, sum]
+          Sergeant::Benchmark.fields.each do |f|
+            s = @reality.output[f]
+            ar = [s.name, s.mean, s.min, s.max, s.sdev, s.sum]
+            pa = '%6s: %.4f (min:%.4f max:%.4f sdev:%.4f sum:%.4f)'.color(@clr)
+            out.puts pa % ar
+          end
+          ar = ['', @reality.output[:rtotal].mean]
+          out.puts '%8s%3.4f (run time)'.color(@clr) % ar
         end
       elsif @dtype == :cli
         out.puts '%6s%s'.color(@clr) % ['', @reality.command]

data/lib/tryouts.rb

@@ -1,10 +1,11 @@
 
 require 'time'
-require 'attic'
-require 'sysinfo'
 require 'digest/sha1'
-require 'ostruct'
-require 'yaml'
+
+autoload :Attic, 'attic'
+autoload :SysInfo, 'sysinfo'
+autoload :OpenStruct, 'ostruct'
+autoload :YAML, 'yaml'
 
 ## NOTE: Don't require rye here so
 ## we can still run tryouts on the
@@ -46,22 +47,29 @@ class Tryouts
     end
   end
     
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
   
   require 'tryouts/mixins'
   require 'tryouts/tryout'
   require 'tryouts/drill'
-  require 'tryouts/stats'
   
-  require 'tryouts/orderedhash'
-  HASH_TYPE = (RUBY_VERSION =~ /1.9/) ? ::Hash : Tryouts::OrderedHash
-
+  autoload :Stats, 'tryouts/stats'
+  
+  unless defined?(HASH_TYPE)
+    if RUBY_VERSION =~ /1.8/
+      require 'tryouts/orderedhash'
+      HASH_TYPE = Tryouts::OrderedHash
+    else
+      HASH_TYPE = Hash
+    end
+  end
+  
     # An Array of +_tryouts.rb+ file paths that have been loaded.
   @@loaded_files = []
     # An Hash of Tryouts instances stored under the name of the Tryouts subclass. 
   @@instances = HASH_TYPE.new
     # An instance of SysInfo
-  @@sysinfo = SysInfo.new
+  @@sysinfo = nil
   
   @@debug = false
   @@verbose = 0
@@ -81,7 +89,10 @@ class Tryouts
   # Returns +@@instances+
   def self.instances; @@instances; end
   # Returns +@@sysinfo+
-  def self.sysinfo;   @@sysinfo;   end
+  def self.sysinfo
+    @@sysinfo = SysInfo.new if @@sysinfo.nil?
+    @@sysinfo
+  end
   
     # The name of this group of Tryout objects
   attr_accessor :group

data/tryouts/30_benchmark_tryouts.rb

@@ -4,24 +4,23 @@ group "Benchmarks"
 
 tryouts "Benchmark Syntax", :benchmark do
   
-  drill "can check the mean is <=", :mean, 4 do
+  drill "can check the mean is <=" do
     sleep 0.1 
   end
   
-  drill "can check the standard deviation", :sdev, 0.1 do
+  drill "can check the standard deviation"  do
     sleep 0.1
   end
   
-  drill "Tryouts::Stat objects have a default name", :name, :unknown do
+  drill "Tryouts::Stat objects have a default name" do
     sleep 0.1
   end
   
-  dream :samples, 5
   drill "default repetitions is 5" do
     sleep 0.1
   end
   
-  dream :proc, lambda { |x| x.sum >= 0.5 }
+  dream :proc, lambda { |x| x[:real].sum >= 0.5 }
   drill "can specify dream proc" do
     sleep 0.1
   end

data/tryouts.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "tryouts"
   s.rubyforge_project = "tryouts"
-	s.version = "0.8.4"
+	s.version = "0.8.5"
 	s.summary = "Tryouts is a high-level testing library (DSL) for your Ruby codes and command-line applications."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tryouts
 version: !ruby/object:Gem::Version 
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-20 00:00:00 -04:00
+date: 2009-10-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency