close #7 Validates actions

lib/trooper/action.rb

@@ -43,7 +43,7 @@ def call(configuration)
       @config = configuration
       @call_count += 1
 
-      if continue_call?
+      if everything_ok? && continue_call?
         reset_commands!
 
         build_commands
@@ -70,16 +70,23 @@ def prerequisite_call(configuration)
       "touch #{prerequisite_list}; if grep -vz #{self.name} #{prerequisite_list}; then #{original_commands.join(' && ')}; else echo 'Already Done'; fi" 
     end
 
-    # Public: Validates the action object. (NOT WORKING)
+    # Public: Validates the action object.
     #
     # Examples
     #
     #   @action.ok? # => true
     #
-    # Returns true.
+    # Returns true or raise an InvalidActionError exception.
     def ok?
-      true
+      begin
+        build_commands
+        reset_commands!
+        true
+      rescue Exception => e
+        raise InvalidActionError, "Action missing config variables - #{e.message}"
+      end
     end
+    alias :everything_ok? :ok?
 
     # Public: What type of action this is.
     #

spec/trooper/action_spec.rb

@@ -7,7 +7,7 @@
 
   before do
     @action = Trooper::Action.new :my_action, 'description' do
-      run 'touch test.txt'
+      run "touch #{my_var}.txt"
     end
 
     @action2 = Trooper::Action.new :my_action, 'description', :local => true do |a|
@@ -36,24 +36,29 @@
   end
 
   it "should be able to call the action after init" do
-    @action.call(:my_var => 'my_var').should == ['touch test.txt']
+    @action.call(:my_var => 'my_var').should == ['touch my_var.txt']
 
     @action2.commands.should == []
   end
 
+  it "should validate that an action has all the variables it needs" do
+    @action.call(:my_var => 'my_var').should == ['touch my_var.txt']
+    lambda { @action.call({}) }.should raise_error(Trooper::InvalidActionError)
+  end
+
   it "should be able to pass a block" do
     @action.call(:my_var => 'my_var')
-    @action.commands.should == ['touch test.txt']
+    @action.commands.should == ['touch my_var.txt']
 
     @action2.call(:my_var => 'my_var')
     @action2.commands.should == ['touch test.txt']
   end
 
   it "should not duplicate the commands if called again" do
     @action.call(:my_var => 'my_var')
-    @action.commands.should == ['touch test.txt']
+    @action.commands.should == ['touch my_var.txt']
     @action.call(:my_var => 'my_var')
-    @action.commands.should == ['touch test.txt']
+    @action.commands.should == ['touch my_var.txt']
   end
 
   it "should add strings to the commands array" do