reap 5.0.0 → 5.10.10

data/{doc/note → data/reap/scaffold}/setup.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 #
 # setup.rb
 #
@@ -57,7 +55,7 @@ class ConfigTable
     @config_opt = nil
     @verbose = true
     @no_harm = false
-    @libsrc_pattern = '*.rb'  # THIS IS NOT GOOD!!!
+    @libsrc_pattern = '*.rb'
   end
 
   attr_accessor :install_prefix
@@ -637,8 +635,8 @@ module FileOperations
         f.write str
       }
       File.chmod mode, realdest
-# 0777
-      File.open("#{objdir_root()}/InstalledFiles", 'a', 0777) {|f|
+
+      File.open("#{objdir_root()}/InstalledFiles", 'a') {|f|
         if prefix
           f.puts realdest.sub(prefix, '')
         else
@@ -662,7 +660,7 @@ module FileOperations
   def ruby(*args)
     command config('rubyprog'), *args
   end
-
+  
   def make(task = nil)
     command(*[config('makeprog'), task].compact)
   end
@@ -725,7 +723,7 @@ module HookScriptAPI
   def srcdirectory?(path)
     File.dir?(srcfile(path))
   end
-
+  
   def srcfile?(path)
     File.file?(srcfile(path))
   end
@@ -773,13 +771,11 @@ class ToplevelInstaller
     config.load_multipackage_entries if multipackage?
     config.fixup
     klass = (multipackage?() ? ToplevelInstallerMulti : ToplevelInstaller)
-    #klass.new(File.dirname($setup_pwd), config).invoke
-    klass.new($setup_pwd, config).invoke
+    klass.new(File.dirname($0), config).invoke
   end
 
   def ToplevelInstaller.multipackage?
-    #File.dir?(File.dirname($setup_pwd) + '/packages')
-    File.dir?($setup_pwd + '/packages')
+    File.dir?(File.dirname($0) + '/packages')
   end
 
   def ToplevelInstaller.load_rbconfig
@@ -831,7 +827,7 @@ class ToplevelInstaller
       __send__ "exec_#{task}"
     end
   end
-
+  
   def run_metaconfigs
     @config.load_script "#{@ardir}/metaconfig"
   end
@@ -873,9 +869,9 @@ class ToplevelInstaller
       when '--help'
         print_usage $stdout
         exit 0
-      #when '--version'
-      #  puts "#{File.basename($setup_pwd)} version #{Version}"
-      #  exit 0
+      when '--version'
+        puts "#{File.basename($0)} version #{Version}"
+        exit 0
       when '--copyright'
         puts Copyright
         exit 0
@@ -1310,7 +1306,6 @@ class Installer
   end
 
   def install_dir_lib(rel)
-p rubyscripts(), "#{config('rbdir')}/#{rel}", 0644
     install_files rubyscripts(), "#{config('rbdir')}/#{rel}", 0644
   end
 
@@ -1544,7 +1539,6 @@ def setup_rb_error(msg)
   raise SetupError, msg
 end
 
-=begin
 if $0 == __FILE__
   begin
     ToplevelInstaller.invoke
@@ -1555,4 +1549,3 @@ if $0 == __FILE__
     exit 1
   end
 end
-=end

data/lib/reap/bin/reap.rb

@@ -1,19 +1,18 @@
 
-# Support libraries
+require 'facets'
 require 'rbconfig'
+require 'carat/shellcommand'
+require 'reap/tasks'
 
-require 'facets'
-require 'consoleapp'
-#require 'console/command'
+INFO_FILES = [ 'ProjectInfo', 'Reapfile', 'projectinfo', 'reapfile' ]
 
-require 'reap/reap'
+Reap.register
 
-class ReapCommand < Console::Command
+module Reap
+  Version = "2005-10-06"
+end
 
-  # to do first for every task
-  #def command_setup
-  #  $PROJECT_INFO = ProjectInfo.new( $PROJECT_FILE )
-  #end
+class ReapCommand < ShellCommand
 
   # Options
 
@@ -21,22 +20,15 @@ class ReapCommand < Console::Command
   def __verbose ; $VERBOSE = true ; end
   alias_method :_V, :__verbose
 
-  # option to display help
-  def __force ; $FORCE = true ; end
-  alias_method :_f, :__force
-
-  # pretend mode (under construction)
-  def __pretend; $PRETEND = true ; end
-  alias_method :_P, :__pretend
-
   # debug mode (under construction)
   def __debug; $DEBUG = true ; end
   alias_method :_D, :__debug
 
-  def __password( pass ); $PASSWORD =  pass ; end
-  alias_method :_p, :__password
+  # pretend mode (under construction)
+  def __pretend; $PRETEND = true ; end
+  alias_method :_P, :__pretend
 
-  # display reap version
+  # option to display version
   def __version ; version ; end
   alias_method :_v, :__version
 
@@ -48,78 +40,61 @@ class ReapCommand < Console::Command
   def __tasks; tasks ; end
   alias_method :_t, :__tasks
 
-  #option for build version (only for package task)
-  def _b ; $BUILD_VERSION = true ; end
+  # option for require
+  #def __require(r); @require = r ; end
+  #alias_method :_r, :__require
 
-  #def _f( pif ) ; $PROJECT_FILE = pif ; end
-  #alias_method :_f, :__file
+  # Commands
 
   # default action
-
   def default
     tasks
   end
 
   # display version
-
   def version
-    puts "Reap v#{Reap::Version}"
+    puts "Reap  v.#{Reap::Version}"
     exit 0
   end
 
   # display help
-
-  def help(tsk=nil)
-    if tsk
-      t = Reap.application.tasks[tsk]
-      unless t
-        puts "Unknown task '#{tsk}'."
-        exit 0
-      end
-      s = "\n"
-      s << "#{args[0]}: "
-      s << t.task_desc.sub(/^\n+/, '').rstrip
-      s << "\n\n"
-      if thelp = t.task_help
-        s << thelp.sub(/^\n+/, '').rstrip
-      end
-      s << "\n\n"
-      puts s
-    else
-      puts HELP
-    end
+  def help
+    puts HELP
     exit 0
   end
 
   # list available tasks
-
   def tasks
-    app = Reap.application
-    tasklist = []
-    if app.tasks.empty?
-      puts "No tasks available."
-    else
-      sorted = app.tasks.keys.sort
-      margin = sorted.collect{ |t| t.size }.max + 6
-      sorted.each do |name|
-        tasklist << "  #{name}".ljust(margin) + "#{app.tasks[name].task_desc}"
-      end
-      puts "(#{Dir.pwd})"
-      puts
-      puts tasklist.join("\n")
-      puts
+    Reap.initialize #_all
+    puts
+    Reap.tasks.each do |name,task|
+      puts "  #{name}".ljust(20) + "#{task.task_desc}"
     end
+    puts
+    exit 0
   end
-  #alias_method :ls, :tasks
+  alias_method :ls, :tasks
 
-  # Add all the reap tasks.
+  # copy the file from lib/data to the current dir.
+  def template
+    if INFO_FILES.any?{ |f| File.exists?(f) }
+      puts "Project file already exists."
+      exit 0
+    end
+    filename = 'ProjectInfo'
+    dir = File.join( ::Config::CONFIG['datadir'], 'reap', 'scaffold' )
+    f = File.join( dir, filename )
+    raise "ProjectInfo template file #{f} is missing." unless File.file?( f )
+    # copy
+    FileUtils.cp( f, filename )
+    puts "#{filename} created. You'll need to fill it out."
+    exit 0
+  end
 
-  app = Reap.application
-  app.tasks.each do |name, task|
-    define_method(name) { |*args|
-      #puts "(#{Dir.pwd})"
-      task.execute( *args )
-    }
+  Reap.registry.each do |sym,taskclass|
+    define_method(sym) do |*args|
+      taskclass.new.run(*args)
+    end
   end
 
 end
@@ -127,25 +102,33 @@ end
 
 HELP = <<-HERE
 
-  reap [options...] <command> [arguments...]
+  reap v#{::Reap::Version}
+
+  USAGE: reap [options...] <command> [arguments...]
 
   COMMANDS:
 
-    tasks
-      List all the current tasks with descriptions.
-      (This is the default if no command is given.)
+    scaffold
+        Copies a ProjectInfo template into the current
+        directory, if it doesn't already exist. If it does
+        exist will build the project directory based on it.
+        This will not destroy any structure already in place!
 
-    help [task]
-      Displays this help information. If a task name is given,
-      it will provide help information specific to that task.
+    help
+        Displays this help information.
 
   OPTIONS:
 
-    -h --help      Display this help information.
-    -v --version   Display the current version.
-    -V --verbose   Provides extra verbose processing information.
-    -f --force     Forces certain operations to be performed.
-    -D --debug     Provides extra verbose processing information.
-    -f --file      Specify alternate project file.
+    -v --version
+        Display the current version.
+
+    -V --verbose
+        Provides extra verbose processing information.
+
+    -D --debug
+        Provides extra verbose processing information.
+
+    -h --help
+        Display this help information.
 
 HERE

data/lib/reap/projectinfo.rb

@@ -1,229 +1,51 @@
 
 require 'yaml'
-
 require 'facet/hash/traverse'
 require 'facet/string/tabto'
 require 'facet/dir/self/ascend'
-require 'facet/kernel/require_all'
-
-require 'facet/basicobject'
-
-
-# Project information, generally read from a file.
-# Simply by calling 'ProjectInfo.load'.
-#
-# ProjectInfo is a Singleton. Access it via the
-# ProjectInfo.instance method.
-
-class ProjectInfo
-
-  INFO_FILES = [
-    'ProjectInfo',
-    'ReapFile',
-    'projectinfo',
-    'reapfile'
-  ]
-
-  class << self
-
-    # Singelton Pattern.
-
-    private :new
-
-    def instance( *args, &block )
-      @instance ||= new( *args, &block )
-    end
-
-    # Find project information file.
-
-    def find
-      info_dir, info_file = nil, nil
-      Dir.ascend(Dir.pwd) do |info_dir|
-        info_file = INFO_FILES.find{ |f| File.file?( File.join( info_dir, f ) ) }
-        break if info_file
-      end
-      return nil unless info_file
-      return File.join( info_dir, info_file )
-    end
 
-    # Load the project information from a file. Generally
-    # no file needs to be specified; the file will be found
-    # by ascending up the current path until a default
-    # file name is found (eg. ProjectInfo or Reapfile).
+module ProjectInfo
+  extend self
 
-    def load( fpath=nil )
-      instance.read( fpath )
-    end
+  INFO_FILES = [ 'ProjectInfo', 'ReapFile', 'projectinfo', 'reapfile' ]
 
+  def add_info_file( f )
+    INFO_FILES.unshift( f )
   end
 
-
-  attr_reader :info, :info_stream, :info_dir, :info_file
-
-  def initialize( &block )
-    @info = {}
-    @info_stream = nil
-
-    define( &block ) if block_given?
-
-    #$PROJECT_INFO = self
-  end
-
-  # Define project information programmatically.
-
-  def define( &block )
-    return unless block
-
-    @info = HashBuilder.new( &block  ).to_h
-    @info_stream = @info.to_yaml
-    @info_dir = Dir.pwd #?
-    @info_file = nil
-
-    #validate
-    defaults
-
-    self
-  end
-
-  # Load project information from YAML file.
-
-  def read( fpath )
-    return unless fpath
-
-    @info_dir = File.dirname( fpath )
-    @info_file = fpath #File.basename( fpath )
-    @info_stream = File.read( fpath ).strip
-    @info = YAML::load( info_stream ).traverse{ |k,v| [k.to_s.downcase, v] }
-
-    #validate
-    defaults
-
-    @info.each do |key, value|
-      case value when Reap::Task
-        value.task_name = key
+  def info_stream
+    dir = Dir.pwd
+    unless @info_stream
+      Dir.ascend(Dir.pwd) do |d|
+        Dir.chdir(d)
+        info_file = INFO_FILES.find{ |f| File.file?( f ) }
+        if info_file
+          @info_stream = File.read( info_file )
+          puts "(in #{d})" unless dir == Dir.pwd
+          break
+        end
       end
     end
-
-    self
+    @info_stream
   end
 
-  # Update project information.
-
-  def update( info=nil, &block )
-    if info
-      @info.update( info.traverse{ |k,v| [k.to_s.downcase, v] } )
-    end
-    if block_given?
-      @info.update( HashBuilder.new( &block  ).to_h )
+  def info
+    if info_stream
+      @info ||= YAML::load(info_stream).traverse{ |k,v| [k.downcase, v] }
+    else
+      {}
     end
-    @info_stream = @info.to_yaml
-
-    #validate
-    defaults
-
-    self
   end
 
-  # Project information file exists? (may need to change to info exists?)
-
-  #def exists?
-  #  @info_file
-  #end
-
-  # Validate project information.
-
-  def validate #( *fields )
-    val = true
-    (puts "NAME is required in project information file."; val=false) unless info['name']
-    (puts "VERSION is required in project information file."; val=false) unless info['version']
-    exit -1 unless val
-  end
-
-  # Project information defaults.
-
-  def defaults
-    self['title']       ||= self['name'].capitalize
-    self['series']      ||= '1'
-    self['date']        ||= Time.now.strftime("%Y-%m-%d")
-    self['author']      ||= "Anonymous"
-    self['maintainer']  ||= self['author']
-    self['arch']        ||= 'Any'
-    self['license']     ||= 'Ruby/GPL'
-    self['status']      ||= 'Beta'
-    self['project']     ||= self['rubyforge'] ? self['rubyforge']['project'] : nil
-    self['homepage']    ||= self['rubyforge'] ? self['rubyforge']['homepage'] : nil
+  # not using at the moment
+  def validate
+    # required main parameters
+    #raise "TITLE is a required configuration field" unless info['title']
+    raise "NAME is a required piece of information" unless info['name']
+    raise "VERSION is a required piece of informatiomn" unless info['version']
   end
 
-  # Convert to a CascadinOpenObject.
-
-  def to_cascading_open_object
-    CascadingOpenObject.new( @info )
-  end
-
-  # Information fetch.
-
   def [](name)
     info[name]
   end
-
-  # Information store.
-
-  def []=(name, x)
-    info[name] = x
-  end
-
-  def each( &block )
-    @info.each( &block )
-  end
-
-  # Information to hash.
-
-  def to_h
-    @info.dup
-  end
-
-end
-
-
-# Build a hash from missing method calls.
-
-class ProjectInfo::HashBuilder < BasicObject
-
-  def initialize( blockstr=nil, &block )
-    @hash = {}
-    @flag = {}
-    raise "both string and block given" if blockstr and block_given?
-    if blockstr
-      instance_eval blockstr
-    else
-      instance_eval &block
-    end
-  end
-
-  def to_h ; @hash ; end
-
-  def method_missing( sym, *args, &block )
-    sym = sym.to_s.downcase
-
-    if @hash.key?(sym)
-      unless @flag[sym]
-        @hash[sym] = [ @hash[sym] ]
-        @flag[sym] = true
-      end
-      if block_given?
-        @hash[sym] << self.__class__.new( &block ).to_h
-      else
-        @hash[sym] << args[0]
-      end
-    else
-      if block_given?
-        @hash[sym] = self.__class__.new( &block ).to_h
-      else
-        @hash[sym] = args[0]
-      end
-    end
-
-  end
-
 end
-