Changeset 201

Timestamp:

05/23/05 13:30:25 (4 years ago)

Author:

ged

Message:

- Cleaned up command-line error-handling

Files:

• branches/simplest-thing/tools/convertWikiPage.rb (modified) (4 diffs)

branches/simplest-thing/tools/convertWikiPage.rb

@@ -1 +1 @@
 #!/usr/bin/ruby
+#
+#  A quick hack of a program to convert TWiki-ish formatted pages from the
+#  docs.FaerieMUD.org site into Trac-style pages.
+#
+#   $Id$
+#
+# = Usage
+#
+#   convertWikiPage.rb [OPTIONS] <Project> <PageFile> [<PageFile>+]
+#
+# Run with '--help' for a list of options.
+#
 
 require 'optparse'
 require 'tempfile'
-
-#
-#  A quick hack of a program to convert TWiki-ish formatted pages from the
-#  docs.FaerieMUD.org site into Trac-style pages.
-#
 require 'pathname'
 require 'diff/lcs'
 require 'pp'
+
 
 TracAdmin = '/usr/local/bin/trac-admin'
@@ -63 +71 @@
     project = args.shift or raise "No project specified"
 
+    project = File::join( ProjectRoot, project ) unless
+        File::directory?( project )
+    projectPath = Pathname::new( project )
+    raise "No such project '%s'" % [projectPath] unless
+        projectPath.exist?
+    debugMsg "Targetting project at %s" % [projectPath]
+
+    raise "No pages to convert" if args.empty?
+    debugMsg "%d pages to convert" % [args.nitems]
+
     args.collect {|arg| Pathname::new(arg) }.each do |path|
         
@@ -87 +105 @@
         $deferr.puts "OK"
     end
+rescue RuntimeError => err
+    $deferr.puts "Error: %s" % err.message
+    exit!( 1 )
 end
 
@@ -285 +306 @@
 ### Invoked trac-admin to import the transformed page +content+ with the
 ### specified +pageName+.
-def importWikiPage( project, pageName, content, dryrun )
-    projectPath = File::join( ProjectRoot, project )
-
+def importWikiPage( projectPath, pageName, content, dryrun )
     if dryrun
         debugMsg "Would have imported new content to %s: %s:" %