tango 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tango (0.0.1)
+    tango (0.0.2)
 
 GEM
   remote: http://rubygems.org/

data/lib/tango.rb

@@ -1,6 +1,5 @@
 require 'tango/dance'
 require 'tango/dance_builder'
+require 'tango/errors'
 require 'tango/step'
-require 'tango/step_builder'
 require 'tango/step_runner'
-require 'tango/step_runner_context'

data/lib/tango/dance.rb

@@ -1,9 +1,6 @@
 module Tango
   class Dance
 
-    class StepAlreadyDefinedError < RuntimeError; end
-    class UndefinedStepError < RuntimeError; end
-
     def initialize(&block)
       @steps = {}
       DanceBuilder.new(self).instance_eval(&block)
@@ -15,9 +12,9 @@ module Tango
       @steps[name] = step
     end
 
-    def run(step_name, options = {})
+    def run(step_name, *args)
       raise UndefinedStepError, "Step #{step_name} not defined" unless @steps.has_key?(step_name)
-      @steps[step_name].run(options)
+      @steps[step_name].run(*args)
     end
 
   end

data/lib/tango/errors.rb

@@ -0,0 +1,6 @@
+module Tango
+  class StepAlreadyDefinedError < RuntimeError; end
+  class UndefinedStepError      < RuntimeError; end
+  class CouldNotMeetError       < RuntimeError; end
+  class MeetWithoutMetError     < RuntimeError; end
+end

data/lib/tango/step.rb

@@ -1,13 +1,14 @@
 module Tango
   class Step
     def initialize(&block)
-      StepBuilder.new(self).instance_eval(&block)
+      @block = block
     end
 
-    attr_accessor :dance, :met_block, :meet_block
+    attr_accessor :dance
+    attr_reader :block
 
-    def run(options = {})
-      StepRunner.new(self, options).run
+    def run(*args)
+      StepRunner.new(self).instance_exec(*args, &block)
     end
   end
 end

data/lib/tango/step_runner.rb

@@ -1,39 +1,24 @@
 module Tango
   class StepRunner
 
-    def initialize(step, options)
-      @step    = step
-      @options = options
-      @context = StepRunnerContext.new(@step)
+    def initialize(step)
+      @step = step
     end
 
-    def run
-      if @step.met_block
-        run_with_met_block
-      else
-        run_without_met_block
-      end
+    def met?(&met_block)
+      @met_block = met_block
     end
 
-  private
-
-    def run_with_met_block
-      unless met?
-        meet
-        raise "Couldn't meet" unless met?
+    def meet(&meet_block)
+      raise MeetWithoutMetError if @met_block.nil?
+      unless instance_eval(&@met_block)
+        instance_eval(&meet_block)
+        raise CouldNotMeetError unless instance_eval(&@met_block)
       end
     end
 
-    def run_without_met_block
-      meet
-    end
-
-    def met?
-      @context.instance_exec(@options, &@step.met_block)
-    end
-
-    def meet
-      @context.instance_exec(@options, &@step.meet_block)
+    def run(step_name, *args)
+      @step.dance.run(step_name, *args)
     end
 
   end

data/lib/tango/version.rb

@@ -1,3 +1,3 @@
 module Tango
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/dance_spec.rb

@@ -8,7 +8,7 @@ module Tango
 
       dance = Dance.new do
         step "example step" do
-          meet { step_run = true }
+          step_run = true
         end
       end
 
@@ -21,11 +21,11 @@ module Tango
 
       dance = Dance.new do
         step "outer step" do
-          meet { run "inner step" }
+          run "inner step"
         end
 
         step "inner step" do
-          meet { inner_step_run = true }
+          inner_step_run = true
         end
       end
 
@@ -33,29 +33,27 @@ module Tango
       inner_step_run.should be_true
     end
 
-    context "option passing" do
-      it "should pass options to a step when running" do
-        step_options = { :example => "example" }
-
+    context "passing arguments" do
+      it "should pass arguments to a step" do
         dance = Dance.new do
-          step "example step" do
-            meet {|options| options.should == step_options }
+          step "example step" do |a, b|
+            a.should == 1
+            b.should == 2
           end
         end
 
-        dance.run "example step", step_options
+        dance.run "example step", 1, 2
       end
 
-      it "should pass options when running other steps" do
-        step_options = { :example => "example" }
-
+      it "should pass arguments when running other steps" do
         dance = Dance.new do
           step "outer step" do
-            meet { run "inner step", step_options }
+            run "inner step", 1, 2
           end
 
-          step "inner step" do 
-            meet {|options| options.should == step_options }
+          step "inner step" do |a, b|
+            a.should == 1
+            b.should == 2
           end
         end
 
@@ -70,7 +68,7 @@ module Tango
             step "example step" do; end
             step "example step" do; end
           end
-        end.should raise_error(Dance::StepAlreadyDefinedError)
+        end.should raise_error(StepAlreadyDefinedError)
       end
 
       it "should raise an error on an attempt to run an undefined step" do
@@ -78,7 +76,7 @@ module Tango
 
         expect do
           dance.run "undefined step"
-        end.should raise_error(Dance::UndefinedStepError)
+        end.should raise_error(UndefinedStepError)
       end
     end
 

data/spec/step_spec.rb

@@ -3,15 +3,15 @@ require 'tango'
 module Tango
   describe Step do
 
-    context "with just a meet block" do
-      it "should run the meet block" do
-        meet_block_calls = 0
+    context "with just a plain block" do
+      it "should run the block" do
+        block_calls = 0
         step = Step.new do
-          meet { meet_block_calls += 1 }
+          block_calls += 1
         end
 
         step.run
-        meet_block_calls.should == 1
+        block_calls.should == 1
       end
     end
 
@@ -59,34 +59,48 @@ module Tango
           meet { meet_block_calls += 1 }
         end
 
-        expect { step.run }.should raise_error
+        expect { step.run }.should raise_error(CouldNotMeetError)
         met_block_calls.should  == 2
         meet_block_calls.should == 1
       end
-    end
-
-    context "run with options" do
-      it "should pass the options to the met block" do
-        step_options = { :example => "example" }
 
+      it "should raise an error if there's a meet block without a met block" do
         step = Step.new do
-          met? do |options|
-            options.should == step_options
-            true
-          end
+          meet { }
         end
 
-        step.run(step_options)
+        expect { step.run }.should raise_error(MeetWithoutMetError)
       end
+    end
 
-      it "should pass the options to the meet block" do
-        step_options = { :example => "example" }
+    context "step arguments" do
+      it "should pass a single argument to the step" do
+        step = Step.new do |a|
+          a.should == 1
+        end
 
-        step = Step.new do
-          meet {|options| options.should == step_options }
+        step.run(1)
+      end
+
+      it "should pass multiple arguments to the step" do
+        step = Step.new do |a, b|
+          a.should == 1
+          b.should == 2
+        end
+
+        step.run(1, 2)
+      end
+
+      it "should capture arguments in the met? and meet blocks" do
+        step = Step.new do |argument|
+          met? do
+            argument.should == 1
+            false
+          end
+          meet { argument.should == 1 }
         end
 
-        step.run(step_options)
+        expect { step.run(1) }.should raise_error(CouldNotMeetError)
       end
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Pete Yandell
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 +11:00
+date: 2011-01-21 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,10 +48,9 @@ files:
 - lib/tango.rb
 - lib/tango/dance.rb
 - lib/tango/dance_builder.rb
+- lib/tango/errors.rb
 - lib/tango/step.rb
-- lib/tango/step_builder.rb
 - lib/tango/step_runner.rb
-- lib/tango/step_runner_context.rb
 - lib/tango/version.rb
 - spec/dance_spec.rb
 - spec/step_spec.rb

data/lib/tango/step_builder.rb

@@ -1,17 +0,0 @@
-module Tango
-  class StepBuilder
-
-    def initialize(step)
-      @step = step
-    end
-
-    def met?(&block)
-      @step.met_block = block
-    end
-
-    def meet(&block)
-      @step.meet_block = block
-    end
-
-  end
-end

data/lib/tango/step_runner_context.rb

@@ -1,13 +0,0 @@
-module Tango
-  class StepRunnerContext
-
-    def initialize(step)
-      @step = step
-    end
-
-    def run(step_name, options = {})
-      @step.dance.run(step_name, options)
-    end
-
-  end
-end