tryouts 0.8.3 → 0.8.4

data/CHANGES.txt

@@ -1,11 +1,19 @@
 TRYOUTS, CHANGES
 
 
+#### 0.8.4 (2009-07-20) ###############################
+
+* CHANGE: "setup" and "clean" blocks now run in the same DrillContext
+  instance as drills (so instance variables are now shared)
+* CHANGE: Non-fatal errors are now displayed only in verbose mode. 
+* ADDED: "set" keyword inside tryout definitions. 
+* ADDED: New dependency: attic
+
+
 #### 0.8.3 (2009-07-19) ###############################
 
 * FIXED: Updated gemspec
 
-
 #### 0.8.2 (2009-07-19) ###############################
 
 * CHANGE: Moved Drill and Reality to separate files. 

data/README.rdoc

@@ -32,37 +32,51 @@ The examples below are a complete overview of Tryouts syntax.
     library :gibbler, "../path/to/gibbler/lib"
 
     tryouts "Common Usage", :api do
-    
+
+      # Define variables available only within
+      # in the current tryout definition.
+      set :local_variable, 3
+      
+      setup do
+        # do stuff before all drills
+      end
+      
+      clean do 
+        # do stuff after all drills
+      end
+      
       # This drill block should return 3.
-      drill "Maths R Us", 3 do
+      drill "Maths R Us", local_variable do
         12 / 4
       end
-      
+
       # You can specify a method to execute
-      # on the return value of the drill block. 
+      # on the return value of the drill block.
       drill "We want a symbol", :class, Symbol do
-        orange.methods.first
+        Class.methods.first
       end
-      
+
       # Dreams can also be specified explicitly which is
       # important b/c it's possible to specify multiple.
       dream :class, Array
-      dream [:a, :b, :c]
+      dream ['b', 'c', 'd']
       drill "Should return a list of 3" do
-        Letters.list(3)
+        letters = 'a'..'z'
+        letters.to_a[1..local_variable]
       end
-      
+
       # Drills can pass based on an exception too.
       dream :exception, NameError
       drill "Something failed" do
         raise NameError
       end
-      
-      # We can even put simple drills on a single line. 
+
+      # We can even put simple drills on a single line.
       drill 'Small, fast, and furious', 'Muggsy Bogues', :match, /Mug+sy Bogu?es/
-      
+
     end
 
+
 === Testing Command-Line Applications (:cli)
 
 You can execute drills on command-line applications. 
@@ -187,19 +201,14 @@ http://delano.github.com/tryouts/screens/tryouts-0.8-benchmark.png
 
 == News
 
-=== 2009-07-01: Drills for command-line applications
-
-Support for testing command-line applications has been re-introduced in 0.8. See example code further down in this README. 
+=== 2009-07-20: New DSL keyword "set"
 
-=== 2009-06-26: DSL Syntax Change
+The "set" keyword has been introduced in 0.8.4 for defining variables available only to the Tryout definition they were declared in. See Example 1. 
 
-The order of dream arguments has reversed between 0.7.1 and 0.7.2. It is now:
-
-* <tt>dream :method, 'Expected value'</tt>
+=== 2009-07-01: Drills for command-line applications
 
-This is a return to the original syntax and I think it's the right way to go because it reads more naturally in the one-liner format:
+Support for testing command-line applications has been re-introduced in 0.8. See example code further down in this README. 
 
-* <tt>drill 'test name', 'return value', :class, String</tt>
 
 
 == BETA Notice

data/bin/sergeant

@@ -3,8 +3,7 @@
 TRYOUTS_HOME = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
 $:.unshift File.join(TRYOUTS_HOME, 'lib')
-
-local_libs = %w{tryouts net-scp amazon-ec2 aws-s3 caesars drydock rye storable sysinfo annoy}
+local_libs = %w{tryouts drydock rye storable sysinfo attic}
 local_libs.each { |dir| $:.unshift File.join(TRYOUTS_HOME, '..', dir, 'lib') }
 
 require 'drydock'

data/lib/tryouts/tryout.rb

@@ -30,13 +30,16 @@ class Tryouts
     # A Hash of Dream objects for this Tryout. The keys are drill names. 
   attr_reader :dream_catcher
   
+    # The instance of Drill::Context in which the drills will run in. 
+  attr_reader :drill_context
      
   def initialize(name, dtype, command=nil, *args)
     raise "Must supply command for dtype :cli" if dtype == :cli && command.nil?
     raise "#{dtype} is not a valid drill type" if !Drill.valid_dtype?(dtype)
     @name, @dtype, @command = name, dtype, command
-    @drills, @dream_catcher = [], []
+    @drills, @dream_catcher, @locals = [], [], {}
     @passed, @failed, @skipped = 0, 0, 0
+    @drill_context = DrillContext.new
   end
   
   ## ---------------------------------------  EXTERNAL API  -----
@@ -54,11 +57,11 @@ class Tryouts
   
   # Execute all Drill objects
   def run
-    DrillContext.module_eval &setup if setup.is_a?(Proc)
+    @drill_context.instance_eval &setup if setup.is_a?(Proc)
     puts "\n  %s ".bright % @name unless Tryouts.verbose < 0
     @drills.each do |drill|
       print '   %-69s ' % "\"#{drill.name}\"" unless Tryouts.verbose < 0
-      drill.run DrillContext.new
+      drill.run @drill_context
       if drill.skip?
         @skipped += 1
       elsif drill.success?
@@ -69,7 +72,7 @@ class Tryouts
       puts drill.flag                           # PASS, FAIL, SKIP
       puts drill.info if Tryouts.verbose > 0 && !drill.skip?  
     end
-    DrillContext.module_eval &clean if clean.is_a?(Proc)
+    @drill_context.instance_eval &clean if clean.is_a?(Proc)
   end
   
   # Prints error output. If there are no errors, it prints nothing. 
@@ -81,13 +84,15 @@ class Tryouts
       puts $/, ' ' << title.color(:red).att(:reverse)
       puts drill.report
     end
-    # Print errors for successful runs too
-    success = @drills.select { |d| !d.skip? && d.success? }
-    success.each do |drill,index|
-      next unless drill.has_error?
-      title = ' Non-fatal error in: %-69s ' % ["\"#{drill.name}\""]
-      puts $/, ' ' << title.color(:red)
-      puts drill.report
+    if Tryouts.verbose > 0
+      # Print errors for successful runs too
+      success = @drills.select { |d| !d.skip? && d.success? }
+      success.each do |drill,index|
+        next unless drill.has_error?
+        title = ' Non-fatal error in: %-69s ' % ["\"#{drill.name}\""]
+        puts $/, ' ' << title.color(:red)
+        puts drill.report
+      end
     end
   end
   
@@ -109,7 +114,16 @@ class Tryouts
     d
   end
   
-  ## ---------------------------------------  EXTERNAL DSL  -----
+  ## ------------------------------------------------  DSL  -----
+  
+  # Define a method named +key+ for only the current instances of
+  # Tryout and DrillContext so it's not available anywhere else.
+  # The methods return +value+.  
+  def set(key, value)
+    self.meta_def( key )           { value }
+    @drill_context.meta_def( key ) { value }
+    value
+  end
   
   # A block to executed one time _before_ starting the drills
   def setup(&block)

data/lib/tryouts.rb

@@ -1,5 +1,6 @@
 
 require 'time'
+require 'attic'
 require 'sysinfo'
 require 'digest/sha1'
 require 'ostruct'
@@ -45,7 +46,7 @@ class Tryouts
     end
   end
     
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
   
   require 'tryouts/mixins'
   require 'tryouts/tryout'

data/tryouts/14_set_tryouts.rb

@@ -0,0 +1,26 @@
+library :tryouts, 'lib'
+group "Syntax"
+
+tryouts "Set (initial)" do
+  set :key1, 9000
+  drill "set values are available outside drill/dream blocks", key1 do
+    9000
+  end
+  drill "set values are available inside drill/dream blocks", 9000 do
+    key1
+  end
+end
+
+tryouts "Set (double check)" do
+
+  dream :exception, NameError
+  drill "set values are not available from other tryouts inside blocks" do
+    key1
+  end
+  
+  ## NOTE: This drill will create a runtime error b/c key1 isn't defined here.
+  ## dream key1
+  ## drill "set values are not available from other tryouts outside blocks" do
+  ## end
+    
+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.3"
+	s.version = "0.8.4"
 	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"
@@ -28,6 +28,7 @@
   # = DEPENDENCIES =
   # Add all gem dependencies
   s.add_dependency 'rye'
+  s.add_dependency 'attic'
   s.add_dependency 'drydock'
   s.add_dependency 'sysinfo'
   
@@ -64,6 +65,7 @@
   tryouts.gemspec
   tryouts/01_mixins_tryouts.rb
   tryouts/10_syntax_tryouts.rb
+  tryouts/14_set_tryouts.rb
   tryouts/15_dreams_tryouts.rb
   tryouts/20_cli_tryouts.rb
   tryouts/30_benchmark_tryouts.rb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tryouts
 version: !ruby/object:Gem::Version 
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-19 00:00:00 -04:00
+date: 2009-07-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: attic
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: drydock
   type: :runtime
@@ -79,6 +89,7 @@ files:
 - tryouts.gemspec
 - tryouts/01_mixins_tryouts.rb
 - tryouts/10_syntax_tryouts.rb
+- tryouts/14_set_tryouts.rb
 - tryouts/15_dreams_tryouts.rb
 - tryouts/20_cli_tryouts.rb
 - tryouts/30_benchmark_tryouts.rb