reap 4.3.3 → 4.3.4

data/lib/reap/reap.rb

@@ -0,0 +1,60 @@
+
+# Reap support
+require 'reap/projectinfo'
+require 'reap/task'
+
+# 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/doap'
+#require 'reap/task/noop'
+
+
+module Reap
+
+  Version = "4.3.4"
+
+  # Hash of all possible tasks
+  # { task name => task class }
+
+  def self.registry
+    Task.task_list
+  end
+
+  # Hash of tasks available to this project
+
+  def self.tasks
+    unless @tasks
+      @tasks = {}
+      registry.each do |name, klass|
+        @tasks[name] = klass if klass.verify?
+      end
+    end
+    @tasks
+  end
+
+  def self.register( alternative_project_file=nil )
+    $PROJECT_INFO = ProjectInfo.new( alternative_project_file )
+    $PROJECT_INFO.exists?
+  end
+
+  def self.projectfile?
+    $PROJECT_INFO.exists?
+  end
+
+#   def self.initialize
+#     @tasks ||= {}
+#     registry.each do |name, klass|
+#       @tasks[name] = klass.new
+#     end
+#   end
+
+end

data/lib/reap/task.rb

@@ -18,73 +18,35 @@ require 'facet/openobject'
 
 # Base class for reap tasks.
 #
-# Here's an oh so simple example:
+# Here's a simple example:
 #
 #   class MyTask < Reap::Task
 #
-#     register 'mytask'
+#     task_desc 'this is a custom reap task'
 #
-#     default_desc 'this is a custom reap task'
-#
-#     attr_accessor :message
+#     task_attr :mytask
 #
 #     def init
-#       @message ||= master['default'] || 'None Found!'
+#       mytask.message ||= 'None Found!'
 #     end
 #
 #     def run
-#       puts @message
+#       puts mytask.message  #=> Hello!
+#       puts master.default  #=> Yo!
+#       puts mytask.default  #=> Yo!   (inherited from master)
 #     end
 #   end
 #
-# The corresponding settings in the ProjectInfo file will then be:
+# With the corresponding settings in the ProjectInfo file as:
 #
-#   default: Default text, if any.
+#   default: Yo!
 #
-#   myname:
-#     TASK: mytask
-#     message: Message text, if any.
+#   mytask:
+#     message: Hello!
 #
 
 module Reap
 
-  @registry ||= {}
-
-  # Hash of all task classes
-  def self.registry ; @registry ; end
-
-  # Hash of tasks available to this project
-  def self.tasks
-    unless @tasks
-      @tasks = {}
-      @registry.each { |name, klass|
-        @tasks[name] = klass if klass.verify?
-      }
-    end
-    @tasks
-  end
-
-  def self.register
-    $PROJECT_INFO = ProjectInfo.new( $PROJECT_FILE )
-
-    #@registry ||= {}
-    #ObjectSpace.each_object(Class) { |klass|
-    #  if klass < ::Reap::Task
-    #    if klass.verify
-    #      @registry[klass.basename.downcase] = klass
-    #    end
-    #  end
-    #}
-  end
-
-#   def self.initialize
-#     @tasks ||= {}
-#     registry.each do |name, klass|
-#       @tasks[name] = klass.new
-#     end
-#   end
-
-
   class Task
 
     include ::Config
@@ -94,11 +56,19 @@ module Reap
 
     class << self
 
+      # When this class is inherited the new task is registered.
+
       def inherited( base )
-        Reap.registry[base.task_name] = base
+        task_list[base.task_name] = base
       end
 
-      def task_name ; basename.downcase ; end
+      def task_list
+        @task_list ||= {}
+      end
+
+      def task_name
+        basename.downcase
+      end
 
       def task_desc( text=nil, &block )
         return @task_desc = proc { text } if text
@@ -127,6 +97,10 @@ module Reap
         true
       end
 
+      def master
+        @master ||= CascadingOpenObject.new( $PROJECT_INFO )
+      end
+
 #       def master_attributes ; @master_attributes ||= [] ; end
 #
 #       # Use this DSL method to define master task attributes.
@@ -139,11 +113,11 @@ module Reap
       # properties not to be looked up in master
       # if they are not in regular task section
 
-      def task_only_properties ; @task_only_properties ||= [] ; end
-      def task_only_property( *names )
-        @task_only_properties ||= []
-        @task_only_properties |= names.collect { |n| n.to_s }
-      end
+#       def task_only_properties ; @task_only_properties ||= [] ; end
+#       def task_only_property( *names )
+#         @task_only_properties ||= []
+#         @task_only_properties |= names.collect { |n| n.to_s }
+#       end
 
     end #<< class
 
@@ -156,13 +130,13 @@ module Reap
     def section_required? ; self.class.section_required? ; end
 
     #def master ; ::ProjectInfo.info ; end
-    def master  ; @master  ; end
+    def master  ; self.class.master  ; end
     def section ; @section ; end
     def task    ; @task    ; end
 
     def initialize( *args )
-      @master = CascadingOpenObject.new( $PROJECT_INFO )
-      section = @master[task_name]
+      #@master = CascadingOpenObject.new( $PROJECT_INFO )
+      section = master[task_name]
       case section
       when Array
         section.each do |s|
@@ -181,7 +155,7 @@ module Reap
       task_properties = {}
       #self.class.task_only_properties.each { |t| section[t] ||= nil }
       task_properties = CascadingOpenObject.new( section )
-      task_properties.__parent__ = @master
+      task_properties.__parent__ = master
       @task = task_properties
 
       init #task
@@ -226,6 +200,18 @@ module Reap
       system arg unless $PRETEND
     end
 
+    def provide_setup_rb
+      return true if File.exists?( 'setup.rb')
+      # copy from data dir to current directory
+      f = File.join( Config::CONFIG['datadir'], 'reap', 'setup_rb', 'setup.rb' )
+      if File.exists?(f)
+        File.cp( f, '.' )
+        true
+      else
+        nil
+      end
+    end
+
   end #class Task
 
 end #module Reap

data/lib/reap/task/doap.rb

@@ -0,0 +1,67 @@
+
+module Reap
+
+  class Doap < Task
+
+    task_desc %{Generate DOAP project file.}
+
+    task_help %{
+
+      reap doap
+
+      DOAP is an XML/RTF format for describing a project. It contains
+      much of the same information as Reap's ProjectInfo file, but is
+      more suitable to RESTful interapplication communications, like 
+      RSS/Atom feeds.
+
+    }
+
+    task_attr :prj
+
+    # Setup doap data
+
+    def init
+
+    end
+
+    # Generate doap file
+
+    def run
+      puts "Generating doap.xml file..."
+
+      x = ''
+      x << %{
+            |<Project xmlns="http://usefulinc.com/ns/doap#"\n
+            |         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"\n
+            |         xmlns:foaf="http://xmlns.com/foaf/0.1/">
+            |   <name>#{prj.title}</name>
+            |   <shortname>#{prj.name}</shortname>
+            |   <homepage rdf:resource="#{prj.homepage}" />
+            |   <wiki rdf:resource="#{prj.wiki}" />
+            |   <created>#{prj.created}</created>
+            |   <shortdesc xml:lang="en">
+            }.margin
+      x << "\n" << prj.summary.word_wrap(50).indent(6)
+      x << %{
+            |   </shortdesc>
+            |   <description xml:lang="en">
+            }.margin
+      x << "\n" << prj.description.word_wrap(50).indent(6)
+      x << %{
+            |   </description>
+            |   <maintainer>
+            |     <foaf:Person>
+            |       <foaf:name>#{prj.maintainer}</foaf:name>
+            |       <foaf:email>#{prj.email}</foaf:name>
+            |       <foaf:homepage rdf:resource="#{prj.homepage}" />
+            |     </foaf:Person>
+            |   </maintainer>
+            | </Project>
+            }.margin
+
+      File.open( "doap.xml", 'w' ) { |f| f << x }
+    end
+
+  end
+
+end

data/lib/reap/task/info.rb

@@ -23,11 +23,11 @@ class Reap::Info < Reap::Task
 
   }
 
-  def init( na )
+  def init
     # no initialization
   end
 
-  def run( na )
+  def run
     puts $PROJECT_INFO.info_stream
   end
 

data/lib/reap/task/install.rb

@@ -23,26 +23,37 @@ class Reap::Install < Reap::Task
     #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 setup.rb..."
-
-    # prepare for using internalized setup.rb
-
-    ARGV.delete('install')
-    ARGV << '-q' unless $VERBOSE
-    ARGV.concat(task.options)
-
-    $setup_pwd = $PROJECT_INFO.info_dir #Dir.pwd
+    unless provide_setup_rb
+      puts "Setup.rb is missing. Forced to skip debian package creation."
+      return nil
+    end
 
-    # invoke setup.rb
+    puts "Reap is shelling out work to setup.rb..."
 
-    begin
-      ToplevelInstaller.invoke
-    rescue SetupError
-      raise if $DEBUG
-      $stderr.puts $!.message
-      $stderr.puts "Try 'reap --help' for detailed usage."
-      exit 1
-    end
+#     # prepare for using internalized setup.rb
+# 
+#     ARGV.delete('install')
+#     ARGV << '-q' unless $VERBOSE
+#     ARGV.concat(task.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
+
+    exe = %{ruby setup.rb}
+    exe << ' -q ' unless $VERBOSE
+    exe << task.options.join(' ')
+    exe << ' all'
+    sh exe
 
     puts "Setup complete!"
   end

data/lib/reap/task/package.rb

@@ -16,7 +16,7 @@ end
 # = Package Task
 #
 # This task creates standard .zip, .tgz, or .tbz
-# packages, plus .gem distributions.
+# packages, plus .gem or .deb distributions.
 
 
 class Reap::Package < Reap::Task
@@ -27,7 +27,11 @@ class Reap::Package < Reap::Task
   # Task line description
 
   task_desc do
-    disttypes = $PROJECT_INFO['distribute'] || [ 'gem', 'tar.bz2', 'zip' ]
+    if master.package
+      disttypes = master.package.distribute || master.distribute || [ 'gem', 'tar.bz2', 'zip' ]
+    else
+      disttypes = master.distribute || [ 'gem', 'tar.bz2', 'zip' ]
+    end
     "Build distribution packages (#{disttypes.join(', ')})."
   end
 
@@ -64,7 +68,7 @@ class Reap::Package < Reap::Task
 
     The package task also has subsection for each type of distribution.
     These can be used to override settings in the package information
-    if it in some way differs. Possible subsections are:
+    if they in some way differ. Possible subsections are:
 
       gems
       pacman
@@ -147,27 +151,21 @@ class Reap::Package < Reap::Task
 
   def run
 
-    puts "Creating #{pkg.distribute.join(',')} packages..."
-
-    # create package image
     group_dir_path = File.join( pkg.dir, pkg.package_name )
     package_dir_path = File.join( pkg.dir, pkg.package_name, pkg.package_name )
 
     if FileTest.directory?(group_dir_path)
-      print "Package directory '#{pkg.package_name}' already exists. Continue or [R]emove and continue? [y/r/N] "
-      until inp = $stdin.gets[0,1] ; sleep 1 ; end
-      inp = inp.to_s.downcase
-      case inp
-      when 'y'
-        # continue...
-      when 'r'
+      if $FORCE
         puts "Removing old directory '#{File.expand_path(group_dir_path)}'..."
         FileUtils.rm_r(group_dir_path)
       else
-        puts "Reap package task canceled."
+        puts "Package directory '#{pkg.package_name}' already exists. Use -f option to overwrite."
         return nil
       end
     end
+
+    puts "Creating #{pkg.distribute.join(',')} packages..."
+
     package_files = FileList.new
     package_files.include(*pkg.include)
     package_files.exclude(*pkg.exclude) if pkg.exclude and not pkg.exclude.empty?
@@ -252,8 +250,7 @@ private
 
   def run_gem
 
-    use_subsection :gem
-    #pkg = sub ? sub : pkg
+    use_subsection :gems
 
     spec = Gem::Specification.new { |s|
       s.name = pkg.name
@@ -309,11 +306,11 @@ private
 
   def run_deb
 
-    use_subsection :deb
+    use_subsection :debian
 
     # build the debian control file
 
-    _dep = pkg.dependencies.collect{ |d, v|
+    dep = pkg.dependencies.collect{ |d, v|
       if v
         "#{d} (#{v})"
       else
@@ -327,42 +324,55 @@ private
     # Pre-Depends: perl, ...
     # Suggests: docbook
 
+    arch = pkg.architecture.downcase
+    arch = (arch == 'any' ? 'all' : arch)
+
     ctrl = %{
       Package: #{pkg.name}
       Version: #{pkg.version}
       Priority: optional
-      Architecture: #{pkg.architecture}
+      Architecture: #{arch}
       Essential: no
     }.tabto(0)
-    ctrl << "Section: #{pkg.category}" if pkg.category
-    ctrl << "Depends: #{pkg.dep}" unless _dep.empty?
-    ctrl << "Recommends: #{pkg.recommends.join(' | ')}" unless pkg.recommends.empty?
-    ctrl << "Conflicts: #{pkg.conflicts.join(', ')}" unless pkg.conflicts.empty?
-    ctrl << %{
-      Maintainer: #{pkg.maintainer} [#{pkg.email}]
-      Provides: #{pkg.name}
-      Description: #{pkg.summary}
-      .
-      #{pkg.description}
-    }.tabto(0)
-
-    if pkg.architecture == 'any'
-      debname = "ruby_#{pkg.name}_#{pkg.version}.deb"
+    ctrl << "Section: #{pkg.category}\n" if pkg.category
+    ctrl << "Depends: #{dep}\n" unless dep.empty?
+    ctrl << "Recommends: #{pkg.recommends.join(' | ')}\n" unless pkg.recommends.empty?
+    ctrl << "Conflicts: #{pkg.conflicts.join(', ')}\n" unless pkg.conflicts.empty?
+    ctrl << "Maintainer: #{pkg.maintainer} <#{pkg.email}>\n"
+    ctrl << "Provides: #{pkg.name}\n"
+    ctrl << "Description: #{pkg.summary}\n"
+    ctrl << " #{pkg.description}\n"
+
+    if arch == 'all'
+      debname = "#{pkg.name}-ruby_#{pkg.version}.deb"
     else
-      debname = "ruby_#{pkg.name}_#{pkg.version}_#{pkg.architecture}.deb"
+      debname = "#{pkg.name}-ruby_#{pkg.version}_#{pkg.architecture}.deb"
+    end
+    pkgdir = File.join( pkg.dir, pkg.package_name )
+    debdir = File.join( pkgdir, 'debian' )
+
+    #debdebdir = File.join( debdir, 'DEBIAN' )
+    debfile = File.join( pkgdir, debname )
+
+    unless provide_setup_rb
+      puts "Setup.rb is missing. Forced to skip debian package creation."
+      return nil
     end
-    debdir = File.join( pkg.dir, pkg.package_name, 'debian' )
-    debdebdir = File.join( debdir, 'DEBIAN' )
-    debfile = File.join( debdir, debname )
 
     puts "Reap is shelling out work to the deb-pkg..."
+
+    cmd = %{ruby setup.rb }
+    cmd << '-q ' unless $VERBOSE
+    cmd << %{all --installdirs=std --root=#{debdir}}
+
     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
+    sh cmd
 
+    FileUtils.mkdir_p( File.join(debdir, 'DEBIAN') )
+    File.open( File.join(debdir, 'DEBIAN', 'control'), 'w') { |f| f << ctrl }
+
+    sh %{dpkg-deb -b #{debdir} #{debfile}}
+  end
 
   # This builds a pacman (archlinux) PKGBUILD script.
 
@@ -375,19 +385,9 @@ private
       return nil
     end
 
-#     if section.key?('pac')
-#       _dep = pkg.pac.dependenciers || pkg.dependencies
-#       _rep = pkg.pac.replaces || pkg.replaces
-#       _con = pkg.pac.conflicts || pkg.conflicts
-#     else
-      _dep = pkg.dependencies
-      _rep = pkg.replaces
-      _con = pkg.conflicts
-#     end
-
-    _dep = _dep.collect{ |d| "'#{d}'" }.join(' ')
-    _rep = _rep.collect{ |d| "'#{d}'" }.join(' ')
-    _con = _rep.collect{ |d| "'#{d}'" }.join(' ')
+    _dep = pkg.dependencies.collect{ |d| "'#{d}'" }.join(' ')
+    _rep = pkg.replaces.collect{ |d| "'#{d}'" }.join(' ')
+    _con = pkg.conflicts.collect{ |d| "'#{d}'" }.join(' ')
 
     proto = %{
       pkgname=#{pkg.name}
@@ -435,7 +435,7 @@ private
     #sh %{ruby setup.rb all --prefix=#{debdir}}
     #FileUtils.mkdir_p(pacpacdir)
     File.open( pacfile, 'w') { |f| f << proto }
-    #sh %{dpkg-deb -b #{debdir} #{debfile}}
+    #sh %{}
 
   end