subcommand 1.0.0 → 1.0.2

data/Rakefile

@@ -10,6 +10,7 @@ begin
     gem.email = "sentinel.1879@gmail.com"
     gem.homepage = "http://github.com/rkumar/subcommand"
     gem.authors = ["Rahul Kumar"]
+    gem.rubyforge_project = "subcommand"
     #gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     gem.add_development_dependency "yard", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.2

data/lib/subcommand.rb

@@ -62,7 +62,6 @@ module Subcommands
   # Do repeatedly for each command
   # Yields the optionparser
   def command *names
-    #puts "inside command with #{names} "
     name = names.shift
     @commands ||= {}
     @aliases ||= {}
@@ -95,8 +94,10 @@ module Subcommands
   # then parse subcommand options if valid subcommand
   # special case of "help command" so we print help of command - git style (3)
   # in all invalid cases print global help
+  # @return command name if relevant
   def opt_parse
     # if user has not defined global, we need to create it
+    @command_name = nil
     if !defined? @global
       global_options do |opts|
         opts.banner = "Usage: #{$0} [options] [subcommand [options]]"
@@ -135,37 +136,43 @@ module Subcommands
     @global.order!
     cmd = ARGV.shift
     if cmd
-      #puts "Command: #{cmd} "
+      #puts "Command: #{cmd}, args:#{ARGV}, #{@commands.keys} "
       sc = @commands[cmd] 
+      #puts "sc: #{sc}: #{@commands}"
+      #puts "sc: ="+@commands.include?(cmd)
       unless sc
         # see if an alias exists
-        #puts "sc nil #{@aliases} "
         alas = @aliases[cmd]
-        #puts "sc nil #{alas} "
         sc = @commands[alas] if alas
-        #puts "sc nil #{sc} "
+        cmd = alas if alas
       end
       # if valid command parse the args
       if sc
+        @command_name = cmd
         sc.call.order!
       else
         # else if help <command> then print its help GIT style (3)
-        if !ARGV.empty? and cmd == "help"
+        if !ARGV.empty? && cmd == "help"
           cmd = ARGV.shift
+          #puts " 110 help #{cmd}"
           sc = @commands[cmd]
           # if valid command print help, else print global help
           if sc
-            #puts " 111 help foo/baz"
+            #puts " 111 help #{cmd}"
             puts sc.call
-          else puts @global
+          else 
+            puts "Invalid command: #{cmd}"
+            puts @global
           end
         else
           # invalid command 
+            puts "Invalid command: #{cmd}"
           puts @global 
         end
         exit 0
       end
     end
+    return @command_name
   end
 end
 
@@ -200,8 +207,9 @@ if __FILE__ == $PROGRAM_NAME
   end
 
   # do the parsing.
-  opt_parse()
+  cmd = opt_parse()
 
+  puts "cmd: #{cmd}"
   puts "options ......"
   p options
   puts "ARGV:"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Rahul Kumar
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: subcommand
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3