pluginfactory 1.0.5 → 1.0.6

data/rake/hg.rb

@@ -22,6 +22,8 @@ unless defined?( HG_DOTDIR )
 	### 
 
 	module MercurialHelpers
+		require './helpers.rb' unless defined?( RakefileHelpers )
+		include RakefileHelpers
 
 		###############
 		module_function
@@ -208,8 +210,20 @@ unless defined?( HG_DOTDIR )
 		task :add => :newfiles
 
 
+		desc "Pull and update from the default repo"
+		task :pull do
+			paths = get_repo_paths()
+			if origin_url = paths['default']
+				ask_for_confirmation( "Pull and update from '#{origin_url}'?", false ) do
+					run 'hg', 'pull', '-u'
+				end
+			else
+				trace "Skipping pull: No 'default' path."
+			end
+		end
+
 		desc "Check the current code in if tests pass"
-		task :checkin => ['hg:newfiles', 'test', COMMIT_MSG_FILE] do
+		task :checkin => ['hg:pull', 'hg:newfiles', 'test', COMMIT_MSG_FILE] do
 			targets = get_target_args()
 			$stderr.puts '---', File.read( COMMIT_MSG_FILE ), '---'
 			ask_for_confirmation( "Continue with checkin?" ) do

data/rake/manual.rb

@@ -147,7 +147,7 @@ module Manual
 
 			layout = self.config['layout'].sub( /\.page$/, '' )
 			templatepath = @layouts_dir + "#{layout}.page"
-			template = ERB.new( templatepath.read )
+			template = ERB.new( templatepath.read(:encoding => 'UTF-8') )
 			page = self
 
 			html = template.result( binding() )
@@ -565,7 +565,7 @@ module Manual
 				manual_pages = setup_page_conversion_tasks( sourcedir, outputdir, catalog )
 
 				desc "Build the manual"
-				task :build => [ :rdoc, :copy_resources, :copy_apidocs, :generate_pages ]
+				task :build => [ :apidocs, :copy_resources, :copy_apidocs, :generate_pages ]
 
 				task :clobber do
 					RakeFileUtils.verbose( $verbose ) do
@@ -686,8 +686,8 @@ module Manual
 			end
 
 			desc "Copy API documentation to the manual output directory"
-			task :copy_apidocs => :rdoc do
-				cp_r( RDOCDIR, outputdir )
+			task :copy_apidocs => :apidocs do
+				cp_r( API_DOCSDIR, outputdir )
 			end
 
 			# Now group all the resource file tasks into a containing task
@@ -713,7 +713,7 @@ if MANUALDIR.exist?
 
 		Manual::GenTask.new do |manual|
 			manual.metadata.version = PKG_VERSION
-			manual.metadata.api_dir = RDOCDIR
+			manual.metadata.api_dir = API_DOCSDIR
 			manual.output_dir = MANUALOUTPUTDIR
 			manual.base_dir = MANUALDIR
 			manual.source_dir = 'src'

data/rake/packaging.rb

@@ -1,17 +1,21 @@
-# 
-# Packaging Rake Tasks
-
-# 
+#####################################################################
+###	P A C K A G I N G   T A S K S
+#####################################################################
 
 require 'rbconfig'
 require 'pathname'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
-require Pathname( __FILE__ ).dirname.expand_path + 'hg.rb'
 
 include Config
 
+### Task: prerelease
+desc "Append the package build number to package versions"
+task :prerelease do
+	GEMSPEC.version.version += ".#{PKG_BUILD}"
+end
+
+
 ### Task: gem
 ### Task: package
 Rake::PackageTask.new( PKG_NAME, PKG_VERSION ) do |task|
@@ -24,34 +28,9 @@ end
 task :package => [:gem]
 
 
-### Task: gem
-gempath = PKGDIR + GEM_FILE_NAME
-
-desc "Build a RubyGem package (#{GEM_FILE_NAME})"
-task :gem => gempath.to_s
-file gempath.to_s => [PKGDIR.to_s] + GEMSPEC.files do
-	when_writing( "Creating GEM" ) do
-		Gem::Builder.new( GEMSPEC ).build
-		verbose( true ) do
-			mv GEM_FILE_NAME, gempath
-		end
-	end
-end
-
-
-prerelease_gempath = PKGDIR + SNAPSHOT_GEM_NAME
-
-desc "Build a pre-release RubyGem package"
-task :prerelease_gem => prerelease_gempath.to_s
-file prerelease_gempath.to_s => [PKGDIR.to_s] + GEMSPEC.files do
-	when_writing( "Creating prerelease GEM" ) do
-		gemspec = GEMSPEC.clone
-		gemspec.version = Gem::Version.create( "%s.%s" % [GEMSPEC.version, PKG_BUILD] )
-		Gem::Builder.new( gemspec ).build
-		verbose( true ) do
-			mv SNAPSHOT_GEM_NAME, prerelease_gempath
-		end
-	end
+Gem::PackageTask.new( GEMSPEC ) do |pkg|
+	pkg.need_zip = true
+	pkg.need_tar = true
 end
 
 

data/rake/publishing.rb

@@ -34,7 +34,13 @@ class Net::SMTP
 
 	def do_ssl_start( helodomain, user, secret, authtype )
 		raise IOError, 'SMTP session already started' if @started
-		check_auth_args user, secret, authtype if user or secret
+		if user or secret
+			if self.method( :check_auth_args ).arity == 3
+				check_auth_args( user, secret, authtype )
+			else
+				check_auth_args( user, secret )
+			end
+		end
 
 		# Open the connection
       	@debug_output << "opening connection to #{@address}...\n" if @debug_output
@@ -85,7 +91,6 @@ begin
 	require 'tmail'
 	require 'net/smtp'
 	require 'etc'
-	require 'rubyforge'
 	require 'socket'
 	require 'text/format'
 
@@ -134,11 +139,11 @@ begin
 		task :project => :upload # the old name
 
 		desc "Publish the project docs to #{PROJECT_HOST}"
-		task :upload_docs => [ :rdoc ] do
+		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', RDOCDIR, PROJECT_SCPDOCURL
+				run 'scp', '-qCr', API_DOCSDIR, PROJECT_SCPDOCURL
 			end
 		end
 
@@ -195,15 +200,16 @@ begin
 		desc 'Send out a release announcement'
 		task :announce => [RELEASE_ANNOUNCE_FILE] do
 			email         = TMail::Mail.new
-			if $publish_privately
+
+			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  = 'Ruby-Talk List <ruby-talk@ruby-lang.org>'
+				email.to  = RELEASE_ANNOUNCE_ADDRESSES
 				email.bcc = 'rubymage@gmail.com'
 			end
-			email.from    = GEMSPEC.email
+			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
@@ -236,61 +242,11 @@ begin
 		end
 
 
-		desc 'Publish the new release to RubyForge'
-		task :publish => [:clean, :package, :notes] do |task|
-			project = GEMSPEC.rubyforge_project
-
-			if $publish_privately
-				log "Skipping push of release files to RubyForge"
-			else
-				rf = RubyForge.new
-				log "Loading RubyForge config"
-				rf.configure
-
-				group_id = rf.autoconfig['group_ids'][RUBYFORGE_GROUP] or
-					fail "Your configuration doesn't have a group id for '#{RUBYFORGE_GROUP}'"
-
-				# If this project doesn't yet exist, create it
-				unless rf.autoconfig['package_ids'].key?( project )
-					ask_for_confirmation( "Package '#{project}' doesn't exist on RubyForge. Create it?" ) do
-						log "Creating new package '#{project}'"
-						rf.create_package( group_id, project )
-					end
-				end
-
-				package_id = rf.autoconfig['package_ids'][ project ]
-
-				# Make sure this release doesn't already exist
-				releases = rf.autoconfig['release_ids']
-				if releases.key?( GEMSPEC.name ) && releases[ GEMSPEC.name ].key?( PKG_VERSION )
-					log "Rubyforge seems to already have #{ PKG_FILE_NAME }"
-				else
-					config = rf.userconfig or
-						fail "You apparently haven't set up your RubyForge credentials on this machine."
-					config['release_notes'] = GEMSPEC.description
-					config['release_changes'] = File.read( RELEASE_NOTES_FILE )
-
-					files = FileList[ PKGDIR + GEM_FILE_NAME ]
-					files.include PKGDIR + "#{PKG_FILE_NAME}.tar.gz"
-					files.include PKGDIR + "#{PKG_FILE_NAME}.tar.bz2"
-					files.include PKGDIR + "#{PKG_FILE_NAME}.zip"
-
-					log "Releasing #{PKG_FILE_NAME}"
-					when_writing do
-						log "Publishing to RubyForge: \n",
-							"\tproject: #{RUBYFORGE_GROUP}\n",
-							"\tpackage: #{PKG_NAME.downcase}\n",
-							"\tpackage version: #{PKG_VERSION}\n",
-							"\tfiles: " + files.collect {|f| f.to_s }.join(', ') + "\n"
-
-						ask_for_confirmation( "Publish to RubyForge?" ) do
-							log 'Logging in...'
-							rf.login
-							log "Adding the new release to the '#{project}' project"
-							rf.add_release( group_id, package_id, PKG_VERSION, *files )
-						end
-					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
 			end
 		end
 	end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: pluginfactory
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Martin Chase, Michael Granger
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 -08:00
+date: 2010-03-23 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -40,17 +45,16 @@ files:
 - lib/pluginfactory.rb
 - rake/191_compat.rb
 - rake/dependencies.rb
+- rake/documentation.rb
 - rake/helpers.rb
 - rake/hg.rb
 - rake/manual.rb
 - rake/packaging.rb
 - rake/publishing.rb
-- rake/rdoc.rb
 - rake/style.rb
 - rake/svn.rb
 - rake/testing.rb
 - rake/verifytask.rb
-- rake/win32.rb
 has_rdoc: true
 homepage: http://deveiate.org/projects/PluginFactory/
 licenses: []
@@ -74,18 +78,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: pluginfactory
-rubygems_version: 1.3.5
+rubyforge_project: 
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A mixin for making plugin classes

data/rake/rdoc.rb

@@ -1,30 +0,0 @@
-# 
-# RDoc Rake tasks
-
-# 
-
-gem 'rdoc', '>= 2.4.3'
-
-require 'rubygems'
-require 'rdoc/rdoc'
-require 'rake/clean'
-require 'rdoc/task'
-
-# Append docs/lib to the load path if it exists for a locally-installed Darkfish
-DOCSLIB = DOCSDIR + 'lib'
-$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 ]
-
-
-directory RDOCDIR.to_s
-CLOBBER.include( RDOCDIR )
-
-desc "Build API documentation in #{RDOCDIR}"
-RDoc::Task.new do |task|
-	task.main = "README"
-	task.rdoc_files.include( DOCFILES )
-	task.rdoc_dir = RDOCDIR.to_s
-	task.options = RDOC_OPTIONS
-end

data/rake/win32.rb

@@ -1,190 +0,0 @@
-# 
-# Win32-specific tasks (cross-compiling, etc.)
-# 
-# Thanks to some people that understand this stuff better than me for
-# posting helpful blog posts. This stuff is an amalgam of stuff they did:
-# 
-# * Mauricio Fernandez
-#   http://eigenclass.org/hiki/cross+compiling+rcovrt
-# 
-# * Jeremy Hinegardner
-#   http://www.copiousfreetime.org/articles/2008/10/12/building-gems-for-windows.html
-# 
-# * Aaron Patterson
-#   http://tenderlovemaking.com/2008/11/21/cross-compiling-ruby-gems-for-win32/
-
-require 'rubygems'
-require 'rake'
-require 'pathname'
-require 'rubygems/platform'
-require 'rbconfig'
-require 'uri'
-require 'net/ftp'
-
-HOMEDIR        = Pathname( '~' ).expand_path
-RUBYVERSION    = '1.8.6-p287'
-RUBYVERSION_MAJORMINOR = RUBYVERSION[/^\d+\.\d+/]
-
-RUBY_DL_BASE   = "ftp://ftp.ruby-lang.org/pub/ruby/#{RUBYVERSION_MAJORMINOR}/"
-RUBY_DL_URI    = URI( RUBY_DL_BASE + "ruby-#{RUBYVERSION}.tar.gz" )
-
-XCOMPILER_DIR  = HOMEDIR + '.ruby_mingw32'
-
-XCOMPILER_DL   = XCOMPILER_DIR + "ruby-#{RUBYVERSION}.tar.gz"
-XCOMPILER_SRC  = XCOMPILER_DIR + "ruby-#{RUBYVERSION}"
-
-XCOMPILER_BIN  = XCOMPILER_DIR + 'bin'
-XCOMPILER_LIB  = XCOMPILER_DIR + 'lib'
-XCOMPILER_RUBY = XCOMPILER_BIN + 'ruby.exe'
-
-XCOMPILER_LOAD_PATH = XCOMPILER_LIB + "ruby/#{RUBYVERSION_MAJORMINOR}/i386-mingw32"
-
-TAR_OPTS = { :compression => :gzip }
-
-WIN32_GEMSPEC = GEMSPEC.dup
-WIN32_GEMSPEC.files += FileList[ EXTDIR + '**.{dll,so}' ]
-WIN32_GEMSPEC.platform = Gem::Platform.new( 'i386-mingw32' )
-WIN32_GEMSPEC.extensions = []
-
-
-CONFIGURE_CMD = %W[
-	env
-		ac_cv_func_getpgrp_void=no
-		ac_cv_func_setpgrp_void=yes
-		rb_cv_negative_time_t=no
-		ac_cv_func_memcmp_working=yes
-		rb_cv_binary_elf=no
-    ./configure
-	    --host=i386-mingw32
-	    --target=i386-mingw32
-	    --build=#{Config::CONFIG['build']}
-	    --prefix=#{XCOMPILER_DIR}
-]
-
-### 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 )
-	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
-
-
-begin
-	require 'archive/tar'
-
-	namespace :win32 do
-		directory XCOMPILER_DIR.to_s
-
-		file XCOMPILER_DL => XCOMPILER_DIR do
-			# openuri can't handle this -- passive ftp required?
-			# run 'wget', '-O', XCOMPILER_DL, RUBY_DL_URI
-			log "Downloading ruby distro from %s" % [ RUBY_DL_URI ]
-			ftp = Net::FTP.new( RUBY_DL_URI.host )
-			ftp.login
-			ftp.getbinaryfile( RUBY_DL_URI.path, XCOMPILER_DL, 4096 )
-			ftp.close
-		end
-
-		directory XCOMPILER_SRC.to_s
-		task XCOMPILER_SRC => [ XCOMPILER_DIR, XCOMPILER_DL ] do
-			if XCOMPILER_SRC.exist?
-				trace "Rake fails. #{XCOMPILER_SRC} already exists."
-			else
-				untar( XCOMPILER_DL, XCOMPILER_DIR )
-			end
-		end
-
-		file XCOMPILER_RUBY => XCOMPILER_SRC do
-			Dir.chdir( XCOMPILER_SRC ) do
-				unless File.exist?( 'Makefile.in.orig' )
-					File.open( 'Makefile.in.new', IO::CREAT|IO::WRONLY|IO::EXCL ) do |ofh|
-						IO.readlines( 'Makefile.in' ).each do |line|
-							next if line.include?( 0.chr )
-							trace "  copying line: %p" % [ line ]
-							line.sub!( /ALT_SEPARATOR = ".*?"/, "ALT_SEPARATOR = 92.chr" )
-							ofh.write( line )
-						end
-					end
-
-					mv 'Makefile.in', 'Makefile.in.orig'
-					mv 'Makefile.in.new', 'Makefile.in'
-				end
-
-				run *CONFIGURE_CMD
-				run 'make', 'ruby'
-				run 'make', 'rubyw.exe'
-				run 'make', 'install'
-			end
-		end
-
-		file XCOMPILER_LOAD_PATH => XCOMPILER_RUBY
-
-		desc "Cross-compile the library for Win32 systems, installing a cross-" +
-		     "compiled Ruby if necessary"
-		task :build => [ EXTDIR, XCOMPILER_LOAD_PATH.to_s ] do
-			in_subdirectory( EXTDIR ) do
-				ruby "-I#{XCOMPILER_LOAD_PATH}", 'extconf.rb'
-				sh 'make'
-			end
-		end
-
-		desc "Build a binary gem for win32 systems"
-		task :gem => ['win32:build', PKGDIR.to_s] + WIN32_GEMSPEC.files do
-			when_writing( "Creating win32 GEM" ) do
-				pkgname = WIN32_GEMSPEC.file_name
-				builder = Gem::Builder.new( WIN32_GEMSPEC )
-				builder.build
-				mv pkgname, PKGDIR + pkgname, :verbose => $trace
-			end
-		end
-	end
-
-rescue LoadError => err
-	trace "Couldn't load the win32 tasks: %s: %s" % [ err.class.name, err.message ]
-
-	task :no_win32_build do
-		abort "No win32 build: %s: %s" % [ err.class.name, err.message ]
-	end
-
-	namespace :win32 do
-		desc "Build a binary Gem for Win32 systems, installing a cross " +
-		     "compiled Ruby if necessary"
-		task :gem => :no_win32_build
-		task :build => :no_win32_build
-	end
-
-end
-
-