linkparser 1.0.3 → 1.0.4

data/rake/191_compat.rb

@@ -0,0 +1,26 @@
+# 1.9.1 fixes
+
+
+# Make Pathname compatible with 1.8.7 Pathname.
+unless Pathname.instance_methods.include?( :=~ )
+	class Pathname
+		def self::glob( *args ) # :yield: p
+			args = args.collect {|p| p.to_s }
+			if block_given?
+				Dir.glob(*args) {|f| yield self.new(f) }
+			else
+				Dir.glob(*args).map {|f| self.new(f) }
+			end
+		end
+
+		def =~( other )
+			self.to_s =~ other
+		end
+
+		def to_str
+			self.to_s
+		end
+	end
+end
+
+

data/rake/helpers.rb

@@ -1,9 +1,23 @@
+# encoding: utf-8
 #####################################################################
 ###	G L O B A L   H E L P E R   F U N C T I O N S
 #####################################################################
 
+
 require 'pathname'
-require 'readline'
+require 'uri'
+require 'open3'
+
+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
 
 # Set some ANSI escape code constants (Shamelessly stolen from Perl's
 # Term::ANSIColor by Russ Allbery <rra@stanford.edu> and Zenin <zenin@best.com>
@@ -42,7 +56,7 @@ CLEAR_CURRENT_LINE = "\e[2K"
 ### Output a logging message
 def log( *msg )
 	output = colorize( msg.flatten.join(' '), 'cyan' )
-	$deferr.puts( output )
+	$stderr.puts( output )
 end
 
 
@@ -50,7 +64,7 @@ end
 def trace( *msg )
 	return unless $trace
 	output = colorize( msg.flatten.join(' '), 'yellow' )
-	$deferr.puts( output )
+	$stderr.puts( output )
 end
 
 
@@ -66,7 +80,7 @@ def run( *cmd )
 	end
 	
 	if $dryrun
-		$deferr.puts "(dry run mode)"
+		$stderr.puts "(dry run mode)"
 	else
 		system( *cmd )
 		unless $?.success?
@@ -91,7 +105,7 @@ def pipeto( *cmd )
 	cmd.flatten!
 	log( "Opening a pipe to: ", cmd.collect {|part| part =~ /\s/ ? part.inspect : part} ) 
 	if $dryrun
-		$deferr.puts "(dry run mode)"
+		$stderr.puts "(dry run mode)"
 	else
 		open( '|-', 'w+' ) do |io|
 		
@@ -111,52 +125,35 @@ end
 
 ### Download the file at +sourceuri+ via HTTP and write it to +targetfile+.
 def download( sourceuri, targetfile=nil )
-	oldsync = $defout.sync
-	$defout.sync = true
-	require 'net/http'
-	require 'uri'
+	oldsync = $stdout.sync
+	$stdout.sync = true
+	require 'open-uri'
 
 	targetpath = Pathname.new( targetfile )
 
 	log "Downloading %s to %s" % [sourceuri, targetfile]
-	targetpath.open( File::WRONLY|File::TRUNC|File::CREAT, 0644 ) do |ofh|
-	
-		url = sourceuri.is_a?( URI ) ? sourceuri : URI.parse( sourceuri )
-		downloaded = false
-		limit = 5
-		
-		until downloaded or limit.zero?
-			Net::HTTP.start( url.host, url.port ) do |http|
-				req = Net::HTTP::Get.new( url.path )
-
-				http.request( req ) do |res|
-					if res.is_a?( Net::HTTPSuccess )
-						log "Downloading..."
-						res.read_body do |buf|
-							ofh.print( buf )
-						end
-						downloaded = true
-						puts "done."
+	trace "  connecting..."
+	ifh = open( sourceuri ) do |ifh|
+		trace "  connected..."
+		targetpath.open( File::WRONLY|File::TRUNC|File::CREAT, 0644 ) do |ofh|
+			log "Downloading..."
+			buf = ''
 		
-					elsif res.is_a?( Net::HTTPRedirection )
-						url = URI.parse( res['location'] )
-						log "...following redirection to: %s" % [ url ]
-						limit -= 1
-						sleep 0.2
-						next
-				
-					else
-						res.error!
-					end
+			while ifh.read( 16384, buf )
+				until buf.empty?
+					bytes = ofh.write( buf )
+					buf.slice!( 0, bytes )
 				end
 			end
+			
+			log "Done."
 		end
 		
 	end
 	
 	return targetpath
 ensure
-	$defout.sync = oldsync
+	$stdout.sync = oldsync
 end
 
 
@@ -172,12 +169,12 @@ end
 def ansi_code( *attributes )
 	attributes.flatten!
 	attributes.collect! {|at| at.to_s }
-	# $deferr.puts "Returning ansicode for TERM = %p: %p" %
+	# $stderr.puts "Returning ansicode for TERM = %p: %p" %
 	# 	[ ENV['TERM'], attributes ]
 	return '' unless /(?:vt10[03]|xterm(?:-color)?|linux|screen)/i =~ ENV['TERM']
 	attributes = ANSI_ATTRIBUTES.values_at( *attributes ).compact.join(';')
 
-	# $deferr.puts "  attr is: %p" % [attributes]
+	# $stderr.puts "  attr is: %p" % [attributes]
 	if attributes.empty? 
 		return ''
 	else
@@ -207,7 +204,7 @@ end
 ### Output the specified <tt>msg</tt> as an ANSI-colored error message
 ### (white on red).
 def error_message( msg, details='' )
-	$deferr.puts colorize( 'bold', 'white', 'on_red' ) { msg } + details
+	$stderr.puts colorize( 'bold', 'white', 'on_red' ) { msg } + details
 end
 alias :error :error_message
 
@@ -229,7 +226,7 @@ def prompt( prompt_string, failure_msg="Try again." ) # :yields: response
 
 	begin
 		prompt = make_prompt_string( prompt_string )
-		response = Readline.readline( prompt ) || ''
+		response = readline( prompt ) || ''
 		response.strip!
 		if block_given? && ! yield( response ) 
 			error_message( failure_msg + "\n\n" )
@@ -280,7 +277,7 @@ def prompt_for_multiple_values( label, default=nil )
     result = nil
     
     begin
-        result = Readline.readline( make_prompt_string("> ") )
+        result = readline( make_prompt_string("> ") )
 		if result.nil? || result.empty?
 			results << default if default && results.empty?
 		else
@@ -365,6 +362,26 @@ def find_pattern_in_file( regexp, file )
 end
 
 
+### Search line-by-line in the output of the specified +cmd+ for the given +regexp+,
+### returning the first match, or nil if no match was found. If the +regexp+ has any 
+### capture groups, those will be returned in an Array, else the whole matching line
+### is returned.
+def find_pattern_in_pipe( regexp, *cmd )
+	output = []
+	
+	log( cmd.collect {|part| part =~ /\s/ ? part.inspect : part} ) 
+	Open3.popen3( *cmd ) do |stdin, stdout, stderr|
+		stdin.close
+
+		output << stdout.gets until stdout.eof?
+		output << stderr.gets until stderr.eof?
+	end
+	
+	result = output.find { |line| regexp.match(line) } 
+	return $1 || result
+end
+
+
 ### Invoke the user's editor on the given +filename+ and return the exit code
 ### from doing so.
 def edit( filename )

data/rake/manual.rb

@@ -1,6 +1,6 @@
 # 
 # Manual-generation Rake tasks and classes
-# $Id: manual.rb 41 2008-08-28 16:46:09Z deveiant $
+# $Id: manual.rb 95 2009-04-02 15:21:01Z deveiant $
 # 
 # Authors:
 # * Michael Granger <ged@FaerieMUD.org>
@@ -292,7 +292,7 @@ module Manual
 		# directory
 		attr_reader :uri_index
 		
-		# The hierarchy of pages in the catalog, suitable for generating an on-page
+		# The hierarchy of pages in the catalog, suitable for generating an on-page index
 		attr_reader :hierarchy
 		
 		# An Array of all Manual::Page objects found
@@ -356,21 +356,21 @@ module Manual
 					if page_or_section[INDEX_PATH]
 						idx = page_or_section[INDEX_PATH].config['index']
 						trace "Index page's index for directory '%s' is: %p" % [ subpath, idx ]
-						idx || subpath
+						idx.to_s || subpath.to_s
 					else
 						trace "Using the path for the sort of directory %p" % [ subpath ]
-						subpath
+						subpath.to_s
 					end
 					
 				# Page
 				else
 					if subpath == INDEX_PATH
 						trace "Sort index for index page %p is 0" % [ subpath ]
-						0
+						'0'
 					else
 						idx = page_or_section.config['index']
 						trace "Sort index for page %p is: %p" % [ subpath, idx ]
-						idx || subpath
+						idx.to_s || subpath.to_s
 					end
 				end
 
@@ -384,12 +384,14 @@ module Manual
 		### for an index section and call it, then recurse into the section contents.
 		def handle_section_callback( path, section, from=nil, &builder )
 			from_current = false
+			trace "Section handler: path=%p, section keys=%p, from=%s" %
+				[ path, section.keys, from.sourcefile ]
 			
 			# Call the callback with :section -- determine the section title from
 			# the 'index.page' file underneath it, or the directory name if no 
 			# index.page exists.
 			if section.key?( INDEX_PATH )
-				if section[INDEX_PATH] == from
+				if section[INDEX_PATH].sourcefile.dirname == from.sourcefile.dirname
 					from_current = true
 					builder.call( :current_section, section[INDEX_PATH].title, path )
 				else
@@ -563,7 +565,7 @@ module Manual
 				manual_pages = setup_page_conversion_tasks( sourcedir, outputdir, catalog )
 				
 				desc "Build the manual"
-				task :build => [ :rdoc, :copy_resources, :generate_pages ]
+				task :build => [ :rdoc, :copy_resources, :copy_apidocs, :generate_pages ]
 				
 				task :clobber do
 					RakeFileUtils.verbose( $verbose ) do
@@ -574,6 +576,25 @@ module Manual
 				
 				desc "Remove any previously-generated parts of the manual and rebuild it"
 				task :rebuild => [ :clobber, self.name ]
+				
+				desc "Watch for changes to the source files and rebuild when they change"
+				task :autobuild do
+					scope = [ self.name ]
+					loop do
+						t = Rake.application.lookup( :build, scope )
+						t.reenable
+						t.prerequisites.each do |pt|
+							if task = Rake.application.lookup( pt, scope )
+								task.reenable
+							else
+								trace "Hmmm... no %p task in scope %p?" % [ pt, scope ]
+							end
+						end
+						t.invoke
+						sleep 2
+						trace "  waking up..."
+					end
+				end
 	        end
 
 		end # def define
@@ -643,9 +664,10 @@ module Manual
 			target = task.name
 			
 			when_writing do
-				log "  #{source} -> #{target}"
-				mkpath File.dirname( target )
-				cp source, target, :verbose => $trace
+				trace "  #{source} -> #{target}"
+				mkpath File.dirname( target ), :verbose => $trace unless
+					File.directory?( File.dirname(target) )
+				install source, target, :mode => 0644, :verbose => $trace
 			end
 		end
 			
@@ -663,9 +685,16 @@ module Manual
 				file( targets[i] => [ outputdir.to_s, resource ], &copier )
 			end
 
+			desc "Copy API documentation to the manual output directory"
+			task :copy_apidocs => :rdoc do
+				cp_r( RDOCDIR, outputdir )
+			end
+
 			# Now group all the resource file tasks into a containing task
 			desc "Copy manual resources to the output directory"
-			task :copy_resources => targets
+			task :copy_resources => targets do
+				log "Copying manual resources"
+			end
 		end
 		
 	end # class Manual::GenTask
@@ -690,9 +719,7 @@ if MANUALDIR.exist?
 			manual.source_dir = 'src'
 		end
 
-		task :clobber_manual do
-			rmtree( MANUALOUTPUTDIR, :verbose => true )
-		end
+		CLOBBER.include( MANUALOUTPUTDIR.to_s )
 
 	rescue LoadError => err
 		task :no_manual do

data/rake/packaging.rb

@@ -1,6 +1,6 @@
 # 
 # Packaging Rake Tasks
-# $Id: packaging.rb 21 2008-08-07 23:45:52Z deveiant $
+# $Id: packaging.rb 102 2009-05-23 21:40:00Z deveiant $
 # 
 
 require 'rbconfig'
@@ -16,8 +16,7 @@ Rake::PackageTask.new( PKG_NAME, PKG_VERSION ) do |task|
 	task.need_tar_bz2  = true
 	task.need_zip      = true
 	task.package_dir   = PKGDIR.to_s
-  	task.package_files = RELEASE_FILES.
-		collect {|f| f.relative_path_from(BASEDIR).to_s }
+  	task.package_files = RELEASE_FILES.collect {|f| f.to_s }
 end
 task :package => [:gem]
 
@@ -36,9 +35,27 @@ file gempath.to_s => [PKGDIR.to_s] + GEMSPEC.files do
 	end
 end
 
+svnrev = get_svn_rev()
+prerelease_gem_file_name = "#{PKG_FILE_NAME}.#{svnrev}.gem"
+prerelease_gempath = PKGDIR + prerelease_gem_file_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.%d" % [GEMSPEC.version, svnrev] )
+		Gem::Builder.new( gemspec ).build
+		verbose( true ) do
+			mv prerelease_gem_file_name, prerelease_gempath
+		end
+	end
+end
+
+
 ### Task: install
 desc "Install #{PKG_NAME} as a conventional library"
-task :install do
+task :install => "spec:quiet" do
 	log "Installing #{PKG_NAME} as a conventional library"
 	sitelib = Pathname.new( CONFIG['sitelibdir'] )
 	sitearch = Pathname.new( CONFIG['sitearchdir'] )
@@ -53,8 +70,10 @@ task :install do
 		end
 	end
 	if EXTDIR.exist?
+		trace "  looking for a binary extension (%s)" % [ EXTDIR + "*.#{Config::CONFIG['DLEXT']}" ]
 		Dir.chdir( EXTDIR ) do
-			Pathname.glob( EXTDIR + Config::CONFIG['DLEXT'] ) do |dl|
+			Pathname.glob( "*.#{Config::CONFIG['DLEXT']}" ) do |dl|
+				trace "    found: #{dl}"
 				target = sitearch + dl.basename
 				FileUtils.install dl, target, 
 					:mode => 0755, :verbose => true, :noop => $dryrun
@@ -91,8 +110,10 @@ task :uninstall do
 		end
 	end
 	if EXTDIR.exist?
+		trace "  looking for a binary extension (%s)" % [ EXTDIR + "*.#{Config::CONFIG['DLEXT']}" ]
 		Dir.chdir( EXTDIR ) do
-			Pathname.glob( EXTDIR + Config::CONFIG['DLEXT'] ) do |dl|
+			Pathname.glob( "*.#{Config::CONFIG['DLEXT']}" ) do |dl|
+				trace "    found: #{dl}"
 				target = sitearch + dl.basename
 				FileUtils.rm target, :verbose => true, :noop => $dryrun
 			end

data/rake/publishing.rb

@@ -26,8 +26,8 @@ class Net::SMTP
 			return self
 		end
 	end
-	
-	
+
+
 	#######
 	private
 	#######
@@ -100,10 +100,10 @@ begin
 
 
 	namespace :release do
-		task :default => [ 'svn:release', :publish, :announce, :project ]
+		task :default => [ 'svn:release', :upload, :publish, :announce ]
 
 		desc "Re-publish the release with the current version number"
-		task :rerelease => [ :publish, :announce, :project ]
+		task :rerelease => [  :upload, :publish, :announce ]
 
 		desc "Re-run the publication tasks, but send notifications to debugging address"
 		task :test do
@@ -111,7 +111,7 @@ begin
 			$publish_privately = true
 			Rake::Task['release:rerelease'].invoke
 		end
-		
+
 
 		desc "Generate the release notes"
 		task :notes => [RELEASE_NOTES_FILE]
@@ -130,14 +130,23 @@ begin
 			edit task.name
 		end
 		CLOBBER.include( RELEASE_NOTES_FILE )
-		
-		
-		desc "Publish the project documentation to #{PROJECT_HOST}"
-		task :project => [ :rdoc ] do
+
+
+		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 => [ :rdoc ] 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
 			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 ]
@@ -147,7 +156,7 @@ begin
             end
 		end
 
-		
+
 		file RELEASE_ANNOUNCE_FILE => [RELEASE_NOTES_FILE] do |task|
 			relnotes = File.read( RELEASE_NOTES_FILE )
 			announce_body = %{
@@ -163,7 +172,7 @@ begin
 				== Installation
 
 				Via gems:
-				
+
 				  $ sudo gem install #{GEMSPEC.name}
 
 				or from source:
@@ -176,7 +185,7 @@ begin
 				== Changes
 				#{relnotes}
 			}.gsub( /^\t+/, '' )
-			
+
 			File.open( task.name, File::WRONLY|File::TRUNC|File::CREAT ) do |fh|
 				fh.print( announce_body )
 			end
@@ -184,8 +193,8 @@ begin
 			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
@@ -208,13 +217,13 @@ begin
 			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 )
@@ -228,73 +237,77 @@ begin
 				trace "done."
 			end
 		end
-		
-	
+
+
 		desc 'Publish the new release to RubyForge'
 		task :publish => [:clean, :package, :notes] do |task|
 			project = GEMSPEC.rubyforge_project
 
-			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 }"
+			if $publish_privately
+				log "Skipping push of release files to RubyForge"
 			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 )
+				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
 			end
 		end
 	end
-	
+
 rescue LoadError => err
 	if !Object.const_defined?( :Gem )
 		require 'rubygems'
 		retry
 	end
-	
+
 	task :no_release_tasks do
 		fail "Release tasks not defined: #{err.message}"
 	end
-	
+
 	task :release => :no_release_tasks
 	task "release:announce" => :no_release_tasks
 	task "release:publish" => :no_release_tasks