commander 4.0.2 → 4.0.3

data/History.rdoc

@@ -1,4 +1,9 @@
 
+4.0.3 / 2010-04-06
+==================
+
+  * Fixed global_option which was consuming arguments when not expected. Closes #22
+
 4.0.2 / 2010-01-19
 ==================
 

data/commander.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{commander}
-  s.version = "4.0.2"
+  s.version = "4.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2010-01-19}
+  s.date = %q{2010-04-06}
   s.default_executable = %q{commander}
   s.description = %q{The complete solution for Ruby command-line executables}
   s.email = %q{tj@vision-media.ca}
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Commander", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{commander}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{The complete solution for Ruby command-line executables}
 
   if s.respond_to? :specification_version then

data/lib/commander/runner.rb

@@ -291,14 +291,19 @@ module Commander
     def remove_global_options options, args
       # TODO: refactor with flipflop, please TJ ! have time to refactor me !
       options.each do |option|
-        switches = option[:switches]
+        switches = option[:switches].dup
+        next if switches.empty?
+
+        if switchHasArg = switches.any? { |s| s =~ /[ =]/ }
+          switches.map! { |s| s[0, s.index('=') || s.index(' ') || s.length] }
+        end
+
         past_switch, arg_removed = false, false
         args.delete_if do |arg|
-          # TODO: clean this up, no rescuing ;)
-          if switches.any? { |switch| switch.match(/^#{arg}/) rescue false }
-            past_switch, arg_removed = true, false
-            true
-          elsif past_switch && !arg_removed && arg !~ /^-/ 
+          if switches.any? { |s| arg[0, s.length] == s }
+            arg_removed = !switchHasArg
+            past_switch = true
+          elsif past_switch && !arg_removed && arg !~ /^-/
             arg_removed = true
           else
             arg_removed = true

data/lib/commander/version.rb

@@ -1,4 +1,4 @@
 
 module Commander
-  VERSION = '4.0.2'
+  VERSION = '4.0.3'
 end

data/spec/runner_spec.rb

@@ -112,7 +112,7 @@ describe Commander do
   end
   
   describe "#remove_global_options" do
-    it "should description" do
+    it "should remove only specified switches" do
       options, args = [], []
       options << { :switches => ['-t', '--trace'] }
       options << { :switches => ['--help'] }
@@ -125,6 +125,19 @@ describe Commander do
       command_runner.remove_global_options options, args
       args.should == ['--command', '--command-with-arg', 'rawr']
     end
+
+    it "should not swallow an argument unless it expects an argument" do
+      options, args = [], []
+      options << { :switches => ['-n', '--no-arg'] }
+      options << { :switches => ['-y', '--yes ARG'] }
+      options << { :switches => ['-a', '--alternative=ARG'] }
+      args << '-n' << 'alpha'
+      args << '--yes' << 'deleted'
+      args << '-a' << 'deleted'
+      args << 'beta'
+      command_runner.remove_global_options options, args
+      args.should == ['alpha', 'beta']
+    end
   end
   
   describe "--trace" do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: commander
 version: !ruby/object:Gem::Version 
-  version: 4.0.2
+  prerelease: false
+  segments: 
+  - 4
+  - 0
+  - 3
+  version: 4.0.3
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-19 00:00:00 -08:00
+date: 2010-04-06 00:00:00 -07:00
 default_executable: commander
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: The complete solution for Ruby command-line executables
 email: tj@vision-media.ca
 executables: 
@@ -108,18 +117,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 2
       version: "1.2"
-  version: 
 requirements: []
 
 rubyforge_project: commander
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: The complete solution for Ruby command-line executables