cmdparse 1.0.3 → 1.0.4

data/ChangeLog

@@ -1,4 +1,24 @@
 ------------------------------------------------------------------------
+r302 | thomas | 2005-06-16 12:02:37 +0200 (Thu, 16 Jun 2005) | 1 line
+Changed paths:
+   M /trunk/cmdparse/doc/src/index.page
+
+* updated index.page
+------------------------------------------------------------------------
+r298 | thomas | 2005-06-14 11:31:47 +0200 (Tue, 14 Jun 2005) | 1 line
+Changed paths:
+   M /trunk/cmdparse/doc/src/index.page
+
+* updated docu
+------------------------------------------------------------------------
+r297 | thomas | 2005-06-14 11:30:22 +0200 (Tue, 14 Jun 2005) | 3 lines
+Changed paths:
+   M /trunk/cmdparse/lib/cmdparse.rb
+
+* bumped version number to 1.0.4
+* bug fix for older ruby versions
+* fixed bug: OptionParser::ParseError not caught when command executed
+------------------------------------------------------------------------
 r291 | thomas | 2005-06-09 12:24:24 +0200 (Thu, 09 Jun 2005) | 1 line
 Changed paths:
    M /trunk/cmdparse/doc/src/index.page

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/doc/src/index.page

@@ -12,6 +12,14 @@ Have a look around the site!
 
 h2. News
 
+<b>2005-06-16 cmdparse 1.0.4 released!!!</b>
+
+Changes:
+
+* fix for older ruby versions
+* fixed bug where exception was not caught
+
+
 <b>2005-06-09 cmdparse 1.0.3 released!!!</b>
 
 Changes:

data/lib/cmdparse.rb

@@ -1,7 +1,7 @@
 #
 #--
 #
-# $Id: cmdparse.rb 284 2005-05-21 11:16:15Z thomas $
+# $Id: cmdparse.rb 297 2005-06-14 09:30:22Z thomas $
 #
 # cmdparse: an advanced command line parser using optparse which supports commands
 # Copyright (C) 2004 Thomas Leitner
@@ -27,8 +27,13 @@ require 'optparse'
 # Some extension to the standard option parser class
 class OptionParser
 
-  Officious.delete( 'version' )
-  Officious.delete( 'help' )
+  if const_defined?( 'Officious' )
+    Officious.delete( 'version' )
+    Officious.delete( 'help' )
+  else
+    DefaultList.long.delete( 'version' )
+    DefaultList.long.delete( 'help' )
+  end
 
   # Returns the <tt>@banner</tt> value. Needed because the method <tt>OptionParser#banner</tt> does
   # not return the internal value of <tt>@banner</tt> but a modified one.
@@ -102,7 +107,7 @@ end
 class CommandParser
 
   # The version of the command parser
-  VERSION = [1, 0, 3]
+  VERSION = [1, 0, 4]
 
   # This error is thrown when an invalid command is encountered.
   class InvalidCommandError < OptionParser::ParseError
@@ -350,12 +355,17 @@ class CommandParser
     end
 
     @parsed[:args] = args
+
     execute if execCommand
   end
 
   # Executes the command. The method +CommandParser#parse!+ has to be called before this one!
   def execute
-    commands[@parsed[:command]].execute( self, @parsed[:args] ) if @parsed[:command]
+    begin
+      commands[@parsed[:command]].execute( self, @parsed[:args] ) if @parsed[:command]
+    rescue OptionParser::ParseError => e
+      handle_exception( e, :local )
+    end
   end
 
   private

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.6
 specification_version: 1
 name: cmdparse
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
-date: 2005-06-09
+  version: 1.0.4
+date: 2005-06-16
 summary: An advanced command line parser using optparse which supports commands
 require_paths: 
   - lib