reap 4.3.1 → 4.3.2

data/lib/reap/task/install.rb

@@ -1,5 +1,7 @@
+#!/usr/bin/env ruby
 
 require 'reap/task'
+require 'reap/setup'
 
 #
 # Install Task
@@ -8,24 +10,39 @@ class Reap::Install < Reap::Task
 
   task_desc "Locally install package using setup.rb or install.rb."
 
-  attr_accessor :options, :quiet #, :sudo
+  attr_accessor :options #, :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
+    #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}..."
+    puts "Reap is shelling out work to setup.rb..."
 
-    options << '-q' if @quiet
+    # prepare for using internalized setup.rb
 
-    c = "sudo ruby #{exe} #{options.join(' ')}"
-    sh c
+    ARGV.delete('install')
+    ARGV << '-q' unless $VERBOSE
+    ARGV.concat(options)
+
+    $setup_pwd = $PROJECT_INFO.info_dir #Dir.pwd
+
+    # invoke setup.rb
+
+    begin
+      ToplevelInstaller.invoke
+    rescue SetupError
+      raise if $DEBUG
+      $stderr.puts $!.message
+      $stderr.puts "Try 'reap --help' for detailed usage."
+      exit 1
+    end
+
+    puts "Setup complete!"
   end
 
 end

data/lib/reap/task/noop.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 
 require 'reap/task'
 
@@ -10,6 +11,8 @@ require 'reap/task'
 #
 class Reap::Noop < Reap::Task
 
+  section_required true
+
   task_desc "A no-op task to help debug reap itself."
 
   attr_accessor :message

data/lib/reap/task/publish.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 
 require 'reap/task'
 
@@ -6,10 +7,10 @@ require 'reap/task'
 #
 class Reap::Publish < Reap::Task
 
-  task_desc "Publish documents to the web."
-
   section_required true
 
+  task_desc "Publish documents to the web."
+
   attr_accessor :host, :type, :dir, :project, :username
   attr_accessor :exclude  # not using yet
 

data/lib/reap/task/test.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 
 require 'reap/task'
 
@@ -7,7 +8,7 @@ require 'facet/string/tabto'
 
 Test::Unit.run = true  # don't run auto tests
 
-#
+
 # Test Task
 #
 # The Reap test task runs each test in
@@ -15,23 +16,41 @@ Test::Unit.run = true  # don't run auto tests
 # 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
+# a hack. It actually marshals test results across
+# 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::Test < Reap::Task
 
   task_desc "Run unit-tests (each in a separate process)."
 
-  attr_accessor :libs, :files, :fixture, :against_installed
+  task_help %{
+
+  Attributes
+
+    files       Test files (eg. test/tc_**/*.rb)
+                Defaults to typcial selection.
+
+    requires    List of any files to pre-require.
+
+    libs        List of lookup directories to include in
+                load path. './lib' is always included.
+
+    live        Flag to quickly deactive use of local libs.
+                Test against installed files instead.
+
+  }
+
+  attr_accessor :files, :requires, :live, :libs
 
   def init
-    @libs    ||= ['lib']
     @files   ||= [ 'test/*/**/*.rb', 'test/**/tc*.rb', 'test/**/test*.rb', 'test/**/*test.rb' ]
-    @fixture ||= []
-    @against_installed ||= false
+    @requires ||= []
+
+    @live ||= false
+    @libs ||= [] #['./lib']
 
     # interal use
     @results = TestResults.new
@@ -48,9 +67,9 @@ class Reap::Test < Reap::Task
       puts "No test files found."
       return
     end
-    print "Reap is shelling out work to Ruby's Test Suite..."
+    print "Reap is shelling out work to Ruby's Test Suite...\n"
 
-    test_files.each { |f|
+    test_files.uniq.each { |f|
       $stdout << '.'; $stdout.flush
       dotest( f )
       #ruby %{-r"test/unit" "#{f}"}
@@ -102,6 +121,8 @@ class Reap::Test < Reap::Task
     #ruby %{-e0 -r"test/unit" \\\n#{test_reqs}#{test_opts}}
   end
 
+  # Runs a test.
+
   def dotest( test_file )
     if ! File.file?( test_file )
       r = nil
@@ -117,20 +138,31 @@ class Reap::Test < Reap::Task
 
   # Currently send program output to null device.
   # Could send to a logger in future version.
+
   def fork_test( testfile )
     src = ''
-    src << %{$:.unshift('lib')} unless against_installed
+
+    unless live
+      l = File.join( Dir.pwd, 'lib' )
+      if File.directory?( l )
+        src << %{$:.unshift('#{l}')\n}
+      end
+      libs.each { |r| src << %{$:.unshift('#{r}')\n} }
+    end
+
     src << %{
       #require 'test/unit'
       require 'test/unit/collector'
       require 'test/unit/collector/objectspace'
       require 'test/unit/ui/testrunnermediator'
     }
-    fixture.each do |fix|
+
+    requires.each do |fix|
       src << %Q{
         require '#{fix}'
       }
     end
+
     src << %{
       output = STDOUT.dup
       STDOUT.reopen( PLATFORM =~ /mswin/ ? "NUL" : "/dev/null" )
@@ -146,46 +178,55 @@ class Reap::Test < Reap::Task
         $stderr << "MARSHAL ERROR\n"
         $stderr << "TEST: #{testfile}\n"
         $stderr << "DATA:" << result.inspect
-        exit 1
+        exit -1
       end
       output << marshalled
-      
+
       STDOUT.reopen(output)
       output.close
     }
+
     result = IO.popen("ruby","w+") do |ruby|
       ruby.puts src
       ruby.close_write
       ruby.read
     end
+
     p testfile if $VERBOSE
+
     begin
       marsh = Marshal.load(result)
     rescue ArgumentError
-      $stderr << "\nCannot load marshalled test data."
+      $stderr << "\nCannot load marshalled test data.\n"
       $stderr << result << "\n"
-      exit 0
+      exit -1
     end
+
     return marsh
   end
 
   #
-  # Support class for collecting test results
+  # Support class for collecting test results.
   #
+
   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}
@@ -194,7 +235,7 @@ class Reap::Test < Reap::Task
       s << %{  errors     : #{@error_count}\n}
       s
     end
+
   end
 
 end
-

data/lib/reap/task/testext.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 require 'reap/task'
 require 'facet/string/margin'
 

data/lib/reap/task.rb

@@ -7,7 +7,7 @@ require 'facet/string/tabto'
 require 'facet/module/basename'
 require 'facet/module/attr_setter'
 
-require 'calibre/filelist'
+require 'facet/filelist'
 
 
 # Base class for reap tasks.
@@ -59,6 +59,7 @@ module Reap
 
   def self.register
     $PROJECT_INFO = ProjectInfo.new( $PROJECT_FILE )
+
     #@registry ||= {}
     #ObjectSpace.each_object(Class) { |klass|
     #  if klass < ::Reap::Task
@@ -77,7 +78,6 @@ module Reap
 #   end
 
 
-
   class Task
 
     include ::Config
@@ -97,13 +97,22 @@ module Reap
         end
       end
 
+      def task_help( text=nil, &block )
+        if text
+          @task_help = proc { text }
+        elsif block_given?
+          @task_help = block
+        else
+          @task_help.call
+        end
+      end
+
       #def task_desc ; '(no desciption given)' ; end
       def task_name ; basename.downcase ; end
 
       def section_required( val ) ; @section_required = val ;end
       def section_required?       ; @section_required ; end
 
-      #
       def verify?
         if section_required?
           return $PROJECT_INFO.info.key?(task_name)

data/note/Rakefile

@@ -0,0 +1,60 @@
+# Rakefile for rubypants  -*-ruby-*-
+require 'rake/rdoctask'
+
+
+desc "Run all the tests"
+task :default => [:test]
+
+desc "Do predistribution stuff"
+task :predist => [:changelog, :doc]
+
+
+desc "Run all the tests"
+task :test do
+  ruby 'rand.rb'
+end
+
+desc "Make an archive as .tar.gz"
+task :dist => :test do
+  system "export DARCS_REPO=#{File.expand_path "."}; " +
+         "darcs dist -d rand#{get_darcs_tree_version}"
+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 --all'
+  rdoc.rdoc_files.include 'README'
+  rdoc.rdoc_files.include 'rand.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/note/composite_task.rb

@@ -0,0 +1,27 @@
+
+require 'reap/reap'
+require 'reap/task'
+
+class Reap::CompositeTask < Reap::Task
+
+  register "composite"
+
+  #def default_name ; "" ; end
+  def default_desc
+    "run tasks #{subtasks.join(',')} [reap]"
+  end
+
+  #attr_accessor :subtasks
+
+  def init
+    #@subtasks = section['subtasks']
+  end
+
+  private
+
+  def run
+    #@subtasks.each do |st|
+    #end
+  end
+
+end

data/note/compositepublisher.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+
+module Rake
+
+  # Manage several publishers as a single entity.
+  class CompositePublisher
+    def initialize
+      @publishers = []
+    end
+    
+    # Add a publisher to the composite.
+    def add(pub)
+      @publishers << pub
+    end
+    
+    # Upload all the individual publishers.
+    def upload
+      @publishers.each { |p| p.upload }
+    end
+  end
+
+end
+
+

data/note/ftptools.rb

@@ -0,0 +1,139 @@
+#!/usr/bin/env ruby
+
+# = Tools for FTP uploading.
+#
+# This file is still under development and is not released for general
+# use.
+
+require 'date'
+require 'parsedate'
+require 'net/ftp'
+
+module Rake # :nodoc:
+
+  ####################################################################
+  # <b>Note:</b> <em> Not released for general use.</em>
+  class FtpFile
+    attr_reader :name, :size, :owner, :group, :time
+
+    def self.date
+      @date_class ||= Date
+    end
+
+    def initialize(path, entry)
+      @path = path
+      @mode, line, @owner, @group, size, d1, d2, d3, @name = entry.split(' ')
+      @size = size.to_i
+      @time = determine_time(d1, d2, d3)
+    end
+
+    def path
+      File.join(@path, @name)
+    end
+
+    def directory?
+      @mode[0] == ?d
+    end
+
+    def mode
+      parse_mode(@mode)
+    end
+
+    def symlink?
+      @mode[0] == ?l
+    end
+
+    private # --------------------------------------------------------
+
+    def parse_mode(m)
+      result = 0
+      (1..9).each do |i|
+	result = 2*result + ((m[i]==?-) ? 0 : 1)
+      end
+      result
+    end
+
+    def determine_time(d1, d2, d3)
+      elements = ParseDate.parsedate("#{d1} #{d2} #{d3}")
+      if elements[0].nil?
+	today = self.class.date.today
+	if elements[1] > today.month
+	  elements[0] = today.year - 1
+	else
+	  elements[0] = today.year
+	end
+      end
+      elements = elements.collect { |el| el.nil? ? 0 : el }
+      Time.mktime(*elements[0,7])
+    end
+  end
+
+  ####################################################################
+  # Manage the uploading of files to an FTP account.
+  class FtpUploader
+
+    # Log uploads to standard output when true.
+    attr_accessor :verbose
+
+    class << FtpUploader
+      # Create an uploader and pass it to the given block as +up+.
+      # When the block is complete, close the uploader.
+      def connect(path, host, account, password)
+	up = self.new(path, host, account, password)
+	begin
+	  yield(up)
+	ensure
+	  up.close
+	end
+      end
+    end
+
+    # Create an FTP uploader targetting the directory +path+ on +host+
+    # using the given account and password.  +path+ will be the root
+    # path of the uploader.
+    def initialize(path, host, account, password)
+      @created = Hash.new
+      @path = path
+      @ftp = Net::FTP.new(host, account, password)
+      makedirs(@path)
+      @ftp.chdir(@path)
+    end
+
+    # Create the directory +path+ in the uploader root path.
+    def makedirs(path)
+      route = []
+      File.split(path).each do |dir|
+	route << dir
+	current_dir = File.join(route)
+	if @created[current_dir].nil?
+	  @created[current_dir] = true
+	  puts "Creating Directory  #{current_dir}" if @verbose
+	  @ftp.mkdir(current_dir) rescue nil
+	end
+      end
+    end
+
+    # Upload all files matching +wildcard+ to the uploader's root
+    # path.
+    def upload_files(wildcard)
+      Dir[wildcard].each do |fn|
+	upload(fn)
+      end
+    end
+    
+    # Close the uploader.
+    def close
+      @ftp.close
+    end
+
+    private # --------------------------------------------------------
+
+    # Upload a single file to the uploader's root path.
+    def upload(file)
+      puts "Uploading #{file}" if @verbose
+      dir = File.dirname(file)
+      makedirs(dir)
+      @ftp.putbinaryfile(file, file) unless File.directory?(file)
+    end
+  end
+end

data/note/license-each.rb

@@ -0,0 +1,85 @@
+# Ruby Treasures 0.4
+# Copyright (C) 2002 Paul Brannan <paul@atdesk.com>
+# 
+# You may distribute this software under the same terms as Ruby (see the file
+# COPYING that was distributed with this library).
+# 
+# Ruby Treasures 0.2
+# Copyright (C) 2002 Paul Brannan <paul@atdesk.com>
+# 
+# You may distribute this software under the same terms as Ruby (see the file
+# COPYING that was distributed with this library).
+# 
+# Run this Ruby script to prepare the RubyTreasures distribution for
+# publication.
+
+require 'find'
+require 'ftools'
+
+
+# Add licences to the top of every file and remove unnecessary files
+
+license = IO.readlines('LICENSE')
+ruby_license_comment = license.map { |i| i.sub(/^/, '# ') }
+c_license_comment = ["/*\n"] + license.map { |i| i.sub(/^/, ' * ') } + [" */\n"]
+
+def rm_rf(dir)
+  Dir.foreach(dir) do |f|
+    if not f =~ /\.?\.$/ then
+      filename = File.join(dir, f)
+      if File.directory?(filename) then
+        rm_rf(filename)
+      else
+        puts "Removing file #{filename}"
+        File.rm_f(filename)
+      end
+    end
+  end
+  puts "Removing directory #{dir}"
+  Dir.rmdir(dir)
+end
+
+Find.find('.') do |file|
+  if File.directory?(file) then
+    case file
+      when /\/CVS$/
+        # Remove CVS directories
+        rm_rf(file)
+      else
+        # Remove empty directories
+        entries = Dir.entries(file)
+        entries.delete('.')
+        entries.delete('..')
+        entries.delete('CVS')
+        if entries.length == 0 then
+          rm_rf(file)
+        end
+    end
+  else
+    case file
+      when /\.rb$/
+        # Add LICENSE to ruby sources
+        puts "Adding license to #{file}"
+        lines = ruby_license_comment + IO.readlines(file)
+        File.open(file, 'w') do |out|
+          lines.each do |line|
+            out.puts line
+          end
+        end
+      when /\.c$/
+        # Add LICENSE to C sources
+        puts "Adding license to #{file}"
+        lines = c_license_comment + IO.readlines(file)
+        File.open(file, 'w') do |out|
+          lines.each do |line|
+            out.puts line
+          end
+        end
+      when /~$/
+        # Remove temporary files
+        puts "Removing file #{file}"
+        File.rm_f(file)
+    end
+  end
+end
+