pluginfactory 1.0.4 → 1.0.5

data/ChangeLog

@@ -1,351 +1,102 @@
--- Wed, 25 Feb 2009 17:50:55 -0000 by deveiant (r57) -----
-   Changed: lib/pluginfactory.rb
+2004-03-09 22:32  Michael Granger <ged@FaerieMUD.org>
 
-   Incrementing library version.
+	* makedist.rb (1.1), utils.rb (1.1), docs/.cvsignore (1.1),
+	docs/CATALOG (1.1), docs/makedocs.rb (1.1):
 
+	Initial checkin.
+	
+2004-03-08 00:07  Michael Granger <ged@FaerieMUD.org>
 
--- Wed, 25 Feb 2009 16:52:20 -0000 by deveiant (r56) -----
-   Added:   spec/lib (new)
-            spec/lib/helpers.rb (new)
-   Changed: lib/pluginfactory.rb
-            spec/pluginfactory_spec.rb
+	* tests/: othersub.rb (1.2), dir/deepsubofmybase.rb (1.2):
 
-    * Fixes for Ruby 1.9.1.
-    * Replace home-grown logger stuff with Logger library
+	- Fixed class/file agreement.
+	
+2004-03-08 00:06  Michael Granger <ged@FaerieMUD.org>
 
+	* tests/mybase.rb (1.2):
 
--- Mon, 23 Feb 2009 06:34:03 -0000 by deveiant (r55) -----
-   Changed: README
-            Rakefile
-            utils.rb
-            project.yml
-            spec/pluginfactory_spec.rb
+	- Fixed derivativeDirs method.
+	
+2004-03-08 00:05  Michael Granger <ged@FaerieMUD.org>
 
-   Start of fixes for 1.9.1.
+	* lib/pluginfactory.rb (1.4):
 
+	- Documentation additions
+	
+	- Refactored path-search code
+	
+2004-03-07 21:30  Michael Granger <ged@FaerieMUD.org>
 
--- Wed, 13 Aug 2008 21:58:41 -0000 by deveiant (r52) -----
-   Changed: lib/pluginfactory.rb
-            Rakefile
-            utils.rb
-            spec/pluginfactory_spec.rb
+	* test.rb (1.3):
 
-   Updating tags on new files.
+	- Added a hook into -d that turns on logging.
+	
+2004-03-07 19:13  Martin Chase <stillflame@FaerieMUD.org>
 
+	* README (1.4):
 
--- Wed, 13 Aug 2008 21:57:47 -0000 by deveiant (r51) -----
-   Deleted: rake
+	no, this is not using the default install.rb installation process
+	
+2004-03-07 19:07  Martin Chase <stillflame@FaerieMUD.org>
 
-   Removing old rake tasklib dir
+	* lib/pluginfactory.rb (1.3):
 
+	FactoryError now inherits from RuntimeError
+	
+2004-03-07 19:06  Martin Chase <stillflame@FaerieMUD.org>
 
--- Wed, 13 Aug 2008 21:57:18 -0000 by deveiant (r50) -----
-   Added:   project.yml (new)
-   Changed: README
-            /trunk
-            LICENSE
-            Rakefile
+	* test.rb (1.2):
 
-   Converting to the new build system
+	filling in
+	
+2004-03-07 19:05  Martin Chase <stillflame@FaerieMUD.org>
 
+	* tests/: mybase.rb (1.1), othersub.rb (1.1), subofmybase.rb (1.1),
+	dir/deepsubofmybase.rb (1.1):
 
--- Wed, 26 Mar 2008 16:01:36 -0000 by deveiant (r48) -----
-   Changed: Rakefile
-            rake/publishing.rb
-            rake/svn.rb
+	initial import
+	
+2004-03-07 15:42  Martin Chase <stillflame@FaerieMUD.org>
 
-    * More packaging/publishing fixes.
+	* README (1.3):
 
+	reformatted
+	
+2004-03-07 15:41  Martin Chase <stillflame@FaerieMUD.org>
 
--- Tue, 25 Mar 2008 21:17:07 -0000 by deveiant (r46) -----
-   Changed: /trunk
-            Rakefile
-            rake/publishing.rb
+	* install.rb (1.2):
 
-    * Fixed announcement-sending task to use SMTP+SSL via a monkeypatch to net/smtp. (Maybe package it
-    up and upstream later?)
+	filled in
+	
+2004-03-07 14:36  Martin Chase <stillflame@FaerieMUD.org>
 
+	* COPYRIGHT (1.2), README (1.2):
 
--- Tue, 25 Mar 2008 19:36:11 -0000 by deveiant (r45) -----
-   Added:   experiments (new)
-            experiments/logger_output.rb (new)
-            rake/publishing.rb (new)
-   Changed: README
-            lib/pluginfactory.rb
-            /trunk
-            MANIFEST
-            LICENSE
-            Rakefile (and 4 other/s)
-   Deleted: .gemspec
-            makedist.rb
-            install.rb
-            .cvsignore
-            docs
+	filled in
+	
+2004-03-07 10:49  Martin Chase <stillflame@FaerieMUD.org>
 
-    * Packaging and publication tasks updated.
-    * Updated documentation.
+	* lib/pluginfactory.rb (1.2):
 
+	cleaned out ties to other modules
+	
+2004-03-07 09:33  Martin Chase <stillflame@FaerieMUD.org>
 
--- Fri, 27 Jul 2007 06:53:27 -0000 by deveiant (r43) -----
-   Deleted: test.rb
+	* lib/: factory.rb (1.2), pluginfactory.rb (1.1):
 
-   Removed test runner script
+	renaming
+	
+2004-03-07 09:31  Martin Chase <stillflame@FaerieMUD.org>
 
+	* COPYRIGHT (1.1), README (1.1), install.rb (1.1), test.rb (1.1),
+	lib/factory.rb (1.1):
 
--- Fri, 27 Jul 2007 06:50:56 -0000 by deveiant (r42) -----
-   Added:   LICENSE
-            -> renamed from /trunk/COPYRIGHT@r41
-            Rakefile (new)
-            rake (new)
-            rake/helpers.rb (new)
-            spec/spec.opts (new)
-            rake/svn.rb (new) (and 4 other/s)
-   Changed: lib/pluginfactory.rb
-            /trunk
-            test.rb
-   Deleted: tests
-            COPYRIGHT
-
-   Converted test::unit tests to RSpec
-
-
--- Tue, 13 Mar 2007 18:34:19 -0000 by deveiant (r40) -----
-   Changed: /trunk
-            makedist.rb
-
-   Bumping project-version and fixing makedist problems.
-
-
--- Tue, 13 Mar 2007 18:20:58 -0000 by deveiant (r38) -----
-   Changed: lib/pluginfactory.rb
-
-    * Log list of candidate subdirs
-
-
--- Thu, 22 Feb 2007 23:03:05 -0000 by deveiant (r37) -----
-   Changed: lib/pluginfactory.rb
-
-
-    * Support #derivative_dirs method as well as the camelCased variant.
-
-
--- Sat, 01 Jul 2006 18:50:52 -0000 by ged (r36) -----
-   Changed: lib/pluginfactory.rb
-            docs/makedocs.rb
-            test.rb
-
-
-    * Converted camelCased methods to under_barred ones.
-
-    * Fixed tests.
-
-
--- Sat, 05 Mar 2005 00:32:10 -0000 by ged (r35) -----
-   Changed: /trunk
-
-   Incremented project version attribute
-
-
--- Sat, 05 Mar 2005 00:25:54 -0000 by ged (r33) -----
-   Changed: makedist.rb
-
-   Merged changes from project-utils version
-
-
--- Sat, 05 Mar 2005 00:21:05 -0000 by ged (r32) -----
-   Changed: lib/pluginfactory.rb
-
-   - Made load failures raise FactoryErrors as intended instead of RuntimeErrors.
-
-
--- Sun, 21 Nov 2004 17:14:13 -0000 by ged (r31) -----
-   Changed: utils.rb
-            install.rb
-
-   -- Updated project-utils files
-
-
--- Sun, 21 Nov 2004 17:02:59 -0000 by ged (r30) -----
-   Added:   .gemspec (new)
-   Changed: /trunk
-            MANIFEST
-
-   -- Gemified
-   -- Fixed missing utils.rb in MANIFEST
-   -- Added project-spec properties to the root dir.
-
-
--- Wed, 08 Sep 2004 04:51:57 -0000 by ged (r28) -----
-   Added:   docs/makedocs.rb (new)
-            utils.rb (new)
-            makedist.rb (new)
-            install.rb (new)
-
-   - Hmmm... that didn't work. Copying over new versions of the util scripts until
-   I figure out how the hell to do what I want.
-
-
--- Wed, 08 Sep 2004 04:27:06 -0000 by ged (r27) -----
-   Deleted: docs/makedocs.rb
-            utils.rb
-            makedist.rb
-            install.rb
-
-   - Replacing with versions from project-utils (experimental -- may just have to
-   re-check them in)
-
-
--- Tue, 24 Aug 2004 01:38:10 -0000 by ged (r26) -----
-   Changed: lib/pluginfactory.rb
-
-   - Added a very important property
-
-
--- Tue, 24 Aug 2004 01:36:11 -0000 by ged (r25) -----
-   Changed: lib/pluginfactory.rb
-
-   - Added keywords property to lib/pluginfactory.rb
-
-
--- Tue, 24 Aug 2004 01:35:26 -0000 by ged (r24) -----
-   Changed: install.rb
-
-   - Fixed String =~ String warning
-
-
--- Tue, 24 Aug 2004 01:34:13 -0000 by ged (r23) -----
-   Changed: install.rb
-
-   - Added bangheader
-
-
--- Tue, 24 Aug 2004 01:33:14 -0000 by ged (r22) -----
-   Changed: test.rb
-
-   - Easyified bangheader
-
-
--- Wed, 10 Mar 2004 06:36:15 -0000 by deveiant (r20) -----
-   Changed: ChangeLog
-
-   Updated for tag release_0_01
-
-
--- Wed, 10 Mar 2004 06:34:00 -0000 by deveiant (r19) -----
-   Added:   .cvsignore (new)
-            .irbrc (new)
-            docs/makedocs.rb (new)
-            docs/CATALOG (new)
-            utils.rb (new)
-            makedist.rb (new) (and 5 other/s)
-   Changed: /trunk
-
-   Initial checkin.
-
-
--- Mon, 08 Mar 2004 08:07:38 -0000 by deveiant (r18) -----
-   Changed: tests/dir/deepsubofmybase.rb
-            tests/othersub.rb
-
-   - Fixed class/file agreement.
-
-
--- Mon, 08 Mar 2004 08:06:24 -0000 by deveiant (r17) -----
-   Changed: tests/mybase.rb
-
-   - Fixed derivativeDirs method.
-
-
--- Mon, 08 Mar 2004 08:05:38 -0000 by deveiant (r16) -----
-   Changed: lib/pluginfactory.rb
-
-   - Documentation additions
-   - Refactored path-search code
-
-
--- Mon, 08 Mar 2004 05:30:01 -0000 by deveiant (r15) -----
-   Changed: test.rb
-
-   - Added a hook into -d that turns on logging.
-
-
--- Mon, 08 Mar 2004 03:13:38 -0000 by stillflame (r14) -----
-   Changed: README
-
-   no, this is not using the default install.rb installation process
-
-
--- Mon, 08 Mar 2004 03:07:27 -0000 by stillflame (r13) -----
-   Changed: lib/pluginfactory.rb
-
-   FactoryError now inherits from RuntimeError
-
-
--- Mon, 08 Mar 2004 03:06:05 -0000 by stillflame (r12) -----
-   Changed: test.rb
-
-   filling in
-
-
--- Mon, 08 Mar 2004 03:05:36 -0000 by stillflame (r11) -----
-   Added:   tests/dir/deepsubofmybase.rb (new)
-            tests/othersub.rb (new)
-            tests/dir (new)
-            tests (new)
-            tests/subofmybase.rb (new)
-            tests/mybase.rb (new) (and 1 other/s)
-
-   initial import
-
-
--- Sun, 07 Mar 2004 23:42:11 -0000 by stillflame (r10) -----
-   Changed: README
-
-   reformatted
-
-
--- Sun, 07 Mar 2004 23:41:51 -0000 by stillflame (r9) -----
-   Changed: install.rb
-
-   filled in
-
-
--- Sun, 07 Mar 2004 22:36:44 -0000 by stillflame (r8) -----
-   Changed: README
-            COPYRIGHT
-
-   filled in
-
-
--- Sun, 07 Mar 2004 18:49:23 -0000 by stillflame (r7) -----
-   Changed: lib/pluginfactory.rb
-
-   cleaned out ties to other modules
-
-
--- Sun, 07 Mar 2004 17:33:10 -0000 by stillflame (r6) -----
-   Added:   lib/pluginfactory.rb (new)
-   Deleted: lib/factory.rb
-
-   renaming
-
-
--- Sun, 07 Mar 2004 17:31:18 -0000 by stillflame (r2) -----
-   Added:   README (new)
-            lib/factory.rb (new)
-            test.rb (new)
-            lib (new)
-            COPYRIGHT (new)
-            install.rb (new) (and 1 other/s)
-
-   Initial revision
-
-
--- Sun, 07 Mar 2004 17:31:18 -0000 by unknown (r1) -----
-   Added:   /trunk (new)
-            /branches (new)
-            /tags (new)
-
-   New repository initialized by cvs2svn.
+	Initial revision
+	
+2004-03-07 09:31  Martin Chase <stillflame@FaerieMUD.org>
 
+	* COPYRIGHT (1.1.1.1), README (1.1.1.1), install.rb (1.1.1.1),
+	test.rb (1.1.1.1), lib/factory.rb (1.1.1.1) (utags: release):
 
+	initial stripping out of Arrow/MUES
+	

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008, Michael Granger
+Copyright (c) 2008, 2009 Michael Granger and Martin Chase
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README

@@ -187,10 +187,6 @@ this might generate a log that looks like:
   E, [...] ERROR -- : Couldn't find a DataDriver named 'ringbuffer': 
         tried ["ringbufferdatadriver", "ringbufferDataDriver", "ringbuffer"]
 
-== Subversion ID
-
-$Id: README 55 2009-02-23 06:34:03Z deveiant $
-
 == Authors
 
 * Martin Chase <stillflame@FaerieMUD.org>

data/Rakefile

@@ -7,6 +7,7 @@
 # Copyright (c) 2007-2009 The FaerieMUD Consortium
 #
 # Authors:
+#  * Martin Chase <stillflame@FaerieMUD.org>
 #  * Michael Granger <ged@FaerieMUD.org>
 #
 
@@ -21,13 +22,23 @@ BEGIN {
 	$LOAD_PATH.unshift( extdir.to_s ) unless $LOAD_PATH.include?( extdir.to_s )
 }
 
+begin
+	require 'readline'
+	include Readline
+rescue LoadError
+	# Fall back to a plain prompt
+	def readline( text )
+		$stderr.print( text.chomp )
+		return $stdin.gets
+	end
+end
+
 require 'rbconfig'
 require 'rake'
-require 'rake/rdoctask'
 require 'rake/testtask'
 require 'rake/packagetask'
 require 'rake/clean'
-require 'rake/191_compat.rb'
+# require 'rake/191_compat.rb'
 
 $dryrun = false
 
@@ -40,10 +51,16 @@ DOCSDIR       = BASEDIR + 'docs'
 PKGDIR        = BASEDIR + 'pkg'
 DATADIR       = BASEDIR + 'data'
 
+MANUALDIR     = DOCSDIR + 'manual'
+
 PROJECT_NAME  = 'PluginFactory'
 PKG_NAME      = PROJECT_NAME.downcase
 PKG_SUMMARY   = 'A mixin for making plugin classes'
 
+# Cruisecontrol stuff
+CC_BUILD_LABEL     = ENV['CC_BUILD_LABEL']
+CC_BUILD_ARTIFACTS = ENV['CC_BUILD_ARTIFACTS'] || 'artifacts'
+
 VERSION_FILE  = LIBDIR + 'pluginfactory.rb'
 if VERSION_FILE.exist? && buildrev = ENV['CC_BUILD_LABEL']
 	PKG_VERSION = VERSION_FILE.read[ /VERSION\s*=\s*['"](\d+\.\d+\.\d+)['"]/, 1 ] + '.' + buildrev
@@ -56,30 +73,39 @@ end
 PKG_FILE_NAME = "#{PKG_NAME.downcase}-#{PKG_VERSION}"
 GEM_FILE_NAME = "#{PKG_FILE_NAME}.gem"
 
+# Universal VCS constants
+DEFAULT_EDITOR  = 'vi'
+COMMIT_MSG_FILE = 'commit-msg.txt'
+FILE_INDENT     = " " * 12
+LOG_INDENT      = " " * 3
+
 EXTCONF       = EXTDIR + 'extconf.rb'
 
-ARTIFACTS_DIR = Pathname.new( ENV['CC_BUILD_ARTIFACTS'] || 'artifacts' )
+ARTIFACTS_DIR = Pathname.new( CC_BUILD_ARTIFACTS )
 
-TEXT_FILES    = %w( Rakefile ChangeLog README LICENSE ).collect {|filename| BASEDIR + filename }
-BIN_FILES     = Pathname.glob( BINDIR + '*' ).delete_if {|item| item =~ /\.svn/ }
-LIB_FILES     = Pathname.glob( LIBDIR + '**/*.rb' ).delete_if {|item| item =~ /\.svn/ }
-EXT_FILES     = Pathname.glob( EXTDIR + '**/*.{c,h,rb}' ).delete_if {|item| item =~ /\.svn/ }
-DATA_FILES    = Pathname.glob( DATADIR + '**/*' ).delete_if {|item| item =~ /\.svn/ }
+TEXT_FILES    = Rake::FileList.new( %w[Rakefile ChangeLog README LICENSE] )
+BIN_FILES     = Rake::FileList.new( "#{BINDIR}/*" )
+LIB_FILES     = Rake::FileList.new( "#{LIBDIR}/**/*.rb" )
+EXT_FILES     = Rake::FileList.new( "#{EXTDIR}/**/*.{c,h,rb}" )
+DATA_FILES    = Rake::FileList.new( "#{DATADIR}/**/*" )
 
 SPECDIR       = BASEDIR + 'spec'
 SPECLIBDIR    = SPECDIR + 'lib'
-SPEC_FILES    = Pathname.glob( SPECDIR + '**/*_spec.rb' ).delete_if {|item| item =~ /\.svn/ } +
-                Pathname.glob( SPECLIBDIR + '**/*.rb' ).delete_if {|item| item =~ /\.svn/ }
+SPEC_FILES    = Rake::FileList.new( "#{SPECDIR}/**/*_spec.rb", "#{SPECLIBDIR}/**/*.rb" )
 
 TESTDIR       = BASEDIR + 'tests'
-TEST_FILES    = Pathname.glob( TESTDIR + '**/*.tests.rb' ).delete_if {|item| item =~ /\.svn/ }
+TEST_FILES    = Rake::FileList.new( "#{TESTDIR}/**/*.tests.rb" )
 
 RAKE_TASKDIR  = BASEDIR + 'rake'
-RAKE_TASKLIBS = Pathname.glob( RAKE_TASKDIR + '*.rb' )
+RAKE_TASKLIBS = Rake::FileList.new( "#{RAKE_TASKDIR}/*.rb" )
+PKG_TASKLIBS  = Rake::FileList.new( "#{RAKE_TASKDIR}/{191_compat,helpers,packaging,rdoc,testing}.rb" )
+PKG_TASKLIBS.include( "#{RAKE_TASKDIR}/manual.rb" ) if MANUALDIR.exist?
+
+RAKE_TASKLIBS_URL = 'http://repo.deveiate.org/rake-tasklibs'
 
 LOCAL_RAKEFILE = BASEDIR + 'Rakefile.local'
 
-EXTRA_PKGFILES = []
+EXTRA_PKGFILES = Rake::FileList.new
 
 RELEASE_FILES = TEXT_FILES + 
 	SPEC_FILES + 
@@ -91,7 +117,8 @@ RELEASE_FILES = TEXT_FILES +
 	RAKE_TASKLIBS +
 	EXTRA_PKGFILES
 
-RELEASE_FILES << LOCAL_RAKEFILE if LOCAL_RAKEFILE.exist?
+
+RELEASE_FILES << LOCAL_RAKEFILE.to_s if LOCAL_RAKEFILE.exist?
 
 COVERAGE_MINIMUM = ENV['COVERAGE_MINIMUM'] ? Float( ENV['COVERAGE_MINIMUM'] ) : 85.0
 RCOV_EXCLUDES = 'spec,tests,/Library/Ruby,/var/lib,/usr/local/lib'
@@ -104,23 +131,35 @@ RCOV_OPTS = [
   ]
 
 
-# Subversion constants -- directory names for releases and tags
-SVN_TRUNK_DIR    = 'trunk'
-SVN_RELEASES_DIR = 'releases'
-SVN_BRANCHES_DIR = 'branches'
-SVN_TAGS_DIR     = 'tags'
-
-SVN_DOTDIR       = BASEDIR + '.svn'
-SVN_ENTRIES      = SVN_DOTDIR + 'entries'
+### Load some task libraries that need to be loaded early
+if !RAKE_TASKDIR.exist?
+	$stderr.puts "It seems you don't have the build task directory. Shall I fetch it "
+	ans = readline( "for you? [y]" )
+	ans = 'y' if !ans.nil? && ans.empty?
+
+	if ans =~ /^y/i
+		$stderr.puts "Okay, fetching #{RAKE_TASKLIBS_URL} into #{RAKE_TASKDIR}..."
+		system 'hg', 'clone', RAKE_TASKLIBS_URL, RAKE_TASKDIR
+		if ! $?.success?
+			fail "Damn. That didn't work. Giving up; maybe try manually fetching?"
+		end
+	else
+		$stderr.puts "Then I'm afraid I can't continue. Best of luck."
+		fail "Rake tasklibs not present."
+	end
 
+	RAKE_TASKLIBS.include( "#{RAKE_TASKDIR}/*.rb" )
+end
 
-### Load some task libraries that need to be loaded early
 require RAKE_TASKDIR + 'helpers.rb'
-require RAKE_TASKDIR + 'svn.rb'
-require RAKE_TASKDIR + 'verifytask.rb'
 
 # Define some constants that depend on the 'svn' tasklib
-PKG_BUILD = get_svn_rev( BASEDIR ) || 0
+if hg = which( 'hg' )
+	id = IO.read('|-') or exec hg.to_s, 'id', '-n'
+	PKG_BUILD = id.chomp[ /^[[:xdigit:]]+/ ]
+else
+	PKG_BUILD = 0
+end
 SNAPSHOT_PKG_NAME = "#{PKG_FILE_NAME}.#{PKG_BUILD}"
 SNAPSHOT_GEM_NAME = "#{SNAPSHOT_PKG_NAME}.gem"
 
@@ -128,11 +167,11 @@ SNAPSHOT_GEM_NAME = "#{SNAPSHOT_PKG_NAME}.gem"
 RDOCDIR = DOCSDIR + 'api'
 RDOC_OPTIONS = [
 	'-w', '4',
-	'-SHN',
+	'-HN',
 	'-i', '.',
 	'-m', 'README',
 	'-t', PKG_NAME,
-	'-W', 'http://deveiate.org/projects/PluginFactory/browser/trunk/'
+	'-W', 'http://deveiate.org/projects/PluginFactory/browser/'
   ]
 
 # Release constants
@@ -156,18 +195,16 @@ DEPENDENCIES = {
 
 # Developer Gem dependencies: gemname => version
 DEVELOPMENT_DEPENDENCIES = {
-	'amatch'      => '>= 0.2.3',
-	'rake'        => '>= 0.8.1',
+	'rake'        => '>= 0.8.7',
 	'rcodetools'  => '>= 0.7.0.0',
-	'rcov'        => '>= 0',
+	'rcov'        => '>= 0.8.1.2.0',
+	'rdoc'        => '>= 2.4.3',
 	'RedCloth'    => '>= 4.0.3',
-	'rspec'       => '>= 0',
+	'rspec'       => '>= 1.2.6',
 	'rubyforge'   => '>= 0',
 	'termios'     => '>= 0',
 	'text-format' => '>= 1.0.0',
 	'tmail'       => '>= 1.2.3.1',
-	'ultraviolet' => '>= 0.10.2',
-	'libxml-ruby' => '>= 0.8.3',
 }
 
 # Non-gem requirements: packagename => version
@@ -188,8 +225,8 @@ GEMSPEC   = Gem::Specification.new do |gem|
 		"which implement the interface for different underlying functionality.",
   	  ].join( "\n" )
 
-	gem.authors           = 'Michael Granger'
-	gem.email             = 'ged@FaerieMUD.org'
+	gem.authors           = "Martin Chase, Michael Granger"
+	gem.email             = ["stillflame@FaerieMUD.org", "ged@FaerieMUD.org"]
 	gem.homepage          = 'http://deveiate.org/projects/PluginFactory/'
 	gem.rubyforge_project = RUBYFORGE_PROJECT
 
@@ -198,48 +235,37 @@ GEMSPEC   = Gem::Specification.new do |gem|
 	gem.extra_rdoc_files  = %w[ChangeLog README LICENSE]
 
 	gem.bindir            = BINDIR.relative_path_from(BASEDIR).to_s
-	gem.executables       = BIN_FILES.select {|pn| pn.executable? }.
-		collect {|pn| pn.relative_path_from(BINDIR).to_s }
+	gem.executables       = BIN_FILES.select {|pn| File.executable?(pn) }.
+	                            collect {|pn| File.basename(pn) }
+	gem.require_paths << EXTDIR.relative_path_from( BASEDIR ).to_s if EXTDIR.exist?
 
 	if EXTCONF.exist?
 		gem.extensions << EXTCONF.relative_path_from( BASEDIR ).to_s
 	end
 
-	gem.files             = RELEASE_FILES.
-		collect {|f| f.relative_path_from(BASEDIR).to_s }
-	gem.test_files        = SPEC_FILES.
-		collect {|f| f.relative_path_from(BASEDIR).to_s }
-		
+	gem.files             = RELEASE_FILES
+	gem.test_files        = SPEC_FILES
+
 	DEPENDENCIES.each do |name, version|
 		version = '>= 0' if version.length.zero?
 		gem.add_runtime_dependency( name, version )
 	end
-	
-	# Developmental dependencies don't work as of RubyGems 1.2.0
-	unless Gem::Version.new( Gem::RubyGemsVersion ) <= Gem::Version.new( "1.2.0" )
-		DEVELOPMENT_DEPENDENCIES.each do |name, version|
-			version = '>= 0' if version.length.zero?
-			gem.add_development_dependency( name, version )
-		end
-	end
-	
+
 	REQUIREMENTS.each do |name, version|
 		gem.requirements << [ name, version ].compact.join(' ')
 	end
 end
 
-# Manual-generation config
-MANUALDIR = DOCSDIR + 'manual'
-
 $trace = Rake.application.options.trace ? true : false
 $dryrun = Rake.application.options.dryrun ? true : false
-
+$include_dev_dependencies = false
 
 # Load any remaining task libraries
 RAKE_TASKLIBS.each do |tasklib|
-	next if tasklib =~ %r{/(helpers|svn|verifytask)\.rb$}
+	next if tasklib.to_s =~ %r{/helpers\.rb$}
 	begin
-		require tasklib
+		trace "  loading tasklib %s" % [ tasklib ]
+		import tasklib
 	rescue ScriptError => err
 		fail "Task library '%s' failed to load: %s: %s" %
 			[ tasklib, err.class.name, err.message ]
@@ -265,19 +291,15 @@ task :default  => [:clean, :local, :spec, :rdoc, :package]
 ### Task the local Rakefile can append to -- no-op by default
 task :local
 
-
 ### Task: clean
 CLEAN.include 'coverage'
 CLOBBER.include 'artifacts', 'coverage.info', PKGDIR
 
-# Target to hinge on ChangeLog updates
-file SVN_ENTRIES
-
 ### Task: changelog
-file 'ChangeLog' => SVN_ENTRIES.to_s do |task|
+file 'ChangeLog' do |task|
 	log "Updating #{task.name}"
 
-	changelog = make_svn_changelog()
+	changelog = make_changelog()
 	File.open( task.name, 'w' ) do |fh|
 		fh.print( changelog )
 	end
@@ -288,15 +310,15 @@ end
 desc "Cruisecontrol build"
 task :cruise => [:clean, 'spec:quiet', :package] do |task|
 	raise "Artifacts dir not set." if ARTIFACTS_DIR.to_s.empty?
-	artifact_dir = ARTIFACTS_DIR.cleanpath + ENV['CC_BUILD_LABEL']
+	artifact_dir = ARTIFACTS_DIR.cleanpath + (CC_BUILD_LABEL || Time.now.strftime('%Y%m%d-%T'))
 	artifact_dir.mkpath
-	
+
 	coverage = BASEDIR + 'coverage'
 	if coverage.exist? && coverage.directory?
 		$stderr.puts "Copying coverage stats..."
 		FileUtils.cp_r( 'coverage', artifact_dir )
 	end
-	
+
 	$stderr.puts "Copying packages..."
 	FileUtils.cp_r( FileList['pkg/*'].to_a, artifact_dir )
 end
@@ -305,7 +327,7 @@ end
 desc "Update the build system to the latest version"
 task :update_build do
 	log "Updating the build system"
-	sh 'svn', 'up', RAKE_TASKDIR
+	run 'hg', '-R', RAKE_TASKDIR, 'pull', '-u'
 	log "Updating the Rakefile"
 	sh 'rake', '-f', RAKE_TASKDIR + 'Metarakefile'
 end