reap 4.5.2 → 5.0.0

data/lib/reap/rake.rb

@@ -0,0 +1,12 @@
+#require 'rake'
+require 'reap/reap'
+
+  app = Reap.application
+
+  app.tasks.each do |name, task|
+    desc task.task_desc
+    task( name ) do |*args|
+      task.execute( *args )
+    end
+  end
+

data/lib/reap/reap.rb

@@ -1,8 +1,10 @@
 
 module Reap
-  Version = "4.5.0"
+  Version = "5.0.1"
 end
 
+require 'reap/app'
+
 # Reap project information object.
 require 'reap/projectinfo'
 
@@ -27,3 +29,4 @@ require 'reap/task/release'
 require 'reap/task/doap'
 require 'reap/task/manifest'
 require 'reap/task/fileperm'  # needs work
+require 'reap/task/custom'

data/lib/reap/task.rb

@@ -28,11 +28,10 @@ require 'reap/projectinfo'
 #
 #     task_attr :mytask
 #
-#     def init
+#     def run
+#
 #       mytask.message ||= 'None Found!'
-#     end
 #
-#     def run
 #       puts mytask.message  #=> Hello!
 #       puts master.default  #=> Yo!
 #       puts mytask.default  #=> Yo!   (inherited from master)
@@ -49,23 +48,8 @@ require 'reap/projectinfo'
 
 module Reap
 
-  # Hash of all possible tasks
-  # { task name => task class }
-
   def self.registry
-    Task.task_list
-  end
-
-  # Hash of tasks available to this project
-
-  def self.tasks
-    unless @tasks
-      @tasks = {}
-      registry.each do |name, klass|
-        @tasks[name] = klass if klass.available?
-      end
-    end
-    @tasks
+    Task.registry
   end
 
   # Task base class.
@@ -79,25 +63,23 @@ module Reap
 
     class << self
 
-      # When this class is inherited the new task is registered
-      # by adding it to the task_list hash.
+      # When this class is inherited the new task is registered.
       def inherited( base )
-        task_list[base.task_name] = base
+        registry << base
+        YAML.add_private_type( base.basename.downcase ) do |type, val|
+          base.new( val )
+        end
       end
 
-      # Task list hash.
-      def task_list
-        @task_list ||= {}
+      # List of task classes.
+      def registry
+        @registry ||= []
       end
 
-      # === Task DSL methods
+      # Task DSL
 
-      #def task_section_required( val ) ; @section_required = val ; end
-      #def section_required?       ; @section_required ; end
-
-      # Provided the tasks name. This defualt's the task's
-      # class' name downcased, so it is rarely needed.
-      def task_name
+      # Provides tasks type.
+      def task_class
         basename.downcase
       end
 
@@ -107,6 +89,7 @@ module Reap
         return @task_desc = block if block_given?
         return @task_desc.call
       end
+      alias_method :desc, :task_desc
 
       # Takes a string or a block the evaluates to a string
       # providing detailed help information about the task.
@@ -115,9 +98,11 @@ module Reap
         return @task_help = block if block_given?
         return @task_help.call
       end
+      alias_method :help, :task_help
 
       # Set alias for 'task' attribute, which provides
       # inherited (from master) access to section data.
+      # (Deprecate? You can use "alias_method name, :task")
       def task_attr( name )
         define_method(name) { @task }
       end
@@ -137,7 +122,7 @@ module Reap
       def task_available( bool=false, &block )
         if bool
           (class << self; self; end).class_eval {
-            define_method( :available? ){ true }
+            define_method( :available? ){ |app| true }
           }
         else
           (class << self; self; end).class_eval {
@@ -147,21 +132,12 @@ module Reap
       end
 
       # Is the task available for use? By default
-      # a task is only made available if the ProjectInfo
-      # is present and the task's section is present.
-      def available?
-        return false unless Reap.projectfile?
-        #if section_required?
-          return has_section?
-        #end
-        #true
-      end
+      # a task is only made available if the
+      # ProjectInfo file has a task for it.
 
-      # Project file exists and has task's section?
-      def has_section?
-        return false unless Reap.projectfile?
-        ProjectInfo.instance.info.key?( task_name )
-      end
+     def available?(app)
+       false
+     end
 
       # Class-level access to Project file's master data
       # provided via a CascadingOpenObject.
@@ -173,77 +149,71 @@ module Reap
 
     # instance methods
 
-    def task_name ; self.class.task_name ; end
-    def task_desc ; self.class.task_desc ; end
-    def task_help ; self.class.task_help ; end
+    attr_accessor :task_name
+    def name ; task_name ; end
 
-    #def section_required? ; self.class.section_required? ; end
+    def task_desc ; @section[:desc] || self.class.task_desc ; end
+    def task_help ; self.class.task_help ; end
 
-    #def master ; ::ProjectInfo.info ; end
-    def master  ; self.class.master  ; end
-    def section ; @section ; end
-    def task    ; @task    ; end
+    def master    ; self.class.master  ; end
+    def setting   ; @task    ; end
 
-    def initialize( *args )
-      #@master = CascadingOpenObject.new( $PROJECT_INFO )
-      @args = args
-    end
+    attr :section
 
-    # Run task for each section entires given.
-
-    def execute( section=nil )
-      section = section || master[task_name]
-      case section
-      when Array
-        section.each do |s|
-          initiate( s )
-        end
+    def initialize( section )
+      case section when Hash, nil
+        @section = CascadingOpenObject.new( section || {} )
       else
-        initiate( section )
+        @section = section
       end
     end
 
-    # Per section entry execution of task.
+    # Run task.
 
-    def initiate( section )
-      @section = CascadingOpenObject.new( section )
+    def execute( *args )
+      #@section = CascadingOpenObject.new( section )
 
-      task_properties = {}  # needed?
-      #self.class.task_only_properties.each { |t| section[t] ||= nil }
-      task_properties = CascadingOpenObject.new( section )
-      task_properties.__parent__ = master
-      @task = task_properties
+      task = section.dup
+      if task.respond_to?(:__parent__)
+        task.__parent__ = master
+      end
+      @task = task
 
       # deprecate init ?
       if respond_to?( :init )
         if method(:init).arity == 0
           init
         else
-          init( *@args )
+          init( *args )
         end
       end
 
       if method(:run).arity == 0
         run
       else
-        run( *@args )
+        run( *args )
       end
     end
 
     # interface
 
     #def init
-    #  raise "not implemented for '#{task_name}' task"
+    #  raise "not implemented for '#{name}' task"
     #end
 
     def run
       raise "no action defined for task #{task_name}"
     end
 
+    # delegate to section hash
+    def method_missing( *args, &block )
+      @section.send( *args, &block )
+    end
+
     # Task support methods
 
     def use_subsection( name )
-      subsection = @section.__send__(name)
+      subsection = @section.__send__(task_name)
       if subsection
         subsection.__parent__ = @section
         @task = subsection

data/lib/reap/task/announce.rb

@@ -70,7 +70,7 @@ class Reap::Announce < Reap::Task
 
   }
 
-  alias_method :anc, :task
+  task_attr :anc
 
   def run
 

data/lib/reap/task/custom.rb

@@ -0,0 +1,12 @@
+
+class Custom < Reap::Task
+
+  task_desc "Custom task"
+
+  task_attr :cust
+
+  def run
+    instance_eval cust.task
+  end
+
+end

data/lib/reap/task/doap.rb

@@ -24,9 +24,9 @@ module Reap
 
     }
 
-    task_available { Reap.projectfile? }
+    task_available { |app| app.projectfile? }
 
-    alias_method :prj, :task
+    task_attr :prj
 
     def run
 

data/lib/reap/task/extest.rb

@@ -37,7 +37,7 @@ class Reap::ExTest < Reap::Task
 
   }
 
-  alias_method :tst, :task
+  task_attr :tst
 
   def run
 

data/lib/reap/task/fileperm.rb

@@ -20,8 +20,6 @@ class Reap::Perm < Reap::Task
 
   task_help %{
 
-    reap perm
-
     Normalizes file permissions.
 
       user          user name to use
@@ -29,7 +27,7 @@ class Reap::Perm < Reap::Task
 
   }
 
-  alias_method :perm, :task
+  task_attr :perm
 
   def run
 

data/lib/reap/task/info.rb

@@ -23,7 +23,7 @@ class Reap::Info < Reap::Task
 
   }
 
-  task_available { Reap.projectfile? }
+  task_available { |app| app.projectfile? }
 
   def run
     puts ProjectInfo.instance.info_stream

data/lib/reap/task/install.rb

@@ -22,12 +22,11 @@ class Reap::Install < Reap::Task
 
   }
 
-  # For now. In future I think an install section will be required.
-  task_available { Reap.projectfile? }
+  task_attr :ins
 
   def run
 
-    task.options ||= []
+    ins.options ||= []
 
     #exe = %w{ setup.rb install.rb }.find{ |f| File.exists?(f) }
     #raise "setup.rb or install.rb not found" if exe == nil
@@ -45,7 +44,7 @@ class Reap::Install < Reap::Task
 
     exe = %{ruby setup.rb}
     exe << ' -q ' unless $VERBOSE
-    exe << task.options.join(' ')
+    exe << ins.options.join(' ')
     exe << ' all'
     sh exe
 

data/lib/reap/task/manifest.rb

@@ -16,8 +16,6 @@ class Reap::Manifest < Reap::Task
 
   task_desc "Create a MANIFEST file for this package."
 
-  task_available { Reap.projectfile? }
-
   task_help %{
 
     reap manifest
@@ -29,7 +27,7 @@ class Reap::Manifest < Reap::Task
 
   }
 
-  alias_method :man, :task
+  task_attr :man
 
   def run
 

data/lib/reap/task/package.rb

@@ -1,13 +1,6 @@
 
 require 'reap/task'
 
-begin
-  require 'rubygems'
-rescue LoadError
-  # no rubygems
-end
-
-
 #  ___         _                   _____        _
 # | _ \__ _ __| |____ _ __ _ ___  |_   _|_ _ __| |__
 # |  _/ _` / _| / / _` / _` / -_)   | |/ _` (_-< / /
@@ -81,10 +74,19 @@ class Reap::Package < Reap::Task
 
   # Alternate for task properties accessor.
 
-  alias_method :pkg, :task
+  task_attr :pkg
 
   def run
 
+    # load rubygems if available
+    # (only do this if need be in future?)
+
+    begin
+      require 'rubygems'
+    rescue LoadError
+      # no rubygems
+    end
+
     # setup package defaults
 
     # Do not look in master information for this

data/lib/reap/task/publish.rb

@@ -60,7 +60,7 @@ class Reap::Publish < Reap::Task
   #attr_accessor :host, :type, :dir, :project, :username
   #attr_accessor :exclude  # not using yet
 
-  alias_method :pub, :task
+  task_attr :pub
 
   # Run the publishing task.
 

data/lib/reap/task/rdoc.rb

@@ -24,14 +24,12 @@ require 'reap/task'
 
 class Reap::RDoc < Reap::Task
 
-  MUST_EXCLUDE = [ 'InstalledFiles', 'CVS/**/*' ]
+  MUST_EXCLUDE = [ 'InstalledFiles', 'CVS/**/*', '_darcs/**/*' ]
 
   task_desc "Generate RDoc API documentation."
 
   task_help %{
 
-    reap rdoc
-
     Generate RDoc doumentation.
 
       dir          Directory to store documentation [doc].
@@ -44,7 +42,7 @@ class Reap::RDoc < Reap::Task
 
   }
 
-  alias_method :doc, :task
+  task_attr :doc
 
   def run
 
@@ -54,7 +52,7 @@ class Reap::RDoc < Reap::Task
     doc.main     ||= 'README'
     doc.title    ||= master.title
     doc.template ||= 'html' # 'jamis'
-    doc.include  ||= [ 'A-Z*', 'lib/**/*', 'ext/**/*' ]
+    doc.include  ||= [ 'A-Z*', 'lib/**/*', 'ext/**/*', doc.main ]
     doc.exclude  ||= [ 'demo/**/*', 'example/**/*', 'sample/**/*' ]
     doc.options  ||= ['--merge', '--all']