darkfish-rdoc 1.1.4 → 1.1.5

data/rake/publishing.rb

@@ -105,10 +105,12 @@ begin
 		desc "Re-publish the release with the current version number"
 		task :rerelease => [ :publish, :announce, :project ]
 
+		desc "Re-run the publication tasks, but send notifications to debugging address"
 		task :test do
+			trace "Will publish privately"
 			$publish_privately = true
+			Rake::Task['release:rerelease'].invoke
 		end
-		task :test => [ :rerelease ]
 		
 
 		desc "Generate the release notes"
@@ -127,13 +129,14 @@ begin
 
 			edit task.name
 		end
-		CLEAN.include( RELEASE_NOTES_FILE )
+		CLOBBER.include( RELEASE_NOTES_FILE )
 		
 		
+		desc "Publish the project documentation to #{PROJECT_HOST}"
 		task :project => [ :rdoc ] do
 			when_writing( "Publishing docs to #{PROJECT_SCPDOCURL}" ) do
-				run 'ssh', PROJECT_HOST, "rm -rf #{PROJECT_SCPDOCURL}"
-				run 'scp', '-qCr', 'docs/html', PROJECT_SCPDOCURL
+				run 'ssh', PROJECT_HOST, "rm -rf #{PROJECT_DOCDIR}"
+				run 'scp', '-qCr', RDOCDIR, PROJECT_SCPDOCURL
 			end
 			when_writing( "Uploading packages") do
 				pkgs = Pathname.glob( PKGDIR + "#{PKG_FILE_NAME}.{gem,tar.gz,tar.bz2,zip}" )
@@ -180,7 +183,7 @@ begin
 
 			edit task.name
 		end
-		CLEAN.include( RELEASE_ANNOUNCE_FILE )
+		CLOBBER.include( RELEASE_ANNOUNCE_FILE )
 		
 		
 		desc 'Send out a release announcement'
@@ -188,12 +191,11 @@ begin
 			email         = TMail::Mail.new
 			if $publish_privately
 				trace "Sending private announce mail"
-				email.to      = 'rubymage@gmail.com'
+				email.to = 'rubymage@gmail.com'
 			else
 				trace "Sending public announce mail"
-				email.to      = 'rubymage@gmail.com'
-				# email.to      = 'Ruby-Talk List <ruby-talk@ruby-lang.org>'
-				# email.bcc     = 'rubymage@gmail.com'
+				email.to  = 'Ruby-Talk List <ruby-talk@ruby-lang.org>'
+				email.bcc = 'rubymage@gmail.com'
 			end
 			email.from    = GEMSPEC.email
 			email.subject = "[ANN] #{PKG_NAME} #{PKG_VERSION}"
@@ -229,7 +231,7 @@ begin
 		
 	
 		desc 'Publish the new release to RubyForge'
-		task :publish => [:clobber, :package, :notes] do |task|
+		task :publish => [:clean, :package, :notes] do |task|
 			project = GEMSPEC.rubyforge_project
 
 			rf = RubyForge.new
@@ -299,5 +301,8 @@ rescue LoadError => err
 	task "release:notes" => :no_release_tasks
 end
 
+desc "Package up a release, publish it, and send out notifications"
 task :release => 'release:default'
+task :rerelease => 'release:rerelease'
+task :testrelease => 'release:test'
 

data/rake/rdoc.rb

@@ -1,11 +1,15 @@
 # 
 # RDoc Rake tasks for ThingFish
-# $Id: rdoc.rb 35 2008-08-19 01:10:27Z deveiant $
+# $Id: rdoc.rb 40 2008-08-27 21:58:00Z deveiant $
 # 
 
 require 'rake/rdoctask'
 $have_darkfish = false
 
+# 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?
+
 begin
 	require 'darkfish-rdoc'
 	$have_darkfish = true
@@ -21,7 +25,7 @@ rescue LoadError => err
 end
 
 Rake::RDocTask.new do |rdoc|
-	rdoc.rdoc_dir = 'docs/html'
+	rdoc.rdoc_dir = RDOCDIR.expand_path.relative_path_from( Pathname.pwd ).to_s
 	rdoc.title    = "#{PKG_NAME} - #{PKG_SUMMARY}"
 	rdoc.options += RDOC_OPTIONS + [ '-f', 'darkfish' ] if $have_darkfish
 

data/rake/svn.rb

@@ -1,6 +1,6 @@
 # 
 # Subversion Rake Tasks
-# $Id: svn.rb 33 2008-08-14 05:39:37Z deveiant $
+# $Id: svn.rb 45 2008-09-06 00:04:47Z deveiant $
 # 
 # Authors:
 # * Michael Granger <ged@FaerieMUD.org>
@@ -10,6 +10,7 @@
 require 'pp'
 require 'yaml'
 require 'date'
+require 'time'
 
 # Strftime format for tags/releases
 TAG_TIMESTAMP_FORMAT = '%Y%m%d-%H%M%S'
@@ -100,7 +101,10 @@ end
 
 
 ### Return the keywords for the specified array of +files+ as a Hash keyed by filename.
-def get_svn_keyword_map( files )
+def get_svn_keyword_map( *files )
+	files.flatten!
+	files.push( '.' ) if files.empty?
+
 	cmd = ['svn', 'pg', 'svn:keywords', *files]
 
 	# trace "Executing: svn pg svn:keywords " + files.join(' ')
@@ -167,6 +171,22 @@ def get_svn_diff( *targets )
 end
 
 
+### Get a subversion status as an Array of tuples of the form:
+###   [ <status>, <path> ]
+def get_svn_status( *targets )
+	targets << BASEDIR if targets.empty?
+	trace "Getting svn status for targets: %p" % [targets]
+	status = IO.read( '|-' ) or exec 'svn', 'st', '--ignore-externals', *(targets.flatten)
+	entries = status.split( /\n/ ).
+		collect do |line|
+			flag, path = line.strip.split( /\s+/, 2 )
+			[ flag, Pathname.new(path) ]
+		end
+
+	return entries
+end
+
+
 ### Return the URL of the latest timestamp in the tags directory.
 def get_latest_release_tag
 	rooturl    = get_svn_repo_root()
@@ -398,8 +418,40 @@ namespace :svn do
 	end
 
 
+	desc "Add/ignore any files that are unknown in the working copy"
+	task :newfiles do
+		log "Checking for new files..."
+		entries = get_svn_status()
+		
+		unless entries.empty?
+			files_to_add = []
+			files_to_ignore = []
+
+			entries.find_all {|entry| entry[0] == '?'}.each do |entry|
+				action = prompt_with_default( "  #{entry[1]}: (a)dd, (i)gnore, (s)kip", 's' )
+				case action
+				when 'a'
+					files_to_add << entry[1]
+				when 'i'
+					files_to_ignore << entry[1]
+				end
+			end
+			
+			unless files_to_add.empty?
+				run 'svn', 'add', *files_to_add
+			end
+		
+			unless files_to_ignore.empty?
+				abort "Ignoring not yet implemented"
+			end
+		
+		end
+	end
+	task :add => :newfiles
+	
+
 	desc "Check in all the changes in your current working copy"
-	task :checkin => ['svn:update', 'test', 'svn:fix_keywords', COMMIT_MSG_FILE] do
+	task :checkin => ['svn:update', 'svn:newfiles', 'test', 'svn:fix_keywords', COMMIT_MSG_FILE] do
 		targets = get_target_args()
 		$deferr.puts '---', File.read( COMMIT_MSG_FILE ), '---'
 		ask_for_confirmation( "Continue with checkin?" ) do
@@ -449,13 +501,19 @@ namespace :svn do
 	
 	task :debug_helpers do
 		methods = [
-			:make_new_tag,
+			:get_last_changed_rev,
+			:get_latest_release_tag,
+			:get_latest_svn_timestamp_tag,
+			:get_svn_diff,
+			:get_svn_filelist,
 			:get_svn_info,
+			:get_svn_keyword_map,
+			:get_svn_path,
 			:get_svn_repo_root,
+			:get_svn_rev,
+			:get_svn_status,
 			:get_svn_url,
-			:get_svn_path,
 			:svn_ls,
-			:get_latest_svn_timestamp_tag,
 		]
 		maxlen = methods.collect {|sym| sym.to_s.length }.max
 		

data/rake/testing.rb

@@ -1,6 +1,6 @@
 # 
 # Rake tasklib for testing tasks
-# $Id: testing.rb 14 2008-07-23 23:16:30Z deveiant $
+# $Id: testing.rb 39 2008-08-22 01:27:56Z deveiant $
 # 
 # Authors:
 # * Michael Granger <ged@FaerieMUD.org>
@@ -150,7 +150,8 @@ begin
 		desc "Show differences in coverage from last run"
 		Spec::Rake::SpecTask.new( :diff ) do |task|
 			task.spec_files = SPEC_FILES
-			task.rcov_opts = ['--text-coverage-diff']
+			task.spec_opts = ['-f', 'p', '-b']
+			task.rcov_opts = RCOV_OPTS - ['--save'] + ['--text-coverage-diff']
 			task.rcov = true
 		end
 

data/spec/rdoc/generator/darkfish_spec.rb

@@ -32,7 +32,9 @@ describe RDoc::Generator::Darkfish do
 	describe "an instance" do
 		
 		before( :each ) do
-			@generator = RDoc::Generator::Darkfish.for( 'darkfish' )
+			$dryrun = true
+			@options = RDoc::Options.new( RDoc::RDoc::GENERATORS )
+			@generator = RDoc::Generator::Darkfish.for( @options )
 		end
 		
 		
@@ -44,11 +46,20 @@ describe RDoc::Generator::Darkfish do
 		
 		it "copies static files over during #write_style_sheet" do
 			FileUtils.should_receive( :cp_r ).
-				with( an_instance_of(Pathname), '.', :verbose => $DEBUG ).
+				with( an_instance_of(Pathname), '.', :verbose => $DEBUG, :noop => $dryrun ).
 				exactly( 3 ).times
 			@generator.write_style_sheet
 		end
 		
+		it "adjusts to changes in RDoc 2.2.0 (::build_indices vs. ::build_indicies)" do
+			RDoc::Generator::Context.should_receive( :respond_to? ).with( :build_indicies ).
+				and_return( false )
+			RDoc::Generator::Context.should_receive( :build_indices ).with( :toplevels, @options ).
+				and_return([ {}, {} ])
+
+			@generator.generate( :toplevels )
+		end
+		
 	end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: darkfish-rdoc
 version: !ruby/object:Gem::Version 
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors: 
 - Michael Granger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-19 00:00:00 -07:00
+date: 2008-09-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency