sprout 0.7.220-x86-linux → 0.7.221-x86-linux

data/lib/sprout.rb

@@ -30,6 +30,7 @@ require 'rubygems/source_info_cache'
 require 'rubygems/version'
 require 'rubygems/digest/md5'
 
+require 'sprout/tool_task_model'
 require 'sprout/project_model'
 require 'sprout/builder'
 require 'sprout/version'

data/lib/sprout/dynamic_accessors.rb

@@ -21,6 +21,12 @@ module DynamicAccessors
     super
     @missing_params_hash = Hash.new
   end
+  
+  def each_attribute
+    @missing_params_hash.each do |param|
+      yield param if block_given?
+    end
+  end
 
   def method_missing(method, *params, &block)
     if(method.to_s.match(/=$/))

data/lib/sprout/tasks/tool_task.rb

@@ -56,6 +56,7 @@ module Sprout
     def self.define_task(args, &block)
       t = super
       if(t.is_a?(ToolTask))
+        t.find_and_resolve_model
         yield t if block_given?
         t.define
         t.prepare
@@ -98,6 +99,12 @@ module Sprout
       return @gem_path ||= @default_gem_path
     end
     
+    def each_param
+      params.each do |param|
+        yield param if block_given?
+      end
+    end
+    
     # Create a string that can be turned into a file
     # that rdoc can parse to describe the customized
     # or generated task using param name, type and
@@ -198,7 +205,6 @@ module Sprout
     
     def execute(*args)
       display_preprocess_message
-      #puts ">> Executing #{File.basename(exe)} #{to_shell}"
       exe = Sprout.get_executable(gem_name, gem_path, gem_version)
       User.execute(exe, to_shell)
     end
@@ -230,14 +236,30 @@ module Sprout
       params.each do |param|
         param.prepare
       end
+      prepare_prerequisites
+    end
+    
+    def prepare_prerequisites
       # Ensure there are no duplicates in the prerequisite collection
       @prerequisites = prerequisites.uniq
     end
-
+    
     def define
       resolve_libraries(prerequisites)
     end
     
+    # Look for a ToolTaskModel in the list
+    # of prerequisites. If found, apply
+    # any applicable params to self...
+    def find_and_resolve_model
+      prerequisites.each do |prereq|
+        instance = Rake::application[prereq]
+        if(instance.is_a?(ToolTaskModel))
+          resolve_model(instance)
+        end
+      end
+    end
+
     # The default file expression to append to each PathParam
     # in order to build file change prerequisites.
     # 
@@ -247,7 +269,7 @@ module Sprout
       @default_file_expression ||= '/**/**/*'
     end
     
-    protected 
+    protected
     
     def initialize_task
     end
@@ -317,8 +339,6 @@ module Sprout
       end
     end
 
-    protected
-
     def create_param(type)
       return eval("#{type.to_s.capitalize}Param.new")
     end
@@ -330,7 +350,7 @@ module Sprout
     def respond_to?(name)
       result = super
       if(!result)
-        result = param_hash.has_key? name
+        result = param_hash.has_key? name.to_s
       end
       return result
     end
@@ -339,7 +359,7 @@ module Sprout
       name.gsub(/=$/, '')
     end
 
-    def method_missing(name,*args)
+    def method_missing(name, *args)
       name = name.to_s
       cleaned = clean_name(name)
       if(!respond_to?(cleaned))
@@ -375,6 +395,14 @@ module Sprout
     def resolve_library(library_task)
     end
     
+    def resolve_model(model)
+      model.each_attribute do |key, value|
+        if(respond_to? key)
+          self.send("#{key}=", value)
+        end
+      end
+    end
+    
     # If the provided path contains spaces, wrap it in quotes so that
     # shell tools won't choke on the spaces
     def clean_path(path)

data/lib/sprout/tasks/zip_task.rb

@@ -55,7 +55,7 @@ module Sprout
     # this parameter.
     attr_writer :output
     
-    def self.define_task(args, &block) # :nodoc:
+    def self.define_task(*args, &block) # :nodoc:
       t = super
       yield t if block_given?
       t.define
@@ -153,6 +153,6 @@ module Sprout
   end
 end
 
-def zip(args, &block)
+def zip(*args, &block)
   Sprout::ZipTask.define_task(args, &block)
 end

data/lib/sprout/tool_task_model.rb

@@ -0,0 +1,19 @@
+
+module Sprout
+
+  class ToolTaskModel < Rake::FileTask
+    include DynamicAccessors
+    
+    def self.define_task(args, &block)
+      t = super
+      yield t if block_given?
+    end
+    
+  end
+
+  
+end
+
+def tool_task_model(*args, &block)
+  Sprout::ToolTaskModel.define_task(args, &block)
+end

data/lib/sprout/version.rb

@@ -3,7 +3,7 @@ module Sprout
     module VERSION #:nodoc:
       MAJOR = 0
       MINOR = 7
-      TINY  = 220
+      TINY  = 221
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       MAJOR_MINOR = [MAJOR, MINOR].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sprout
 version: !ruby/object:Gem::Version 
-  version: 0.7.220
+  version: 0.7.221
 platform: x86-linux
 authors: 
 - Luke Bayes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 -04:00
+date: 2009-10-29 00:00:00 -04:00
 default_executable: sprout
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,6 +123,7 @@ files:
 - lib/sprout/tasks/tool_task.rb
 - lib/sprout/tasks/zip_task.rb
 - lib/sprout/template_resolver.rb
+- lib/sprout/tool_task_model.rb
 - lib/sprout/user.rb
 - lib/sprout/version.rb
 - lib/sprout/version_file.rb