reap 0.4.0 → 0.5.0

data/lib/reap/tasks/announce-task.rb

@@ -1,45 +1,53 @@
 
 require 'net/smtp'
-require 'facet/string/margin'
-require 'facet/string/tab'
-require 'facet/string/center_lines'
-require 'facet/string/clump'
-require 'facet/string/word_wrap'
+
+require 'nano/string/margin'
+require 'nano/string/tab'
+require 'nano/string/align_center'
+require 'nano/string/fold'
+require 'nano/string/word_wrap'
 
 module Reap
 
   class AnnounceTask < Task
-    
+
     def self.task ; :announce ; end
-    
+
     def self.desc ; "Sends [ANN] email to ruby-talk or other list." ; end
 
 
-    def set( section )
-      @address = section['to']
-      @from = section['from'].to_s
-      @server = section['server'].to_s.strip
-      @port = section['port'] || 25
-      @domain = section['domain'].to_s.strip
-      @account = section['account'].to_s
+    def setup
+      @address  = section['to']
+      @from     = section['from'].to_s
+      @server   = section['server'].to_s.strip
+      @port     = section['port'] || 25
+      @domain   = section['domain'].to_s.strip
+      @account  = section['account'].to_s
       @authtype = section['authtype'].to_sym
-      @subject = "[ANN] #{@config['title']}, v#{@config['version']}"
+      @tls      = section['tls'] ? true : false
 
+      @title    = master['title']
+      @version  = master['version']
+      @summary  = master['summary']
+      
+      @subject  = "[ANN] #{@title}, v#{@version}"
+      
       #raise "DOMAIN is a required field" if @domain.empty?
 
+      # header
       announce = %Q{
         |
         |A N N O U N C I N G
         |
-        |#{@config['title']}, v#{@config['version']}
+        |#{@title}, v#{@version}
         |
-        |#{@config['summary']}
+        |#{@summary}
         |
         }.margin.center_lines(66)
 
       # abstract
       abstract = ''
-      desc = @config['description']
+      desc = description
       if desc
         abstract << "\n\n"
         abstract << "ABSTRACT: #{desc}".word_wrap(72)
@@ -71,7 +79,7 @@ module Reap
         memo = ''
         memo << "\n" << ('-' * 72) << "\n"
         memo << "(Memo)\n\n"
-        memo << section['memo'].clump.word_wrap(72)
+        memo << section['memo'].fold.word_wrap(72)
         #memo << "\n"
       end
 
@@ -83,7 +91,7 @@ module Reap
         msg << "(from #{msg_file})\n\n"
         mg = ''       
         File.open( msg_file ) { |f| mg << f.gets(nil) }
-        msg << mg.clump.word_wrap(72)
+        msg << mg.fold.word_wrap(72)
       end
     
       # stamp
@@ -122,6 +130,7 @@ module Reap
          }.margin
         begin
           # --- Send using SMTP object and an adaptor
+          Net::SMTP.enable_tls if Net::SMTP.respond_to?(:enable_tls) and @tls
           Net::SMTP.start(@server, @port, @domain, @account, passwd, @authtype) do |s|
             s.send_message mail, @from, @address
           end

data/lib/reap/tasks/chmod-task.rb

@@ -4,19 +4,16 @@ module Reap
   class ChmodTask < Task
 
     def self.task; :chmod ; end
-
     def self.desc; "Change the permissions of package files." ; end
 
-
-    def set( section )
-#       @user = section['user']
-#       @group = section['group']
-#       #raise "USER and GROUP are required CHMOD fields." unless @user and @group
+    def setup
+      @user = section['user']
+      @group = section['group']
     end
 
     def run
       puts "Reap is shelling out work to chmod..."
-      
+
       # misc
       misc = FileList.new
       misc.include('[A-Z]*')
@@ -43,7 +40,7 @@ module Reap
     end
 
     private
-    
+
     def chmod( file_list, file_mode=644, dir_mode=755 )
       dirs, files = file_list.partition{ |l| File.directory?(l) }
       unless files.empty?
@@ -53,7 +50,7 @@ module Reap
       unless dirs.empty?
         fstr = '"' + dirs.join('" "') + '"'
         sh %{chmod #{dir_mode} #{fstr}}
-      end   
+      end
     end
 
 #     def chown( file_list, user, group )

data/lib/reap/tasks/package-task.rb

@@ -1,5 +1,9 @@
 
-require 'rubygems'
+begin
+  require 'rubygems'
+rescue
+  # no rubygems
+end
 
 module Reap
 
@@ -12,41 +16,41 @@ module Reap
   class PackageTask < Task
 
     def self.task ; :package ; end
-    
     def self.desc ; "Build standard .tar.gz, .tar.bzip2 and .zip packages." ; end
 
+    def setup
+      @dir          = section['dir']      || 'pkg'
 
-    def set( section )
-      @dir = section['dir'] || 'pkg'
-      
-      @name = section['name'] || @config['name']
-      @version = section['version'] || @config['version'] || '0.0.1'
-      @package_name = @name + '--' + @version
+      @name         = section['name']     || master['name']
+      @version      = section['version']  || master['version'] || '0.0.1'
+      @package_name = @name + '-' + @version
 
-      @author = section['author'] || @config['author']
-      @email = section['email'] || @config['email']
-      @summary = section['summary'] || @config['summary']     
-      @project = section['project'] || @config['rubyforge']['project']
-      @homepage = section['homepage'] || @config['homepage'] || @config['rubyforge']['homepage']
-      
-      @include = section['include'] || DEFAULT_INCLUDE 
-      @exclude = MUST_EXCLUDE + section['exclude']
+      @author       = section['author']   || master['author']
+      @email        = section['email']    || master['email']
+      @summary      = section['summary']  || master['summary']
+      @project      = section['project']  || master['rubyforge']['project']
+      @homepage     = section['homepage'] || master['homepage'] || master['rubyforge']['homepage']
+
+      @include      = section['include']  || DEFAULT_INCLUDE 
+      @exclude      = MUST_EXCLUDE + section['exclude']
 
       @zip = section['zip'].nil? ? true : section['zip']
       @gzip = section['gzip'].nil? ? true : section['zip']
       @bzip2 = section['bzip2'].nil? ? true : section['zip']
       @gem = section['gem'].nil? ? true : section['gem']
-      
+
       # gem specific
-      if self['platform']
-        @platform = ::Gem.const_get(section['platform'])
-      else 
-        @platform = ::Gem::Platform::RUBY
+      if defined?(Gem)
+        if self['platform']
+          @platform = ::Gem.const_get(section['platform'])
+        else
+          @platform = ::Gem::Platform::RUBY
+        end
+        @autorequire  = section['autorequire']
+        @requirements = section['requirements'] || []
+        @dependencies = section['dependencies'] || []
+        @executables = section['executables'] || []
       end
-      @autorequire  = section['autorequire']
-      @requirements = section['requirements'] || []
-      @dependencies = section['dependencies'] || []
-      @executables = section['executables'] || []
     end
 
     def run
@@ -81,7 +85,7 @@ module Reap
           FileUtils.safe_ln(fn, f)
         end
       end
-      
+
       # create standard package files
       FileUtils.chdir(@dir) do
         # tar bzip2 for unix
@@ -103,14 +107,14 @@ module Reap
       end
 
       # create gem package
-      if @gem
+      if defined?(Gem) and @gem
         run_gem
       end
       return true
     end
 
     private
-    
+
     def run_gem
       spec = Gem::Specification.new { |s|
         s.name = @name
@@ -147,7 +151,7 @@ module Reap
       Gem::Builder.new(spec).build
       sh %{mv ./*.gem #{@dir}/}
     end
-    
+
   end #class PackageTask
 
 end #module Reap

data/lib/reap/tasks/publish-task.rb

@@ -2,28 +2,34 @@
 module Reap
 
   class PublishTask < Task
-    
+
     def self.task ; :publish ; end
-    
     def self.desc ; "Publish documents to the web." ; end
-    
 
-    def set( section )
-      @dir = section["dir"]
-      #@exclude = section["exclude"]
-      @project = section["project"]
-      @username = section["username"]
+
+    def setup
+      @host     = section['host'].to_s.downcase || 'rubyforge'
+      @type     = (section['type'] || 'www').to_s.downcase 
+      @command  = section['command']
+      @dir      = section['dir']
+      #@exclude = section['exclude']
+      @project  = section['project']
+      @username = section['username']
     end
 
     def run
-      #current_dir = Dir.pwd
-      #Dir.chdir( @web_dir )
-      #web_files = FileList.new
-      #web_files.include('**/*')
-      #web_files.exclude(*@web_exclude) if @web_exclude
-      #web_files = '"' << web_files.join('" "') << '"'
-      cmd = %{scp -r #{@dir}/* #{@username}@rubyforge.org:/var/www/gforge-projects/#{@project}/}
-      puts "Reap is shelling out work to scp..."
+      case @host
+      when 'rubyforge'
+        case @type
+        when 'www', 'web'
+          cmd = %{scp -r #{@dir}/* #{@username}@rubyforge.org:/var/www/gforge-projects/#{@project}/}
+        else
+          puts %{Unrecognized publishing type '#{@type}' for host '#{@host}'.}
+        end
+      else
+        puts %{Unrecognized publishing host '#{@host}'.}
+      end
+      puts "Reap is shelling out publishing work..."
       puts cmd
       sh(cmd) unless $PRETEND
     end

data/lib/reap/tasks/rdoc-task.rb

@@ -4,18 +4,16 @@ module Reap
   class RDocTask < Task
 
     def self.task; :rdoc ; end
-    
     def self.desc ; "Generate RDocs." ; end
 
-
-    def set( section )
-      @dir = section["dir"] || 'doc/rdoc'
-      @main = section["main"]
-      @title = section["title"] || @config["title"]
+    def setup
+      @dir      = section["dir"]      || 'doc'
+      @main     = section["main"]
+      @title    = section["title"]    || master["title"]
       @template = section["template"] || 'html'
-      @include = section["include"] || ['lib/**/*']
-      @exclude = section["exclude"]
-      @options = section["options"] || []
+      @include  = section["include"]  || ['lib/**/*']
+      @exclude  = section["exclude"]
+      @options  = section["options"]  || []
     end
 
     def run
@@ -30,7 +28,7 @@ module Reap
           FileUtils.rm_r(trash_dir) if FileTest.exists?(trash_dir)
           FileUtils.mv(@dir, trash_dir)
         else
-          puts "Packmule rdoc task canceled."
+          puts "Reap rdoc task canceled."
           return nil
         end
       end
@@ -47,7 +45,7 @@ module Reap
       build << "-T '#{@template}'" if @template
       rdoc_opts = build.join(' ')
       # do it!
-      puts "PackMule is shelling work out to RDoc..."
+      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/tasks/template-task.rb

@@ -1,38 +1,39 @@
 
 require 'fileutils'
+require 'rbconfig'
 
 module Reap
 
   class TemplateTask < Task
-  
+
+    DATA_DIR = 'site_ruby/reap'
+
     def self.task ; :template ; end
-    
     def self.desc ; "Create template configuration file in current directory." ; end
 
-
-    def set( section )
-    end
+    #def setup
+    #end
 
     def run
-      dir = File.dirname(File.dirname(__FILE__))
-      tmpf = File.join( dir, 'template.rb' )
+      dir = File.join( ::Config::CONFIG['datadir'], DATA_DIR ) #File.dirname(File.dirname(__FILE__))
+      tmpf = File.join( dir, 'template.yaml' )
       unless File.file?( tmpf )
         puts tmpf
         raise "Tempfile is missing."
       end
-      
+
       if File.directory?("Reapfile")
         puts "Why is Reapfile a directory? Cannot comply."
         return
       elsif File.file?("Reapfile")
         puts "Reapfile already exists."
-        return      
+        return
       end
       # copy tmpf to Reapfile
       FileUtils.cp( tmpf, "Reapfile" )
-      puts "Reapfile create. You'll need to fill it out."
+      puts "Reapfile created. You'll need to fill it out."
     end
-    
+
   end #class Template
 
 end #module Reap

data/lib/reap/tasks/test-task.rb

@@ -1,18 +1,27 @@
 
+require 'nano/string/tab'
+
+#require 'test/unit'
+require 'test/unit/ui/testrunnermediator'
+
+Test::Unit.run = true  # don't run auto tests
+
 module Reap
 
   class TestTask < Task
 
     def self.task ; :test ; end
-
     def self.desc ; "Run unit tests." ; end
 
+    def setup
+      @libs    = ( section["libs"]  || ['lib'] ).join(':')
+      #@libs   = (section["libs"]   || []).join(':')
+      @files   = section["files"]   || [ 'test/**/tc*.rb', 'test/**/test*.rb', 'test/**/*test.rb' ]
+      @options = section['options']
 
-    def set( section )
-      @libs = ( section["libs"] || ['lib'] ).join(':')
-      #@libs = (section["libs"] || []).join(':')
-      @files = section["files"] || [ 'test/**/tc*.rb', 'test/**/test*.rb', 'test/**/*test.rb' ]
-      @options = section['options']     
+      @results = TestResults.new
+      @errors = []
+      @failures = []
     end
 
     def run
@@ -24,22 +33,108 @@ module Reap
         puts "No test files found."
         return
       end
-      #test_reqs = test_files.gsub(/^(.*)\.rb$/, ' -r"\1"').join(" \\\n")
-      #test_opts = " \\\n -- #{@options}" if @options
-      puts "Reap is shelling out work to Ruby's Test Suite..."
-      begin
-        test_files.each { |f|
-          ruby %{-r"test/unit" "#{f}"}
+      print "Reap is shelling out work to Ruby's Test Suite..."
+
+      test_files.each { |f|
+        $stdout << '.'; $stdout.flush
+        run_test( f )
+        #ruby %{-r"test/unit" "#{f}"}
+      }
+      puts "done."
+
+      # Display Failures
+      puts
+      puts %{FAILURES:#{@failures.empty? ? ' []' : ''}}
+      @failures.reverse.each { |fails|
+        fails.reverse.each { |failure|
+          puts
+          puts %{  - test      : #{failure.test_name}}
+          puts %{    message   : #{failure.message.gsub("\n"," ")}}
+          puts %{    location  : #{failure.location}}
         }
-        #puts %Q{ ruby %{-I#{test_libs} -e0 -r"test/unit" \\\n#{test_reqs}#{test_opts}} } if $DEBUG
-        #ruby %{-I#{test_libs} -e0 -r"test/unit" \\\n#{test_reqs}#{test_opts}}
-        #ruby %{-e0 -r"test/unit" \\\n#{test_reqs}#{test_opts}}
-      rescue
-        puts "Error occured while trying to run tests."
-        exit 0
+      }
+
+      # Display Errors
+      puts
+      puts %{ERRORS:#{@errors.empty? ? ' []' : ''}}
+      @errors.reverse.each { |errs|
+        errs.reverse.each { |err|
+          puts
+          puts %{  - test      : #{err.test_name}}
+          puts %{    message   : #{err.exception.message}}
+          puts %{    backtrace :}
+          err.exception.backtrace[0...-1].each { |bt| puts %Q{      - #{bt}} }
+        }
+      }
+
+      # Display Final Results
+      puts
+      puts @results
+      puts
+
+      # old way (don't work right)
+      #puts %Q{ ruby %{-I#{test_libs} -e0 -r"test/unit" \\\n#{test_reqs}#{test_opts}} } if $DEBUG
+      #ruby %{-I#{test_libs} -e0 -r"test/unit" \\\n#{test_reqs}#{test_opts}}
+      #ruby %{-e0 -r"test/unit" \\\n#{test_reqs}#{test_opts}}
+    end
+
+    def run_test( test_file )
+      if ! File.file?( test_file )
+        r = nil
+      else
+        r = fork_test( test_file )
+      end
+      unless r.passed?
+        @errors << r.instance_variable_get('@errors')
+        @failures << r.instance_variable_get('@failures')
+      end
+      @results << r
+    end
+
+    def fork_test( testfile )
+      src = %Q{
+        #require 'test/unit'
+        require 'test/unit/collector'
+        require 'test/unit/collector/objectspace'
+        require 'test/unit/ui/testrunnermediator'
+        load('#{testfile}')
+        tests = Test::Unit::Collector::ObjectSpace.new.collect
+        runner = Test::Unit::UI::TestRunnerMediator.new( tests )
+        result = runner.run_suite
+        puts Marshal.dump(result)
+      }
+      result = IO.popen("ruby","w+") do |ruby|
+        ruby.puts src
+        ruby.close_write
+        ruby.read
       end
+      return Marshal.load(result)
     end
 
-  end
-  
+    class TestResults
+      attr_reader :assertion_count, :run_count, :failure_count, :error_count
+      def initialize
+        @assertion_count = 0
+        @run_count = 0
+        @failure_count = 0
+        @error_count = 0
+      end
+      def <<( result )
+        @assertion_count += result.assertion_count
+        @run_count += result.run_count
+        @failure_count += result.failure_count
+        @error_count += result.error_count
+      end
+      def to_s
+        s  = %{SUMMARY:\n\n}
+        s << %{  tests      : #{@run_count}\n}
+        s << %{  assertions : #{@assertion_count}\n}
+        s << %{  failures   : #{@failure_count}\n}
+        s << %{  errors     : #{@error_count}\n}
+        s
+      end
+    end
+
+  end #class TestTask
+
 end #module Reap