darkfish-rdoc 1.1.2 → 1.1.3

data/ChangeLog

@@ -1,3 +1,24 @@
+-- Tue, 19 Aug 2008 02:12:27 -0000 by deveiant (r27) -----
+   Changed: lib/rdoc/generator/darkfish.rb
+            lib/darkfish-rdoc.rb
+
+   Oops. Forgot I need to change the version string in two places. Should really figure out some better
+   way to do this.
+
+
+-- Tue, 19 Aug 2008 02:10:53 -0000 by deveiant (r26) -----
+   Changed: README
+            lib/rdoc/generator/darkfish.rb
+            lib/rdoc/generator/template/darkfish/classpage.rhtml
+            Rakefile
+            lib/rdoc/generator/template/darkfish/rdoc.css
+            ChangeLog (and 2 other/s)
+
+    * Bumped version to 1.1.3
+    * Updated build system
+    * Fixed output for C source
+
+
 -- Thu, 14 Aug 2008 00:59:07 -0000 by deveiant (r24) -----
    Changed: /trunk
             lib/rdoc/generator/darkfish.rb

data/Rakefile

@@ -234,8 +234,11 @@ task :cruise => [:clean, :spec, :package] do |task|
 	artifact_dir = ARTIFACTS_DIR.cleanpath
 	artifact_dir.mkpath
 	
-	$stderr.puts "Copying coverage stats..."
-	FileUtils.cp_r( 'coverage', artifact_dir )
+	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 )

data/lib/darkfish-rdoc.rb

@@ -8,7 +8,7 @@ require 'pathname'
 require 'rdoc/rdoc' unless defined?( RDoc ) && defined?( RDoc::RDoc )
 
 ### Version for the Rakefile (update this in rdoc/generator/darkfish.rb too)
-# VERSION = '1.1.2'
+# VERSION = '1.1.3'
 
 begin
 	generator_dir = Pathname.new( __FILE__ ).dirname + 'rdoc/generator'

data/lib/rdoc/generator/darkfish.rb

@@ -1,7 +1,7 @@
 #!ruby
 #
 #  Darkfish RDoc HTML Generator
-#  $Id: darkfish.rb 24 2008-08-14 00:59:07Z deveiant $
+#  $Id: darkfish.rb 27 2008-08-19 02:12:27Z deveiant $
 #
 #  Author: Michael Granger <ged@FaerieMUD.org>
 #  
@@ -48,17 +48,17 @@ class RDoc::Generator::Darkfish < RDoc::Generator::XML
 	include ERB::Util
 
 	# Subversion rev
-	SVNRev = %$Rev: 24 $
+	SVNRev = %$Rev: 27 $
 	
 	# Subversion ID
-	SVNId = %$Id: darkfish.rb 24 2008-08-14 00:59:07Z deveiant $
+	SVNId = %$Id: darkfish.rb 27 2008-08-19 02:12:27Z deveiant $
 
 	# Path to this file's parent directory. Used to find templates and other
 	# resources.
 	GENERATOR_DIR = Pathname.new( __FILE__ ).expand_path.dirname
 
-	# Darkfish Version (update this in )
-	VERSION = '1.1.2'
+	# Darkfish Version (update this in the comment in darkfish-rdoc.rb, too!)
+	VERSION = '1.1.3'
 
 
 	#################################################################
@@ -158,7 +158,7 @@ class RDoc::Generator::Darkfish < RDoc::Generator::XML
 			hash
 		}
 
-		# Make a hash of 
+		# Make a hash of file info keyed by path
 		files_by_path = files.inject({}) {|hash, fileinfo|
 			hash[ fileinfo['full_path'] ] = fileinfo
 			hash[ fileinfo['full_path'] ][:outfile] = 
@@ -292,7 +292,7 @@ class RDoc::Generator::Darkfish < RDoc::Generator::XML
 	end
 
 
-	# %q$Id: darkfish.rb 24 2008-08-14 00:59:07Z deveiant $"
+	# %q$Id: darkfish.rb 27 2008-08-19 02:12:27Z deveiant $"
 	SVNID_PATTERN = /
 		\$Id:\s 
 			(\S+)\s					# filename

data/lib/rdoc/generator/template/darkfish/classpage.rhtml

@@ -207,7 +207,16 @@
 		<div id="<%= methodlist['type'].downcase %>-<%= methodlist['category'].downcase %>-method-details" class="method-section section">
 			<h3 class="section-header"><%= methodlist['type'] %> <%= methodlist['category'] %> Methods</h3>
 
-			<% methodlist['methods'].each do |methodinfo| %>
+		<% methodlist['methods'].each do |methodinfo| %>
+
+		<%
+		# If the method doesn't have a 'name' attribute, it's defined in C, so make one out of the
+		# first method name in the callseq.
+		unless methodinfo['name'] 
+			methodinfo['name'] = methodinfo['callseq'][/^.*?\.(\w+)/, 1] or
+				raise "No method name nor callseq!" 
+		end
+		%>
 			<% if methodinfo['m_desc'] =~ /Alias for/ %>
 			<div id="<%= methodinfo['name'].gsub( /[^a-z]+/, '-' ) %>-method" class="method-detail method-alias">
 			<% else %>
@@ -216,9 +225,14 @@
 				<a name="<%= methodinfo['name'] %>"></a>
 
 				<div class="method-heading">
+				<% if methodinfo['callseq'] %>
+					<span class="method-callseq"><%= methodinfo['callseq'].strip.gsub( /^\w.*?\./m, '') %></span>
+					<span class="method-click-advice">click to toggle source</span>
+				<% else %>
 					<span class="method-name"><%= methodinfo['name'] %></span><span 
 						class="method-args"><%= methodinfo['params'] %></span>
 					<span class="method-click-advice">click to toggle source</span>
+				<% end %>
 				</div>
 
 				<div class="method-description">
@@ -246,10 +260,11 @@
 				</div>
 				<% end %>
 			</div>
-			<% end %>
-		</div>
-		<% end %>
+
 		<% end %>
+		</div>
+	<% end %>
+	<% end %>
 
 	  </div>
 	</div>

data/lib/rdoc/generator/template/darkfish/rdoc.css

@@ -5,7 +5,7 @@
 
 /*
  * "Darkfish" Rdoc CSS
- * $Id$
+ * $Id: rdoc.css 26 2008-08-19 02:10:53Z deveiant $
  * 
  * Author: Michael Granger <ged@FaerieMUD.org>
  * 

data/rake/rdoc.rb

@@ -1,6 +1,6 @@
 # 
 # RDoc Rake tasks for ThingFish
-# $Id: rdoc.rb 28 2008-08-13 04:50:05Z deveiant $
+# $Id: rdoc.rb 35 2008-08-19 01:10:27Z deveiant $
 # 
 
 require 'rake/rdoctask'
@@ -27,4 +27,5 @@ Rake::RDocTask.new do |rdoc|
 
 	rdoc.rdoc_files.include 'README'
 	rdoc.rdoc_files.include LIB_FILES.collect {|f| f.to_s }
+	rdoc.rdoc_files.include EXT_FILES.collect {|f| f.to_s }
 end

data/rake/svn.rb

@@ -1,6 +1,6 @@
 # 
 # Subversion Rake Tasks
-# $Id: svn.rb 30 2008-08-13 23:31:25Z deveiant $
+# $Id: svn.rb 33 2008-08-14 05:39:37Z deveiant $
 # 
 # Authors:
 # * Michael Granger <ged@FaerieMUD.org>
@@ -19,8 +19,15 @@ RELEASE_VERSION_PATTERN = /\d+\.\d+\.\d+/
 
 DEFAULT_EDITOR = 'vi'
 DEFAULT_KEYWORDS = %w[Date Rev Author URL Id]
-KEYWORDED_FILEDIRS = %w[applets bin etc lib misc]
-KEYWORDED_FILEPATTERN = /^(?:Rakefile|.*\.(?:rb|js|html|template))$/i
+KEYWORDED_FILEDIRS = %w[applets spec bin etc ext experiments examples lib misc docs]
+KEYWORDED_FILEPATTERN = /
+	^(?:
+		(?:meta)?rakefile.*							# Rakefiles
+		|
+		.*\.(?:rb|c|h|js|html|css|template|erb)		# Source file extensions
+		|
+		readme|install|todo
+	)$/ix
 
 COMMIT_MSG_FILE = 'commit-msg.txt'
 

metadata

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