subcommander 1.0.4 → 1.1.0

data/README.markdown

@@ -6,7 +6,7 @@ More description coming... this is basically a placeholder for now.
 
 ### Simple Example:
 
-		%w[rubygems subcommander].each { |m| require m }
+    %w[rubygems subcommander].each { |m| require m }
     include Subcommander
     
     subcommander.version = '1.0.0'
@@ -15,12 +15,12 @@ More description coming... this is basically a placeholder for now.
     subcommand :run, "Runs the simple tool" do |sc|
       sc.opt :just_kidding, '-k', '--just-kidding', "Don't really run the simple tool"
       sc.exec {
-	      # This is where the subcommand has its implementation
-	      if sc[:just_kidding]
-	        puts "Not really running"
-	      else
-	        puts "Running!"
-	      end
+        # This is where the subcommand has its implementation
+        if sc[:just_kidding]
+          puts "Not really running"
+        else
+          puts "Running!"
+        end
       }
     end
     
@@ -28,38 +28,38 @@ More description coming... this is basically a placeholder for now.
 
 ### Nested Subcommands Example:
 
-		%w[rubygems subcommander].each { |m| require m }
-		include Subcommander
-
-		subcommander.version = '1.0.0'
-		subcommander.desc = "ComplexTool is ephemeral and only here to demonstrate Subcommander."
-
-		subcommand :run, "Commands for running the complex tool" do |run|
-		  run.subcommand 'on-foot', "Run down the street" do |sc|
-		    sc.usage = "complextool run on-foot [-f | -s]"
-				sc.opt :fast, '-f', '--fast', "Run fast!"
-				sc.opt :slow, '-s', '--slow', "Run slow."
-				sc.exec {
-					speed = "at a normal pace"
-					if sc[:fast]
-						speed = 'fast'
-					elsif sc[:slow]
-					  speed = 'slow'
-					end
-					puts "We're running #{speed}"
-				}
-		  end
-		  run.subcommand 'an-app', "Run an app" do |sc|
-		    sc.arity = 1
-		    sc.usage = "complextool run an-app NAME"
-				sc.exec {
-					app = sc[:remaining_args][0]
-					puts "Running #{app}"
-				}
-		  end
-		end
-
-		subcommander.go!
+    %w[rubygems subcommander].each { |m| require m }
+    include Subcommander
+
+    subcommander.version = '1.0.0'
+    subcommander.desc = "ComplexTool is ephemeral and only here to demonstrate Subcommander."
+
+    subcommand :run, "Commands for running the complex tool" do |run|
+      run.subcommand 'on-foot', "Run down the street" do |sc|
+        sc.usage = "complextool run on-foot [-f | -s]"
+        sc.opt :fast, '-f', '--fast', "Run fast!"
+        sc.opt :slow, '-s', '--slow', "Run slow."
+        sc.exec {
+          speed = "at a normal pace"
+          if sc[:fast]
+            speed = 'fast'
+          elsif sc[:slow]
+            speed = 'slow'
+          end
+          puts "We're running #{speed}"
+        }
+      end
+      run.subcommand 'an-app', "Run an app" do |sc|
+        sc.arity = 1
+        sc.usage = "complextool run an-app NAME"
+        sc.exec {
+          app = sc[:args][0]
+          puts "Running #{app}"
+        }
+      end
+    end
+
+    subcommander.go!
 
 ---------------------------
 

data/lib/subcommander.rb

@@ -130,7 +130,7 @@ module Subcommander
         return
       end
       parse_args()
-      num_remaining = @props[:remaining_args].length
+      num_remaining = @props[:args].length
       if @arity > -1 && num_remaining != @arity
         puts "We expected #{@arity} arguments and #{num_remaining} were provided."
         exit
@@ -161,7 +161,8 @@ module Subcommander
     
     private
     def parse_args
-      @props[:remaining_args] = @opts.parse(@args)
+      @props[:args] = @opts.parse(@args)
+      @props[:remaining_args] = @props[:args] # for legacy support
     end
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: subcommander
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 4
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors: 
 - Tom Santos
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 -07:00
+date: 2011-07-26 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -40,27 +39,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A library for cleanly handling subcommands (and options), like Git