cliqr 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbf6874d54c340fea81a85d5d9c5d495eaf4bf70
-  data.tar.gz: c3a763238d2cfb47d3cf479d7922a9fa43357656
+  metadata.gz: 779fd42a32e0ec2a3d11d5db83bc65c66926d56b
+  data.tar.gz: a2c085fa4815bdcd88d04d1c52e6d7e1e2e4e4d2
 SHA512:
-  metadata.gz: db2d7b59f422dd286fc244b6ed263ddbef70f9a088b3c95018fda4113daf3525ba53d96b4e6d0d6b970ba1fe52bf4772be34b2acdc60131c08aa3a242a5ddc2b
-  data.tar.gz: e470554fbb6649e3685173b78bd6559f5d104b6215ef8fd7cdc4265679cf1df2d7a29973c46a0ef009cf3278f3e84ea6b82fe04820989985d9af8bda512655b5
+  metadata.gz: f91257c83d83705c218151e96b5c0e68f183ab714df0b661d65287d819ef83b0099c152780e46a25c1aab151a4cb21439252c787f1a6ae99bab3d7f6b4fb68ac
+  data.tar.gz: 609e715827bfe3cb93fb6dd9271856c0a9c7c256aa7ba89d070aa0906181452b5a3b34020dd3d4850b26d75483721931f1339fedb9f230f16dd60e841bf3394c

data/CHANGELOG.md

@@ -5,6 +5,12 @@ item in this nested table for further details.
 <!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc/generate-toc again -->
 **Table of Contents**
 
+- [1.1.0 / 2015-06-05](#110--2015-06-05)
+    - [Features](#features)
+        - [Support for arbitrary arguments in a command](#support-for-arbitrary-arguments-in-a-command)
+    - [Minor Improvements](#minor-improvements)
+        - [Improve readme example](#improve-readme-example)
+        - [Reorganize config validation logic](#reorganize-config-validation-logic)
 - [1.0.0 / 2015-06-04](#100--2015-06-04)
     - [Features](#features)
         - [Support for option types](#support-for-option-types)
@@ -61,6 +67,24 @@ item in this nested table for further details.
 
 <!-- markdown-toc end -->
 
+1.1.0 / 2015-06-05
+==================
+
+A small, yet a very important release. In this release we add support
+for arbitrary arguments.
+
+## Features
+
+### Support for arbitrary arguments in a command
+
+For the first time you can invoke a command with a non-option arguments.
+
+## Minor Improvements
+
+### Improve readme example
+
+### Reorganize config validation logic
+
 1.0.0 / 2015-06-04
 ==================
 

data/README.md

@@ -53,8 +53,8 @@ class MyCommandHandler < Cliqr.command
     puts "value for option 'count' is '#{context.option('count').value}'"
     puts "value for option 'single' is '#{context.option('single').value}'"
     puts "value for option 'test-1' is '#{context.option('test-1').value}'"
-    puts "has count argument" if context.option?('count')
-    puts "does not have test argument" unless context.option?('test-2')
+    puts "has 'count' argument" if context.option?('count')
+    puts "does not have 'test-2' argument" unless context.option?('test-2')
   end
 end
 
@@ -88,7 +88,7 @@ puts cli.usage
 # my-command -- this is an awesome command...try it out
 #
 # USAGE:
-#     my-command [options]
+#     my-command [options] [arguments]
 #
 # Available options:
 #
@@ -108,8 +108,8 @@ cli.execute %w(--an-option qwerty -c 86 --no-single --test-1 some-value)
 # value for option 'count' is '86'
 # value for option 'single' is 'false'
 # value for option 'test-1' is 'some-value'
-# has count argument
-# does not have test argument
+# has 'count' argument
+# does not have 'test-2' argument
 ```
 
 ## Installation

data/lib/cliqr/cli/command_context.rb

@@ -12,6 +12,11 @@ module Cliqr
       # @return [String]
       attr_accessor :command
 
+      # Command arguments
+      #
+      # @return [Array<String>] List of arguments
+      attr_accessor :arguments
+
       # Build a instance of command context based on the parsed set of arguments
       #
       # @param [Cliqr::Parser::ParsedInput] parsed_input Parsed input object
@@ -24,8 +29,10 @@ module Cliqr
       # Initialize the command context (called by the CommandContextBuilder)
       #
       # @return [Cliqr::CLI::CommandContext]
-      def initialize(command, options)
+      def initialize(command, options, arguments)
         @command = command
+        @arguments = arguments
+
         # make option map from array
         @options = Hash[*options.collect { |option| [option.name, option] }.flatten]
       end
@@ -78,7 +85,8 @@ module Cliqr
       # @return [Cliqr::CLI::CommandContext] A newly created CommandContext instance
       def build
         CommandContext.new @parsed_input.command,
-                           @parsed_input.options.map { |option| CommandOption.new(option) }
+                           @parsed_input.options.map { |option| CommandOption.new(option) },
+                           @parsed_input.arguments
       end
     end
 

data/lib/cliqr/cli/config.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 require 'cliqr/dsl'
-require 'cliqr/validation/verifiable'
+require 'cliqr/config_validation/verifiable'
 require 'cliqr/cli/command'
 
 module Cliqr
@@ -15,7 +15,7 @@ module Cliqr
     # @api private
     class Config
       extend Cliqr::DSL
-      include Cliqr::Validation
+      include Cliqr::ConfigValidation
 
       # Base name of the command
       #
@@ -36,6 +36,13 @@ module Cliqr
       validates :handler,
                 extend: Cliqr::CLI::Command
 
+      # Optional attribute that dictates whether this command can take arbitrary arguments
+      #
+      # @return [Symbol] Either <tt>:enabled</tt> or <tt>:disabled</tt>
+      attr_accessor :arguments
+      validates :arguments,
+                inclusion: [:enable, :disable]
+
       # Array of options applied to the base command
       #
       # @return [Array<OptionConfig>]
@@ -48,6 +55,7 @@ module Cliqr
         @basename = UNSET
         @description = UNSET
         @handler = UNSET
+        @arguments = UNSET
 
         @options = []
         @option_index = {}
@@ -60,6 +68,7 @@ module Cliqr
         @basename = '' if @basename == UNSET
         @description = '' if @description == UNSET
         @handler = nil if @handler == UNSET
+        @arguments = :enable if @arguments == UNSET
 
         self
       end
@@ -108,6 +117,13 @@ module Cliqr
         @option_index[name]
       end
 
+      # Check if arguments are enabled for this configuration
+      #
+      # @return [Boolean] <tt>true</tt> if arguments are enabled
+      def arguments?
+        @arguments == :enable
+      end
+
       private
 
       # Set value for config option without evaluating a block
@@ -165,7 +181,7 @@ module Cliqr
     # @api private
     class OptionConfig
       extend Cliqr::DSL
-      include Cliqr::Validation
+      include Cliqr::ConfigValidation
 
       # Long option name
       #

data/lib/cliqr/{validation → config_validation}/validation_set.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
-require 'cliqr/validation/validator_factory'
+require 'cliqr/config_validation/validator_factory'
 
 module Cliqr
-  module Validation
+  module ConfigValidation
     # A collection of configured validators
     #
     # @api private

data/lib/cliqr/{validation → config_validation}/validator_factory.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 module Cliqr
-  module Validation
+  module ConfigValidation
     # A factory class to retrieve a attribute validator based on the configuration type
     #
     # @api private

data/lib/cliqr/{validation → config_validation}/verifiable.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
-require 'cliqr/validation/validator_factory'
-require 'cliqr/validation/validation_set'
+require 'cliqr/config_validation/validator_factory'
+require 'cliqr/config_validation/validation_set'
 require 'cliqr/validation_errors'
 
 module Cliqr
@@ -11,7 +11,7 @@ module Cliqr
   # @api private
   #
   # @see https://github.com/lotus/validations
-  module Validation
+  module ConfigValidation
     # If a class includes this module, we add a few useful methods to that class
     #
     # @see http://www.ruby-doc.org/core/Module.html#method-i-included

data/lib/cliqr/parser/argument_token.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+
+module Cliqr
+  module Parser
+    # Token handler for parsing a arbitrary argument value
+    #
+    # @api private
+    class ArgumentToken < Token
+      # Create a new argument token
+      def initialize(arg)
+        super(arg)
+      end
+
+      # This token is valid if argument is non-empty
+      #
+      # @return [Boolean] <tt>true</tt> if token's argument is non-empty
+      def valid?
+        return false if arg.nil?
+
+        return !arg.empty? if @arg.respond_to?(:empty?)
+
+        true
+      end
+    end
+  end
+end

data/lib/cliqr/parser/argument_tree_walker.rb

@@ -24,27 +24,31 @@ module Cliqr
       #
       # @return [Hash] Parsed hash of command line arguments
       def walk(args)
-        argument_builder = ParsedInputBuilder.new(@config)
+        input_builder = ParsedInputBuilder.new(@config)
         token_factory = TokenFactory.new(@config)
         token = token_factory.get_token
         args.each do |arg|
-          token = handle_argument(arg, token, token_factory)
-          argument_builder.add_token(token) unless token.active?
+          token = handle_argument(arg, token, token_factory, input_builder)
         end
-        token.finalize if token.active?
-        argument_builder.build
+        fail Cliqr::Error::OptionValueMissing, "a value must be defined for argument \"#{token.arg}\"" \
+          if token.active?
+        input_builder.build
       end
 
       # Handle the next argument in the context of the current token
       #
       # @return [Cliqr::CLI::Parser::Token] The new active token in case <tt>current_token</tt>
       # becomes inactive
-      def handle_argument(arg, current_token, token_factory)
+      def handle_argument(arg, current_token, token_factory, input_builder)
         if current_token.active?
-          current_token.append(arg)
+          token = current_token.append(arg)
         else
-          token_factory.get_token(arg)
+          token = token_factory.get_token(arg)
         end
+
+        token.collect(input_builder)
+
+        token
       end
     end
   end

data/lib/cliqr/parser/boolean_option_token.rb

@@ -5,22 +5,12 @@ module Cliqr
     # Token handler for parsing a boolean option
     #
     # @api private
-    class BooleanOptionToken < Token
+    class BooleanOptionToken < OptionToken
       # Create a new option token to store boolean value
       def initialize(name, arg)
         super(name, arg)
         @value = !arg.to_s.start_with?('--no-')
       end
-
-      # Get the token representation
-      #
-      # @return [Hash] A hash of the option name and its value (<tt>true</tt> or <tt>false</tt>)
-      def build
-        {
-            :name => @name.to_s,
-            :value => @value
-        }
-      end
     end
   end
 end

data/lib/cliqr/parser/option_token.rb

@@ -0,0 +1,57 @@
+# encoding: utf-8
+
+module Cliqr
+  module Parser
+    # Represents a option token
+    #
+    # @api private
+    class OptionToken < Token
+      # Name of the option token
+      #
+      # @return [String]
+      attr_accessor :name
+
+      # Value of the option token
+      #
+      # @return [String]
+      attr_accessor :value
+
+      # Create a new option token with a name and value
+      #
+      # @param [String] name Long name of the option
+      # @param [String] arg Argument used to parse option name
+      def initialize(name, arg)
+        super(arg)
+
+        @name = name
+        # @value = value
+      end
+
+      # Get the token representation
+      #
+      # @return [Hash] A hash of the option name and its value
+      def build
+        {
+            :name => @name.to_s,
+            :value => @value
+        }
+      end
+
+      # A option token is not valid if it does not have a name
+      #
+      # @return [Boolean] <tt>false</tt> if the token's name is nil
+      def valid?
+        !@name.nil?
+      end
+
+      # Collect this token's name and value into a input builder
+      #
+      # @param [Cliqr::Parser::ParsedInputBuilder] input_builder A builder to prepare parsed arguments
+      #
+      # @return [Cliqr::Parser::ParsedInputBuilder] The updated input builder instance
+      def collect(input_builder)
+        input_builder.add_option_token(self) unless active?
+      end
+    end
+  end
+end

data/lib/cliqr/parser/parsed_input.rb

@@ -15,13 +15,20 @@ module Cliqr
       # @return [Hash]
       attr_accessor :options
 
+      # List of arguments from the command line
+      #
+      # @return [Array<String>]
+      attr_accessor :arguments
+
       # Initialize a new parsed input
       def initialize(parsed_arguments)
         @command = parsed_arguments[:command]
 
         @options = Hash[parsed_arguments[:options].collect \
-            { |option| [option[:name], option[:value]] }
-          ]
+            { |option| [option[:name], option[:value]] }]\
+            if parsed_arguments.key?(:options)
+
+        @arguments = parsed_arguments[:arguments]
       end
 
       # Get a value of an option

data/lib/cliqr/parser/parsed_input_builder.rb

@@ -18,19 +18,31 @@ module Cliqr
         @config = config
         @options = []
         @option_names = Set.new
+        @arguments = []
       end
 
-      # Add a new parsed token from the list of arguments
+      # Add a new parsed option token from the list of options
       #
-      # @param [Cliqr::CLI::Parser::Token] token A parsed token from command line arguments
+      # @param [Cliqr::CLI::Parser::OptionToken] token A parsed option token from command line arguments
       #
-      # @return [Boolean] <tt>true</tt> if the token was added
-      def add_token(token)
-        return false unless token.valid?
+      # @return [Cliqr::Parser::ParsedInputBuilder] Updated input builder
+      def add_option_token(token)
+        return self unless token.valid?
 
         add_option_name(token)
         @options.push(token.build)
-        true
+
+        self
+      end
+
+      # Add a argument to the list of parsed arguments
+      #
+      # @param [String] arg Argument value
+      #
+      # @return [Cliqr::Parser::ParsedInputBuilder] Updated input builder
+      def add_argument(arg)
+        @arguments.push(arg)
+        self
       end
 
       # Build the hash of parsed command line arguments
@@ -38,7 +50,8 @@ module Cliqr
       # @return [Cliqr::Parser::ParsedInput] Parsed arguments wrapper
       def build
         ParsedInput.new(:command => @config.basename,
-                        :options => @options)
+                        :options => @options,
+                        :arguments => @arguments)
       end
 
       private

data/lib/cliqr/parser/single_valued_option_token.rb

@@ -1,23 +1,17 @@
 # encoding: utf-8
 
+require 'cliqr/parser/option_token'
+
 module Cliqr
   module Parser
     # Token handler for parsing a option and its value
     #
     # @api private
-    class SingleValuedOptionToken < Token
+    class SingleValuedOptionToken < OptionToken
       # Create a new option token. Initial state will be <tt>active</tt>
       def initialize(name, arg)
         super(name, arg)
-        @value = nil
-        @active = true
-      end
-
-      # Check if the token handler is active and needs more arguments
-      #
-      # @return [Boolean] <tt>true</tt> if the token handler is active
-      def active?
-        @active
+        activate
       end
 
       # Append the next argument in the series and set token to inactive
@@ -27,27 +21,9 @@ module Cliqr
       # @return [Cliqr::Parser::SingleValuedOptionToken]
       def append(arg)
         @value = arg
-        @active = false
+        deactivate
         self
       end
-
-      # Get the token representation
-      #
-      # @return [Hash] Token name and value in a hash
-      def build
-        {
-            :name => @name.to_s,
-            :value => @value
-        }
-      end
-
-      # Called if this token handler was still active once the argument list ends
-      #
-      # @return [Cliqr::CLI::Parser::OptionToken] Current instance object
-      def finalize
-        # should not be called
-        fail Cliqr::Error::OptionValueMissing, "a value must be defined for option \"#{@arg}\""
-      end
     end
   end
 end

data/lib/cliqr/parser/token.rb

@@ -6,39 +6,57 @@ module Cliqr
     #
     # @api private
     class Token
-      # Name of the option token
-      #
-      # @return [String]
-      attr_accessor :name
-
-      # Argument that was used to parse the option name from
+      # Argument that was used to parse this token
       #
       # @return [String]
       attr_accessor :arg
 
-      # Create a new option token
+      # Create a new token
       #
-      # @param [String] name Long name of the option
       # @param [String] arg Value of the option
-      #
-      # @return [Cliqr::CLI::Parser::OptionToken] A new Token instance
-      def initialize(name = nil, arg = nil)
-        @name = name
+      def initialize(arg = nil)
         @arg = arg
+
+        @active = false
       end
 
-      # This token is never active
+      # Get activation status of this token
       #
       # @return [Boolean] This will always return <tt>false</tt> in this case
       def active?
-        false
+        @active
       end
 
-      # A token is not valid if it does not have a name
+      # This token is never valid
       #
-      # @return [Boolean] <tt>false</tt> if the token's name is nil
+      # @return [Boolean] Always <tt>false</tt>
       def valid?
-        !@name.nil?
+        false
+      end
+
+      # Collect this token's argument into a input builder
+      #
+      # @param [Cliqr::Parser::ParsedInputBuilder] input_builder A builder to prepare parsed arguments
+      #
+      # @return [Cliqr::Parser::ParsedInputBuilder] The updated input builder instance
+      def collect(input_builder)
+        input_builder.add_argument(@arg)
+      end
+
+      protected
+
+      # Activate this token so that it can consume more arguments
+      #
+      # @return [Boolean] Token activation state
+      def activate
+        @active = true
+      end
+
+      # Deactivate this token to indicate that it does not need more arguments
+      #
+      # @return [Boolean] Token activation state
+      def deactivate
+        @active = false
       end
     end
   end

data/lib/cliqr/parser/token_factory.rb

@@ -3,6 +3,7 @@
 require 'cliqr/parser/token'
 require 'cliqr/parser/single_valued_option_token'
 require 'cliqr/parser/boolean_option_token'
+require 'cliqr/parser/argument_token'
 
 module Cliqr
   module Parser
@@ -34,7 +35,9 @@ module Cliqr
             option_config = get_option_config(Regexp.last_match(2), arg)
             build_token(option_config, arg)
           else
-            fail Cliqr::Error::InvalidArgumentError, "invalid command argument \"#{arg}\""
+            fail Cliqr::Error::InvalidArgumentError, "invalid command argument \"#{arg}\"" \
+              unless @config.arguments?
+            ArgumentToken.new(arg)
           end
         end
       end

data/lib/cliqr/version.rb

@@ -2,5 +2,5 @@
 
 # Versioned gem
 module Cliqr
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/dsl/interface_spec.rb

@@ -16,6 +16,7 @@ describe Cliqr::CLI::Interface do
       basename 'my-command'
       description 'a command used to test cliqr'
       handler TestCommand
+      arguments :disable
     end
 
     expect(cli.usage).to eq <<-EOS
@@ -30,6 +31,7 @@ EOS
     cli = Cliqr.interface do
       basename 'my-command'
       handler TestCommand
+      arguments :disable
     end
 
     expect(cli.usage).to eq <<-EOS
@@ -45,6 +47,7 @@ EOS
       basename 'my-command'
       description 'a command used to test cliqr'
       handler TestCommand
+      arguments :disable
 
       option 'option-1' do
         short 'p'
@@ -69,6 +72,7 @@ EOS
       basename 'my-command'
       description 'a command used to test cliqr'
       handler TestCommand
+      arguments :disable
 
       option 'option-1'
     end
@@ -104,6 +108,7 @@ Available options:
       basename 'my-command'
       description 'a command used to test cliqr'
       handler TestCommand
+      arguments :disable
 
       option 'option-1' do
         description 'a numeric option'
@@ -129,6 +134,7 @@ Available options:
       basename 'my-command'
       description 'a command used to test cliqr'
       handler TestCommand
+      arguments :disable
 
       option 'option-1' do
         description 'a boolean option'
@@ -148,4 +154,41 @@ Available options:
     --[no-]option-1, -p  :  <boolean> a boolean option
     EOS
   end
+
+  it 'allows interface to enable arbitrary argument list parsing without options' do
+    cli = Cliqr.interface do
+      basename 'my-command'
+      handler TestCommand
+      arguments :enable
+    end
+
+    expect(cli.usage).to eq <<-EOS
+my-command
+
+USAGE:
+    my-command [arguments]
+    EOS
+  end
+
+  it 'allows interface to enable arbitrary argument list parsing' do
+    cli = Cliqr.interface do
+      basename 'my-command'
+      handler TestCommand
+      arguments :enable
+
+      option 'option-1'
+    end
+
+    expect(cli.usage).to eq <<-EOS
+my-command
+
+USAGE:
+    my-command [options] [arguments]
+
+Available options:
+
+    --option-1
+    EOS
+  end
+
 end

data/spec/executor/executor_spec.rb

@@ -9,6 +9,7 @@ require 'fixtures/always_error_command'
 require 'fixtures/option_reader_command'
 require 'fixtures/test_option_reader_command'
 require 'fixtures/test_option_checker_command'
+require 'fixtures/argument_reader_command'
 
 describe Cliqr::CLI::Executor do
   it 'returns code 0 for default command runner' do
@@ -100,4 +101,21 @@ some-value
 test-option is defined
     EOS
   end
+
+  it 'allows command to access argument list' do
+    cli = Cliqr.interface do
+      basename 'my-command'
+      handler ArgumentReaderCommand
+      arguments :enable
+
+      option 'test-option'
+    end
+
+    result = cli.execute %w(value1 --test-option qwerty value2 value3), output: :buffer
+    expect(result[:stdout]).to eq <<-EOS
+value1
+value2
+value3
+    EOS
+  end
 end

data/spec/fixtures/argument_reader_command.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+# A command that echoes the value for option named 'test-option'
+class ArgumentReaderCommand < Cliqr.command
+  def execute(context)
+    puts context.arguments
+  end
+end

data/spec/parser/argument_parser_spec.rb

@@ -12,6 +12,7 @@ describe Cliqr::Parser do
   TEST_CLI = Cliqr.interface do
     basename 'my-command'
     handler TestCommand
+    arguments :disable
 
     option 'test-option' do
       short 't'
@@ -84,11 +85,81 @@ describe Cliqr::Parser do
 
   it 'cannot parse option without value if required' do
     expect { PARSER.parse(CONFIG, %w(--test-option)) }.to(
-      raise_error(Cliqr::Error::OptionValueMissing, 'a value must be defined for option "--test-option"'))
+      raise_error(Cliqr::Error::OptionValueMissing, 'a value must be defined for argument "--test-option"'))
   end
 
   it 'cannot parse option if it has multiple values' do
     expect { PARSER.parse(CONFIG, %w(--test-option val1 --test-option val2)) }.to(
       raise_error(Cliqr::Error::MultipleOptionValues, 'multiple values for option "--test-option"'))
   end
+
+  it 'can parse command with arguments' do
+    cli = Cliqr.interface do
+      basename 'my-command'
+      handler TestCommand
+      arguments :enable
+
+      option 'test-option' do
+        short 't'
+      end
+    end
+    parsed_input = Cliqr::Parser::ParsedInput.new(:command => 'my-command',
+                                                  :options => {},
+                                                  :arguments => ['value1'])
+    expect(PARSER.parse(cli.config, %w(value1))).to eq(parsed_input)
+  end
+
+  it 'can parse command with one option and one argument' do
+    parsed_input = Cliqr::Parser::ParsedInput.new(:command => 'my-command',
+                                                  :options => [
+                                                      {
+                                                          :name => 'test-option',
+                                                          :value => 'abcd'
+                                                      }],
+                                                  :arguments => ['value1'])
+    cli = Cliqr.interface do
+      basename 'my-command'
+      handler TestCommand
+      arguments :enable
+
+      option 'test-option' do
+        short 't'
+      end
+    end
+
+    expect(PARSER.parse(cli.config, %w(-t abcd value1))).to eq(parsed_input)
+    expect(PARSER.parse(cli.config, %w(value1 -t abcd))).to eq(parsed_input)
+  end
+
+  it 'can parse command with a mix of options and arguments' do
+    cli = Cliqr.interface do
+      basename 'my-command'
+      handler TestCommand
+      arguments :enable
+
+      option 'test-option-1' do
+        short 't'
+      end
+
+      option 'test-option-2' do
+        short 'p'
+      end
+    end
+    config = cli.config
+    parsed_input = Cliqr::Parser::ParsedInput.new(:command => 'my-command',
+                                                  :arguments => %w(value1 value2),
+                                                  :options => [
+                                                      {
+                                                          :name => 'test-option-1',
+                                                          :value => 'abcd'
+                                                      },
+                                                      {
+                                                          :name => 'test-option-2',
+                                                          :value => 'qwe'
+                                                      }
+                                                    ])
+    expect(PARSER.parse(config, %w(-t abcd -p qwe value1 value2))).to eq(parsed_input)
+    expect(PARSER.parse(config, %w(value1 -t abcd value2 -p qwe))).to eq(parsed_input)
+    expect(PARSER.parse(config, %w(-t abcd value1 -p qwe value2))).to eq(parsed_input)
+  end
 end

data/spec/validation/argument_validation_spec.rb

@@ -93,6 +93,7 @@ false
     cli = Cliqr.interface do
       basename 'my-command'
       handler TestCommand
+      arguments :disable
 
       option 'opt' do
         type :boolean

data/spec/validation/validation_spec.rb

@@ -2,10 +2,10 @@
 
 require 'spec_helper'
 
-describe Cliqr::Validation do
+describe Cliqr::ConfigValidation do
   it 'does not know how to validate unknown types' do
     expect do
-      Cliqr::Validation::ValidatorFactory.get(:bla, {}).validate(nil, nil, nil)
+      Cliqr::ConfigValidation::ValidatorFactory.get(:bla, {}).validate(nil, nil, nil)
     end.to raise_error(Cliqr::Error::UnknownValidatorType, "unknown validation type: 'bla'")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cliqr
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Anshul Verma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -65,19 +65,21 @@ files:
 - lib/cliqr/cli/executor.rb
 - lib/cliqr/cli/interface.rb
 - lib/cliqr/cli/router.rb
+- lib/cliqr/config_validation/validation_set.rb
+- lib/cliqr/config_validation/validator_factory.rb
+- lib/cliqr/config_validation/verifiable.rb
 - lib/cliqr/dsl.rb
 - lib/cliqr/error.rb
 - lib/cliqr/parser/argument_parser.rb
+- lib/cliqr/parser/argument_token.rb
 - lib/cliqr/parser/argument_tree_walker.rb
 - lib/cliqr/parser/boolean_option_token.rb
+- lib/cliqr/parser/option_token.rb
 - lib/cliqr/parser/parsed_input.rb
 - lib/cliqr/parser/parsed_input_builder.rb
 - lib/cliqr/parser/single_valued_option_token.rb
 - lib/cliqr/parser/token.rb
 - lib/cliqr/parser/token_factory.rb
-- lib/cliqr/validation/validation_set.rb
-- lib/cliqr/validation/validator_factory.rb
-- lib/cliqr/validation/verifiable.rb
 - lib/cliqr/validation_errors.rb
 - lib/cliqr/version.rb
 - spec/config/config_finalize_spec.rb
@@ -87,6 +89,7 @@ files:
 - spec/executor/command_runner_spec.rb
 - spec/executor/executor_spec.rb
 - spec/fixtures/always_error_command.rb
+- spec/fixtures/argument_reader_command.rb
 - spec/fixtures/option_reader_command.rb
 - spec/fixtures/test_command.rb
 - spec/fixtures/test_option_checker_command.rb
@@ -128,6 +131,7 @@ test_files:
 - spec/executor/command_runner_spec.rb
 - spec/executor/executor_spec.rb
 - spec/fixtures/always_error_command.rb
+- spec/fixtures/argument_reader_command.rb
 - spec/fixtures/option_reader_command.rb
 - spec/fixtures/test_command.rb
 - spec/fixtures/test_option_checker_command.rb