reap 4.3.3 → 4.3.4

data/doc/doap.xml

@@ -0,0 +1,27 @@
+<Project xmlns="http://usefulinc.com/ns/doap#"
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:foaf="http://xmlns.com/foaf/0.1/">
+   <name>Reap</name>
+   <shortname>reap</shortname>
+   <homepage rdf:resource="http://reap.rubyforge.org" />
+   <wiki rdf:resource="" />
+   <created>2004-04-01</created>
+   <shortdesc xml:lang="en">
+      Tools for Ruby project testing, management and
+      assistance.
+   </shortdesc>
+   <description xml:lang="en">
+      Reap comprises a set of commonly needed tools for
+      Ruby package developers/deployers. Because of the
+      commonality, Reap utilizes a YAML configuration
+      file to harvest project information, significantly
+      simplifying usage.
+   </description>
+   <maintainer>
+     <foaf:Person>
+       <foaf:name>Thomas Sawyer</foaf:name>
+       <foaf:email>transfire@gmail.com</foaf:name>
+       <foaf:homepage rdf:resource="http://reap.rubyforge.org" />
+     </foaf:Person>
+   </maintainer>
+ </Project>

data/doc/note/Rakefile.htm

@@ -0,0 +1,69 @@
+# Rakefile for xoxo-rb.  -*-ruby-*-
+require 'rake/rdoctask'
+require 'rake/testtask'
+
+
+desc "Run all the tests"
+task :default => [:test]
+
+desc "Do predistribution stuff"
+task :predist => [:chmod, :changelog, :doc]
+
+
+desc "Run all the tests"
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test_*.rb']
+  t.verbose = true
+end
+
+desc "Make an archive as .tar.gz"
+task :dist => :test do
+  system "export DARCS_REPO=#{File.expand_path "."}; " +
+         "darcs dist -d xoxo-rb#{get_darcs_tree_version}"
+end
+
+desc "Make binaries executable"
+task :chmod do
+  Dir["bin/*"].each { |binary| File.chmod(0775, binary) }
+end
+
+desc "Generate a ChangeLog"
+task :changelog do
+  system "darcs changes --repo=#{ENV["DARCS_REPO"] || "."} >ChangeLog"
+end
+
+desc "Generate RDoc documentation"
+Rake::RDocTask.new(:doc) do |rdoc|
+  rdoc.options << '--line-numbers --inline-source'
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.rdoc_files.include 'README'
+  rdoc.rdoc_files.include 'xoxo.rb'
+end 
+
+
+# Helper to retrieve the "revision number" of the darcs tree.
+def get_darcs_tree_version
+  return ""  unless File.directory? "_darcs"
+
+  changes = `darcs changes`
+  count = 0
+  tag = "0.0"
+  
+  changes.each("\n\n") { |change|
+    head, title, desc = change.split("\n", 3)
+    
+    if title =~ /^  \*/
+      # Normal change.
+      count += 1
+    elsif title =~ /tagged (.*)/
+      # Tag.  We look for these.
+      tag = $1
+      break
+    else
+      warn "Unparsable change: #{change}"
+    end
+  }
+
+  "-" + tag + "." + count.to_s
+end

data/{lib/reap/task → doc/note}/scaffold.rb

@@ -11,7 +11,7 @@
 module Scaffold
   extend self
 
-  SCMPaths => %w{
+  SVNPaths => %w{
     trunk
     branch
     tag
@@ -23,10 +23,11 @@ module Scaffold
     bin
     lib
     ext
-    dev
+    conf
     data
     test
-    demo
+    note
+    sample
   }
 
   TrunkFiles = %w{

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

@@ -57,7 +57,7 @@ class ConfigTable
     @config_opt = nil
     @verbose = true
     @no_harm = false
-    @libsrc_pattern = '*.rb'
+    @libsrc_pattern = '*.rb'  # THIS IS NOT GOOD!!!
   end
 
   attr_accessor :install_prefix
@@ -637,8 +637,8 @@ module FileOperations
         f.write str
       }
       File.chmod mode, realdest
-
-      File.open("#{objdir_root()}/InstalledFiles", 'a') {|f|
+# 0777
+      File.open("#{objdir_root()}/InstalledFiles", 'a', 0777) {|f|
         if prefix
           f.puts realdest.sub(prefix, '')
         else
@@ -662,7 +662,7 @@ module FileOperations
   def ruby(*args)
     command config('rubyprog'), *args
   end
-  
+
   def make(task = nil)
     command(*[config('makeprog'), task].compact)
   end
@@ -725,7 +725,7 @@ module HookScriptAPI
   def srcdirectory?(path)
     File.dir?(srcfile(path))
   end
-  
+
   def srcfile?(path)
     File.file?(srcfile(path))
   end
@@ -831,7 +831,7 @@ class ToplevelInstaller
       __send__ "exec_#{task}"
     end
   end
-  
+
   def run_metaconfigs
     @config.load_script "#{@ardir}/metaconfig"
   end
@@ -1310,6 +1310,7 @@ class Installer
   end
 
   def install_dir_lib(rel)
+p rubyscripts(), "#{config('rbdir')}/#{rel}", 0644
     install_files rubyscripts(), "#{config('rbdir')}/#{rel}", 0644
   end
 

data/lib/reap/bin/reap.rb

@@ -3,34 +3,14 @@
 require 'rbconfig'
 
 require 'facets'
-require 'facet/consoleapp'
+require 'consoleapp'
 
-# Reap support
-require 'reap/projectinfo'
+require 'reap/reap'
 
-# Reap tasks
-require 'reap/task/fileperm'
-require 'reap/task/test'
-require 'reap/task/testext'
-require 'reap/task/rdoc'
-require 'reap/task/announce'
-require 'reap/task/package'
-require 'reap/task/publish'
-require 'reap/task/info'
-require 'reap/task/install'
-require 'reap/task/release'
-#require 'reap/task/noop'
-
-
-Reap.register
-
-module Reap
-  Version = "1.2.0"
-end
 
 class ReapCommand < Console::Application
 
-  # to do first for exvery task
+  # to do first for every task
   #def application_setup
   #  $PROJECT_INFO = ProjectInfo.new( $PROJECT_FILE )
   #end
@@ -41,15 +21,22 @@ class ReapCommand < Console::Application
   def __verbose ; $VERBOSE = true ; end
   alias_method :_V, :__verbose
 
-  # debug mode (under construction)
-  def __debug; $DEBUG = true ; end
-  alias_method :_D, :__debug
+  # 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
 
-  # option to display version
+  # debug mode (under construction)
+  def __debug; $DEBUG = true ; end
+  alias_method :_D, :__debug
+
+  def __password( pass ); $PASSWORD =  pass ; end
+  alias_method :_p, :__password
+
+  # display reap version
   def __version ; version ; end
   alias_method :_v, :__version
 
@@ -67,10 +54,6 @@ class ReapCommand < Console::Application
   #def _f( pif ) ; $PROJECT_FILE = pif ; end
   #alias_method :_f, :__file
 
-  # option for require
-  #def __require(r); @require = r ; end
-  #alias_method :_r, :__require
-
   # Commands
 
   # default action
@@ -109,12 +92,15 @@ class ReapCommand < Console::Application
   # list available tasks
 
   def tasks
-    #Reap.initialize #_all
-    puts
-    Reap.tasks.each do |name,task_class|
-      puts "  #{name}".ljust(20) + "#{task_class.task_desc}"
+    if Reap.projectfile?
+      puts
+      Reap.tasks.each do |name,task_class|
+        puts "    #{name}".ljust(20) + "#{task_class.task_desc}"
+      end
+      puts
+    else
+      puts "No project information file found."
     end
-    puts
     exit 0
   end
   alias_method :ls, :tasks
@@ -122,23 +108,50 @@ class ReapCommand < Console::Application
   # 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."
+    f = nil
+    if ::ProjectInfo::INFO_FILES.any?{ |f| File.exists?(f) }
+      puts "Project file '#{f}' already exists."
       exit 0
     end
     filename = 'ProjectInfo'
-    dir = File.join( ::Config::CONFIG['datadir'], 'reap', 'scaffold' )
+    # need to add gems workaround
+    dir = File.join( ::Config::CONFIG['datadir'], 'reap', 'scaffold', 'standard' )
     f = File.join( dir, filename )
     raise "ProjectInfo template file #{f} is missing." unless File.file?( f )
     # copy
-    FileUtils.cp( f, filename )
+    FileUtils.install( f, '.' )
     puts "#{filename} created. You'll need to fill it out."
     exit 0
   end
 
-  Reap.tasks.each do |sym,taskclass|
-    define_method(sym) do |*args|
-      taskclass.new(*args)
+  def scaffold( name, type=nil )
+    if File.directory?(name) and not $FORCE
+      puts "Directory already exists. Use -f option to force scaffoling."
+      exit -1
+    end
+    case type
+    when 'std', 'standard', nil
+      type = 'standard'
+    when 'svn', 'subversion'
+      type = 'subversion'
+    else
+      puts "Unrecognized project type."
+      exit -1
+    end
+    # need to add gems workaround
+    dir = File.join( ::Config::CONFIG['datadir'], 'reap', 'scaffold', type )
+    #FileUtils.mkdir_p( name )
+    FileUtils.cp_r( dir, name )
+    puts "Project #{name} created. Good luck with your new project!"
+    exit 0
+  end
+
+  # Add all the reap tasks.
+  if Reap.register
+    Reap.tasks.each do |sym,taskclass|
+      define_method(sym) do |*args|
+        taskclass.new(*args)
+      end
     end
   end
 
@@ -153,17 +166,25 @@ HELP = <<-HERE
 
   COMMANDS:
 
+    tasks (default)
+      List all the current tasks with descriptions.
+      This is the default action if no command
+      is given. (Also aliased as 'ls'.)
+
+    help [task]
+      Displays this help information. If a task name
+      is given, it will provide help information
+      specific to that task.
+
     template
         Copies a ProjectInfo template into the current
-        directory, if it doesn't already exist.
-
-    scaffold
-        Builds a project directory based on settings of
-        project information file. This will not destroy
-        any structure already in place!
+        directory, if it does not already exist.
 
-    help
-        Displays this help information.
+    scaffold [directory] [type]
+        Builds a starter project directory. There are
+        two types: 'standard' and 'subversion'. These can
+        be abbreviated 'std' and 'svn', repectively. If
+        no type is given then standard is used.
 
   OPTIONS:
 
@@ -173,6 +194,9 @@ HELP = <<-HERE
     -V --verbose
         Provides extra verbose processing information.
 
+    -f --force
+        Forces certain operations to be performed.
+
     -D --debug
         Provides extra verbose processing information.
 

data/lib/reap/projectinfo.rb

@@ -8,7 +8,12 @@ require 'facet/dir/self/ascend'
 
 class ProjectInfo
 
-  INFO_FILES = [ 'ProjectInfo', 'ReapFile', 'projectinfo', 'reapfile' ]
+  INFO_FILES = [
+    'ProjectInfo',
+    'ReapFile',
+    'projectinfo',
+    'reapfile'
+  ]
 
   def self.add_info_file( f )
     INFO_FILES.unshift( f )
@@ -21,68 +26,120 @@ class ProjectInfo
 
   attr_reader :info, :info_stream, :info_dir
 
-  def initialize( info_file=nil )
-    unless info_file
-      Dir.ascend(Dir.pwd) do |d|
-        Dir.chdir(d)
-        info_file = INFO_FILES.find{ |f| File.file?( f ) }
-        if info_file
-          @info_dir = d; break
-        end
-      end
+  def initialize( alt_info_file=nil )
+
+    # Consider alternative info files?
+    # NOTE Should this work out of the current working dir only?
+    add_info_file( alt_info_file ) if alt_info_file
+
+    info_dir = nil
+    info_file = nil
+
+    Dir.ascend(Dir.pwd) do |info_dir|
+      #Dir.chdir(info_dir)
+      info_file = INFO_FILES.find{ |f| File.file?( File.join( info_dir, f ) ) }
+      break if info_file
     end
-    if info_file
-      @info_stream = File.read( info_file )
-      @info = YAML::load( @info_stream ).traverse{ |k,v| [k.downcase, v] }
-      puts "(in #{Dir.pwd})" #unless dir == Dir.pwd
-    else
-      puts "Aborted. No project information file found."
-      exit 1
-      #@info_stream = ""
-      #@info = {}
-      #puts "(without a project information file)"
+
+    return unless info_file
+
+    info_file = File.basename( info_file )
+    @info_dir = info_dir
+    @info_file = info_file
+    Dir.chdir(info_dir)
+
+    puts "(in #{Dir.pwd})" #unless dir == Dir.pwd
+
+    info_stream = File.read( info_file ).strip
+
+    begin
+      info = YAML::load( info_stream )
+    rescue
+      #info_proc = lambda { instance_eval( info_stream ) }
+      info = HashBuilder.new( info_stream  ).to_h
     end
-  end
 
-#   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
-#     @info_stream
-#   end
-
-#   def info
-#     @info
-#     #if info_stream
-#     #  @info ||= YAML::load(info_stream).traverse{ |k,v| [k.downcase, v] }
-#     #else
-#     #  {}
-#     #end
-#   end
+    @info_stream = info_stream
+    @info = info.traverse{ |k,v| [k.to_s.downcase, v] }
 
-  def to_h
-    @info
+    validate
+    defaults
+  end
+
+  def exists?
+    @info_dir
   end
 
-  # 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
 
+  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
+  end
+
   def [](name)
     info[name]
   end
 
+  def []=(name, x)
+    info[name] = x
+  end
+
+  def to_h
+    @info
+  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 )
+
+    if @hash.key?(sym)
+      unless @flag[sym]
+        @hash[sym] = [ @hash[sym] ]
+        @flag[sym] = true
+      end
+      if block_given?
+        @hash[sym] << HashBuilder.new( &block ).to_h
+      else
+        @hash[sym] << args[0]
+      end
+    else
+      if block_given?
+        @hash[sym] = HashBuilder.new( &block ).to_h
+      else
+        @hash[sym] = args[0]
+      end
+    end
+
+  end
+
 end