reap 4.4.0 → 4.4.1

data/ProjectInfo

@@ -2,7 +2,7 @@
 
 title    : Reap
 name     : reap
-version  : '4.4.0'
+version  : '4.4.1'
 #date     : '2006-04-01'
 created  : '2004-04-01'
 status   : 'beta/stable'

data/data/reap/scaffold/standard/ProjectInfo

@@ -2,8 +2,7 @@
 
 TITLE    : &title Your App's Title
 NAME     : &pkg your_unix_name
-SERIES   : '0.0.1'
-DATE     : '2005-01-01'
+VERSION  : '0.0.1'
 STATUS   : beta
 
 AUTHOR   : Your Name
@@ -31,11 +30,10 @@ PACKAGE:
   DISTRIBUTE   : [ gem, tar.bz2 ]  # tgz zip deb
   DEPENDENCIES : []
   EXECUTABLES  : []
-  DIR: pkg
+  DIR: pkg  # where to put dist packages
   INCLUDE:
     - '**/*'
-  EXCLUDE:
-    - InstalledFiles
+  EXCLUDE: []
 
 # PUBLISH:
 #  - HOST: rubyforge
@@ -43,6 +41,14 @@ PACKAGE:
 #    USERNAME: your_username
 #    DIR: www
 
+# RELEASE:
+#   host       : rubyforge.org
+#   username   : user_username_for_host
+#   project    : *pkg
+#   groupid    : 999   # group id
+#   package    : Release-pacakge-name
+#   dir        : pkg  # where the dist packages are stored
+
 # RDOC:
 #   TITLE: *title
 #   DIR: 'rdoc'  # 'web/rdoc'
@@ -70,9 +76,3 @@ PACKAGE:
 #     - http://your_homepage.org
 #     - http://other_links.com
 
-# TEST:
-#   FILES:
-#     - 'test/**/tc*.rb'
-#     - 'test/**/test*.rb'
-#     - 'test/**/*test.rb'
-#  FIXTURE: []

data/data/reap/scaffold/subversion/trunk/ProjectInfo

@@ -2,8 +2,7 @@
 
 TITLE    : &title Your App's Title
 NAME     : &pkg your_unix_name
-SERIES   : '0.0.1'
-DATE     : '2005-01-01'
+VERSION  : '0.0.1'
 STATUS   : beta
 
 AUTHOR   : Your Name
@@ -31,11 +30,10 @@ PACKAGE:
   DISTRIBUTE   : [ gem, tar.bz2 ]  # tgz zip deb
   DEPENDENCIES : []
   EXECUTABLES  : []
-  DIR: pkg
+  DIR: pkg  # where to put dist packages
   INCLUDE:
     - '**/*'
-  EXCLUDE:
-    - InstalledFiles
+  EXCLUDE: []
 
 # PUBLISH:
 #  - HOST: rubyforge
@@ -43,6 +41,14 @@ PACKAGE:
 #    USERNAME: your_username
 #    DIR: www
 
+# RELEASE:
+#   host       : rubyforge.org
+#   username   : user_username_for_host
+#   project    : *pkg
+#   groupid    : 999   # group id
+#   package    : Release-pacakge-name
+#   dir        : pkg  # where the dist packages are stored
+
 # RDOC:
 #   TITLE: *title
 #   DIR: 'rdoc'  # 'web/rdoc'
@@ -70,9 +76,3 @@ PACKAGE:
 #     - http://your_homepage.org
 #     - http://other_links.com
 
-# TEST:
-#   FILES:
-#     - 'test/**/tc*.rb'
-#     - 'test/**/test*.rb'
-#     - 'test/**/*test.rb'
-#  FIXTURE: []

data/lib/reap/bin/reap.rb

@@ -6,6 +6,8 @@ require 'facets'
 require 'consoleapp'
 #require 'console/command'
 
+require 'facet/gem/self/active'
+
 require 'reap/reap'
 
 
@@ -115,11 +117,15 @@ class ReapCommand < Console::Command
     f = nil
     if ::ProjectInfo::INFO_FILES.any?{ |f| File.exists?(f) }
       puts "Project file '#{f}' already exists."
-      exit 0
+      return
     end
     filename = 'ProjectInfo'
-    # need to add gems workaround
-    dir = File.join( ::Config::CONFIG['datadir'], 'reap', 'scaffold', 'standard' )
+    # if using gems
+    if dir = Gem.gempath('reap')
+      dir = File.join( dir, 'data', 'reap', 'scaffold', 'standard' )
+    else
+      dir = File.join( ::Config::CONFIG['datadir'], 'reap', 'scaffold', 'standard' )
+    end
     f = File.join( dir, filename )
     raise "ProjectInfo template file #{f} is missing." unless File.file?( f )
     # copy
@@ -128,9 +134,10 @@ class ReapCommand < Console::Command
     exit 0
   end
 
-  def scaffold( name, type=nil )
-    if File.directory?(name) and not $FORCE
-      puts "Directory already exists. Use -f option to force scaffoling."
+  def scaffold( type=nil )
+    content = Dir.entries('.') - [ '.', '..' ]
+    if not content.empty? and not $FORCE
+      puts "Directory already has content. Use -f option to force scaffolding."
       exit -1
     end
     case type
@@ -143,23 +150,24 @@ class ReapCommand < Console::Command
       exit -1
     end
     # need to add gems workaround
-    dir = File.join( ::Config::CONFIG['datadir'], 'reap', 'scaffold', type )
+    if dir = Gem.gempath('reap')
+      dir = File.join( dir, 'data', 'reap', 'scaffold', 'standard', type )
+    else
+      dir = File.join( ::Config::CONFIG['datadir'], 'reap', 'scaffold', type )
+    end
     #FileUtils.mkdir_p( name )
-    FileUtils.cp_r( dir, name )
-    puts "Project #{name} created. Good luck with your new project!"
-    exit 0
+    FileUtils.cp_r( File.join( dir, '.'), '.' )
+    puts "Project ready."
   end
 
   # Add all the reap tasks.
 
   if Reap.register
-
     Reap.tasks.each do |sym,taskclass|
       define_method(sym) do |*args|
         taskclass.new(*args).execute
       end
     end
-
   end
 
 end
@@ -187,11 +195,11 @@ HELP = <<-HERE
         Copies a ProjectInfo template into the current
         directory (if it does not already exist).
 
-    scaffold [directory] [type]
-        Builds a starter project directory. There are
-        two types: 'standard' and 'subversion'. These can
-        be abbreviated 'std' and 'svn', repectively. If
-        no type is given then standard is used.
+    scaffold [type]
+        Builds a starter project in the current directory.
+        There are two types: 'standard' and 'subversion'.
+        These can be abbreviated 'std' and 'svn', repectively.
+        If no type is given then standard is used.
 
   OPTIONS:
 

data/lib/reap/projectinfo.rb

@@ -32,7 +32,8 @@ class ProjectInfo
       if fpath
         new.read( fpath, report )
       else
-        new.read( find, report )
+        fpath = find
+        new.read( fpath, report )
       end
     end
 
@@ -44,6 +45,7 @@ class ProjectInfo
         info_file = INFO_FILES.find{ |f| File.file?( File.join( info_dir, f ) ) }
         break if info_file
       end
+      return nil unless info_file
       return File.join( info_dir, info_file )
     end
 
@@ -73,7 +75,7 @@ class ProjectInfo
     @info = HashBuilder.new( &block  ).to_h
     @info_stream = @info.to_yaml
 
-    validate
+    #validate
     defaults
 
     self
@@ -94,7 +96,7 @@ class ProjectInfo
       puts "(in #{Dir.pwd})" #unless dir == Dir.pwd
     end
 
-    validate
+    #validate
     defaults
 
     self
@@ -111,7 +113,7 @@ class ProjectInfo
     end
     @info_stream = @info.to_yaml
 
-    validate
+    #validate
     defaults
 
     self
@@ -125,9 +127,11 @@ class ProjectInfo
 
   # 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']
+  def validate #( *fields )
+    val = true
+    (puts "NAME is required in project information file."; val=false) unless info['name']
+    (puts "VERSION is required in project information file."; val=false) unless info['version']
+    exit -1 unless val
   end
 
   # Project information defaults.

data/lib/reap/reap.rb

@@ -44,11 +44,10 @@ module Reap
 
   def self.register #( alternative_project_file=nil )
     $PROJECT_INFO = ProjectInfo.load( nil, true )
-    $PROJECT_INFO.exists?
   end
 
   def self.projectfile?
-    $PROJECT_INFO.exists?
+    $PROJECT_INFO #.exists?
   end
 
 #   def self.initialize

data/lib/reap/task/release.rb

@@ -83,13 +83,18 @@ class Reap::Release < Reap::Task
       package        Package name
       groupid        Group id number
       architecture   Architecture (Any, i386, PPC, etc.)
-      release        Release name
+      release        Release name (default is "%s")
       private        Private release?
       changelog      Change log file
       notelog        Release notes file
       dir            Distribution directory
       exclude        Distribution types to exclude
 
+    The release option can be a template by using %s in the
+    string. The version number of your project will be sub'd
+    in for the %s. This saves you from having to update
+    the release name before every release.
+
   }
 
   alias_method :rel, :task
@@ -124,7 +129,7 @@ class Reap::Release < Reap::Task
     # do not inherit these
 
     rel.dir = section.dir || master.project.dir
-    rel.release   = section.release || master.version || rel.date
+    rel.release = (section.release || "%s") % (master.version || rel.date)
 
     # verify
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: reap
 version: !ruby/object:Gem::Version 
-  version: 4.4.0
-date: 2006-04-20 00:00:00 -04:00
+  version: 4.4.1
+date: 2006-04-21 00:00:00 -04:00
 summary: Tools for Ruby project testing, management and assistance.
 require_paths: 
 - lib
@@ -39,7 +39,6 @@ files:
 - ProjectInfo
 - setup.rb
 - README
-- ProjectInfo.rb
 - package.rb
 - bin/reap
 - bin/rubytest
@@ -62,6 +61,7 @@ files:
 - doc/note/aRakefile
 - doc/note/Rakefile.htm
 - doc/note/scaffold.rb
+- doc/note/ProjectInfo.rb
 - doc/note/interface/interface.rb
 - doc/note/interface/rubyforge.rb
 - data/reap