reap 03.01 → 4.0.0

data/lib/reap/{rdoc_task.rb → task/rdoc.rb}

@@ -1,22 +1,13 @@
 
 require 'reap/task'
 
-module ReapTask
-  def rdoc_task(*args,&blk)
-    ::Reap::RDocTask.new(*args,&blk)
-  end
-end
-
 #
 # RDoc Task
 #
-class Reap::RDocTask < Reap::Task
-
-  #register 'rdoc'
+class Reap::RDoc < Reap::Task
 
-  def default_name ; 'rdoc' ; end
-  def default_desc
-     "generate RDocs (in #{dir}) [reap]"
+  def task_desc
+     "Generate RDocs (in #{dir})."
   end
 
   attr_accessor :dir, :main, :title, :template,
@@ -27,18 +18,21 @@ class Reap::RDocTask < Reap::Task
     @main     ||= 'README'
     @title    ||= master["title"]
     @template ||= 'html' # 'jamis'
-    @include  ||= ['lib/**/*','bin/**/*', 'ext/**/*',
-                   'READ*', 'LICENC*', 'COPY*', 'Change*']
-    @exclude  ||= []
+    @include  ||= [ 'A-Z*', 'lib/**/*', 'ext/**/*' ]
+    @exclude  ||= [ 'demo/**/*', 'example/**/*', 'sample/**/*' ]
     @options  ||= ['--merge', '--all']
   end
 
   def run
+    must_exclude = [ 'InstalledFiles', 'CVS/**/*' ]
+
     if !File.exists?(@main) or File.directory?(@main)
       warn "Specified RDoc Main file #{@main} not found. Ignored."
       @main = nil
     end
+
     rdoc_dir = File.expand_path(@dir)
+
     if FileTest.directory?(@dir)
       print "Directory '#{@dir}' already exists. Clobber? [y/N] "
       until inp = $stdin.gets[0,1] ; sleep 1 ; end ; puts
@@ -48,27 +42,40 @@ class Reap::RDocTask < Reap::Task
         #trashdir = ".trash/#{File.basename(@dir)}"
         #FileUtils.rm_r(trashdir) if FileTest.exists?(trashdir)
         #FileUtils.mv(@dir, trashdir)
-        FileUtils.rm_r(@dir)
+        FileUtils.rm_r(@dir) unless $PRETEND
       else
         puts "Reap rdoc task canceled."
         return nil
       end
     end
+
     rdoc_target = "#{rdoc_dir}/index.html"
-    # rdoc files
-    rdoc_files = FileList.new
-    rdoc_files.include(*@include)
-    rdoc_files.exclude(*@exclude)
+
+    exc = []
+    (@exclude + must_exclude).each{ |e|
+      exc << e
+      exc |= Dir.glob(e+'/**/*')
+    }
+
+    inc = Dir.glob('[A-Z]*')
+    @include.each{ |i| inc |= Dir.glob(i) }
+    inc -= exc
+
+    inc = inc.select{ |f| File.file?(f) }
+
+    rdoc_files = inc
     rdoc_files = '"' << rdoc_files.join('" "') << '"'
+
     # build options string
-    build = @options.dup
+    build = []
+    build += @options
     build << "--main '#{@main}'" if @main
     build << "--title '#{@title}'" if @title
     build << "-T '#{@template}'" if @template
     rdoc_opts = build.join(' ')
+
     # do it!
     puts "Reap is shelling work out to RDoc..."
-    puts %{rdoc -o #{@dir} #{rdoc_opts}}
     sh %{rdoc -o #{rdoc_dir} #{rdoc_opts} #{rdoc_files}}
   end
 

data/lib/reap/task/scaffold.rb

@@ -0,0 +1,114 @@
+
+#require 'rbconfig'
+#require 'reap/projectinfo'
+
+module Scaffold
+  extend self
+
+  SCMPaths => %w{
+    trunk
+    branch
+    tag
+    scrap
+    package
+  }
+
+  TrunkPaths = %w{
+    bin
+    lib
+    ext
+    dev
+    data
+    test
+    demo
+  }
+
+  TrunkFiles = %w{
+    README
+    INSTALL
+    COPYING
+    ProjectInfo
+    ChangeLog
+    Todo
+    RakeFile
+    setup.rb
+  }
+
+  def go(name) ; scaffold(name) ; end
+
+  # Main method.
+  def scaffold(name=nil)
+    name ||= 'yourlib.projectdomain.org'
+    t = Time.now.strftime("%Y-%m-%d")
+    libdir = File.join( 'lib', "#{@name},#{t}" )
+
+    if @scm
+      SCMPaths.each { |d| makedir( d ) }
+      Dir.chdir 'trunk'
+    end
+    TrunkPaths.each { |d| makedir( d ) }
+    makedir_with_check( libdir )
+    TrunkFiles.each { |f| temlpate( f ) }
+  end
+
+  private
+
+  # Copy a file from lib/data to the current dir.
+  def template( filename )
+    dir = File.join(File.dirname(__FILE__), 'data' )
+    #dir = File.join( ::Config::CONFIG['datadir'], DATA_DIR )
+    f = File.join( dir, filename )
+    unless File.file?( f )
+      puts f
+      raise "Tempfile is missing."
+    end
+
+    if File.exists?(filename)
+      puts "#{filename} already exists."
+      return
+    end
+    # copy tmpf to Reapfile
+    FileUtils.cp( f, filename )
+    #puts "#{filename} created. You'll need to fill it out."
+  end
+
+  # Make a directory as long as it doesn't already exist.
+  def makedir( dir )
+    FileUtils.makedir_p( dir ) unless File.directory?( dir )
+  end
+
+end
+
+
+
+=begin
+  def scaffold
+    require 'reap/scaffold'
+    name =
+    domain =
+    Scaffold.go( name, domain )
+  end
+
+  def template( file_name = ProjectInfo )
+    #dir = File.dirname(File.dirname(__FILE__))
+    dir = File.join( ::Config::CONFIG['datadir'], DATA_DIR )
+
+    tmpf = File.join( dir, 'template.yaml' )
+    unless File.file?( tmpf )
+      puts tmpf
+      raise "Tempfile is missing."
+    end
+
+    if File.directory?(filename)
+      puts "#{filename} a directory. Cannot comply."
+      return
+    elsif File.file?(filename)
+      puts "#{filename} already exists."
+      return
+    end
+    # copy tmpf to Reapfile
+    FileUtils.cp( tmpf, filename )
+    puts "#{filename} created. You'll need to fill it out."
+  end
+=end
+

data/lib/reap/{test_task.rb → task/test.rb}

@@ -1,3 +1,4 @@
+
 require 'reap/task'
 
 #require 'test/unit'
@@ -6,12 +7,6 @@ require 'nano/string/tabto'
 
 Test::Unit.run = true  # don't run auto tests
 
-module ReapTask
-  def test_task(*args,&blk)
-    ::Reap::TestTask.new(*args,&blk)
-  end
-end
-
 #
 # Test Task
 #
@@ -19,30 +14,26 @@ end
 # it's own process, making for purer
 # test facility.
 #
-# NOTE:
-# This works well enough but it is a bit of hack.
-# It actually marshals test results across
-# a stdout->stdin shell pipe. One consequence
-# of this is that you can't send debug info
-# to stdout (including #p and #puts) within
-# the tests themselves. This, hopefully can
-# be remedied.
+# NOTE: This works well enough but it is a bit of
+# hack. It actually marshals test results across
+# a stdout->stdin shell pipe. One consequence of
+# this is that you can't send debug info to stdout
+# (including #p and #puts). This, hopefully can be
+# remedied in the future.
 #
-class Reap::TestTask < Reap::Task
-
-  #register 'test'
+class Reap::Test < Reap::Task
 
-  def default_name ; 'test' ; end
-  def default_desc
-    "run unit-tests (each in a separate process) [reap]"
+  def task_desc
+    "Run unit-tests (each in a separate process)."
   end
 
-  attr_accessor :libs, :files, :options
+  attr_accessor :libs, :files, :fixture, :against_installed
 
   def init
     @libs    ||= ['lib']
-    @files   ||= [ 'test/**/tc*.rb', 'test/**/test*.rb', 'test/**/*test.rb' ]
-    #@options
+    @files   ||= [ 'test/*/**/*.rb', 'test/**/tc*.rb', 'test/**/test*.rb', 'test/**/*test.rb' ]
+    @fixture ||= []
+    @against_installed ||= false
 
     # interal use
     @results = TestResults.new
@@ -126,18 +117,34 @@ class Reap::TestTask < Reap::Task
     @results << r
   end
 
+  # Currently send program output to null device.
+  # Could send to a logger in future version.
   def fork_test( testfile )
-    src = %Q{
+    src = ''
+    src << %{$:.unshift('lib')} unless against_installed
+    src << %{
       #require 'test/unit'
       require 'test/unit/collector'
       require 'test/unit/collector/objectspace'
       require 'test/unit/ui/testrunnermediator'
+    }
+    fixture.each do |fix|
+      src << %Q{
+        require '#{fix}'
+      }
+    end
+    src << %{
+      output = STDOUT.dup
+      STDOUT.reopen( PLATFORM =~ /mswin/ ? "NUL" : "/dev/null" )
 
       load('#{testfile}')
       tests = Test::Unit::Collector::ObjectSpace.new.collect
       runner = Test::Unit::UI::TestRunnerMediator.new( tests )
       result = runner.run_suite
-      puts Marshal.dump(result)
+      output << Marshal.dump(result)
+
+      STDOUT.reopen(output)
+      output.close
     }
     result = IO.popen("ruby","w+") do |ruby|
       ruby.puts src

data/lib/reap/task/testext.rb

@@ -0,0 +1,110 @@
+require 'reap/task'
+require 'nano/string/margin'
+
+# Extract Test Task
+#
+# The Reap extract test task scans every package script
+# looking for =begin testing ... =end sections.
+# With appropriat headers, it copies these sections
+# to files in the test dir, which then can be run
+# using the Reap test taks.
+#
+class Reap::TestExt < Reap::Task
+
+  def task_desc
+    "Extract unit-tests from lib scripts."
+  end
+
+  attr_accessor :dir, :files, :options
+
+  def init
+    @dir    ||= 'test'
+    @files  ||= [ 'lib/**/*.rb' ]
+    #@options
+  end
+
+  def run
+    #test_libs = @libs.join(':')
+    files = FileList.new
+    files.include(*@files)
+    if files.empty?
+      puts "No script files found."
+      return
+    end
+    print "Reap is scanning and copying embedded tests..."
+
+    if @dir.strip.empty?
+      puts "Test directory must be specified."
+      return
+    end
+
+    unless File.directory?(@dir)
+      puts "Test directory doesn't exist: #{File.expand_path( @dir )}"
+      return
+    end
+
+    files.each { |file|
+      $stdout << '.'; $stdout.flush
+      testing = extract( file )
+      unless testing.strip.empty?
+        complete_test = create( testing, file )
+        fp = File.join(@dir,file)
+        unless File.directory?( File.dirname( fp ) )
+          FileUtils.mkdir_p( File.dirname(fp) )
+        end
+        File.open( fp, "w" ) { |fw| fw << complete_test }
+      end
+    }
+    puts "done."
+  end
+
+  def extract( file )
+    return nil if ! File.file?( file )
+    tests = ""; inside = false
+    fstr = File.read( file )
+    fstr.split(/\n/).each do |l|
+      if l =~ /^=[ ]*begin[ ]*testing/
+        tests << "\n"
+        inside = true
+        next
+      elsif inside and l =~ /^=[ ]*end/
+        inside = false
+        next
+      end
+      if inside
+        tests << l << "\n"
+      end
+    end
+    tests
+  end
+
+  def create( testing, file )
+    fp = file.split(/[\/]/)
+    if fp[0] == 'lib'
+      reqf = "require '#{fp[1..-1].join('/')}'"
+    else
+      reqf = ''
+    end
+
+    teststr = <<-HERE.margin
+      `#  _____         _
+      `# |_   _|__  ___| |_
+      `#   | |/ _ \\/ __| __|
+      `#   | |  __/\\__ \\ |_
+      `#   |_|\\___||___/\\__|
+      `#
+      `# for #{file}
+      `#
+      `# Extracted #{Time.now}
+      `# Unit Tools Reap Test Extractor
+      `#
+      `
+      `#{reqf}
+      `
+    HERE
+    teststr << testing << "\n"
+    teststr
+  end
+
+end
+

data/lib/reap/{web_publish_task.rb → task/webpublish.rb}

@@ -1,21 +1,15 @@
-require 'reap/task'
 
-module ReapTask
-  def webpublish_task(*args,&blk)
-    ::Reap::WebPublishTask.new(*args,&blk)
-  end
-end
+require 'reap/task'
 
 #
 # Web Publish Task
 #
-class Reap::WebPublishTask < Reap::Task
+class Reap::WebPublish < Reap::Task
 
-  #register 'webpublish'
+  section_required true
 
-  def default_name ; 'webpublish' ; end
-  def default_desc
-    "publish project website to your internet host [reap]"
+  def task_desc
+    "publish project website to your internet host *"
   end
 
   attr_accessor :host, :type, :dir, :project, :username

data/lib/reap/tasks.rb

@@ -1,9 +1,13 @@
 
-require 'reap/filemod_task'
-require 'reap/test_task'
-require 'reap/rdoc_task'
-require 'reap/announce_task'
-require 'reap/package_task'
-require 'reap/publish_task'
-require 'reap/info_task'
-require 'reap/noop_task'
+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/noop'
+#require 'reap/webpublish'
+