reap 4.0 → 4.3.1

data/lib/reap/task/package.rb

@@ -3,7 +3,7 @@ require 'reap/task'
 
 begin
   require 'rubygems'
-rescue
+rescue LoadError
   # no rubygems
 end
 
@@ -15,90 +15,115 @@ end
 #
 class Reap::Package < Reap::Task
 
-  attr_accessor :dir, :name, :date, :series, :status,
-                :author, :email, :summary, :project, :homepage,
-                :exclude, :types, :platform, :autorequire,
-                :dependencies, :requirements, :executables
+  task_desc do
+    disttypes = $PROJECT_INFO['distribute'] || [ 'gem', 'tar.bz2', 'zip' ]
+    "Build distribution packages (#{disttypes.join(', ')})."
+  end
 
-  attr_reader :package_name, :include
+  MUST_EXCLUDE = [ 'InstalledFiles', '**/CVS/**/*', '**/*~', 'dist', 'pkg' ]
+  LOCATIONS = [ '../leaf', '../dist', '../pkg', 'dist', 'pkg' ]
 
-  MUST_EXCLUDE = [ 'InstalledFiles', '**/CVS/**/*', '**/*~' ]
+  attr_master :name, :version, :date, :series, :status,
+              :author, :maintainer, :email, :homepage,
+              :summary, :description,
+              :dependencies, :executables, :requirements, :architecture,
+              :category, :recommends
 
-  def task_desc
-    "Build distribution packages (#{(types||[]).join(', ')})."
-  end
+  attr_accessor :dir, :project, :exclude, :include, :format,
+                :autorequire, :platform, :require_paths
 
-  def init
-    @dir          ||= ( File.directory?('../leaf') ? '../leaf' : 'pkg')
+  attr_reader :package_name, :series_versioning
 
-    @name         ||= master['name']
-    @status       ||= master['status'] || 'beta/stable'
-    @date         ||= master['date'] || Time.now.strftime("%Y-%m-%d")
 
-    @series       ||= master['series']
-    @version      ||= master['version']
+  def init( options={} )
+    @dir ||= LOCATIONS.find { |f| File.directory?(f)  } || 'dist'
 
-    unless @series || @version
-      puts "Series or Version is a required field."
-      exit 0
+    #@name         ||= master['name']
+    #@status       ||= master['status'] || 'beta/stable'
+    #@date         ||= master['date'] || Time.now.strftime("%Y-%m-%d")
+    #@series       ||= master['series'] || '1'
+
+    @maintainer   ||= @author
+    @status       ||= 'beta/stable'
+    @date         ||= Time.now.strftime("%Y-%m-%d")
+    @series       ||= '1'
+    @architecture ||= 'any'
+
+    d = @date.split('-').collect{ |e| e.to_i }
+    #d[0] = d[0] - 2000  # No need to keep the 2000
+    @version     ||= d.join('.')
+
+    if $BUILD_VERSION
+      buildno = eval(Time.now.strftime("%H*60+%M"))
+      @version += ".#{buildno}"
     end
 
-    if @version
-      @package_name ||= @name + '-' + @version
-    else
-      @package_name ||= @name + ',' + @date
+    unless @series
+      puts "Series is required."
+      exit 0
     end
 
-    @author       ||= master['author']
-    @email        ||= master['email']
-    @summary      ||= master['summary']
+    @package_name ||= @name + '-' + @version
+    #@package_name ||= @name + ',' + @date  # rubyforge doesn't allow commas
+
+    #@author       ||= master['author']
+    #@email        ||= master['email']
+    #@summary      ||= master['summary']
     @project      ||= master['rubyforge']['project']
-    @homepage     ||= master['homepage'] || master['rubyforge']['homepage']
+    #@homepage     ||= master['homepage'] || master['rubyforge']['homepage']
+    @homepage     ||= master['rubyforge']['homepage']
 
     @exclude      ||= []
     @exclude      |= MUST_EXCLUDE
 
-    # types include 'tgz', 'tbz', 'zip', 'tar.gz' 'tar.bz2' and 'gem'.
-    @types        ||= master['distribute'] || [ 'gem', 'tar.gz', 'zip' ]
-    @types.collect! { |t| t.to_s.strip.downcase }
-
-    # not setable
     @include      ||= ['**/*']
 
+    # format types include 'tgz', 'tbz', 'zip', 'tar.gz' 'tar.bz2', 'gem' and 'deb'.
+    @format        ||= master['distribute'] || [ 'gem', 'tar.bz2', 'zip' ]
+    @format = [@format].flatten
+    @format.collect! { |t| t.to_s.strip.downcase }
+
+    @dependencies ||= []
+    @executables  ||= []
+    @requirements ||= []
+    @recommends   ||= []
+
     # gem specific (at least in this context)
     if defined?(Gem)
       if @platform
         begin
-          @gem_platform = ::Gem.const_get(@platform)
+          @platform = ::Gem.const_get(@platform)
         rescue NameError
-          @platform = nil
+          @platform = ::Gem::Platform::RUBY
         end
+      else
+        @platform ||= ::Gem::Platform::RUBY
       end
-      @platform = ::Gem::Platform::RUBY unless @plaform
       #@autorequire
-      @requirements ||= master['requirements'] || []
-      @dependencies ||= master['dependencies'] || []
-      @executables  ||= master['executables']  || []
     end
+
   end
 
-  def run
+  def run( options={} )
+    puts "Creating #{@format.join(',')} packages..."
+
     # create package image
-    package_dir_path = "#{@dir}/#{@package_name}"
+    group_dir_path = File.join( @dir, @package_name )
+    package_dir_path = File.join( @dir, @package_name, @package_name )
 
-    if FileTest.directory?(package_dir_path)
-      print "Package '#{package_name}' already exists. Clobber? [y/N] "
+    if FileTest.directory?(group_dir_path)
+      print "Package directory '#{package_name}' already exists. Conitnue anyway or [R]emove and continue? [y/r/N] "
       until inp = $stdin.gets[0,1] ; sleep 1 ; end
-      if (inp || 'y').downcase == 'y'
-        puts "Removing old directory '#{File.expand_path(package_dir_path)}'..."
-        FileUtils.rm_r(package_dir_path)
-        #FileUtils.rm("#{package_dir_path}/*")
-        #trash_dir = ".trash/#{File.basename(@dir)}"
-        #FileUtils.mkdir_p(".trash") unless FileTest.directory?(".trash")
-        #FileUtils.mv(@dir, trash_dir)
+      inp = inp.to_s.downcase
+      case inp
+      when 'y'
+        # continue...
+      when 'r'
+        puts "Removing old directory '#{File.expand_path(group_dir_path)}'..."
+        FileUtils.rm_r(group_dir_path)
       else
         puts "Reap package task canceled."
-        exit 0
+        return nil
       end
     end
     package_files = FileList.new
@@ -118,8 +143,8 @@ class Reap::Package < Reap::Task
     end
 
     # create standard package files
-    FileUtils.chdir(@dir) do
-      @types.each do |t|
+    FileUtils.chdir( File.join( @dir, @package_name ) ) do
+      @format.each do |t|
         sh_cmd = nil
         prefix = 'ERROR' # in case of unforseen bug
         case t
@@ -135,7 +160,7 @@ class Reap::Package < Reap::Task
           prefix = 'zip'
           sh_cmd = 'zip -r'
           puts "\nReap is shelling out work to zip..."
-        when 'gem'
+        when 'gem', 'deb'
           sh_cmd = nil
         else
           puts "Unknown package type '#{t}' skipped."
@@ -147,23 +172,38 @@ class Reap::Package < Reap::Task
     end
 
     # create gem package
-    run_gem if defined?(Gem) and @types.include?('gem')
+    if @format.include?('gem')
+      if defined?(Gem)
+        run_gem
+      else
+        puts "Package .gem requested, but rubygems not found (skipped)."
+      end
+    end
+
+    # create debian package
+    if @format.include?('deb')
+      if true # TODO ensure required debian tools here
+        run_deb
+      else
+        puts "Package .deb requested, but debian tools not found (skipped)."
+      end
+    end
 
     return true
   end
 
+  # support methods -------------------------------------------
+
+  private
+
+  # This builds the gem package.
+
   def run_gem
     spec = Gem::Specification.new { |s|
-
       s.name = @name
- 
-      if @version
-        s.version = @version
-      else
-        s.version = @series
-      end
+      s.version = @version
 
-      @dependencies.each{ |d,v|
+      @dependencies.each { |d,v|
         if v
           s.add_dependency(d, v)
         else
@@ -189,14 +229,72 @@ class Reap::Package < Reap::Task
       s.rubyforge_project = @project
       s.homepage = @homepage
       s.executables = @executables
+      s.require_paths = @require_paths if @require_paths
       s.bindir = "bin"
-
+      s.has_rdoc = true
     }
 
     puts "Reap is shelling out work to the Gem Package Manager..."
     Gem.manage_gems
     Gem::Builder.new(spec).build
-    sh %{mv ./*.gem #{@dir}/}
+    gems = Dir.glob( './*.gem' )
+    gems.each{ |f|
+      FileUtils.mv( f, File.join( @dir, @package_name ) )
+    }
+    #sh %{mv ./*.gem #{@dir}/}
+  end
+
+
+  # This build the Debiam package.
+
+  def run_deb
+
+    # build the debian control file
+
+    dep = dependencies.collect{ |d, v|
+      if v
+        "#{d} (#{v})"
+      else
+        d
+      end
+    }.join(', ')
+
+    # Some debian fields not yet used:
+    # Installed-Size: 1024
+    # Conflicts: wile-e-coyote, ...
+    # Replaces: sam-sheepdog
+    # Pre-Depends: perl, ...
+    # Suggests: docbook
+
+    ctrl = %{
+      Package: #{name}
+      Version: #{version}
+      Priority: optional
+      Architecture: #{architecture}
+      Essential: no
+    }.tabto(0)
+    ctrl << "Section: #{category}" if category
+    ctrl << "Depends: #{dep}" unless dep.empty?
+    ctrl << "Recommends: #{recommends.join(' | ')}" unless recommends.empty?
+    ctrl << %{
+      Maintainer: #{maintainer} [#{email}]
+      Provides: #{name}
+      Description: #{summary}
+      .
+      #{description}
+    }.tabto(0)
+
+    debname = architecture == 'any' ? "ruby_#{name}_#{version}.deb" : "ruby_#{name}_#{version}_#{architecture}.deb"
+    debdir = File.join( @dir, @package_name, 'debian' )
+    debdebdir = File.join( debdir, 'DEBIAN' )
+    debfile = File.join( debdir, debname )
+
+    puts "Reap is shelling out work to the deb-pkg..."
+    FileUtils.mkdir_p(debdir)
+    sh %{ruby setup.rb all --prefix=#{debdir}}
+    FileUtils.mkdir_p(debdebdir)
+    File.open( File.join(debdebdir, 'control'), 'w') { |f| f << ctrl }
+    #sh %{dpkg-deb -b #{debdir} #{debfile}}
   end
 
 end

data/lib/reap/task/publish.rb

@@ -6,11 +6,9 @@ require 'reap/task'
 #
 class Reap::Publish < Reap::Task
 
-  section_required true
+  task_desc "Publish documents to the web."
 
-  def task_desc
-    "Publish documents to the web."
-  end
+  section_required true
 
   attr_accessor :host, :type, :dir, :project, :username
   attr_accessor :exclude  # not using yet

data/lib/reap/task/rdoc.rb

@@ -6,9 +6,7 @@ require 'reap/task'
 #
 class Reap::RDoc < Reap::Task
 
-  def task_desc
-     "Generate RDocs (in #{dir})."
-  end
+  task_desc "Generate RDocs."
 
   attr_accessor :dir, :main, :title, :template,
                 :include, :exclude, :options

data/lib/reap/task/release.rb

@@ -0,0 +1,273 @@
+require 'reap/task'
+
+require "enumerator"
+require "http-access2"
+
+
+#
+# Release Task
+#
+
+# This Rake task releases files to RubyForge and other GForge instaces
+# or SourceForge clones. In its most simple usage it looks like:
+#
+#   project = MetaProject::Project::XForge::RubyForge.new('xforge')
+#   # Create a new release of the xforge project on Rubyforge.
+#   task :release => [:gem] do
+#     Rake::XForge::Release.new(project) {}
+#   end
+#
+# The previous example will use defaults where it can. It will prompt
+# you for your xForge user name and password before it uploads all
+# gems under the pkg folder and creates a RubyForge release.
+#
+# While defaults are nice, you may want a little more control. You can
+# specify additional attributes:
+#
+# * #user_name
+# * #password
+# * #changes_file
+# * #version
+# * #files
+# * #release_name
+# * #release_notes
+# * #release_changes
+# * #package_name
+#
+# Example:
+#   project = MetaProject::Project::XForge::RubyForge.new('xforge')
+#   task :release => [:gem] do
+#     release_files = FileList[ 'pkg/*.gem', 'CHANGES' ]
+#
+#     Rake::XForge::Release.new(project) do |xf|
+#       # Never hardcode user name and password in the Rakefile!
+#       xf.user_name = ENV['RUBYFORGE_USER']
+#       xf.password = ENV['RUBYFORGE_PASSWORD']
+#       xf.files = release_files.to_a
+#       xf.release_name = "XForge 0.1"
+#   end
+#
+# This can be invoked from the command line:
+#
+#   rake release RUBYFORGE_USER=myuser \
+#                RUBYFORGE_PASSWORD=mypassword
+#
+# If you don't like blocks, you can do like this:
+#
+#   project = MetaProject::Project::XForge::RubyForge.new('xforge')
+#   task :release => [:gem] do
+#     xf = Rake::XForge::Release.new(project)
+#     ... # Set additional attributes
+#     xf.execute
+#   end
+
+class Reap::Release < Reap::Task
+
+  task_desc "Release distribution files."
+
+  section_required true
+
+  attr_accessor :project, :version
+  attr_accessor :host, :username, :password
+  attr_accessor :package, :packageid, :groupid, :private, :processor
+  attr_accessor :name, :changes, :notes, :changelog, :notelog
+  attr_accessor :cookiejar
+
+  def init
+    @project   ||= master['rubyforge']['project'] || master['name']
+    @version   ||= master['version'] || master['date']
+
+    @host      ||= 'rubyforge.org'
+    @username  ||= master['rubyforge']['username']
+    @password  ||= master['rubyforge']['password']
+
+    @package   ||= master['rubyforge']['package']
+    @packageid ||= master['rubyforge']['packageid']
+    @groupid   ||= master['rubyforge']['groupid']
+    @private   ||= false
+    @processor ||= 'Any'
+
+    #@files     ||= section['files']
+    @name      ||= master['version'] || master['date']
+    @date      ||= master['date'] || Time::now.strftime('%Y-%m-%d %H:%M')
+
+    @cookiejar ||= File::join(File::expand_path("~"), ".rubyforge.cookie_jar")
+  end
+
+  # run task
+
+  def run
+    abort "missing field -- package" unless @package
+    abort "missing field -- packageid" unless @packageid
+    abort "missing field -- groupid" unless @groupid
+    # add more...
+
+    case @host
+    when 'rubyforge', 'rubyforge.org'
+    else
+      puts %{Unrecognized release host '#{@host}'. Skipped.}
+      skip = true
+    end
+
+    unless skip
+      puts "Reap is preparing release ..."
+      @password = get_password
+      login
+      #create_package (doesn't fit)
+      add_release( @file.unshift )
+      @files.each { |f| add_file( f ) }
+      add_release
+    end
+  end
+
+  FILETYPES = {
+    ".deb"     => 1000,
+    ".rpm"     => 2000,
+    ".zip"     => 3000,
+    ".bz2"     => 3100,
+    ".gz"      => 3110,
+    ".src.zip" => 5000,
+    ".src.bz2" => 5010,
+    ".src.gz"  => 5020,
+    ".src.rpm" => 5100,
+    ".src"     => 5900,
+    ".jpg"     => 8000,
+    ".txt"     => 8100,
+    ".text"    => 8100,
+    ".htm"     => 8200,
+    ".html"    => 8200,
+    ".pdf"     => 8300,
+    ".oth"     => 9999,
+    ".ebuild"  => 1300,
+    ".exe"     => 1100,
+    ".dmg"     => 1200,
+    ".tar.gz"  => 5000,
+    ".tgz"     => 5000,
+    ".gem"     => 1400,
+    ".pgp"     => 8150,
+    ".sig"     => 8150,
+  }
+
+  PROCESSORS = {
+    "i386"       => 1000,
+    "IA64"       => 6000,
+    "Alpha"      => 7000,
+    "Any"        => 8000,
+    "PPC"        => 2000,
+    "MIPS"       => 3000,
+    "Sparc"      => 4000,
+    "UltraSparc" => 5000,
+    "Other"      => 9999,
+  }
+
+
+  # login
+
+  def login
+    page = "/account/login.php"
+    method = "post_content"
+    form = {
+      "return_to" => "",
+      "form_loginname" => @username,
+      "form_pw" => @password,
+      "login" => "Login"
+    }
+    http_transaction( page, method, form )
+  end
+
+  # create a new package ( should be another task )
+
+  def create_package
+    page = "/frs/admin/index.php"
+    method = "post_content"
+    form = {
+      "group_id"     => @groupid,
+      "package_name" => @package,
+      "func"         => "add_package",
+      "is_public"    => (@private ? 0 : 1),
+      "submit"       => "Create This Package",
+    }
+    http_transaction( page, method, form )
+  end
+
+  # add a new release
+
+  def add_release( userfile )
+    page = "/frs/admin/qrs.php"
+    method = "post_content"
+
+    type_id = @type || userfile[%r|\.[^\./]+$|]
+    type_id = FILETYPES[type_id]
+
+    proc_id = PROCESSORS[@processor]
+
+    # how to use these?
+    notes   = @notes ? @notes : ( @notelog ? open(@notelog) : nil )
+    changes = @changes ? @changes : ( @changelog ? open(@changelog) : nil )
+
+    userfile = open(userfile)
+
+    preformatted = '1'
+
+    form = {
+      "group_id"     => @groupid,
+      "package_id"   => @packageid,
+      "release_name" => @name,
+      "release_date" => @date,
+      "type_id"      => type_id,
+      "processor_id" => proc_id,
+      "preformatted" => preformatted,
+      "userfile"     => userfile,
+      "submit"       => "Release File"
+    }
+
+    boundary = Array::new(8){ "%2.2d" % rand(42) }.join('__')
+    extheader = { 'content-type'=>"multipart/form-data; boundary=___#{ boundary }___" }
+
+    http_transaction( page, method, form, extheader )
+  end
+
+  # add file to release
+
+  def add_file( userfile )
+
+    # to do
+
+  end
+
+  # http transaction
+
+  def http_transaction( page, method, form, extheader={} )
+    client = HTTPAccess2::Client::new ENV['HTTP_PROXY']
+    client.debug_dev = STDERR if ENV['DEBUG']
+    client.set_cookie_store cookie_jar
+    # fixes http-access2 bug
+    client.redirect_uri_callback = lambda do |res|
+      page = res.header['location'].first
+      page = page =~ %r/http/ ? page : "#{ config['uri'] }/#{ page }"
+      page
+    end
+    response = client.send "#{ method }", "#{ config['uri'] }/#{ page }", form, extheader
+    client.save_cookie_store
+  end
+
+
+# fixes http-access2 bug
+BEGIN {
+   require "http-access2"
+   module WebAgent::CookieUtils
+     def domain_match(host, domain)
+       case domain
+       when /\d+\.\d+\.\d+\.\d+/
+         return (host == domain)
+       when '.'
+         return true
+       when /^\./
+         #return tail_match?(domain, host)
+         return tail_match?(host, domain)
+       else
+         return (host == domain)
+       end
+     end
+   end
+}

data/lib/reap/task/test.rb

@@ -23,9 +23,7 @@ Test::Unit.run = true  # don't run auto tests
 #
 class Reap::Test < Reap::Task
 
-  def task_desc
-    "Run unit-tests (each in a separate process)."
-  end
+  task_desc "Run unit-tests (each in a separate process)."
 
   attr_accessor :libs, :files, :fixture, :against_installed
 
@@ -141,8 +139,17 @@ class Reap::Test < Reap::Task
       tests = Test::Unit::Collector::ObjectSpace.new.collect
       runner = Test::Unit::UI::TestRunnerMediator.new( tests )
       result = runner.run_suite
-      output << Marshal.dump(result)
 
+      begin
+        marshalled = Marshal.dump(result)
+      rescue TypeError => e
+        $stderr << "MARSHAL ERROR\n"
+        $stderr << "TEST: #{testfile}\n"
+        $stderr << "DATA:" << result.inspect
+        exit 1
+      end
+      output << marshalled
+      
       STDOUT.reopen(output)
       output.close
     }
@@ -152,7 +159,14 @@ class Reap::Test < Reap::Task
       ruby.read
     end
     p testfile if $VERBOSE
-    return Marshal.load(result)
+    begin
+      marsh = Marshal.load(result)
+    rescue ArgumentError
+      $stderr << "\nCannot load marshalled test data."
+      $stderr << result << "\n"
+      exit 0
+    end
+    return marsh
   end
 
   #

data/lib/reap/task/testext.rb

@@ -11,9 +11,7 @@ require 'facet/string/margin'
 #
 class Reap::TestExt < Reap::Task
 
-  def task_desc
-    "Extract unit-tests from lib scripts."
-  end
+  task_desc "Extract unit-tests from lib scripts."
 
   attr_accessor :dir, :files, :options
 
@@ -48,7 +46,9 @@ class Reap::TestExt < Reap::Task
       testing = extract( file )
       unless testing.strip.empty?
         complete_test = create( testing, file )
-        fp = File.join(@dir,file)
+        libpath = File.dirname( file )
+        testfile = "test_" + File.basename( file )
+        fp = File.join(@dir,libpath,testfile)
         unless File.directory?( File.dirname( fp ) )
           FileUtils.mkdir_p( File.dirname(fp) )
         end
@@ -63,7 +63,7 @@ class Reap::TestExt < Reap::Task
     tests = ""; inside = false
     fstr = File.read( file )
     fstr.split(/\n/).each do |l|
-      if l =~ /^=[ ]*begin[ ]*testing/
+      if l =~ /^=begin[ ]*test/i
         tests << "\n"
         inside = true
         next