reap 4.3.4 → 4.4.0

data/lib/reap/rake/manifest.rb

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require 'reap/rake/adapter'
+require 'reap/task/manifest'
+
+module Rake
+  ReapManifest = ::Reap::RakeAdapter( ::Reap::Manifest )
+end
+

data/lib/reap/rake/package.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'reap/rake/adapter'
+require 'reap/task/package'
+
+module Rake
+
+  ReapPackage = ::Reap::RakeAdapter( ::Reap::Package )
+
+end

data/lib/reap/rake/publish.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'reap/rake/adapter'
+require 'reap/task/publish'
+
+module Rake
+
+  ReapPublish = ::Reap::RakeAdapter( ::Reap::Publish )
+
+end

data/lib/reap/rake/rdoc.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'reap/rake/adapter'
+require 'reap/task/rdoc'
+
+module Rake
+
+  ReapRDoc = ::Reap::RakeAdapter( ::Reap::RDoc )
+
+end

data/lib/reap/rake/release.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'reap/rake/adapter'
+require 'reap/task/release'
+
+module Rake
+
+  ReapRelease = ::Reap::RakeAdapter( ::Reap::Release )
+
+end

data/lib/reap/rake/test.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'reap/rake/adapter'
+require 'reap/task/test'
+
+module Rake
+
+  ReapTest = ::Reap::RakeAdapter( ::Reap::Test )
+
+end

data/lib/reap/reap.rb

@@ -4,9 +4,8 @@ require 'reap/projectinfo'
 require 'reap/task'
 
 # Reap tasks
-require 'reap/task/fileperm'
 require 'reap/task/test'
-require 'reap/task/testext'
+require 'reap/task/extest'
 require 'reap/task/rdoc'
 require 'reap/task/announce'
 require 'reap/task/package'
@@ -15,12 +14,14 @@ require 'reap/task/info'
 require 'reap/task/install'
 require 'reap/task/release'
 require 'reap/task/doap'
+require 'reap/task/manifest'
+require 'reap/task/fileperm'  # needs work
 #require 'reap/task/noop'
 
 
 module Reap
 
-  Version = "4.3.4"
+  Version = "4.3.5"
 
   # Hash of all possible tasks
   # { task name => task class }
@@ -41,8 +42,8 @@ module Reap
     @tasks
   end
 
-  def self.register( alternative_project_file=nil )
-    $PROJECT_INFO = ProjectInfo.new( alternative_project_file )
+  def self.register #( alternative_project_file=nil )
+    $PROJECT_INFO = ProjectInfo.load( nil, true )
     $PROJECT_INFO.exists?
   end
 

data/lib/reap/task.rb

@@ -7,7 +7,7 @@ require 'facet/string/tabto'
 require 'facet/module/basename'
 require 'facet/module/attr_setter'
 
-require 'facet/filelist'
+require 'facet/filelist' unless defined?( FileList )
 require 'facet/openobject'
 
 #  _____        _     ___                  ___ _
@@ -49,10 +49,10 @@ module Reap
 
   class Task
 
-    include ::Config
+    #include ::Config
     include ::FileUtils
 
-    RUBY = CONFIG['ruby_install_name']
+    RUBY = ::Config::CONFIG['ruby_install_name']
 
     class << self
 
@@ -66,6 +66,11 @@ module Reap
         @task_list ||= {}
       end
 
+      # task dsl
+
+      def section_required( val ) ; @section_required = val ; end
+      def section_required?       ; @section_required ; end
+
       def task_name
         basename.downcase
       end
@@ -75,7 +80,6 @@ module Reap
         return @task_desc = block if block_given?
         return @task_desc.call
       end
-      #def task_desc ; '(no desciption given)' ; end
 
       def task_help( text=nil, &block )
         return @task_help = proc { text } if text
@@ -87,8 +91,6 @@ module Reap
         define_method(name) { @task }
       end
 
-      def section_required( val ) ; @section_required = val ; end
-      def section_required?       ; @section_required ; end
 
       def verify?
         if section_required?
@@ -101,15 +103,6 @@ module Reap
         @master ||= CascadingOpenObject.new( $PROJECT_INFO )
       end
 
-#       def master_attributes ; @master_attributes ||= [] ; end
-#
-#       # Use this DSL method to define master task attributes.
-#       def attr_master( *names )
-#         attr_accessor *names
-#         @master_attributes ||= []
-#         @master_attributes |= names.collect { |n| n.to_s }
-#       end
-
       # properties not to be looked up in master
       # if they are not in regular task section
 
@@ -136,7 +129,13 @@ module Reap
 
     def initialize( *args )
       #@master = CascadingOpenObject.new( $PROJECT_INFO )
-      section = master[task_name]
+      @args = args
+    end
+
+    # Run task for each section entires given.
+
+    def execute( section=nil )
+      section = section || master[task_name]
       case section
       when Array
         section.each do |s|
@@ -147,39 +146,38 @@ module Reap
       end
     end
 
-    # Per section
+    # Per section entry execution of task.
 
     def initiate( section )
       @section = CascadingOpenObject.new( section )
 
-      task_properties = {}
+      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
 
-      init #task
-      run #task
-    end
+      # deprecate init ?
+      if respond_to?( :init )
+        if method(:init).arity == 0
+          init
+        else
+          init( *@args )
+        end
+      end
 
-#     def set( sec )
-# 
-#       #@task = @section #TaskProperties.new( @master, @section )
-# 
-#       #self.class.master_attributes.each do |k,v|
-#       #  send( "#{k}=", @master[k] )
-#       #end
-# 
-#       #@section.each do |k,v|
-#       #  send( "#{k}=", v )
-#       #end
-#     end
+      if method(:run).arity == 0
+        run
+      else
+        run( *@args )
+      end
+    end
 
-    # the two primary methods
+    # interface
 
-    def init
-      raise "not implemented for '#{task_name}' task"
-    end
+    #def init
+    #  raise "not implemented for '#{task_name}' task"
+    #end
 
     def run
       raise "no action defined for task #{task_name}"
@@ -200,9 +198,20 @@ module Reap
       system arg unless $PRETEND
     end
 
+    def ask( question, answers=nil )
+      print "#{question}"
+      print " [#{answers}] " if answers
+      until inp = $stdin.gets[0,1] ; sleep 1 ; end ; puts
+      inp
+    end
+
+    def tell( statement )
+      puts statement
+    end
+
     def provide_setup_rb
       return true if File.exists?( 'setup.rb')
-      # copy from data dir to current directory
+      # copy from data dir to current directory (Won't work with Gem!)
       f = File.join( Config::CONFIG['datadir'], 'reap', 'setup_rb', 'setup.rb' )
       if File.exists?(f)
         File.cp( f, '.' )

data/lib/reap/task/announce.rb

@@ -15,12 +15,35 @@ require 'facet/string/word_wrap'
 #
 
 # = Announcement Task
-
+#
+# The announce task is intended for sending out a nice
+# formated email message to a mailing address, especially
+# mailing-lists. ProjectInfo uses these parameters:
+#
+#   announce:
+#     server       Email server to route message.
+#     port         Email server's port.
+#     domain       Email server's domain name.
+#     account      Email account name.
+#     type         Login type, either plain, cram_md5 or login.
+#     secure       Uses TLS security, true or false?
+#     to           Email address to send announcemnt.
+#     from         Email address sent from.
+#     subject      Subject of email message.
+#     title        Project title.
+#     summary      Brief onl-liner description.
+#     description  Long description of project.
+#     homespage    Project homepage web address.
+#     links        Array of http links to related sites.
+#     file         File that contains announcement message.
+#     memo         Embedded announcement message.
+#     slogan:      Motto for you project.
+#
 class Reap::Announce < Reap::Task
 
   section_required true
 
-  task_desc "Send announcement email to ruby-talk or other address."
+  task_desc "Email project announcement."
 
   task_help %{
 
@@ -28,9 +51,8 @@ class Reap::Announce < Reap::Task
 
     Send an announcement to a mailaing list or other email address.
 
-      to           Email address to send announcemnt.
-      from         Email address sent from.
-      subject      Subject of email message.
+    Server settings are
+
       server       Email server to route message.
       port         Email server's port.
       domain       Email server's domain name.
@@ -38,38 +60,46 @@ class Reap::Announce < Reap::Task
       type         Login type, either plain, cram_md5 or login.
       secure       Uses TLS security, true or false?
 
+    Message settings are
+
+      to           Email address to send announcemnt.
+      from         Email address sent from.
+      subject      Subject of email message.
+      file         File that contains announcement message.
+      memo         Embedded announcement message.
+
   }
 
-  task_attr :ann
+  alias_method :anc, :task
 
-  #attr_accessor :title, :version, :summary, :description, :subject
-  #attr_accessor :to, :from, :server, :port, :domain, :account
-  #attr_accessor :type, :secure
-  #attr_accessor :links, :slogan, :memo, :file
+  def run
 
-  def init
-    ann.to       = (ann.to || 'ruby-talk@ruby-lang.org').to_s.strip
-    ann.from     = (ann.from || master['email']).to_s.strip
-    ann.server   = ann.server.to_s.strip
-    ann.port     = (ann.port || 25).to_i
-    ann.domain   = ann.domain.to_s.strip if ann.domain
-    ann.account  = ann.account.to_s.strip
-    ann.type     = (ann.type || 'plain').to_s.strip  #cram_md5 #plain #login
+    # setup
 
-    raise "server is a require announce field" if ann.server.empty?
-    raise "account is a require announce field" if ann.account.empty?
+    anc.to       = (anc.to || 'ruby-talk@ruby-lang.org').to_s.strip
+    anc.from     = (anc.from || master['email']).to_s.strip
+    anc.server   = anc.server.to_s.strip
+    anc.port     = (anc.port || 25).to_i
+    anc.domain   = anc.domain.to_s.strip if anc.domain
+    anc.account  = anc.account.to_s.strip
+    anc.type     = (anc.type || 'plain').to_s.strip  #cram_md5 #plain #login
 
-    ann.title       ||= master.title
-    ann.version     ||= master.version || master.date
-    ann.links       ||= []
-    ann.subject     ||= "[ANN] #{ann.title}, v#{ann.version}"
+    raise "server is a require announce field" if anc.server.empty?
+    raise "account is a require announce field" if anc.account.empty?
 
-    ann.address = ann.to  # TODO
+    anc.title       ||= master.title
+    anc.version     ||= master.version || master.date
+    anc.links       ||= []
+    anc.subject     ||= "[ANN] #{anc.title}, v#{anc.version}"
 
-    #raise "DOMAIN is a required field" if ann.domain.empty?
-  end
+    anc.address = anc.to  # TODO
+
+    # validate
+
+    #raise "DOMAIN is a required field" if anc.domain.empty?
+
+    # announce
 
-  def run
     message = build_message
 
     puts "\n#{message}\n\n"
@@ -78,27 +108,27 @@ class Reap::Announce < Reap::Task
 
     unless inp.downcase == 'y'
       puts "Reap announce task canceled."
-      exit 0
+      return nil
     end
 
     # ask for password
-    print "Password for #{ann.account}: "
+    print "Password for #{anc.account}: "
     until passwd = $stdin.gets.strip ; sleep 1 ; end
 
     mail = %Q{
-      |From: #{ann.from}
-      |To: #{ann.address}
-      |Subject: #{ann.subject}
+      |From: #{anc.from}
+      |To: #{anc.address}
+      |Subject: #{anc.subject}
       |
       |#{message}
       }.margin
     begin
       # --- Send using SMTP object and an adaptor
-      Net::SMTP.enable_tls if Net::SMTP.respond_to?(:enable_tls) and ann.secure # == :tls
-      Net::SMTP.start(ann.server, ann.port, ann.domain, ann.account, passwd, ann.type) do |s|
-        s.send_message mail, ann.from, ann.address
+      Net::SMTP.enable_tls if Net::SMTP.respond_to?(:enable_tls) and anc.secure # == :tls
+      Net::SMTP.start(anc.server, anc.port, anc.domain, anc.account, passwd, anc.type) do |s|
+        s.send_message mail, anc.from, anc.address
       end
-      puts "Email sent successfully to #{ann.address}."
+      puts "Email sent successfully to #{anc.address}."
     rescue => e
       puts "Email delivery failed."
       puts e
@@ -115,55 +145,55 @@ private
       |
       |A N N O U N C I N G
       |
-      |#{ann.title}, v#{ann.version}
+      |#{anc.title}, v#{anc.version}
       |
-      |#{ann.summary}
+      |#{anc.summary}
       |
-      |#{ann.homepage}
+      |#{anc.homepage}
       }.margin.align_center(66)
 
     # abstract
     abstract = ''
-    if ann.description
+    if anc.description
       abstract << "\n\n"
-      abstract << "ABSTRACT\n------------->\n\n#{ann.description}"
+      abstract << "ABSTRACT\n------------->\n\n#{anc.description}"
       abstract << "\n"
     end
 
     # more info
     info = ''
-    unless ann.links.empty?
+    unless anc.links.empty?
       info << "\n\n"
       info << "\nRELATED LINKS\n------------------>\n\n" #.center(67)
-      ann.links.each{ |mi| info << "#{mi}" << "\n" } #.center(67) << "\n" }
+      anc.links.each{ |mi| info << "#{mi}" << "\n" } #.center(67) << "\n" }
       info << "\n"
     end
 
     # slogan
     slogan = ''
-    if ann.slogan
+    if anc.slogan
       slogan << "\n\n"
-      slogan << ann.slogan.center(67)
+      slogan << anc.slogan.center(67)
       slogan << "\n\n"
     end
 
     # memo
     memo = ''
-    if ann.memo
+    if anc.memo
       memo = ''
       #memo << "\n---\n" #<< ('-' * 72) << "\n"
       memo << "\nRELEASE MEMO\n----------------->\n\n"
-      memo << ann.memo.strip.fold(true) #.word_wrap(67)
+      memo << anc.memo.strip.fold(true) #.word_wrap(67)
       #memo << "\n"
     end
 
     # msg file
     msg = ''
-    if ann.file and File.file?( ann.file )
+    if anc.file and File.file?( anc.file )
       msg << "\nRELEASE MEMO\n----------------->\n\n"
       #msg << "\n---\n" #<< ("-" * 68) << "\n"
-      #msg << "(from #{ann.file})\n\n"
-      mg = File.read( ann.file )
+      #msg << "(from #{anc.file})\n\n"
+      mg = File.read( anc.file )
       msg << mg.strip.fold(true) #.word_wrap(67)
     end