reap 4.3.4 → 4.4.0

data/data/reap/setup.rb

@@ -647,6 +647,10 @@ module FileOperations
       }
       File.chmod mode, realdest
 
+      # Do not make InstalledFiles entry if to alternate root.
+      # This prevents problem with root permissions on this file.
+      return true unless $setup_install_root
+
       File.open("#{objdir_root()}/InstalledFiles", 'a') {|f|
         if prefix
           f.puts realdest.sub(prefix, '')

data/doc/LATEST

@@ -0,0 +1,24 @@
+Hey, today I'm gald to have gotten Reap 4.3.4 out the door.
+
+This realease fixes a bunch nagging no-ops that have been
+real turn-offs for those who have only dipped their 
+first big toe into the Reaping fields. Like the template
+and scaffold commands actually do something now!
+
+I've also added some hot off the skillet features.
+Reap can now cook you up a DOAP XML project file
+(<Project> section only as of yet). She can
+now release directly to Rubyforge -- Woohoo! is life easier
+without all that point-and-clickery. And best of all
+Reap can not plunk down a .deb package as easy as a 
+.tar.gz or .gem. You gotta love that! (Note, that you'll need to
+use Reap's slightly modified version of setup.rb for this.
+Just copy it out of the installation if you need it.)
+
+Boy oh boy, more of goodies, good fixes and solidity.
+Reaps coming along nice. She'll move to version 4.4 once 
+all the little undiscovered cockaroaches are scurried away.
+
+Ciao,
+T.
+

data/lib/reap/bin/reap.rb

@@ -4,14 +4,15 @@ require 'rbconfig'
 
 require 'facets'
 require 'consoleapp'
+#require 'console/command'
 
 require 'reap/reap'
 
 
-class ReapCommand < Console::Application
+class ReapCommand < Console::Command
 
   # to do first for every task
-  #def application_setup
+  #def command_setup
   #  $PROJECT_INFO = ProjectInfo.new( $PROJECT_FILE )
   #end
 
@@ -65,7 +66,7 @@ class ReapCommand < Console::Application
   # display version
 
   def version
-    puts "Reap  v.#{Reap::Version}"
+    puts "Reap  v#{Reap::Version}"
     exit 0
   end
 
@@ -94,8 +95,11 @@ class ReapCommand < Console::Application
   def tasks
     if Reap.projectfile?
       puts
-      Reap.tasks.each do |name,task_class|
-        puts "    #{name}".ljust(20) + "#{task_class.task_desc}"
+      sorted_names = Reap.tasks.keys.sort
+      margin = sorted_names.collect{ |n| n.size }.max + 6
+      sorted_names.each do |name|
+        task_class = Reap.tasks[name]
+        puts "  #{name}".ljust(margin) + "#{task_class.task_desc}"
       end
       puts
     else
@@ -147,12 +151,15 @@ class ReapCommand < Console::Application
   end
 
   # Add all the reap tasks.
+
   if Reap.register
+
     Reap.tasks.each do |sym,taskclass|
       define_method(sym) do |*args|
-        taskclass.new(*args)
+        taskclass.new(*args).execute
       end
     end
+
   end
 
 end
@@ -166,7 +173,7 @@ HELP = <<-HERE
 
   COMMANDS:
 
-    tasks (default)
+    tasks
       List all the current tasks with descriptions.
       This is the default action if no command
       is given. (Also aliased as 'ls'.)
@@ -178,7 +185,7 @@ HELP = <<-HERE
 
     template
         Copies a ProjectInfo template into the current
-        directory, if it does not already exist.
+        directory (if it does not already exist).
 
     scaffold [directory] [type]
         Builds a starter project directory. There are

data/lib/reap/projectinfo.rb

@@ -5,6 +5,12 @@ require 'facet/hash/traverse'
 require 'facet/string/tabto'
 require 'facet/dir/self/ascend'
 
+require 'facet/basicobject'
+
+
+#--
+# NOTE At some point get past the use of the global variable perhaps?
+#++
 
 class ProjectInfo
 
@@ -15,66 +21,117 @@ class ProjectInfo
     'reapfile'
   ]
 
-  def self.add_info_file( f )
-    INFO_FILES.unshift( f )
+  class << self
+
+    # Load the project information from a file. Generally
+    # no file needs to be specified; the file will be found
+    # by ascending up the current path until a default
+    # file name is found (eg. ProjectInfo or Reapfile).
+
+    def load( fpath=nil, report=false )
+      if fpath
+        new.read( fpath, report )
+      else
+        new.read( find, report )
+      end
+    end
+
+    # Find project information file.
+
+    def find
+      info_dir, info_file = nil, nil
+      Dir.ascend(Dir.pwd) do |info_dir|
+        info_file = INFO_FILES.find{ |f| File.file?( File.join( info_dir, f ) ) }
+        break if info_file
+      end
+      return File.join( info_dir, info_file )
+    end
+
+    #def add_file( f )
+    #  INFO_FILES.unshift( f )
+    #end
+
   end
 
-  #def self.[](name)
-  #  @self ||= self.new
-  #  @self[name]
-  #end
 
-  attr_reader :info, :info_stream, :info_dir
+  attr_reader :info, :info_stream, :info_dir, :info_file
 
-  def initialize( alt_info_file=nil )
+  def initialize( &block )
+    @info = {}
+    @info_stream = nil
 
-    # Consider alternative info files?
-    # NOTE Should this work out of the current working dir only?
-    add_info_file( alt_info_file ) if alt_info_file
+    define( &block ) if block_given?
 
-    info_dir = nil
-    info_file = nil
+    $PROJECT_INFO = self
+  end
 
-    Dir.ascend(Dir.pwd) do |info_dir|
-      #Dir.chdir(info_dir)
-      info_file = INFO_FILES.find{ |f| File.file?( File.join( info_dir, f ) ) }
-      break if info_file
-    end
+  # Define project information programmatically.
 
-    return unless info_file
+  def define( &block )
+    return unless block
 
-    info_file = File.basename( info_file )
-    @info_dir = info_dir
-    @info_file = info_file
-    Dir.chdir(info_dir)
+    @info = HashBuilder.new( &block  ).to_h
+    @info_stream = @info.to_yaml
 
-    puts "(in #{Dir.pwd})" #unless dir == Dir.pwd
+    validate
+    defaults
+
+    self
+  end
 
-    info_stream = File.read( info_file ).strip
+  # Load project information from YAML file.
 
-    begin
-      info = YAML::load( info_stream )
-    rescue
-      #info_proc = lambda { instance_eval( info_stream ) }
-      info = HashBuilder.new( info_stream  ).to_h
+  def read( fpath, report=true )
+    return unless fpath
+
+    @info_dir = File.dirname( fpath )
+    @info_file = fpath #File.basename( fpath )
+    @info_stream = File.read( fpath ).strip
+    @info = YAML::load( info_stream ).traverse{ |k,v| [k.to_s.downcase, v] }
+
+    Dir.chdir(@info_dir)
+    if report
+      puts "(in #{Dir.pwd})" #unless dir == Dir.pwd
     end
 
-    @info_stream = info_stream
-    @info = info.traverse{ |k,v| [k.to_s.downcase, v] }
+    validate
+    defaults
+
+    self
+  end
+
+  # Update project information.
+
+  def update( info=nil, &block )
+    if info
+      @info.update( info.traverse{ |k,v| [k.to_s.downcase, v] } )
+    end
+    if block_given?
+      @info.update( HashBuilder.new( &block  ).to_h )
+    end
+    @info_stream = @info.to_yaml
 
     validate
     defaults
+
+    self
   end
 
+  # Project information file exists? (may need to change to info exists?)
+
   def exists?
-    @info_dir
+    @info_file
   end
 
+  # Validate project information.
+
   def validate
     raise "NAME is a required piece of information" unless info['name']
     raise "VERSION is a required piece of informatiomn" unless info['version']
   end
 
+  # Project information defaults.
+
   def defaults
     self['title']       ||= self['name'].capitalize
     self['series']      ||= '1'
@@ -88,14 +145,20 @@ class ProjectInfo
     self['homepage']    ||= self['rubyforge'] ? self['rubyforge']['homepage'] : nil
   end
 
+  # Information fetch.
+
   def [](name)
     info[name]
   end
 
+  # Information sore.
+
   def []=(name, x)
     info[name] = x
   end
 
+  # Information to hash.
+
   def to_h
     @info
   end
@@ -121,6 +184,7 @@ class ProjectInfo::HashBuilder < BasicObject
   def to_h ; @hash ; end
 
   def method_missing( sym, *args, &block )
+    sym = sym.to_s.downcase
 
     if @hash.key?(sym)
       unless @flag[sym]
@@ -128,13 +192,13 @@ class ProjectInfo::HashBuilder < BasicObject
         @flag[sym] = true
       end
       if block_given?
-        @hash[sym] << HashBuilder.new( &block ).to_h
+        @hash[sym] << self.__class__.new( &block ).to_h
       else
         @hash[sym] << args[0]
       end
     else
       if block_given?
-        @hash[sym] = HashBuilder.new( &block ).to_h
+        @hash[sym] = self.__class__.new( &block ).to_h
       else
         @hash[sym] = args[0]
       end
@@ -143,3 +207,4 @@ class ProjectInfo::HashBuilder < BasicObject
   end
 
 end
+

data/lib/reap/rake.rb

@@ -0,0 +1,16 @@
+
+# This file requires all rake adapted reap tasks.
+
+require 'rake'
+
+require 'reap/rake/announce.rb'
+require 'reap/rake/package.rb'
+require 'reap/rake/test.rb'
+require 'reap/rake/extest.rb'
+require 'reap/rake/release.rb'
+require 'reap/rake/publish.rb'
+require 'reap/rake/info.rb'
+require 'reap/rake/doap.rb'
+require 'reap/rake/install.rb'
+require 'reap/rake/rdoc.rb'
+require 'reap/rake/manifest.rb'

data/lib/reap/rake/adapter.rb

@@ -0,0 +1,50 @@
+
+#require 'rake'
+require 'rake/tasklib'
+
+require 'reap/projectinfo.rb'
+require 'facet/hash/keys_to_s'
+
+
+module Reap
+
+  def self.RakeAdapter( reapclass )
+
+    Class.new( ::Rake::TaskLib ) do
+
+      define_method( :reapclass ) {  reapclass }
+
+      attr_accessor :name, :options
+
+      # Create task.
+      def initialize(name=reapclass.task_name) # :yield:
+        @name = name
+        @options = nil
+        if block_given?
+          options = OpenObject.new
+          yield( options )
+          @options = options.to_h.keys_to_s
+          #reapclass.master[reapclass.task_name].update( @options )
+        end
+        define
+      end
+
+      # Create the tasks defined by this task lib.
+      def define
+        desc reapclass.task_desc
+        task name do
+          rc = reapclass.new
+          if @options
+            rc.execute( @options.to_h )
+          else
+            rc.execute
+          end
+        end
+        self
+      end
+
+    end
+
+  end
+
+end

data/lib/reap/rake/announce.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'reap/rake/adapter'
+require 'reap/task/announce'
+
+module Rake
+
+  ReapAnnounce = ::Reap::RakeAdapter( ::Reap::Announce )
+
+end

data/lib/reap/rake/doap.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'reap/rake/adapter'
+require 'reap/task/doap'
+
+module Rake
+
+  ReapDoap = ::Reap::RakeAdapter( ::Reap::Doap )
+
+end

data/lib/reap/rake/extest.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'reap/rake/adapter'
+require 'reap/task/extest'
+
+module Rake
+
+  ReapExTest = ::Reap::RakeAdapter( ::Reap::ExTest )
+
+end

data/lib/reap/rake/info.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'reap/rake/adapter'
+require 'reap/task/info'
+
+module Rake
+
+  ReapInfo = ::Reap::RakeAdapter( ::Reap::Info )
+
+end

data/lib/reap/rake/install.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'reap/rake/adapter'
+require 'reap/task/install'
+
+module Rake
+
+  ReapInstall = ::Reap::RakeAdapter( ::Reap::Install )
+
+end