acclaim 0.1.0 → 0.2.0

data/README.markdown

@@ -2,7 +2,17 @@
 
 Command-line option parsing and command interface.
 
-## Introduction
+# Installation
+
+Latest version:
+
+    gem install acclaim
+
+From source:
+
+    git clone git://github.com/matheusmoreira/acclaim.git
+
+# Introduction
 
 Acclaim makes it easy to describe commands and options for a command-line
 application in a structured manner. Commands are classes that inherit from

data/lib/acclaim/command.rb

@@ -83,13 +83,13 @@ module Acclaim
       alias :when_called :action
 
       # Adds help subcommand and options to this command.
-      def help(opts = {})
-        Help.create(self, opts)
+      def help(*args)
+        Help.create(self, *args)
       end
 
       # Adds help subcommand and options to this command.
-      def version(version_string, opts = {})
-        Version.create(self, version_string, opts)
+      def version(*args)
+        Version.create(self, *args)
       end
 
       # Parses the argument array using this command's set of options.
@@ -145,16 +145,56 @@ module Acclaim
       # Finds the root of the command hierarchy.
       def root
         command = self
-        command = command.superclass until command.root?
+        until command.root?
+          yield command if block_given?
+          command = command.superclass
+        end
+        yield command if block_given?
         command
       end
 
+      # Walks the command inheritance tree, yielding each command successively
+      # until the root command.
+      alias until_root root
+
+      # Return this command's parent commands.
+      def parents
+        Array.new.tap do |parents|
+          until_root do |command|
+            parents << command
+          end
+        end
+      end
+
+      # Computes the full command line of this command, which takes parent
+      # commands into account.
+      #
+      #   class Command < Acclaim::Command
+      #     class Subcommand < Command
+      #       class Subcommand2 < Subcommand
+      #       end
+      #     end
+      #   end
+      #
+      #   Command::Subcommand::Subcommand2.full_line
+      #    => "subcommand subcommand2"
+      #
+      #   Command::Subcommand::Subcommand2.full_line include_root: true
+      #    => "command subcommand subcommand2"
+      def full_line(*args)
+        options = args.extract_ribbon!
+        parents.tap do |parents|
+          parents.pop unless options.include_root?
+        end.reverse.map(&:line).join ' '
+      end
+
       private
 
       # Handles special options such as <tt>--help</tt> or <tt>--version</tt>.
       def handle_special_options!(opts, args)
         const_get(:Help).execute opts, args if opts.acclaim_help?
         const_get(:Version).execute opts, args if opts.acclaim_version?
+      # TODO: possibly rescue a NameError and warn user
       end
 
       # Deletes all argument separators in the given argument array.

data/lib/acclaim/command/help.rb

@@ -1,4 +1,5 @@
 require 'acclaim/command/help/template'
+require 'ribbon/core_ext/array'
 
 module Acclaim
   class Command
@@ -6,47 +7,67 @@ module Acclaim
     # Module which adds help support to a command.
     module Help
 
-      # Adds a special help option to the given +command+.
-      #
-      # The last argument is an option +Hash+, which accepts the following
-      # options:
-      #
-      # [:switches]  The switches used when creating the help option.
-      def self.add_options_to!(command, opts = {})
-        switches = opts.fetch :switches, %w(-h --help)
-        description = opts.fetch :description, 'Show usage information and exit.'
-        command.option :acclaim_help, *switches, description
-      end
+      # The class methods.
+      class << self
 
-      private_class_method :add_options_to!
-
-      # Creates a help subcommand that inherits from the given +base+ command
-      # and stores the class in the +Help+ constant of +base+. When called, the
-      # command displays a help screen including information for all commands
-      # and then exits.
-      #
-      # The last argument is an option +Hash+, which accepts the following
-      # options:
-      #
-      # [:options]   If +true+, will add a help option to the +base+ command.
-      # [:switches]  The switches used when creating the help option.
-      def self.create(base, opts = {})
-        if opts.fetch :options, true
-          add_options_to! base, opts
-        end
-        base.const_set(:Help, Class.new(base)).tap do |help_command|
-          help_command.when_called do |options, args|
-            display_help_for base.root
-            exit
+        # Creates a help subcommand that inherits from the given +base+ command
+        # and stores the class in the +Help+ constant of +base+. When called,
+        # the command displays a help screen including information for all
+        # commands and then exits.
+        #
+        # The last argument can be a configuration hash, which accepts the
+        # following options:
+        #
+        # [:options]       If +true+, will add a help option to the +base+
+        #                  command.
+        # [:switches]      The switches used when creating the help option.
+        # [:exit]          If +true+, +exit+ will be called when the command is
+        #                  done.
+        # [:include_root]  Includes the root command when displaying a command's
+        #                  usage.
+        def create(*args)
+          opts, base = args.extract_ribbon!, args.shift
+          add_options_to! base, opts if opts.options? true
+          base.const_set(:Help, Class.new(base)).tap do |help_command|
+            help_command.when_called do |options, args|
+              # TODO: implement a way to specify a command to the help option
+              # and command.
+              #   display_for options.command || args.pop
+              display_for base.root, opts
+              exit if opts.exit? true
+            end
           end
         end
-      end
 
-      # Displays a very simple help screen for the given command and all its
-      # subcommands.
-      def self.display_help_for(command)
-        puts Template.for(command) if command.options.any?
-        command.subcommands.each { |subcommand| display_help_for subcommand }
+        # Displays a very simple help screen for the given command and all its
+        # subcommands.
+        #
+        # The last argument can be a configuration hash, which accepts the
+        # following options:
+        #
+        # [:include_root]  Includes the root command when displaying a command's
+        #                  usage.
+        def display_for(*args)
+          options, command = args.extract_ribbon!, args.shift
+          puts Template.for(command, options) if command.options.any?
+          command.subcommands.each { |subcommand| display_for(subcommand, options) }
+        end
+
+        private
+
+        # Adds a special help option to the given +command+.
+        #
+        # The last argument can be a configuration hash, which accepts the
+        # following options:
+        #
+        # [:switches]  The switches used when creating the help option.
+        def add_options_to!(*args)
+          opts, command = args.extract_ribbon!, args.shift
+          switches = opts.switches? %w(-h --help)
+          description = opts.description? 'Show usage information and exit.'
+          command.option :acclaim_help, *switches, description
+        end
+
       end
 
     end

data/lib/acclaim/command/help/template.rb

@@ -1,4 +1,5 @@
 require 'erb'
+require 'ribbon/core_ext/array'
 
 module Acclaim
   class Command
@@ -7,20 +8,38 @@ module Acclaim
       # Manages help templates.
       module Template
 
-        # Loads an ERB template file from the
-        # +lib/acclaim/command/help/template+ folder and instantiates a new ERB
-        # instance with its contents.
-        def self.load(template)
-          filename = File.join File.dirname(__FILE__), 'template', template
-          ERB.new File.read(filename), nil, '%<>'
-        end
+        # The class methods.
+        class << self
+
+          # Returns the +template+ folder relative to this directory.
+          def folder
+            File.join File.dirname(__FILE__), 'template'
+          end
+
+          # Loads the contents of a template file from the template #folder.
+          def load(template_file)
+            File.read File.join(folder, template_file)
+          end
+
+          # Creates a new ERB instance with the contents of +template+.
+          def create_from(template_file)
+            ERB.new load(template_file), nil, '%<>'
+          end
+
+          # Computes the result of the template +file+ using the +command+'s
+          # binding.
+          def for(*args)
+            template_options, command = args.extract_ribbon!, args.shift
+            template = create_from template_options.file?('command.erb')
+            b = command.instance_eval { binding }
+            # Since blocks are closures, the binding has access to the
+            # template_options ribbon:
+            #
+            # p b.eval 'template_options'
+            #  => {}
+            template.result b
+          end
 
-        # Computes the result of the template +file+ using the +command+'s
-        # binding.
-        def self.for(command, file = 'command.erb')
-          template = self.load file
-          b = command.instance_eval { binding }
-          template.result b
         end
 
       end

data/lib/acclaim/command/help/template/command.erb

@@ -1,8 +1,9 @@
 <% unless root? or options.empty? %>
-  Command '<%= line %>':
+  Command '<%= full_line include_root: template_options.include_root? %>':
 <% end %>
 
 <% options.each do |option| %>
-      <%= option.names.join ', ' %>    <%= option.description %>
+      <%= option.names.join ', ' %>
+          <%= option.description %>
 <% end %>
 

data/lib/acclaim/command/version.rb

@@ -1,43 +1,53 @@
+require 'ribbon/core_ext/array'
+
 module Acclaim
   class Command
 
     # Module which adds version query support to a command.
     module Version
 
-      # Adds a special version option to the given +command+.
-      #
-      # The last argument is an option +Hash+, which accepts the following
-      # options:
-      #
-      # [:switches]  The switches used when creating the version option.
-      def self.add_options_to!(command, opts = {})
-        switches = opts.fetch :switches, %w(-v --version)
-        description = opts.fetch :description, 'Show version and exit.'
-        command.option :acclaim_version, *switches, description
-      end
+      # The class methods.
+      class << self
 
-      private_class_method :add_options_to!
-
-      # Creates a <tt>version</tt> subcommand that inherits from the given
-      # +base+ command and stores the class in the +Version+ constant of +base+.
-      # When called, the command displays the +version_string+ of the program
-      # and then exits.
-      #
-      # The last argument is an option +Hash+, which accepts the following
-      # options:
-      #
-      # [:options]   If +true+, will add a version option to the +base+ command.
-      # [:switches]  The switches used when creating the version option.
-      def self.create(base, version_string, opts = {})
-        if opts.fetch :options, true
-          add_options_to! base, opts
-        end
-        base.const_set(:Version, Class.new(base)).tap do |version_command|
-          version_command.when_called do |options, args|
-            puts version_string
-            exit
+        # Creates a <tt>version</tt> subcommand that inherits from the given
+        # +base+ command and stores the class in the +Version+ constant of
+        # +base+. When called, the command displays the +version_string+ of the
+        # program and then exits.
+        #
+        # The last argument can be a configuration hash, which accepts the
+        # following options:
+        #
+        # [:options]   If +true+, will add a version option to the +base+
+        #              command.
+        # [:switches]  The switches used when creating the version option.
+        # [:exit]      If +true+, +exit+ will be called when the command is
+        #              done.
+        def create(*args)
+          opts, base, version_string = args.extract_ribbon!, args.shift, args.shift
+          add_options_to! base, opts if opts.options? true
+          base.const_set(:Version, Class.new(base)).tap do |version_command|
+            version_command.when_called do |options, args|
+              puts version_string
+              exit if opts.exit? true
+            end
           end
         end
+
+        private
+
+        # Adds a special version option to the given +command+.
+        #
+        # The last argument can be a configuration hash, which accepts the
+        # following options:
+        #
+        # [:switches]  The switches used when creating the version option.
+        def add_options_to!(*args)
+          opts, command = args.extract_ribbon!, args.shift
+          switches = opts.switches? %w(-v --version)
+          description = opts.description? 'Show version and exit.'
+          command.option :acclaim_version, *switches, description
+        end
+
       end
 
     end

data/lib/acclaim/option/parser.rb

@@ -61,13 +61,13 @@ module Acclaim
       #   args = %w(-F log.txt --verbose arg1 arg2)
       #   options = []
       #   options << Option.new(:file, '-F', arity: [1,0], required: true)
-      #   options << Option.new(:verbose, '--verbose')
+      #   options << Option.new(:verbose)
       #
       #   Option::Parser.new(args, options).parse!
-      #   => {Ribbon file: "log.txt", verbose: true}
+      #    => {file: "log.txt", verbose: true}
       #
       #   args
-      #   => ["arg1", "arg2"]
+      #    => ["arg1", "arg2"]
       def parse!
         preprocess_argv!
         parse_values!
@@ -88,8 +88,8 @@ module Acclaim
       def split_multiple_short_options!
         argv.find_all { |arg| arg =~ MULTIPLE_SHORT_SWITCHES }.each do |multiples|
           multiples_index = argv.index multiples
-          argv.delete multiples
-          switches = multiples.sub!(/^-/, '').split(//).each { |letter| letter.prepend '-' }
+          argv.delete_at multiples_index
+          switches = multiples.sub(/^-/, '').split(//).each { |letter| letter.prepend '-' }
           argv.insert multiples_index, *switches
         end
       end
@@ -103,7 +103,7 @@ module Acclaim
       def normalize_parameters!
         argv.find_all { |arg| arg =~ SWITCH_PARAM_EQUALS }.each do |switch|
           switch_index = argv.index switch
-          argv.delete switch
+          argv.delete_at switch_index
           switch, params = switch.split /\=/
           params = (params or '').split /,/
           argv.insert switch_index, *[ switch, *params ]
@@ -113,24 +113,24 @@ module Acclaim
       # Parses the options and their arguments, associating that information
       # with a Ribbon instance.
       def parse_values!
-        ribbon = Ribbon.new
+        values = Ribbon.wrap
         options.each do |option|
           key = option.key
-          ribbon[key] = option.default unless Ribbon[ribbon].has_key? key
+          values[key] = option.default unless values.has_key? key
           switches = argv.find_all { |switch| option =~ switch }
           Error.raise_missing_required option if option.required? and switches.empty?
           Error.raise_multiple option if option.on_multiple == :raise and switches.count > 1
           switches.each do |switch|
             if option.flag?
-              found_boolean option, ribbon
+              found_boolean option, values.ribbon
               argv.delete_at argv.index(switch)
             else
               params = extract_parameters_of! option, switch
-              found_params_for option, params, ribbon
+              found_params_for option, params, values.ribbon
             end
           end
         end
-        ribbon
+        values.ribbon
       end
 
       # Finds the +switch+ in #argv and scans the next +option.arity.total+
@@ -179,10 +179,10 @@ module Acclaim
         params = option.convert_parameters *params
         if handler = option.handler then handler.call ribbon, params
         else
-          key = option.key.to_sym
+          key = option.key
           value = option.arity.total == 1 ? params.first : params
           value = [*ribbon[key], *value] if option.on_multiple == :append
-          ribbon[option.key.to_sym] = value unless params.empty?
+          ribbon[key] = value unless params.empty?
         end
       end
 
@@ -191,7 +191,7 @@ module Acclaim
       # be set to <tt>true</tt>.
       def found_boolean(option, ribbon = Ribbon.new)
         if handler = option.handler then handler.call ribbon
-        else ribbon[option.key.to_sym] = true end
+        else ribbon[option.key] = true end
       end
 
     end

data/lib/acclaim/option/parser/regexp.rb

@@ -12,19 +12,19 @@ module Acclaim
         # <tt>'-mult'</tt> should match MULTIPLE_SHORT_SWITCHES, and will be
         # split into <tt>%w(-m -u -l -t)</tt>, which in turn should match this
         # regular expression.
-        SHORT_SWITCH = /\A-\w\Z/
+        SHORT_SWITCH = /\A-[a-zA-Z_]\Z/.freeze
 
         # Regular expression for a long option switch.
         #
         # Examples: <tt>--long; --no-feature; --with_underscore;
         # --_private-option; --1-1</tt>
-        LONG_SWITCH = /\A--[\w\d]+(-[\w\d]+)*\Z/
+        LONG_SWITCH = /\A--\w+(-\w+)*\Z/.freeze
 
         # Regular expression for multiple short options in a single "short"
         # switch.
         #
         # Examples: <tt>-xvf; -abc; -de_f</tt>
-        MULTIPLE_SHORT_SWITCHES = /\A-\w{2,}\Z/
+        MULTIPLE_SHORT_SWITCHES = /\A-[a-zA-Z_]{2,}\Z/.freeze
 
         # Regular expression for a long switch connected to its parameters with
         # an equal sign. Multiple parameters are be separated by commas.
@@ -40,16 +40,17 @@ module Acclaim
         # <tt>'--weird=,PARAM2'</tt> will become
         # <tt>['--weird', '', 'PARAM2']</tt> when it is split up. What to make
         # of those isn't a decision for a preprocessor.
-        SWITCH_PARAM_EQUALS = /\A--[\w\d]+(-[\w\d]+)*=(,*[\w\d]*)*\Z/
+        SWITCH_PARAM_EQUALS = /\A--\w+(-\w+)*=(,*\w*)*\Z/.freeze
 
         # Regular expression for any kind of option switch.
-        SWITCH = /(#{SHORT_SWITCH})|(#{LONG_SWITCH})|(#{MULTIPLE_SHORT_SWITCHES})|(#{SWITCH_PARAM_EQUALS})/
+        SWITCH = ::Regexp.union(SHORT_SWITCH, LONG_SWITCH,
+                                MULTIPLE_SHORT_SWITCHES, SWITCH_PARAM_EQUALS).freeze
 
         # Regular expression for the string that separates options and their
         # parameters from arguments like filenames.
         #
         # Examples: <tt>--; ---</tt>
-        ARGUMENT_SEPARATOR = /\A-{2,}\Z/
+        ARGUMENT_SEPARATOR = /\A-{2,}\Z/.freeze
 
       end
 

data/lib/acclaim/version.rb

@@ -11,7 +11,7 @@ module Acclaim
     # Minor version.
     #
     # Increments denote backward-compatible changes and additions.
-    MINOR = 1
+    MINOR = 2
 
     # Patch version.
     #

data/spec/acclaim/option/parser/regexp_spec.rb

@@ -0,0 +1,238 @@
+require 'acclaim/option/parser/regexp'
+
+describe Acclaim::Option::Parser::Regexp do
+
+  # Generate one helper for each constant in the described module.
+  described_class.constants.each do |constant|
+    let(constant.to_s.downcase.to_sym) { described_class.const_get constant }
+  end
+
+  let(:short_option) { '-o' }
+  let(:long_option) { '--option' }
+  let(:multiple_short_options) { '-option' }
+  let(:long_option_equals_sign) { '--option=' }
+  let(:long_option_equals_sign_value) { '--option=VALUE' }
+  let(:long_option_equals_sign_values) { '--option=VALUE1,VALUE2,VALUE3' }
+  let(:long_option_equals_sign_comma_values) { '--option=,VALUE2,VALUE3' }
+  let(:long_option_equals_sign_empty_commas) { '--option=,,' }
+  let(:double_argument_separator) { '--' }
+  let(:triple_argument_separator) { '---' }
+  let(:long_option_with_separators) { '--my-option' }
+  let(:short_option_underscore) { '-_' }
+  let(:long_option_underscore) { '--_' }
+  let(:multiple_short_options_underscore) { '-many_options' }
+  let(:long_option_equals_sign_underscore) { '--my_option=' }
+  let(:short_option_with_numbers) { '-5' }
+  let(:multiple_short_options_with_numbers) { '-1234567890' }
+  let(:long_option_equals_sign_and_numbers) { '--1234567890=' }
+  let(:long_option_with_numbers) { '--1234567890' }
+
+  describe 'SHORT_SWITCH' do
+    it 'should match short options' do
+      short_option.should match(short_switch)
+    end
+
+    it 'should not match long options' do
+      long_option.should_not match(short_switch)
+    end
+
+    it 'should not match multiple short options' do
+      multiple_short_options.should_not match(short_switch)
+    end
+
+    it 'should not match long options with an equals sign' do
+      long_option_equals_sign.should_not match(short_switch)
+    end
+
+    it 'should not match a two-dash argument separator' do
+      double_argument_separator.should_not match(short_switch)
+    end
+
+    it 'should not match a three-dash argument separator' do
+      triple_argument_separator.should_not match(short_switch)
+    end
+
+    it 'should consider underscores as valid characters' do
+      short_option_underscore.should match(short_switch)
+    end
+
+    it 'should not consider digits as valid characters' do
+      short_option_with_numbers.should_not match(short_switch)
+    end
+  end
+
+  describe 'LONG_SWITCH' do
+    it 'should not match short options' do
+      short_option.should_not match(long_switch)
+    end
+
+    it 'should match long options' do
+      long_option.should match(long_switch)
+    end
+
+    it 'should not match multiple short options' do
+      multiple_short_options.should_not match(long_switch)
+    end
+
+    it 'should not match long options with an equals sign' do
+      long_option_equals_sign.should_not match(long_switch)
+    end
+
+    it 'should not match a two-dash argument separator' do
+      double_argument_separator.should_not match(long_switch)
+    end
+
+    it 'should not match a three-dash argument separator' do
+      triple_argument_separator.should_not match(long_switch)
+    end
+
+    it 'should consider underscores as valid characters' do
+      long_option_underscore.should match(long_switch)
+    end
+
+    it 'should consider digits as valid characters' do
+      long_option_with_numbers.should match(long_switch)
+    end
+
+    it 'should allow dashes as word separators' do
+      long_option_with_separators.should match(long_switch)
+    end
+  end
+
+  describe 'MULTIPLE_SHORT_SWITCHES' do
+    it 'should not match short options' do
+      short_option.should_not match(multiple_short_switches)
+    end
+
+    it 'should not match long options' do
+      long_option.should_not match(multiple_short_switches)
+    end
+
+    it 'should match multiple short options' do
+      multiple_short_options.should match(multiple_short_switches)
+    end
+
+    it 'should not match long options with an equals sign' do
+      long_option_equals_sign.should_not match(multiple_short_switches)
+    end
+
+    it 'should not match a two-dash argument separator' do
+      double_argument_separator.should_not match(multiple_short_switches)
+    end
+
+    it 'should not match a three-dash argument separator' do
+      triple_argument_separator.should_not match(multiple_short_switches)
+    end
+
+    it 'should consider underscores as valid characters' do
+      multiple_short_options_underscore.should match(multiple_short_switches)
+    end
+
+    it 'should not consider digits as valid characters' do
+      multiple_short_options_with_numbers.should_not match(multiple_short_switches)
+    end
+  end
+
+  describe 'SWITCH_PARAM_EQUALS' do
+    it 'should not match short options' do
+      short_option.should_not match(switch_param_equals)
+    end
+
+    it 'should not match long options' do
+      long_option.should_not match(switch_param_equals)
+    end
+
+    it 'should not match multiple short options' do
+      multiple_short_options.should_not match(switch_param_equals)
+    end
+
+    it 'should match long options with an equals sign' do
+      long_option_equals_sign.should match(switch_param_equals)
+    end
+
+    it 'should not match a two-dash argument separator' do
+      double_argument_separator.should_not match(switch_param_equals)
+    end
+
+    it 'should not match a three-dash argument separator' do
+      triple_argument_separator.should_not match(switch_param_equals)
+    end
+
+    it 'should consider underscores as valid characters' do
+      long_option_equals_sign_underscore.should match(switch_param_equals)
+    end
+
+    it 'should consider digits as valid characters' do
+      long_option_equals_sign_and_numbers.should match(switch_param_equals)
+    end
+
+    it 'should match a long option with an equals sign followed by a value' do
+      long_option_equals_sign_value.should match(switch_param_equals)
+    end
+
+    it 'should match a long option with an equals sign followed by comma-separated values' do
+      long_option_equals_sign_values.should match(switch_param_equals)
+    end
+
+    it 'should match a long option with an equals sign with a comma before the values' do
+      long_option_equals_sign_comma_values.should match(switch_param_equals)
+    end
+
+    it 'should match a long option with an equals sign followed by commas' do
+      long_option_equals_sign_empty_commas.should match(switch_param_equals)
+    end
+  end
+
+  describe 'SWITCH' do
+    it 'should match short options' do
+      short_option.should match(switch)
+    end
+
+    it 'should match long options' do
+      long_option.should match(switch)
+    end
+
+    it 'should match multiple short options' do
+      multiple_short_options.should match(switch)
+    end
+
+    it 'should match long options with an equals sign' do
+      long_option_equals_sign.should match(switch)
+    end
+
+    it 'should not match a two-dash argument separator' do
+      double_argument_separator.should_not match(switch)
+    end
+
+    it 'should not match a three-dash argument separator' do
+      triple_argument_separator.should_not match(switch)
+    end
+  end
+
+  describe 'ARGUMENT_SEPARATOR' do
+    it 'should not match short options' do
+      short_option.should_not match(argument_separator)
+    end
+
+    it 'should not match long options' do
+      long_option.should_not match(argument_separator)
+    end
+
+    it 'should not match multiple short options' do
+      multiple_short_options.should_not match(argument_separator)
+    end
+
+    it 'should not match long options with an equals sign' do
+      long_option_equals_sign.should_not match(argument_separator)
+    end
+
+    it 'should match a two-dash argument separator' do
+      double_argument_separator.should match(argument_separator)
+    end
+
+    it 'should match a three-dash argument separator' do
+      triple_argument_separator.should match(argument_separator)
+    end
+  end
+
+end

data/spec/acclaim/option/parser_spec.rb

@@ -18,14 +18,14 @@ describe Acclaim::Option::Parser do
     end
 
     context 'when given a long switch with multiple parameters separated by an equals sign' do
-      let!(:args) { %w(--files FILE1 FILE2 FILE3) }
+      let!(:args) { %w(--files=FILE1,FILE2,FILE3) }
 
       it 'should separate the switch and the parameters' do
         subject.parse!
         args.should == %w(--files FILE1 FILE2 FILE3)
       end
 
-      context 'but the parameter list starts with a comma' do
+      context 'but without a first parameter' do
         let!(:args) { %w(--files=,FILE2,FILE3) }
 
         it 'should treat the first parameter as if it was an empty string' do
@@ -35,7 +35,7 @@ describe Acclaim::Option::Parser do
       end
     end
 
-    context 'when given a long siwtch with an equals sign' do
+    context 'when given a long switch with an equals sign' do
       context 'but no parameters' do
         let!(:args) { %w(--none=) }
 

data/spec/acclaim/option_spec.rb

@@ -164,7 +164,7 @@ describe Acclaim::Option do
 
     context 'when the option was initialized with Date as its type' do
       let(:type) { Date }
-      let(:date) { Date.today }
+      let(:date) { type.today }
       let(:params) { [date.to_s] }
 
       it 'should convert the parameters to dates' do
@@ -174,7 +174,7 @@ describe Acclaim::Option do
 
     context 'when the option was initialized with DateTime as its type' do
       let(:type) { DateTime }
-      let(:date_time) { DateTime.now }
+      let(:date_time) { type.parse type.now.to_s }
       let(:params) { [date_time.to_s] }
 
       it 'should convert the parameters to dates/times' do
@@ -184,7 +184,7 @@ describe Acclaim::Option do
 
     context 'when the option was initialized with Time as its type' do
       let(:type) { Time }
-      let(:time) { Time.now }
+      let(:time) { type.parse type.now.to_s }
       let(:params) { [time.to_s] }
 
       it 'should convert the parameters to times' do
@@ -194,7 +194,7 @@ describe Acclaim::Option do
 
     context 'when the option was initialized with URI as its type' do
       let(:type) { URI }
-      let(:uri) { URI.parse 'https://github.com/matheusmoreira/acclaim' }
+      let(:uri) { type.parse 'https://github.com/matheusmoreira/acclaim' }
       let(:params) { [uri.to_s] }
 
       it 'should convert the parameters to URIs' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acclaim
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000 Z
+date: 2012-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ribbon
-  requirement: &22189080 !ruby/object:Gem::Requirement
+  requirement: &20746840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22189080
+  version_requirements: *20746840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22188500 !ruby/object:Gem::Requirement
+  requirement: &20745700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22188500
+  version_requirements: *20745700
 - !ruby/object:Gem::Dependency
   name: rookie
-  requirement: &22188080 !ruby/object:Gem::Requirement
+  requirement: &20744980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22188080
+  version_requirements: *20744980
 description: Command-line option parser and command interface.
 email: matheus.a.m.moreira@gmail.com
 executables: []
@@ -78,6 +78,7 @@ files:
 - lib/acclaim/version.rb
 - spec/acclaim/command_spec.rb
 - spec/acclaim/option/arity_spec.rb
+- spec/acclaim/option/parser/regexp_spec.rb
 - spec/acclaim/option/parser_spec.rb
 - spec/acclaim/option_spec.rb
 homepage: https://github.com/matheusmoreira/acclaim
@@ -94,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -901301498998529047
+      hash: -1211294602011748853
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -103,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -901301498998529047
+      hash: -1211294602011748853
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10