tap 0.10.0 → 0.10.1

data/lib/tap/test/tap_methods.rb

@@ -173,8 +173,6 @@ module Tap
         assert_audit_records_equal(expected, actual, nesting)
       end
       
-      private
-      
       def assert_audit_records_equal(expected, actual, nesting=[])
         assert_equal ExpAudit, expected.class
         assert_equal expected.length, actual.length, "unequal number of records"
@@ -192,9 +190,7 @@ module Tap
           end
         end
       end
-      
-      public
-      
+
       # The configurations used to initialize self.app
       def app_config
         { :root => method_root, 

data/lib/tap/workflow.rb

@@ -78,6 +78,27 @@ module Tap
   #
   class Workflow 
     include Support::Framework
+    
+    class << self
+      protected
+      
+      def define(name, klass=Tap::Task, &block)
+        instance_var = "@#{name}".to_sym
+        
+        define_method(name) do |*args|
+          raise ArgumentError, "wrong number of arguments (#{args.length} for 1)" if args.length > 1
+          
+          instance_name = args[0] || name
+          instance_variable_set(instance_var, {}) unless instance_variable_defined?(instance_var)
+          instance_variable_get(instance_var)[instance_name] ||= task(instance_name, klass, &block)
+        end
+        
+        define_method("#{name}=") do |input|
+          input = {name => input} unless input.kind_of?(Hash)
+          instance_variable_set(instance_var, input)
+        end
+      end
+    end
 
     # The entry point for self.
     attr_accessor :entry_point
@@ -103,25 +124,31 @@ module Tap
       initialize_workflow
     end
     
+    def initialize_workflow
+      @entry_point = {}
+      @exit_point = {}
+      workflow
+    end
+    
     # Returns an array of entry points, determined from entry_point.
     def entry_points
-      case entry_point
-      when Hash then entry_point.values
-      when Support::Executable then [entry_point]
-      when Array then entry_point
-      else
-        raise "unable to determine entry points from entry_point (should be Hash, Array, or Executable): #{entry_point}"
+      case @entry_point
+      when Hash then @entry_point.values
+      when Support::Executable then [@entry_point]
+      when Array then @entry_point
+      when nil then []
+      else raise "unable to determine entry points from entry_point: #{@entry_point}"
       end
     end
     
     # Returns an array of exit points, determined from exit_point.
     def exit_points
-      case exit_point
-      when Hash then exit_point.values
-      when Support::Executable then [exit_point]
-      when Array then exit_point
-      else
-        raise "unable to determine exit points from exit_point (should be Hash, Array, or Executable): #{exit_point}"
+      case @exit_point
+      when Hash then @exit_point.values
+      when Support::Executable then [@exit_point]
+      when Array then @exit_point
+      when nil then []
+      else raise "unable to determine exit points from exit_point: #{@exit_point}"
       end
     end
     
@@ -149,36 +176,22 @@ module Tap
     end
     
     batch_function(:on_complete) {}
-
+    
+    def task(name, klass=Tap::Task, &block)
+      configs = config[name] || {}
+      raise ArgumentError, "config '#{name}' is not a hash" unless configs.kind_of?(Hash)
+      klass.new(configs, name, &block)
+    end
+    
     # The workflow definition method.  By default workflow
     # simply calls the task_block.  In subclasses, workflow
     # should be overridden to provide the workflow definition.
     def workflow
-      raise WorkflowError.new("No workflow definition provided.") unless task_block
-      task_block.call(self) 
-    end
-
-    class WorkflowError < Exception # :nodoc:
-    end
-    
-    # Returns the name of the workflow joined to the input.  This
-    # can be convenient when naming internal tasks, as they can 
-    # be grouped based on the name of the workflow.  Returns
-    # the name of the workflow if input == nil.
-    def name(input=nil)
-      input == nil ? @name : File.join(@name, input)
+      task_block.call(self) if task_block
     end
     
     protected
     
-    def initialize_workflow
-      @entry_point = {}
-      @exit_point = {}
-      
-      workflow
-      raise WorkflowError.new("No entry points defined") if entry_points.empty?
-    end
-    
     # Hook to set a default task block.  By default, nil.
     def default_task_block
       nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tap
 version: !ruby/object:Gem::Version 
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors: 
 - Simon Chiang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-08 00:00:00 -06:00
+date: 2008-08-21 00:00:00 -06:00
 default_executable: tap
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - cmd/console.rb
 - cmd/destroy.rb
 - cmd/generate.rb
+- cmd/manifest.rb
 - cmd/run.rb
 - doc/Tutorial
 - doc/Class Reference
@@ -41,6 +42,7 @@ files:
 - lib/tap/app.rb
 - lib/tap/constants.rb
 - lib/tap/env.rb
+- lib/tap/exe.rb
 - lib/tap/file_task.rb
 - lib/tap/generator/base.rb
 - lib/tap/generator/destroy.rb
@@ -89,7 +91,10 @@ files:
 - lib/tap/support/executable_queue.rb
 - lib/tap/support/framework.rb
 - lib/tap/support/framework_class.rb
+- lib/tap/support/gems/rake.rb
+- lib/tap/support/gems.rb
 - lib/tap/support/instance_configuration.rb
+- lib/tap/support/lazy_attributes.rb
 - lib/tap/support/lazydoc.rb
 - lib/tap/support/manifest.rb
 - lib/tap/support/run_error.rb
@@ -107,6 +112,7 @@ files:
 - lib/tap/test/env_vars.rb
 - lib/tap/test/file_methods.rb
 - lib/tap/test/script_methods.rb
+- lib/tap/test/script_methods/script_test.rb
 - lib/tap/test/subset_methods.rb
 - lib/tap/test/tap_methods.rb
 - lib/tap/test.rb