reap 03.01 → 4.0

data/lib/reap/{announce_task.rb → task/announce.rb}

@@ -2,26 +2,18 @@
 require 'reap/task'
 
 require 'net/smtp'
-require 'nano/string/margin'
-require 'nano/string/tab'
-require 'nano/string/align_center'
-require 'nano/string/fold'
-require 'nano/string/word_wrap'
-
-module ReapTask
-  def announce_task(*args,&blk)
-    ::Reap::AnnounceTask.new(*args,&blk)
-  end
-end
+require 'facet/string/margin'
+require 'facet/string/tab'
+require 'facet/string/align_center'
+require 'facet/string/fold'
+require 'facet/string/word_wrap'
 
+class Reap::Announce < Reap::Task
 
-class Reap::AnnounceTask < Reap::Task
+  section_required true
 
-  #register "announce"
-
-  def default_name ; "announce" ; end
-  def default_desc
-    "send [ANN] email to ruby-talk or other list [reap]"
+  def task_desc
+    "Send announcement email to ruby-talk or other address."
   end
 
   attr_accessor :title, :version, :summary, :description, :subject
@@ -30,14 +22,17 @@ class Reap::AnnounceTask < Reap::Task
   attr_accessor :links, :slogan, :memo, :file
 
   def init
-    @to       = @to.to_s
-    @from     = @from.to_s
-    @server   = @server.strip
+    @to       = (@to || 'ruby-talk@ruby-lang.org').to_s.strip
+    @from     = (@from || master['email']).to_s.strip
+    @server   = @server.to_s.strip
     @port     = (@port || 25).to_i
-    @domain   = @domain.strip if @domain
-    @account  = @account.to_s
-    @authtype = @authtype.to_s
-    @sectype  = @sectype.to_s
+    @domain   = @domain.to_s.strip if @domain
+    @account  = @account.to_s.strip
+    @authtype = (@authtype || 'plain').to_s.strip  #cram_md5 #plain #login
+    #@sectype  = @sectype
+
+    raise "server is a require announce field" if @server.empty?
+    raise "account is a require announce field" if @account.empty?
 
     @title       ||= master['title']
     @version     ||= master['version']
@@ -46,7 +41,7 @@ class Reap::AnnounceTask < Reap::Task
     @links       ||= []
     @subject     ||= "[ANN] #{@title}, v#{@version}"
 
-    @address = @to  # fix
+    @address = @to  # TODO
 
     #raise "DOMAIN is a required field" if @domain.empty?
 

data/lib/reap/{filemod_task.rb → task/fileperm.rb}

@@ -1,28 +1,21 @@
 
 require 'reap/task'
 
-module ReapTask
-  def filemod_task(*args,&blk)
-    ::Reap::FilemodTask.new(*args,&blk)
-  end
-end
-
 #
-# Filemod Task
+# File Permissions Task
 #
-class Reap::FilemodTask < Reap::Task
+class Reap::Perm < Reap::Task
 
-  #register 'filemod'
+  attr_accessor :user, :group, :filemod, :dirmod
 
-  def default_name ; 'filemod' ; end
-  def default_desc
-    "normalize ownership and permissions of package files [reap]"
-  end
+  section_required true
 
-  attr_accessor :user, :group, :filemod, :dirmod
+  def task_desc
+    "Normalize ownership and permissions of package files."
+  end
 
   def init
-    #@user = section['user']
+    @user = section['user']
     @group   ||= @user
     @filemod ||= 644
     @dirmod  ||= 755
@@ -56,7 +49,8 @@ class Reap::FilemodTask < Reap::Task
     chmod( bins, 755 ) unless bins.empty?
   end
 
-  # support function
+  # support functions
+
   def chmod( file_list, file_mode=644, dir_mode=755 )
     dirs, files = file_list.partition{ |l| File.directory?(l) }
     unless files.empty?
@@ -84,3 +78,5 @@ class Reap::FilemodTask < Reap::Task
 #     end
 
 end
+
+#Reap.register( Reap::Perm )

data/lib/reap/task/info.rb

@@ -0,0 +1,20 @@
+
+require 'reap/task'
+
+#
+# Info Task - Displays the ProjectInfo file.
+#
+class Reap::Info < Reap::Task
+
+  def task_desc
+    "Display ProjectInfo file."
+  end
+
+  def init
+  end
+
+  def run
+    puts ProjectInfo.info_stream
+  end
+
+end

data/lib/reap/task/install.rb

@@ -0,0 +1,33 @@
+
+require 'reap/task'
+
+#
+# Install Task
+#
+class Reap::Install < Reap::Task
+
+  def task_desc
+    "Locally install package using setup.rb or install.rb."
+  end
+
+  attr_accessor :options, :quiet #, :sudo
+
+  def init
+    @quiet   ||= !$VERBOSE
+    @options ||= []
+    #@sudo   ||= true
+  end
+
+  def run
+    exe = %w{ setup.rb install.rb }.find{ |f| File.exists?(f) }
+    raise "setup.rb or install.rb not found" if exe == nil
+
+    puts "Reap is shelling out work to #{exe}..."
+
+    options << '-q' if @quiet
+
+    c = "sudo ruby #{exe} #{options.join(' ')}"
+    sh c
+  end
+
+end

data/lib/reap/task/noop.rb

@@ -0,0 +1,26 @@
+
+require 'reap/task'
+
+#
+# Noop Task
+#
+# This task doesn't do anything except
+# display a message. It is used simply
+# for test purposes when debugging Reap.
+#
+class Reap::Noop < Reap::Task
+
+  def task_desc
+    "A no-op task to help debug reap itself."
+  end
+
+  attr_accessor :message
+
+  def init
+  end
+
+  def run
+    puts ( message || 'No message field in noop section.' )
+  end
+
+end

data/lib/reap/{package_task.rb → task/package.rb}

@@ -7,52 +7,47 @@ rescue
   # no rubygems
 end
 
-module ReapTask
-  def package_task(*args,&blk)
-    ::Reap::PackageTask.new(*args,&blk)
-  end
-end
-
 ##
 # Package Task
 #
 # This task creates standard .zip, .tgz, or .tbz
 # packages, plus .gem distributions.
 #
-class Reap::PackageTask < Reap::Task
-
-  #register 'package'
-
-  def default_name ; 'package' ; end
-  def default_desc
-    w = []
-    w << (@gzip  ? 'tgz' : nil)
-    w << (@bzip2 ? 'tbz' : nil)
-    w << (@zip   ? 'zip' : nil)
-    w << (@gem   ? 'gem' : nil)
-    w.compact!
-    "build distribution packages (#{w.join(',')}) [reap]"
-  end
+class Reap::Package < Reap::Task
 
-  DEFAULT_INCLUDE = [ '[A-Z]*', 'setup.rb', 'lib/**/*', 'bin/**/*', 'data/**/*',
-                      'doc/**/*', 'rdoc/**/*', 'test/**/*', 'bench/**/*',
-                      'demo/**/*', 'samples/**/*', 'examples/**/*' ]
+  attr_accessor :dir, :name, :date, :series, :status,
+                :author, :email, :summary, :project, :homepage,
+                :exclude, :types, :platform, :autorequire,
+                :dependencies, :requirements, :executables
 
-  MUST_EXCLUDE = [ 'InstalledFiles', '**/CVS/**/*', '**/*~' ]
+  attr_reader :package_name, :include
 
+  MUST_EXCLUDE = [ 'InstalledFiles', '**/CVS/**/*', '**/*~' ]
 
-  attr_accessor :dir, :name, :version, :package_name,
-                :author, :email, :summary, :project, :homepage,
-                :include, :exclude, :zip, :gzip, :bzip2, :gem,
-                :platform, :autorequire,
-                :dependencies, :requirements, :executables
+  def task_desc
+    "Build distribution packages (#{(types||[]).join(', ')})."
+  end
 
   def init
-    @dir          ||= 'pkg'
+    @dir          ||= ( File.directory?('../leaf') ? '../leaf' : 'pkg')
 
     @name         ||= master['name']
-    @version      ||= master['version'] || '0.0.1'
-    @package_name ||= @name + '-' + @version
+    @status       ||= master['status'] || 'beta/stable'
+    @date         ||= master['date'] || Time.now.strftime("%Y-%m-%d")
+
+    @series       ||= master['series']
+    @version      ||= master['version']
+
+    unless @series || @version
+      puts "Series or Version is a required field."
+      exit 0
+    end
+
+    if @version
+      @package_name ||= @name + '-' + @version
+    else
+      @package_name ||= @name + ',' + @date
+    end
 
     @author       ||= master['author']
     @email        ||= master['email']
@@ -60,14 +55,15 @@ class Reap::PackageTask < Reap::Task
     @project      ||= master['rubyforge']['project']
     @homepage     ||= master['homepage'] || master['rubyforge']['homepage']
 
-    @include      ||= DEFAULT_INCLUDE
     @exclude      ||= []
-    @exclude.concat MUST_EXCLUDE
+    @exclude      |= MUST_EXCLUDE
 
-    @zip   = @zip.nil?   ? true : @zip
-    @gzip  = @gzip.nil?  ? true : @gzip
-    @bzip2 = @bzip2.nil? ? true : @bzip2
-    @gem   = @gem.nil?   ? true : @gem
+    # types include 'tgz', 'tbz', 'zip', 'tar.gz' 'tar.bz2' and 'gem'.
+    @types        ||= master['distribute'] || [ 'gem', 'tar.gz', 'zip' ]
+    @types.collect! { |t| t.to_s.strip.downcase }
+
+    # not setable
+    @include      ||= ['**/*']
 
     # gem specific (at least in this context)
     if defined?(Gem)
@@ -80,75 +76,93 @@ class Reap::PackageTask < Reap::Task
       end
       @platform = ::Gem::Platform::RUBY unless @plaform
       #@autorequire
-      @requirements ||= []
+      @requirements ||= master['requirements'] || []
       @dependencies ||= master['dependencies'] || []
-      @executables  ||= master['executables'] || []
+      @executables  ||= master['executables']  || []
     end
   end
 
   def run
     # create package image
-    if FileTest.directory?(@dir)
-      print "Directory '#{@dir}' already exists. Clobber? [y/N] "
+    package_dir_path = "#{@dir}/#{@package_name}"
+
+    if FileTest.directory?(package_dir_path)
+      print "Package '#{package_name}' already exists. Clobber? [y/N] "
       until inp = $stdin.gets[0,1] ; sleep 1 ; end
       if (inp || 'y').downcase == 'y'
-        puts "Removing old directory '#{File.expand_path(@dir)}'..."
-        trash_dir = ".trash/#{File.basename(@dir)}"
-        FileUtils.mkdir_p(".trash") unless FileTest.directory?(".trash")
-        FileUtils.rm_r(trash_dir) if FileTest.exists?(trash_dir)
-        FileUtils.mv(@dir, trash_dir)
+        puts "Removing old directory '#{File.expand_path(package_dir_path)}'..."
+        FileUtils.rm_r(package_dir_path)
+        #FileUtils.rm("#{package_dir_path}/*")
+        #trash_dir = ".trash/#{File.basename(@dir)}"
+        #FileUtils.mkdir_p(".trash") unless FileTest.directory?(".trash")
+        #FileUtils.mv(@dir, trash_dir)
       else
         puts "Reap package task canceled."
         exit 0
       end
     end
-    package_dir_path = "#{@dir}/#{@package_name}"
     package_files = FileList.new
     package_files.include(*@include)
     package_files.exclude(*@exclude) if @exclude and not @exclude.empty?
     FileUtils.mkdir_p @dir #rescue nil
-    package_files.each do |fn|
-      f = File.join(package_dir_path, fn)
-      fdir = File.dirname(f)
+    package_files.each do |f|
+      pkgf = File.join(package_dir_path, f)
+      fdir = File.dirname(pkgf)
       FileUtils.mkdir_p(fdir) if not File.exist?(fdir)
-      if File.directory?(fn)
-        FileUtils.mkdir_p(f)
+      if File.directory?(f)
+        FileUtils.mkdir_p(pkgf)
       else
-        FileUtils.rm_f(f)
-        FileUtils.safe_ln(fn, f)
+        FileUtils.rm_f(pkgf)
+        FileUtils.safe_ln(f, pkgf)
       end
     end
 
     # create standard package files
     FileUtils.chdir(@dir) do
-      # tar bzip2 for unix
-      if @bzip2
-        puts "\nReap is shelling out work to tar and bzip2..."
-        sh %{tar --bzip2 -cvf #{@package_name}.tbz #{@package_name}}
-      end
-      # tar gzip for unix
-      if @gzip
-        puts "\nReap is shelling out work to tar and gzip..."
-        sh %{tar --gzip -cvf #{@package_name}.tgz #{@package_name}}
-      end
-      # zip for windows
-      if @zip
-        puts "\nReap is shelling out work to zip..."
-        sh %{zip -r #{@package_name}.zip #{@package_name}}
+      @types.each do |t|
+        sh_cmd = nil
+        prefix = 'ERROR' # in case of unforseen bug
+        case t
+        when 'tbz', 'bz2', 'bzip2', 'tar.bz2'
+          prefix = ( t == 'tbz' ? 'tbz' : 'tar.bz2' )
+          sh_cmd = 'tar --bzip2 -cvf'
+          puts "\nReap is shelling out work to tar and bzip2..."
+        when 'tgz', 'tar.gz'
+          prefix = ( t == 'tgz' ? 'tgz' : 'tar.gz' )
+          sh_cmd = 'tar --gzip -cvf'
+          puts "\nReap is shelling out work to tar and gzip..."
+        when 'zip'
+          prefix = 'zip'
+          sh_cmd = 'zip -r'
+          puts "\nReap is shelling out work to zip..."
+        when 'gem'
+          sh_cmd = nil
+        else
+          puts "Unknown package type '#{t}' skipped."
+          sh_cmd = nil
+        end
+        sh %{#{sh_cmd} #{@package_name}.#{prefix} #{@package_name}} if sh_cmd
       end
       puts
     end
 
     # create gem package
-    run_gem if defined?(Gem) and @gem
+    run_gem if defined?(Gem) and @types.include?('gem')
 
     return true
   end
 
   def run_gem
     spec = Gem::Specification.new { |s|
+
       s.name = @name
-      s.version = @version
+ 
+      if @version
+        s.version = @version
+      else
+        s.version = @series
+      end
+
       @dependencies.each{ |d,v|
         if v
           s.add_dependency(d, v)
@@ -156,6 +170,7 @@ class Reap::PackageTask < Reap::Task
           s.add_dependency(d)
         end
       }
+
       s.platform = @platform
       s.summary = @summary
       s.requirements = @requirements
@@ -175,7 +190,9 @@ class Reap::PackageTask < Reap::Task
       s.homepage = @homepage
       s.executables = @executables
       s.bindir = "bin"
+
     }
+
     puts "Reap is shelling out work to the Gem Package Manager..."
     Gem.manage_gems
     Gem::Builder.new(spec).build