pluginfactory 1.0.6 → 1.0.7

data/Rakefile

@@ -7,7 +7,6 @@
 # Copyright (c) 2007-2010 The FaerieMUD Consortium
 #
 # Authors:
-#  * Martin Chase <stillflame@FaerieMUD.org>
 #  * Michael Granger <ged@FaerieMUD.org>
 #
 
@@ -19,6 +18,7 @@ BEGIN {
 	libdir = basedir + "lib"
 	extdir = libdir + Config::CONFIG['sitearch']
 
+	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
 	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
 	$LOAD_PATH.unshift( extdir.to_s ) unless $LOAD_PATH.include?( extdir.to_s )
 }
@@ -77,7 +77,7 @@ elsif VERSION_FILE.exist?
 	PKG_VERSION = VERSION_FILE.read[ /VERSION\s*=\s*['"](\d+\.\d+\.\d+)['"]/, 1 ]
 end
 
-PKG_VERSION ||= '0.0.0'
+PKG_VERSION = '0.0.0' unless defined?( PKG_VERSION ) && !PKG_VERSION.nil?
 
 PKG_FILE_NAME = "#{PKG_NAME.downcase}-#{PKG_VERSION}"
 GEM_FILE_NAME = "#{PKG_FILE_NAME}.gem"
@@ -92,7 +92,7 @@ EXTCONF       = EXTDIR + 'extconf.rb'
 
 ARTIFACTS_DIR = Pathname.new( CC_BUILD_ARTIFACTS )
 
-TEXT_FILES    = Rake::FileList.new( %w[Rakefile ChangeLog README LICENSE] )
+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}" )
@@ -168,34 +168,37 @@ include RakefileHelpers
 
 # Set the build ID if the mercurial executable is available
 if hg = which( 'hg' )
-	id = IO.read('|-') or exec hg.to_s, 'id', '-n'
-	PKG_BUILD = 'pre' + (id.chomp[ /^[[:xdigit:]]+/ ] || '1')
+	id = `#{hg} id -n`.chomp
+	PKG_BUILD = "pre%03d" % [(id.chomp[ /^[[:xdigit:]]+/ ] || '1')]
 else
-	PKG_BUILD = 'pre0'
+	PKG_BUILD = 'pre000'
 end
 SNAPSHOT_PKG_NAME = "#{PKG_FILE_NAME}.#{PKG_BUILD}"
 SNAPSHOT_GEM_NAME = "#{SNAPSHOT_PKG_NAME}.gem"
 
 # Documentation constants
 API_DOCSDIR = DOCSDIR + 'api'
+README_FILE = TEXT_FILES.find {|path| path =~ /^README/ } || 'README'
 RDOC_OPTIONS = [
-	'-w', '4',
-	'-HN',
-	'-i', '.',
-	'-m', 'README',
-	'-t', PKG_NAME,
-	'-W', 'http://deveiate.org/projects/PluginFactory/browser/'
+	'--tab-width=4',
+	'--show-hash',
+	'--include', BASEDIR.to_s,
+	"--main=#{README_FILE}",
+	"--title=#{PKG_NAME}",
   ]
 YARD_OPTIONS = [
-    '--protected',
-    '-r', 'README',
+	'--use-cache',
+	'--no-private',
+	'--protected',
+	'-r', README_FILE,
 	'--exclude', 'extconf\\.rb',
-    '--files', 'ChangeLog,LICENSE',
+	'--files', 'ChangeLog,LICENSE',
 	'--output-dir', API_DOCSDIR.to_s,
+	'--title', "#{PKG_NAME} #{PKG_VERSION}",
   ]
 
 # Release constants
-SMTP_HOST = ""
+SMTP_HOST = "mail.faeriemud.org"
 SMTP_PORT = 465 # SMTP + SSL
 
 # Project constants
@@ -205,22 +208,24 @@ PROJECT_DOCDIR = "#{PROJECT_PUBDIR}/#{PKG_NAME}"
 PROJECT_SCPPUBURL = "#{PROJECT_HOST}:#{PROJECT_PUBDIR}"
 PROJECT_SCPDOCURL = "#{PROJECT_HOST}:#{PROJECT_DOCDIR}"
 
+GEM_PUBHOST = 'rubygems.org'
+
 # Gem dependencies: gemname => version
 DEPENDENCIES = {
 }
 
 # Developer Gem dependencies: gemname => version
 DEVELOPMENT_DEPENDENCIES = {
-	'rake'        => '>= 0.8.7',
-	'rcodetools'  => '>= 0.7.0.0',
-	'rcov'        => '>= 0.8.1.2.0',
-	'rdoc'        => '>= 2.4.3',
-	'RedCloth'    => '>= 4.0.3',
-	'rspec'       => '>= 1.2.6',
-	'termios'     => '>= 0',
-	'text-format' => '>= 1.0.0',
-	'tmail'       => '>= 1.2.3.1',
-	'diff-lcs'    => '>= 1.1.2',
+	'rake'         => '>= 0.8.7',
+	'rcodetools'   => '>= 0.7.0.0',
+	'rcov'         => '>= 0.8.1.2.0',
+	'rdoc'         => '>= 2.4.3',
+	'RedCloth'     => '>= 4.0.3',
+	'rspec'        => '>= 1.2.6',
+	'ruby-termios' => '>= 0.9.6',
+	'text-format'  => '>= 1.0.0',
+	'tmail'        => '>= 1.2.3.1',
+	'diff-lcs'     => '>= 1.1.2',
 }
 
 # Non-gem requirements: packagename => version
@@ -247,7 +252,7 @@ GEMSPEC   = Gem::Specification.new do |gem|
 
 	gem.has_rdoc          = true
 	gem.rdoc_options      = RDOC_OPTIONS
-	gem.extra_rdoc_files  = %w[ChangeLog README LICENSE]
+	gem.extra_rdoc_files  = TEXT_FILES - [ 'Rakefile' ]
 
 	gem.bindir            = BINDIR.relative_path_from(BASEDIR).to_s
 	gem.executables       = BIN_FILES.select {|pn| File.executable?(pn) }.
@@ -261,6 +266,10 @@ GEMSPEC   = Gem::Specification.new do |gem|
 	gem.files             = RELEASE_FILES
 	gem.test_files        = SPEC_FILES
 
+	# signing key and certificate chain
+	gem.signing_key       = '/Volumes/Keys/ged-private_gem_key.pem'
+	gem.cert_chain        = [File.expand_path('~/.gem/ged-public_gem_cert.pem')]
+
 	DEPENDENCIES.each do |name, version|
 		version = '>= 0' if version.length.zero?
 		gem.add_runtime_dependency( name, version )

data/lib/pluginfactory.rb

@@ -77,7 +77,7 @@ class FactoryError < RuntimeError; end
 module PluginFactory
 
 	# Library version
-	VERSION = '1.0.6'
+	VERSION = '1.0.7'
 
 
 	### Logging 

data/rake/documentation.rb

@@ -13,6 +13,10 @@ $LOAD_PATH.unshift( DOCSLIB.to_s ) if DOCSLIB.exist?
 # Make relative string paths of all the stuff we need to generate docs for
 DOCFILES = Rake::FileList[ LIB_FILES + EXT_FILES + GEMSPEC.extra_rdoc_files ]
 
+# Documentation coverage constants
+COVERAGE_DIR    = BASEDIR + 'coverage'
+COVERAGE_REPORT = COVERAGE_DIR + 'documentation.txt'
+
 
 # Prefer YARD, fallback to RDoc
 begin
@@ -40,28 +44,66 @@ begin
 	end
 
 	class YARD::CLI::Base; include YardGlobals; end
+	class YARD::CLI::Command; include YardGlobals; end
 	class YARD::Parser::SourceParser; extend YardGlobals; include YardGlobals; end
 	class YARD::Parser::CParser; include YardGlobals; end
 	class YARD::CodeObjects::Base; include YardGlobals; end
 	class YARD::Handlers::Base; include YardGlobals; end
+	class YARD::Handlers::Processor; include YardGlobals; end
 	class YARD::Serializers::Base; include YardGlobals; end
+	class YARD::RegistryStore; include YardGlobals; end
+	class YARD::Docstring; include YardGlobals; end
 	module YARD::Templates::Helpers::ModuleHelper; include YardGlobals; end
+
+	if vvec(RUBY_VERSION) >= vvec("1.9.1")
+		# Monkeypatched to allow more than two '#' characters at the beginning
+		# of the comment line.
+		# Patched from yard-0.5.8
+		require 'yard/parser/ruby/ruby_parser'
+		class YARD::Parser::Ruby::RipperParser < Ripper
+			def on_comment(comment)
+				$stderr.puts "Adding comment: %p" % [ comment ]
+				visit_ns_token(:comment, comment)
+
+				comment = comment.gsub(/^\#+\s{0,1}/, '').chomp
+				append_comment = @comments[lineno - 1]
+
+				if append_comment && @comments_last_column == column
+					@comments.delete(lineno - 1)
+					comment = append_comment + "\n" + comment
+				end
+
+				@comments[lineno] = comment
+				@comments_last_column = column
+			end
+		end # class YARD::Parser::Ruby::RipperParser
+	end
+
 	# </metamonkeypatch>
 
 	YARD_OPTIONS = [] unless defined?( YARD_OPTIONS )
 
-	YARD::Rake::YardocTask.new( :apidocs ) do |task|
+	yardoctask = YARD::Rake::YardocTask.new( :apidocs ) do |task|
 		task.files   = DOCFILES
 		task.options = YARD_OPTIONS
+		task.options << '--debug' << '--verbose' if $trace
 	end
+	yardoctask.before = lambda {
+		trace "Calling yardoc like:",
+			"  yardoc %s" % [ quotelist(yardoctask.options + yardoctask.files).join(' ') ]
+	}
+
+	YARDOC_CACHE = BASEDIR + '.yardoc'
+	CLOBBER.include( YARDOC_CACHE.to_s )
+
 rescue LoadError
 	require 'rdoc/task'
 
-	desc "Build API documentation in #{DOCDIR}"
+	desc "Build API documentation in #{API_DOCSDIR}"
 	RDoc::Task.new( :apidocs ) do |task|
 		task.main     = "README"
 		task.rdoc_files.include( DOCFILES )
-		task.rdoc_dir = API_DOCSDIR
+		task.rdoc_dir = API_DOCSDIR.to_s
 		task.options  = RDOC_OPTIONS
 	end
 end
@@ -69,3 +111,5 @@ end
 # Need the DOCFILES to exist to build the API docs
 task :apidocs => DOCFILES
 
+CLEAN.include( API_DOCSDIR.to_s )
+

data/rake/helpers.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 #####################################################################
 ###	G L O B A L   H E L P E R   F U N C T I O N S
 #####################################################################
@@ -6,7 +7,6 @@
 
 require 'pathname'
 require 'uri'
-require 'open3'
 
 begin
 	require 'readline'
@@ -54,9 +54,12 @@ module RakefileHelpers
 	CLEAR_CURRENT_LINE = "\e[2K"
 
 
-    ###############
-    module_function
-    ###############
+	TAR_OPTS = { :compression => :gzip }
+
+
+	###############
+	module_function
+	###############
 
 	### Output a logging message
 	def log( *msg )
@@ -388,6 +391,7 @@ module RakefileHelpers
 	### capture groups, those will be returned in an Array, else the whole matching line
 	### is returned.
 	def find_pattern_in_pipe( regexp, *cmd )
+		require 'open3'
 		output = []
 
 		log( cmd.collect {|part| part =~ /\s/ ? part.inspect : part} ) 
@@ -436,6 +440,63 @@ module RakefileHelpers
 		return ver.split('.').collect {|char| char.to_i }.pack('N*')
 	end
 
+
+	### Archive::Tar::Reader#extract (as of 0.9.0) is broken w.r.t.
+	### permissions, so we have to do this ourselves.
+	def untar( tarfile, targetdir )
+		require 'archive/tar'
+		targetdir = Pathname( targetdir )
+		raise "No such directory: #{targetdir}" unless targetdir.directory?
+
+		reader = Archive::Tar::Reader.new( tarfile.to_s, TAR_OPTS )
+
+		mkdir_p( targetdir )
+		reader.each( true ) do |header, body|
+			path = targetdir + header[:path]
+			# trace "Header is: %p" % [ header ]
+
+			case header[:type]
+			when :file
+				trace "  #{path}"
+				path.open( File::WRONLY|File::EXCL|File::CREAT|File::TRUNC, header[:mode] ) do |fio|
+					bytesize = header[:size]
+					fio.write( body[0,bytesize] )
+				end
+
+			when :directory
+				trace "  #{path}"
+				path.mkpath
+
+			when :link
+				linktarget = targetdir + header[:dest]
+				trace "  #{path} => #{linktarget}"
+				path.make_link( linktarget.to_s )
+
+			when :symlink
+				linktarget = targetdir + header[:dest]
+				trace "  #{path} -> #{linktarget}" 
+				path.make_symlink( linktarget )
+			end
+		end
+
+	end
+
+
+	### Extract the contents of the specified +zipfile+ into the given +targetdir+.
+	def unzip( zipfile, targetdir, *files )
+		require 'zip/zip'
+		targetdir = Pathname( targetdir )
+		raise "No such directory: #{targetdir}" unless targetdir.directory?
+
+		Zip::ZipFile.foreach( zipfile ) do |entry|
+			# trace "  entry is: %p" % [ entry ]
+			next unless files.empty? || files.include?( entry.name )
+			target_path = targetdir + entry.name
+			# trace "  would extract to: %s" % [ target_path ]
+			entry.extract( target_path ) { true }
+		end
+	end
+
 end # module Rakefile::Helpers
 
 

data/rake/hg.rb

@@ -85,7 +85,7 @@ unless defined?( HG_DOTDIR )
 
 		### Return the list of files which are of status 'unknown'
 		def get_unknown_files
-			list = read_command_output( 'hg', 'status', '-un', '--no-color' )
+			list = read_command_output( 'hg', 'status', '-un', '--color', 'never' )
 			list = list.split( /\n/ )
 
 			trace "New files: %p" % [ list ]
@@ -215,13 +215,20 @@ unless defined?( HG_DOTDIR )
 			paths = get_repo_paths()
 			if origin_url = paths['default']
 				ask_for_confirmation( "Pull and update from '#{origin_url}'?", false ) do
-					run 'hg', 'pull', '-u'
+					Rake::Task['hg:pull_without_confirmation'].invoke
 				end
 			else
 				trace "Skipping pull: No 'default' path."
 			end
 		end
 
+
+		desc "Pull and update without confirmation"
+		task :pull_without_confirmation do
+			run 'hg', 'pull', '-u'
+		end
+
+
 		desc "Check the current code in if tests pass"
 		task :checkin => ['hg:pull', 'hg:newfiles', 'test', COMMIT_MSG_FILE] do
 			targets = get_target_args()
@@ -242,13 +249,18 @@ unless defined?( HG_DOTDIR )
 			paths = get_repo_paths()
 			if origin_url = paths['default']
 				ask_for_confirmation( "Push to '#{origin_url}'?", false ) do
-					run 'hg', 'push'
+					Rake::Task['hg:push_without_confirmation'].invoke
 				end
 			else
 				trace "Skipping push: No 'default' path."
 			end
 		end
 
+		desc "Push to the default repo without confirmation"
+		task :push_without_confirmation do
+			run 'hg', 'push'
+		end
+
 	end
 
 	if HG_DOTDIR.exist?

data/rake/manual.rb

@@ -147,9 +147,14 @@ module Manual
 
 			layout = self.config['layout'].sub( /\.page$/, '' )
 			templatepath = @layouts_dir + "#{layout}.page"
-			template = ERB.new( templatepath.read(:encoding => 'UTF-8') )
-			page = self
+			template = nil
+			if Object.const_defined?( :Encoding )
+				template = ERB.new( templatepath.read(:encoding => 'UTF-8') )
+			else
+				template = ERB.new( templatepath.read )
+			end
 
+			page = self
 			html = template.result( binding() )
 
 			# Use Tidy to clean up the html if 'cleanup' is turned on, but remove the Tidy

data/rake/packaging.rb

@@ -12,7 +12,13 @@ include Config
 ### Task: prerelease
 desc "Append the package build number to package versions"
 task :prerelease do
-	GEMSPEC.version.version += ".#{PKG_BUILD}"
+	GEMSPEC.version.version << ".#{PKG_BUILD}"
+	Rake::Task[:gem].clear
+
+	Gem::PackageTask.new( GEMSPEC ) do |pkg|
+		pkg.need_zip = true
+		pkg.need_tar = true
+	end
 end
 
 

data/rake/publishing.rb

@@ -13,6 +13,7 @@ $publish_privately = false
 
 ### Add SSL to Net::SMTP
 class Net::SMTP
+
 	def ssl_start( helo='localhost.localdomain', user=nil, secret=nil, authtype=nil )
 		if block_given?
 			begin
@@ -93,6 +94,9 @@ begin
 	require 'etc'
 	require 'socket'
 	require 'text/format'
+	require 'rubygems/gemcutter_utilities'
+
+	include Gem::GemcutterUtilities
 
 	### Generate a valid RFC822 message-id
 	def gen_message_id
@@ -104,6 +108,48 @@ begin
 	end
 
 
+	### Fetch the rubygems API token if it hasn't been already.
+	def sign_in_to_rubygems
+		return if Gem.configuration.rubygems_api_key
+
+		log "Enter your RubyGems.org credentials."
+
+		email    = prompt "   Email: "
+		password = prompt_for_password( "Password: " )
+
+		response = rubygems_api_request( :get, "api/v1/api_key" ) do |request|
+			request.basic_auth( email, password )
+		end
+
+		with_response( response ) do |resp|
+			log "Signed in."
+			Gem.configuration.rubygems_api_key = resp.body
+		end
+	end
+
+
+	### Push the gem at the specified +path+ to the rubygems server at +gemhost+.
+	def push_gem( path, gemhost )
+		ENV['RUBYGEMS_HOST'] = "http://#{gemhost}"
+
+		sign_in_to_rubygems()
+
+		response = rubygems_api_request( :post, "api/v1/gems" ) do |request|
+			request.body = Gem.read_binary( path )
+			request.add_field "Content-Length", request.body.size
+			request.add_field "Content-Type",   "application/octet-stream"
+			request.add_field "Authorization",  Gem.configuration.rubygems_api_key
+		end
+
+		case response
+		when Net::HTTPSuccess
+			log( response.body )
+		else
+			fail( response.body )
+		end
+	end
+
+
 	namespace :release do
 		task :default => [ :prep_release, :upload, :publish, :announce ]
 
@@ -133,120 +179,147 @@ begin
 		end
 		CLOBBER.include( RELEASE_NOTES_FILE )
 
+		# Only define upload tasks if there's an upload host
+		if PROJECT_HOST.empty?
+			task :no_upload_host do
+				log "Skipping upload: no upload host."
+			end
+			task :upload => :no_upload_host
+			task :upload_docs => :no_upload_host
+			task :upload_packages => :no_upload_host
+		else
+			desc "Upload project documentation and packages to #{PROJECT_HOST}"
+			task :upload => [ :upload_docs, :upload_packages ]
+			task :project => :upload # the old name
+
+			desc "Publish the project docs to #{PROJECT_HOST}"
+			task :upload_docs => [ :apidocs ] do
+				when_writing( "Publishing docs to #{PROJECT_SCPDOCURL}" ) do
+					log "Uploading API documentation to %s:%s" % [ PROJECT_HOST, PROJECT_DOCDIR ]
+					run 'ssh', PROJECT_HOST, "rm -rf #{PROJECT_DOCDIR}"
+					run 'scp', '-qCr', API_DOCSDIR, PROJECT_SCPDOCURL
+				end
+			end
 
-		desc "Upload project documentation and packages to #{PROJECT_HOST}"
-		task :upload => [ :upload_docs, :upload_packages ]
-		task :project => :upload # the old name
-
-		desc "Publish the project docs to #{PROJECT_HOST}"
-		task :upload_docs => [ :apidocs ] do
-			when_writing( "Publishing docs to #{PROJECT_SCPDOCURL}" ) do
-				log "Uploading API documentation to %s:%s" % [ PROJECT_HOST, PROJECT_DOCDIR ]
-				run 'ssh', PROJECT_HOST, "rm -rf #{PROJECT_DOCDIR}"
-				run 'scp', '-qCr', API_DOCSDIR, PROJECT_SCPDOCURL
+			desc "Publish the project packages to #{PROJECT_HOST}"
+			task :upload_packages => [ :package ] do
+				when_writing( "Uploading packages") do
+					pkgs = Pathname.glob( PKGDIR + "#{PKG_FILE_NAME}.{gem,tar.gz,tar.bz2,zip}" )
+					log "Uploading %d packages to #{PROJECT_SCPPUBURL}" % [ pkgs.length ]
+					pkgs.each do |pkgfile|
+						run 'scp', '-qC', pkgfile, PROJECT_SCPPUBURL
+	                end
+	            end
 			end
 		end
 
-		desc "Publish the project packages to #{PROJECT_HOST}"
-		task :upload_packages => [ :package ] do
-			when_writing( "Uploading packages") do
-				pkgs = Pathname.glob( PKGDIR + "#{PKG_FILE_NAME}.{gem,tar.gz,tar.bz2,zip}" )
-				log "Uploading %d packages to #{PROJECT_SCPPUBURL}" % [ pkgs.length ]
-				pkgs.each do |pkgfile|
-					run 'scp', '-qC', pkgfile, PROJECT_SCPPUBURL
-                end
-            end
-		end
+		# Only define the announcement tasks if there are addresses to announce to
+		if RELEASE_ANNOUNCE_ADDRESSES.empty?
+			task :no_announce_addresses do
+				log "Skipping announcement: no announce addresses"
+			end
+			task :announce => :no_announce_addresses
 
+		else
+			file RELEASE_ANNOUNCE_FILE => [RELEASE_NOTES_FILE] do |task|
+				relnotes = File.read( RELEASE_NOTES_FILE )
+				announce_body = %{
 
-		file RELEASE_ANNOUNCE_FILE => [RELEASE_NOTES_FILE] do |task|
-			relnotes = File.read( RELEASE_NOTES_FILE )
-			announce_body = %{
+					Version #{PKG_VERSION} of #{PKG_NAME} has been released.
 
-				Version #{PKG_VERSION} of #{PKG_NAME} has been released.
+					#{Text::Format.new(:first_indent => 0).format_one_paragraph(GEMSPEC.description)}
 
-				#{Text::Format.new(:first_indent => 0).format_one_paragraph(GEMSPEC.description)}
+					== Project Page
 
-				== Project Page
+					  #{GEMSPEC.homepage}
 
-				  #{GEMSPEC.homepage}
+					== Installation
 
-				== Installation
+					Via gems:
 
-				Via gems:
+					  $ sudo gem install #{GEMSPEC.name}
 
-				  $ sudo gem install #{GEMSPEC.name}
+					or from source:
 
-				or from source:
+					  $ wget http://deveiate.org/code/#{PKG_FILE_NAME}.tar.gz
+					  $ tar -xzvf #{PKG_FILE_NAME}.tar.gz
+					  $ cd #{PKG_FILE_NAME}
+					  $ sudo rake install
 
-				  $ wget http://deveiate.org/code/#{PKG_FILE_NAME}.tar.gz
-				  $ tar -xzvf #{PKG_FILE_NAME}.tar.gz
-				  $ cd #{PKG_FILE_NAME}
-				  $ sudo rake install
+					== Changes
+					#{relnotes}
+				}.gsub( /^\t+/, '' )
 
-				== Changes
-				#{relnotes}
-			}.gsub( /^\t+/, '' )
+				File.open( task.name, File::WRONLY|File::TRUNC|File::CREAT ) do |fh|
+					fh.print( announce_body )
+				end
 
-			File.open( task.name, File::WRONLY|File::TRUNC|File::CREAT ) do |fh|
-				fh.print( announce_body )
+				edit task.name
 			end
+			CLOBBER.include( RELEASE_ANNOUNCE_FILE )
 
-			edit task.name
-		end
-		CLOBBER.include( RELEASE_ANNOUNCE_FILE )
 
+			desc 'Send out a release announcement'
+			task :announce => [RELEASE_ANNOUNCE_FILE] do
+				email         = TMail::Mail.new
 
-		desc 'Send out a release announcement'
-		task :announce => [RELEASE_ANNOUNCE_FILE] do
-			email         = TMail::Mail.new
+				if $publish_privately || RELEASE_ANNOUNCE_ADDRESSES.empty?
+					trace "Sending private announce mail"
+					email.to = 'rubymage@gmail.com'
+				else
+					trace "Sending public announce mail"
+					email.to  = RELEASE_ANNOUNCE_ADDRESSES
+					email.bcc = 'rubymage@gmail.com'
+				end
 
-			if $publish_privately || RELEASE_ANNOUNCE_ADDRESSES.empty?
-				trace "Sending private announce mail"
-				email.to = 'rubymage@gmail.com'
-			else
-				trace "Sending public announce mail"
-				email.to  = RELEASE_ANNOUNCE_ADDRESSES
-				email.bcc = 'rubymage@gmail.com'
-			end
-			email.from    = 'Michael Granger <mgranger@laika.com>'
-			email.subject = "[ANN] #{PKG_NAME} #{PKG_VERSION}"
-			email.body    = File.read( RELEASE_ANNOUNCE_FILE )
-			email.date    = Time.new
-
-			email.message_id = gen_message_id()
-
-			log "About to send the following email:"
-			puts '---',
-			     email.to_s,
-			     '---'
-
-				ask_for_confirmation( "Will send via #{SMTP_HOST}." ) do
-				pwent = Etc.getpwuid( Process.euid )
-				curuser = pwent ? pwent.name : 'unknown'
-				username = prompt_with_default( "SMTP user", curuser )
-				password = prompt_for_password()
-
-				trace "Creating SMTP connection to #{SMTP_HOST}:#{SMTP_PORT}"
-				smtp = Net::SMTP.new( SMTP_HOST, SMTP_PORT )
-				smtp.set_debug_output( $stdout )
-				smtp.esmtp = true
-
-				trace "connecting..."
-				smtp.ssl_start( Socket.gethostname, username, password, :plain ) do |smtp|
-					trace "sending message..."
-					smtp.send_message( email.to_s, email.from, email.to )
+				from = prompt_with_default( "Send announcement as:",
+					'Michael Granger <ged@FaerieMUD.org>' ) or fail
+
+				email.from    = from
+				email.subject = "[ANN] #{PKG_NAME} #{PKG_VERSION}"
+				email.body    = File.read( RELEASE_ANNOUNCE_FILE )
+				email.date    = Time.new
+
+				email.message_id = gen_message_id()
+
+				log "About to send the following email:"
+				puts '---',
+				     email.to_s,
+				     '---'
+
+					ask_for_confirmation( "Will send via #{SMTP_HOST}." ) do
+					pwent = Etc.getpwuid( Process.euid )
+					curuser = pwent ? pwent.name : 'unknown'
+					username = prompt_with_default( "SMTP user", curuser )
+					password = prompt_for_password()
+
+					trace "Creating SMTP connection to #{SMTP_HOST}:#{SMTP_PORT}"
+					smtp = Net::SMTP.new( SMTP_HOST, SMTP_PORT )
+					smtp.set_debug_output( $stdout )
+					smtp.esmtp = true
+
+					trace "connecting..."
+					smtp.ssl_start( Socket.gethostname, username, password, :plain ) do |smtp|
+						trace "sending message..."
+						smtp.send_message( email.to_s, email.from, email.to )
+					end
+					trace "done."
 				end
-				trace "done."
 			end
 		end
 
-
-		desc 'Publish the new release to Gemcutter'
-		task :publish => [:clean, :gem, :notes] do |task|
-			ask_for_confirmation( "Publish #{GEM_FILE_NAME} to Gemcutter?", false ) do
-				gempath = PKGDIR + GEM_FILE_NAME
-				sh 'gem', 'push', gempath
+		if GEM_PUBHOST.empty?
+			task :no_gem_host do
+				log "Skipping gem push: no gem publication host."
+			end
+			task :publish => :no_gem_host
+		else
+			desc 'Publish the new gem to #{GEM_PUBHOST}'
+			task :publish => [:clean, :gem, :notes] do |task|
+				ask_for_confirmation( "Publish #{GEM_FILE_NAME} to #{GEM_PUBHOST}?", false ) do
+					gempath = PKGDIR + GEM_FILE_NAME
+					push_gem( gempath, GEM_PUBHOST )
+				end
 			end
 		end
 	end
@@ -262,6 +335,7 @@ rescue LoadError => err
 	end
 
 	task :release => :no_release_tasks
+	task "release:rerelease" => :no_release_tasks
 	task "release:announce" => :no_release_tasks
 	task "release:publish" => :no_release_tasks
 	task "release:notes" => :no_release_tasks

data/spec/pluginfactory_spec.rb

@@ -6,6 +6,7 @@ BEGIN {
 
 	libdir = basedir + "lib"
 
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 

metadata

@@ -1,20 +1,41 @@
 --- !ruby/object:Gem::Specification 
 name: pluginfactory
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Martin Chase, Michael Granger
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDLDCCAhSgAwIBAgIBADANBgkqhkiG9w0BAQUFADA8MQwwCgYDVQQDDANnZWQx
+  FzAVBgoJkiaJk/IsZAEZFgdfYWVyaWVfMRMwEQYKCZImiZPyLGQBGRYDb3JnMB4X
+  DTEwMDkxNjE0NDg1MVoXDTExMDkxNjE0NDg1MVowPDEMMAoGA1UEAwwDZ2VkMRcw
+  FQYKCZImiZPyLGQBGRYHX2FlcmllXzETMBEGCgmSJomT8ixkARkWA29yZzCCASIw
+  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALy//BFxC1f/cPSnwtJBWoFiFrir
+  h7RicI+joq/ocVXQqI4TDWPyF/8tqkvt+rD99X9qs2YeR8CU/YiIpLWrQOYST70J
+  vDn7Uvhb2muFVqq6+vobeTkILBEO6pionWDG8jSbo3qKm1RjKJDwg9p4wNKhPuu8
+  KGue/BFb67KflqyApPmPeb3Vdd9clspzqeFqp7cUBMEpFS6LWxy4Gk+qvFFJBJLB
+  BUHE/LZVJMVzfpC5Uq+QmY7B+FH/QqNndn3tOHgsPadLTNimuB1sCuL1a4z3Pepd
+  TeLBEFmEao5Dk3K/Q8o8vlbIB/jBDTUx6Djbgxw77909x6gI9doU4LD5XMcCAwEA
+  AaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFJeoGkOr9l4B
+  +saMkW/ZXT4UeSvVMA0GCSqGSIb3DQEBBQUAA4IBAQBG2KObvYI2eHyyBUJSJ3jN
+  vEnU3d60znAXbrSd2qb3r1lY1EPDD3bcy0MggCfGdg3Xu54z21oqyIdk8uGtWBPL
+  HIa9EgfFGSUEgvcIvaYqiN4jTUtidfEFw+Ltjs8AP9gWgSIYS6Gr38V0WGFFNzIH
+  aOD2wmu9oo/RffW4hS/8GuvfMzcw7CQ355wFR4KB/nyze+EsZ1Y5DerCAagMVuDQ
+  U0BLmWDFzPGGWlPeQCrYHCr+AcJz+NRnaHCKLZdSKj/RHuTOt+gblRex8FAh8NeA
+  cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
+  -----END CERTIFICATE-----
 
-date: 2010-03-23 00:00:00 -07:00
+date: 2010-09-27 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -61,37 +82,36 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
-- -w
-- "4"
-- -HN
-- -i
+- --tab-width=4
+- --show-hash
+- --include
 - .
-- -m
-- README
-- -t
-- pluginfactory
-- -W
-- http://deveiate.org/projects/PluginFactory/browser/
+- --main=README
+- --title=pluginfactory
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A mixin for making plugin classes

metadata.gz.sig

@@ -0,0 +1,2 @@
+5���,�Z�ӵ)h�������Z�1q�����~����T|�� �
�6�"��*.<�d:�O��I��=���o�J�x� �|��~͖�-=�z�
+Y�8�?a^� MѼ�}X`�Bke��a��5ä{��֍M�coa9�Mc_}��r�����/gD��KIM�3��j-��N���A��	x���\����o�&�<6Á�M�G����F�(Ț����
B�C�{��]0P�Y5�r(;�`��[/�J��xE.e�ߙj