reap 4.4.1 → 4.5.0

data/ProjectInfo

@@ -2,8 +2,7 @@
 
 title    : Reap
 name     : reap
-version  : '4.4.1'
-#date     : '2006-04-01'
+version  : '4.5.0'
 created  : '2004-04-01'
 status   : 'beta/stable'
 
@@ -19,9 +18,9 @@ description: >
   information, significantly simplifying usage.
 
 package:
-  distribute   : [ gem, tar.bz2, deb ]  # zip, tar.gz, tbz, tgz, gem, deb
+  distribute   : [ gem, tar.bz2 ]  # zip, tar.gz, tbz, tgz, gem, deb
   dependencies : [ facets ]
-  executables  : [ reap ]
+  executables  : [ reap, rubytest ]
   dir: '../DISTRIBUTION'
   exclude:
     - dist
@@ -75,6 +74,6 @@ perm:
   user: trans
   group: users
 
-#noop:
-#  message: Hello Dude!
+noop:
+  message: Hello Dude!
 

data/Rakefile

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rake'
-require 'reap/rake'
+require 'reap/reap'
 
 # Load the project information file from standard location.
 # (Note that this sets the global variable $PROJECT_INFO.)

data/doc/rake/announce.rb

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

data/{lib/reap → doc}/rake/install.rb

@@ -4,7 +4,5 @@ require 'reap/rake/adapter'
 require 'reap/task/install'
 
 module Rake
-
   ReapInstall = ::Reap::RakeAdapter( ::Reap::Install )
-
 end

data/lib/reap/bin/reap.rb

@@ -140,21 +140,20 @@ class ReapCommand < Console::Command
       puts "Directory already has content. Use -f option to force scaffolding."
       exit -1
     end
-    case type
-    when 'std', 'standard', nil
-      type = 'standard'
-    when 'svn', 'subversion'
-      type = 'subversion'
-    else
-      puts "Unrecognized project type."
-      exit -1
-    end
-    # need to add gems workaround
+    type ||= 'standard'
+    type = 'standard' if type == 'std'
+    type = 'subversion' if type == 'svn'
+    # gems workaround
     if dir = Gem.gempath('reap')
-      dir = File.join( dir, 'data', 'reap', 'scaffold', 'standard', type )
+      dir = File.join( dir, 'data', 'reap', 'scaffold', type )
     else
       dir = File.join( ::Config::CONFIG['datadir'], 'reap', 'scaffold', type )
     end
+    #
+    unless File.directory?( dir )
+      puts "Unrecognized project type."
+      exit -1
+    end
     #FileUtils.mkdir_p( name )
     FileUtils.cp_r( File.join( dir, '.'), '.' )
     puts "Project ready."

data/lib/reap/projectinfo.rb

@@ -4,13 +4,31 @@ require 'yaml'
 require 'facet/hash/traverse'
 require 'facet/string/tabto'
 require 'facet/dir/self/ascend'
+require 'facet/kernel/require_all'
 
 require 'facet/basicobject'
 
 
-#--
-# NOTE At some point get past the use of the global variable perhaps?
-#++
+module Reap
+
+  def self.register #( alternative_project_file=nil )
+    pi = ProjectInfo.load( nil, true )
+    pi.require_custom_tasks
+    pi
+  end
+
+  def self.projectfile?
+    ProjectInfo.instance.info_file
+  end
+
+end
+
+
+# Project information, generally read from a file.
+# Simply by calling 'ProjectInfo.load'.
+#
+# ProjectInfo is a Singleton. Access it via the
+# ProjectInfo.instance method.
 
 class ProjectInfo
 
@@ -23,6 +41,14 @@ class ProjectInfo
 
   class << self
 
+    # Singelton Pattern.
+
+    private :new
+
+    def instance( *args, &block )
+      @instance ||= new( *args, &block )
+    end
+
     # 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
@@ -33,7 +59,7 @@ class ProjectInfo
         new.read( fpath, report )
       else
         fpath = find
-        new.read( fpath, report )
+        instance.read( fpath, report )
       end
     end
 
@@ -64,7 +90,7 @@ class ProjectInfo
 
     define( &block ) if block_given?
 
-    $PROJECT_INFO = self
+    #$PROJECT_INFO = self
   end
 
   # Define project information programmatically.
@@ -74,6 +100,8 @@ class ProjectInfo
 
     @info = HashBuilder.new( &block  ).to_h
     @info_stream = @info.to_yaml
+    @info_dir = Dir.pwd #?
+    @info_file = nil
 
     #validate
     defaults
@@ -121,9 +149,9 @@ class ProjectInfo
 
   # Project information file exists? (may need to change to info exists?)
 
-  def exists?
-    @info_file
-  end
+  #def exists?
+  #  @info_file
+  #end
 
   # Validate project information.
 
@@ -149,13 +177,32 @@ class ProjectInfo
     self['homepage']    ||= self['rubyforge'] ? self['rubyforge']['homepage'] : nil
   end
 
+  # Load custom tasks.
+
+  def require_custom_tasks
+    # Universal custom tasks for all projects.
+    dir = File.join( Config::CONFIG['datadir'], 'reap/task' )
+    require_all( File.join(dir, '*') ) if File.directory?(dir)
+    # Personal tasks for all projects.
+    dir = File.expand_path( '~/.share/reap/task' )
+    require_all( File.join(dir, '*') ) if File.directory?(dir)
+    # Project specific tasks.
+    require_all('task/*') if File.directory?('task')
+  end
+
+  # Convert to a CascadinOpenObject.
+
+  def to_cascading_open_object
+    CascadingOpenObject.new( @info )
+  end
+
   # Information fetch.
 
   def [](name)
     info[name]
   end
 
-  # Information sore.
+  # Information store.
 
   def []=(name, x)
     info[name] = x

data/lib/reap/rakeadapter.rb

@@ -0,0 +1,50 @@
+
+require 'facet/hash/keys_to_s'
+
+
+module Reap
+
+  # Rake adapter translates a Reap task into a Rake task.
+
+  def self.RakeAdapter( reapclass )
+
+    require 'rake/tasklib'
+
+    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 # module Reap

data/lib/reap/reap.rb

@@ -1,6 +1,15 @@
 
-# Reap support
+module Reap
+  Version = "4.5.0"
+end
+
+# Reap project information object.
 require 'reap/projectinfo'
+
+# Rake adapter.
+require 'reap/rakeadapter'
+
+# Reap task base class.
 require 'reap/task'
 
 # Reap tasks
@@ -16,45 +25,3 @@ require 'reap/task/release'
 require 'reap/task/doap'
 require 'reap/task/manifest'
 require 'reap/task/fileperm'  # needs work
-#require 'reap/task/noop'
-
-
-module Reap
-
-  Version = "4.3.5"
-
-  # 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.load( nil, true )
-  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/announce.rb

@@ -2,12 +2,14 @@
 require 'reap/task'
 
 require 'net/smtp'
+
 require 'facet/string/margin'
 require 'facet/string/tab'
 require 'facet/string/align_center'
 require 'facet/string/fold'
 require 'facet/string/word_wrap'
 
+
 #    _                                    _____        _
 #   /_\  _ _  _ _  ___ _  _ _ _  __ ___  |_   _|_ _ __| |__
 #  / _ \| ' \| ' \/ _ \ || | ' \/ _/ -_)   | |/ _` (_-< / /
@@ -228,3 +230,17 @@ private
   end
 
 end
+
+
+# Rake interface.
+
+if defined?(Rake)
+
+  #require 'reap/rake/adapter'
+
+  module Rake
+    ReapAnnounce = ::Reap::RakeAdapter( ::Reap::Announce )
+  end
+
+end
+

data/lib/reap/task/doap.rb

@@ -68,3 +68,16 @@ module Reap
 
 end
 
+
+# Rake interface.
+
+if defined?(Rake)
+
+  #require 'reap/rake/adapter'
+
+  module Rake
+    ReapDoap = ::Reap::RakeAdapter( ::Reap::Doap )
+  end
+
+end
+

data/lib/reap/task/extest.rb

@@ -145,3 +145,17 @@ private
 
 end
 
+
+# Rake interface.
+
+if defined?(Rake)
+
+  #require 'reap/rake/adapter'
+
+  module Rake
+    ReapExTest = ::Reap::RakeAdapter( ::Reap::ExTest )
+  end
+
+end
+
+

data/lib/reap/task/fileperm.rb

@@ -96,3 +96,17 @@ class Reap::Perm < Reap::Task
 
 end
 
+
+# Rake interface.
+
+if defined?(Rake)
+
+  #require 'reap/rake/adapter'
+
+  module Rake
+    ReapPerm = ::Reap::RakeAdapter( ::Reap::Perm )
+  end
+
+end
+
+

data/lib/reap/task/info.rb

@@ -24,7 +24,21 @@ class Reap::Info < Reap::Task
   }
 
   def run
-    puts $PROJECT_INFO.info_stream
+    puts ProjectInfo.instance.info_stream
   end
 
 end
+
+
+# Rake interface.
+
+if defined?(Rake)
+
+  #require 'reap/rake/adapter'
+
+  module Rake
+    ReapInfo = ::Reap::RakeAdapter( ::Reap::Info )
+  end
+
+end
+

data/lib/reap/task/install.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'reap/task'
-require 'reap/setup'
 
 #  ___           _        _ _   _____         _
 # |_ _|_ __  ___| |_ __ _| | | |_   _|_ _ ___| | __
@@ -66,3 +65,17 @@ class Reap::Install < Reap::Task
   end
 
 end
+
+
+# Rake interface.
+
+if defined?(Rake)
+
+  #require 'reap/rake/adapter'
+
+  module Rake
+    ReapInstall = ::Reap::RakeAdapter( ::Reap::Install )
+  end
+
+end
+

data/lib/reap/task/manifest.rb

@@ -57,3 +57,16 @@ class Reap::Manifest < Reap::Task
 
 end
 
+
+# Rake interface.
+
+if defined?(Rake)
+
+  #require 'reap/rake/adapter'
+
+  module Rake
+    ReapManifest = ::Reap::RakeAdapter( ::Reap::Manifest )
+  end
+
+end
+

data/lib/reap/task/package.rb

@@ -7,6 +7,7 @@ rescue LoadError
   # no rubygems
 end
 
+
 #  ___         _                   _____        _
 # | _ \__ _ __| |____ _ __ _ ___  |_   _|_ _ __| |__
 # |  _/ _` / _| / / _` / _` / -_)   | |/ _` (_-< / /
@@ -431,3 +432,15 @@ private
   end
 
 end
+
+
+# Rake interface.
+
+if defined?(Rake)
+
+  module Rake
+    ReapPackage = ::Reap::RakeAdapter( ::Reap::Package )
+  end
+
+end
+

data/lib/reap/task/publish.rb

@@ -157,3 +157,17 @@ private
   end
 
 end
+
+
+# Rake interface.
+
+if defined?(Rake)
+
+  #require 'reap/rake/adapter'
+
+  module Rake
+    ReapPublish = ::Reap::RakeAdapter( ::Reap::Publish )
+  end
+
+end
+

data/lib/reap/task/rdoc.rb

@@ -116,3 +116,17 @@ class Reap::RDoc < Reap::Task
   end
 
 end
+
+
+# Rake interface.
+
+if defined?(Rake)
+
+  #require 'reap/rake/adapter'
+
+  module Rake
+    ReapRDoc = ::Reap::RakeAdapter( ::Reap::RDoc )
+  end
+
+end
+

data/lib/reap/task/release.rb

@@ -498,3 +498,17 @@ BEGIN {
    end
 }
 
+
+# Rake interface.
+
+if defined?(Rake)
+
+  #require 'reap/rake/adapter'
+
+  module Rake
+    ReapRelease = ::Reap::RakeAdapter( ::Reap::Release )
+  end
+
+end
+
+

data/lib/reap/task/test.rb

@@ -266,3 +266,17 @@ private
   end
 
 end
+
+
+# Rake interface.
+
+if defined?(Rake)
+
+  #require 'reap/rake/adapter'
+
+  module Rake
+    ReapTest = ::Reap::RakeAdapter( ::Reap::Test )
+  end
+
+end
+

data/lib/reap/task.rb

@@ -10,6 +10,8 @@ require 'facet/module/attr_setter'
 require 'facet/filelist' unless defined?( FileList )
 require 'facet/openobject'
 
+require 'reap/projectinfo'
+
 #  _____        _     ___                  ___ _
 # |_   _|_ _ __| |__ | _ ) __ _ ___ ___   / __| |__ _ ______
 #   | |/ _` (_-< / / | _ \/ _` (_-</ -_) | (__| / _` (_-<_-<
@@ -47,6 +49,27 @@ require 'facet/openobject'
 
 module Reap
 
+  # 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
+
+  # Task base class.
+
   class Task
 
     #include ::Config
@@ -94,13 +117,14 @@ module Reap
 
       def verify?
         if section_required?
-          return $PROJECT_INFO.info.key?(task_name)
+          return ProjectInfo.instance.info.key?(task_name)
         end
         true
       end
 
       def master
-        @master ||= CascadingOpenObject.new( $PROJECT_INFO )
+        @master ||= ProjectInfo.instance.to_cascading_open_object
+        #@master ||= CascadingOpenObject.new( $PROJECT_INFO )
       end
 
       # properties not to be looked up in master

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: reap
 version: !ruby/object:Gem::Version 
-  version: 4.4.1
-date: 2006-04-21 00:00:00 -04:00
+  version: 4.5.0
+date: 2006-04-22 00:00:00 -04:00
 summary: Tools for Ruby project testing, management and assistance.
 require_paths: 
 - lib
@@ -32,6 +32,7 @@ files:
 - Rakefile
 - doc
 - data
+- task
 - lib
 - test
 - MANIFEST
@@ -45,6 +46,7 @@ files:
 - doc/ChangeLog
 - doc/note
 - doc/doap.xml
+- doc/rake
 - doc/LATEST
 - doc/note/setup.rb
 - doc/note/license-each.rb
@@ -64,6 +66,18 @@ files:
 - doc/note/ProjectInfo.rb
 - doc/note/interface/interface.rb
 - doc/note/interface/rubyforge.rb
+- doc/rake/info.rb
+- doc/rake/package.rb
+- doc/rake/announce.rb
+- doc/rake/release.rb
+- doc/rake/adapter.rb
+- doc/rake/extest.rb
+- doc/rake/test.rb
+- doc/rake/publish.rb
+- doc/rake/rdoc.rb
+- doc/rake/install.rb
+- doc/rake/doap.rb
+- doc/rake/manifest.rb
 - data/reap
 - data/reap/scaffold
 - data/reap/setup.rb
@@ -103,6 +117,7 @@ files:
 - data/reap/scaffold/standard/test
 - data/reap/scaffold/standard/doc/note
 - data/reap/scaffold/standard/doc/api
+- task/noop.rb
 - lib/reap
 - lib/reap/bin
 - lib/reap/task
@@ -110,8 +125,7 @@ files:
 - lib/reap/vendor
 - lib/reap/task.rb
 - lib/reap/reap.rb
-- lib/reap/rake.rb
-- lib/reap/rake
+- lib/reap/rakeadapter.rb
 - lib/reap/bin/reap.rb
 - lib/reap/bin/rubytest.rb
 - lib/reap/bin/rubylint.rb
@@ -122,7 +136,6 @@ files:
 - lib/reap/task/install.rb
 - lib/reap/task/test.rb
 - lib/reap/task/extest.rb
-- lib/reap/task/noop.rb
 - lib/reap/task/fileperm.rb
 - lib/reap/task/package.rb
 - lib/reap/task/info.rb
@@ -132,18 +145,6 @@ files:
 - lib/reap/vendor/http-access2.rb
 - lib/reap/vendor/http-access2/cookie.rb
 - lib/reap/vendor/http-access2/http.rb
-- lib/reap/rake/info.rb
-- lib/reap/rake/package.rb
-- lib/reap/rake/announce.rb
-- lib/reap/rake/release.rb
-- lib/reap/rake/adapter.rb
-- lib/reap/rake/extest.rb
-- lib/reap/rake/test.rb
-- lib/reap/rake/publish.rb
-- lib/reap/rake/rdoc.rb
-- lib/reap/rake/install.rb
-- lib/reap/rake/doap.rb
-- lib/reap/rake/manifest.rb
 - test/tc_reap.rb
 test_files: []
 
@@ -153,6 +154,7 @@ extra_rdoc_files: []
 
 executables: 
 - reap
+- rubytest
 extensions: []
 
 requirements: []

data/lib/reap/rake/announce.rb

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

data/lib/reap/rake.rb

@@ -1,16 +0,0 @@
-
-# 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'