cmdparse 1.0.1 → 1.0.2

data/ChangeLog

@@ -1,4 +1,17 @@
 ------------------------------------------------------------------------
+r265 | thomas | 2005-04-21 12:57:51 +0200 (Thu, 21 Apr 2005) | 1 line
+Changed paths:
+   M /trunk/cmdparse/doc/src/index.page
+
+* updated doc
+------------------------------------------------------------------------
+r246 | thomas | 2005-04-13 15:36:19 +0200 (Wed, 13 Apr 2005) | 1 line
+Changed paths:
+   M /trunk/cmdparse/lib/cmdparse.rb
+   M /trunk/cmdparse/test.rb
+
+* splitted parsing of the arguments and executing the command into two methods
+------------------------------------------------------------------------
 r242 | thomas | 2005-04-13 13:42:24 +0200 (Wed, 13 Apr 2005) | 1 line
 Changed paths:
    M /trunk/cmdparse/README

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/doc/src/index.page

@@ -12,7 +12,13 @@ Have a look around the site!
 
 h2. News
 
-*cmdparse 1.0.1 released!!!*
+<b>cmdparse 1.0.2 released!!!</b>
+
+Changes:
+
+* splitted parsing of the arguments and executing the command into two methods
+
+<b>cmdparse 1.0.1 released!!!</b>
 
 Changes:
 

data/lib/cmdparse.rb

@@ -1,7 +1,7 @@
 #
 #--
 #
-# $Id: cmdparse.rb 240 2005-04-13 11:40:39Z thomas $
+# $Id: cmdparse.rb 246 2005-04-13 13:36:19Z thomas $
 #
 # cmdparse: an advanced command line parser using optparse which supports commands
 # Copyright (C) 2004 Thomas Leitner
@@ -99,7 +99,7 @@ end
 class CommandParser
 
   # The version of the command parser
-  VERSION = [1, 0, 1]
+  VERSION = [1, 0, 2]
 
   # This error is thrown when an invalid command is encountered.
   class InvalidCommandError < OptionParser::ParseError
@@ -215,7 +215,9 @@ class CommandParser
       puts "Available commands:"
       width = commandParser.commands.keys.max {|a,b| a.length <=> b.length }.length
       commandParser.commands.sort.each do |name, command|
-        puts commandParser.options.summary_indent + name.ljust( width + 4 ) + command.description
+        print commandParser.options.summary_indent + name.ljust( width + 4 ) + command.description
+        print " (default)" if name == commandParser.default
+        print "\n"
       end
       puts ""
       puts commandParser.options.summarize
@@ -268,11 +270,13 @@ class CommandParser
 
   # Holds the registered commands
   attr_reader :commands
+  attr_reader :default
 
   def initialize
     @options = OptionParser.new
     @commands = {}
     @default = nil
+    @parsed = {}
   end
 
   # If called with a block, this method yields the global options of the +CommandParser+. If no
@@ -306,22 +310,29 @@ class CommandParser
   def parse( args ); parse!( args.dup ); end
 
   # Parses the given argument. First it tries to parse global arguments if given. After that the
-  # command name is analyzied and the options for the specific commands parsed. After that the
-  # command is executed by invoking its +execute+ method.
-  def parse!( args )
+  # command name is analyzied and the options for the specific commands parsed. If +execCommand+
+  # is true, the command is executed immediately. If false, the +CommandParser#execute+ has to be
+  # called to execute the command.
+  def parse!( args, execCommand = true )
     @options.order!( args )
-    command = args.shift
-    if command.nil?
+    @parsed[:command] = args.shift
+    if @parsed[:command].nil?
       if @default.nil?
         raise NoCommandGivenError
       else
-        command = @default
+        @parsed[:command] = @default
       end
     else
-      raise InvalidCommandError.new( command ) unless commands.include?( command )
+      raise InvalidCommandError.new( @parsed[:command] ) unless commands.include?( @parsed[:command] )
     end
-    commands[command].options.permute!( args ) unless commands[command].options.nil?
-    commands[command].execute( self, args )
+    commands[@parsed[:command]].options.permute!( args ) unless commands[@parsed[:command]].options.nil?
+    @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]
   end
 
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.4
+rubygems_version: 0.8.6
 specification_version: 1
 name: cmdparse
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2005-04-13
+  version: 1.0.2
+date: 2005-04-21
 summary: An advanced command line parser using optparse which supports commands
 require_paths: 
   - lib