rap 0.13.0 → 0.13.1

data/History

@@ -1,10 +1,13 @@
+== 0.17.1 / 2009-06-06
+
+Updates for Tap-0.17.1.
+
+* Refactored DeclarationTask as Rap::Task
+
 == 0.13.0 / 2009-05-25
 
 Updates to use Tap-0.17.0.
 
-* added Test task
-* added Manifest task
-
 == 0.12.3 / 2009-03-23
 
 Update executable to use Tap-0.12.4.  No significant changes.

data/README

@@ -102,7 +102,7 @@ minor and sometimes no changes.
 
 ==== Regarding Tap
 
-Rap tasks (ie subclasses of Rap::DeclarationTask) are designed to behave like
+Rap tasks (ie subclasses of Rap::Task) are designed to behave like
 Rake tasks. As such Rap tasks:
 
 * return nil and pass nil in workflows 

data/bin/rap

@@ -56,15 +56,19 @@ when '--help', nil, '-T'
 else
   begin
     schema = Tap::Schema.parse(ARGV)
-    env.run(schema) do |type, key, metadata|
-      if type == :task && Rap::Rake.has_rakefile?
-        warn "warning: implict rake for '#{metadata.join(' ')}'"
-        metadata.unshift(key)
-        Rap::Rake
-      else
-        nil
+    schema.tasks.each_pair do |key, task|
+      if tasc = env[:task][task[0]]
+        task[0] = tasc
+      elsif Rap::Rake.has_rakefile?
+        warn "warning: implict rake for '#{task.join(' ')}'"
+        task.unshift(Rap::Rake)
       end
     end
+    
+    app = Tap::App.instance
+    app.build(schema, :resources => env)
+    Tap::Exe.set_signals(app)
+    app.run
   rescue
     raise if $DEBUG
     puts $!.message

data/lib/rap/declarations.rb

@@ -1,4 +1,4 @@
-require 'rap/declaration_task'
+require 'rap/task'
 require 'rap/utils'
 
 module Rap
@@ -21,19 +21,19 @@ module Rap
   #     t.class                          # => Nested::Sample
   #   end
   #
-  # Normally all declared tasks are subclasses of DeclarationTask, but
-  # subclasses of DeclarationTask can declare tasks as well.
+  # Normally all declared tasks are subclasses of Rap::Task, but
+  # subclasses of Rap::Task can declare tasks as well.
   #
-  #   class Alt < DeclarationTask
+  #   class Alt < Rap::Task
   #   end
   #
   #   include Rap::Declarations
   #
-  #   desc "task one, a subclass of DeclarationTask"
+  #   desc "task one, a subclass of Rap::Task"
   #   o = Rap.task(:one)
   #   o.class                            # => One
-  #   o.class.superclass                 # => DeclarationTask
-  #   o.class.desc.to_s                  # => "task one, a subclass of DeclarationTask"
+  #   o.class.superclass                 # => Rap::Task
+  #   o.class.desc.to_s                  # => "task one, a subclass of Rap::Task"
   #
   #   namespace(:nest) do
   #     desc "task two, a nested subclass of Alt"
@@ -43,10 +43,10 @@ module Rap
   #     t.class.desc.to_s                # => "task two, a nested subclass of Alt"
   #   end
   #
-  # This feature is only available to subclasses of DeclarationTask and can
+  # This feature is only available to subclasses of Rap::Task and can
   # be very useful for creating inheritance hierarchies.  Note that other
   # declaration methods like 'desc' and 'namespace' are not available on
-  # DeclarationTask or subclasses, just 'task'.
+  # Rap::Task or subclasses, just 'task'.
   #
   # See the {Syntax Reference}[link:files/doc/Syntax%20Reference.html] for more
   # information.
@@ -81,11 +81,11 @@ module Rap
     end
     
     # Declares a task with a rake-like syntax.  Task generates a subclass of
-    # DeclarationTask, nested within the current namespace.
+    # Rap::Task, nested within the current namespace.
     def task(*args, &action)
       # resolve arguments and declare unknown dependencies
       name, configs, dependencies, arg_names = resolve_args(args) do |dependency| 
-        register DeclarationTask.subclass(dependency)
+        register Rap::Task.subclass(dependency)
       end
       
       # generate the task class
@@ -198,11 +198,11 @@ module Rap
       name.to_s.tr(":", "/")
     end
     
-    # The class of task declared by task, by default DeclarationTask. 
+    # The class of task declared by task, by default Rap::Task. 
     # Used as a hook to set the declaring class in including modules 
-    # (such as DeclarationTask itself).
+    # (such as Rap::Task itself).
     def declaration_class
-      DeclarationTask
+      Rap::Task
     end
     
     # Registers a task class with the Declarations.env, if necessary.
@@ -225,7 +225,7 @@ module Rap
     end
   end
   
-  class DeclarationTask
+  class Task
     class << self
       # :stopdoc:
       alias original_desc desc

data/lib/rap/rake.rb

@@ -25,8 +25,9 @@ module Rap
           puts help
           exit
         end
-        argv = argv.collect {|arg| arg == '--rake-help' ? '--help' : arg}
-        [new({}, app), argv]
+        argv.collect! {|arg| arg == '--rake-help' ? '--help' : arg}
+        
+        new({}, app)
       end
       
       # Returns true if Rake detects a rakefile.

data/lib/rap/{declaration_task.rb → task.rb}

@@ -5,7 +5,7 @@ require 'rap/description'
 
 module Rap
   
-  # DeclarationTasks are a special breed of Tap::Task designed to behave much
+  # Rap tasks are a special breed of Tap::Task designed to behave much
   # like Rake tasks.  As such, declaration tasks:
   #
   # * return nil and pass nil in workflows 
@@ -13,7 +13,7 @@ module Rap
   # * are effectively singletons (one instance per app)
   # * allow for multiple actions
   #
-  # The DeclarationTask class partially includes Declarations so subclasses
+  # The Rap::Task class partially includes Declarations so subclasses
   # may directly declare tasks.  A few alias acrobatics makes it so that ONLY
   # Declarations#task is made available (desc cannot be used because Task
   # classes already use that method for documentation, and namespace
@@ -22,7 +22,7 @@ module Rap
   # Weird? Yes, but it leads to this syntax:
   #
   #   # [Rapfile]
-  #   # class Subclass < Rap::DeclarationTask
+  #   # class Subclass < Rap::Task
   #   #   def helper(); "help"; end
   #   # end
   #   #
@@ -32,7 +32,7 @@ module Rap
   #   % rap help
   #   got help
   #
-  class DeclarationTask < Tap::Task
+  class Task < Tap::Task
     class << self
       
       # Sets actions.
@@ -60,14 +60,8 @@ module Rap
         args
       end
       
-      # Instantiates the instance of self for app and reconfigures it using
-      # argh.  Configurations are set, the task name is set, and the
-      # arguments are stored on the instance.  The arguments are returned
-      # as normal in the [instance, args] result.
-      #
-      # These atypical behaviors handle various situations on the command
-      # line.  Setting the args this way, for example, allows arguments to
-      # be specified on dependency tasks:
+      # Parses as normal, but also stores the arguments on the instance to
+      # allows arguments to be specified on dependency tasks:
       #
       #   # [Rapfile]
       #   # Rap.task(:a, :obj) {|t, a| puts "A #{a.obj}"}
@@ -77,19 +71,29 @@ module Rap
       #   A hello
       #   B world
       #
+      def parse!(argv=ARGV, app=Tap::App.instance)
+        instance = super
+        instance.args = argv
+        instance
+      end
+      
+      # Instantiates the instance of self for app and reconfigures it as
+      # specified in argh.
       def instantiate(argh={}, app=Tap::App.instance)
-        config = argh[:config]
-        config_file = argh[:config_file]
-        
         instance = self.instance(app)
-        instance.reconfigure(load_config(config_file)) if config_file
-        instance.reconfigure(config) if config
-        instance.args = argh[:args]
-      
-        [instance, instance.args]
+        
+        if config = argh[:config]
+          instance.reconfigure(config)
+        end
+        
+        if args = argh[:args]
+          instance.args = args
+        end
+        
+        instance
       end
       
-      # Looks up or creates the DeclarationTask subclass specified by const_name
+      # Looks up or creates the Rap::Task subclass specified by const_name
       # and adds the configs and dependencies.
       #
       # Configurations are always validated using the yaml transformation block
@@ -101,7 +105,7 @@ module Rap
           constants.inject(base) do |namespace, const|
             # nesting Task classes into other Task classes is required
             # for namespaces with the same name as a task
-            namespace.const_set(const, Class.new(DeclarationTask))
+            namespace.const_set(const, Class.new(Rap::Task))
           end.const_set(subclass_const, Class.new(self))
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rap
 version: !ruby/object:Gem::Version 
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors: 
 - Simon Chiang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-25 00:00:00 -06:00
+date: 2009-06-06 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.17.0
+        version: 0.17.1
     version: 
 description: 
 email: simon.a.chiang@gmail.com
@@ -34,7 +34,7 @@ extra_rdoc_files:
 - History
 - doc/Syntax Reference
 files: 
-- lib/rap/declaration_task.rb
+- lib/rap/task.rb
 - lib/rap/declarations.rb
 - lib/rap/description.rb
 - lib/rap/rake.rb