acclaim 0.0.1.alpha2 → 0.0.1

data/lib/acclaim/command.rb

@@ -95,8 +95,13 @@ module Acclaim
       # otherwise.
       def invoke(opts, args = [])
         opts.merge! parse_options!(args)
+        arg_separator = args.find { |arg| arg =~ Option::Parser::ARGUMENT_SEPARATOR }
+        separator_index = args.index arg_separator
         subcommands.find do |subcommand|
-          subcommand.line == args.first
+          index = args.index subcommand.line
+          # If we have the subcommand AND the separator, then we have it if the
+          # subcommand is before the separator.
+          index and not separator_index or index < separator_index
         end.tap do |subcommand|
           if subcommand
             args.delete subcommand.line

data/lib/acclaim/option/parser.rb

@@ -6,6 +6,32 @@ module Acclaim
     # Parses arrays of strings and returns an Options instance containing data.
     class Parser
 
+      # Regular expression for any kind of option switch.
+      #
+      # Matches strings that begin with 1 or 2 dashes, are followed by at least
+      # one word character or number, and may be followed by any other word
+      # character, number or dash.
+      #
+      # Examples: -s, --long, -multiple, -1, --no-feature, --with_underscore,
+      #           --_private_option, etc.
+      SWITCH = /^-{1,2}[\w\d]+[\w\d-]*$/
+
+      # Regular expression for multiple short options in a single "short"
+      # switch.
+      #
+      # Matches strings that begin with a single dash and are followed by 2 or
+      # more word characters, among which is the underscore but not the dash
+      # character.
+      #
+      # Examples: -xvf, -abc, -de_f
+      MULTIPLE_SHORT_SWITCHES = /^-\w{2,}$/
+
+      # Regular expression for the string that separates options and their
+      # parameters from arguments like filenames.
+      #
+      # Matches strings made up of 2 or more dashes.
+      ARGUMENT_SEPARATOR = /^-{2,}$/
+
       class Error < StandardError
 
         def self.raise_wrong_arg_number(actual, minimum, optional)
@@ -35,7 +61,7 @@ module Acclaim
 
       private
 
-      # Argument array preprocessing. Does not touch
+      # Argument array preprocessing.
       def preprocess_argv!
         split_multiple_short_options!
         # TODO: normalize parameter formats?
@@ -46,18 +72,14 @@ module Acclaim
       end
 
       def split_multiple_short_options!
-        argv.find_all { |arg| arg =~ /^-\w{2,}/ }.each do |multiples|
+        argv.find_all { |arg| arg =~ MULTIPLE_SHORT_SWITCHES }.each do |multiples|
           multiples_index = argv.index multiples
           argv.delete multiples
-          options, *parameters = multiples.split /\s+/
-          separated_options = options.sub!(/^-/, '').split(//).map! { |option| option.prepend '-' }
-          separated_options.each_index do |option_index|
-            argv.insert multiples_index + option_index, separated_options[option_index]
-          end
-          last_option_index = argv.index separated_options.last
-          parameters.each_index do |parameter_index|
-            argv.insert last_option_index + paramter_index + 1,
-                        parameters[parameter_index]
+          letters = multiples.sub!(/^-/, '').split(//)
+          letters.each { |letter| letter.prepend '-' }.tap do |options|
+            options.each_index do |option_index|
+              argv.insert multiples_index + option_index, options[option_index]
+            end
           end
         end
       end
@@ -84,7 +106,7 @@ module Acclaim
                   values = []
                   params.each do |param|
                     case param
-                      when nil, /^-{1,2}/, /^-{2,}$/ then break
+                      when nil, SWITCH, ARGUMENT_SEPARATOR then break
                       else
                         break if optional >= 0 and values.count >= minimum + optional
                         values << param

data/lib/acclaim/version.rb

@@ -4,7 +4,7 @@ module Acclaim
     MAJOR = 0
     MINOR = 0
     PATCH = 1
-    BUILD = 'alpha2'
+    BUILD = nil
 
     STRING = [ MAJOR, MINOR, PATCH, BUILD ].compact.join '.'
 

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: acclaim
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha2
-  prerelease: 6
+  version: 0.0.1
+  prerelease: 
 platform: ruby
 authors:
 - Matheus Afonso Martins Moreira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-17 00:00:00.000000000 Z
+date: 2011-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7316860 !ruby/object:Gem::Requirement
+  requirement: &11364480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7316860
+  version_requirements: *11364480
 description: Command-line option parser and command interface.
 email: matheus.a.m.moreira@gmail.com
 executables: []
@@ -57,9 +57,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10