cliqr 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2892f4cce1901d6018999df394a46e27d591af4b
-  data.tar.gz: 709e7b21684d0f463382e4c3b1c49fd59b874bb9
+  metadata.gz: aa7b636b8c96c46131bce26dc5019a0ab0a1cadc
+  data.tar.gz: a7a236dd9d2c144b271e132e8520c75cac921094
 SHA512:
-  metadata.gz: e11d059ede7010a84baa7dfe33ccf85b1776534c2f5b9ca87d6840519e376c46feca6c84d48ce69d9b1c86316623e548bf34f054e32521aa2344916a3b3fb588
-  data.tar.gz: 3e340c1aff3fc1a664345d08406ad8e11b1b5ab7178f9e22fe31ad743aa8da8949b88ead8eda1ed67c326e0dd7b10d06a23e76e58411acca62a428fb6a2af793
+  metadata.gz: 64435fe4b4bb4c5eebd23452c091d474f282eea28d997d11d3f81a52404bab76ba12c3b52f4f8b5a551f13704b2285a74a3b1860274891cf7b0c6d9ca57d0e9e
+  data.tar.gz: c0134be11cb243f3073277f745719c4376be96b33a876b0c9cfb5d7b99ff1ce7cd49cf41065bdef48b0d7d14e88ddb13da22b80d1e56c6cf831e9acdf9b4c1d1

data/CHANGELOG.md

@@ -5,6 +5,17 @@ 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**
 
+- [2.2.0 / 2015-07-28](#220--2015-07-28)
+    - [Features](#features)
+        - [Ability to hook into sawaal for selection](#ability-to-hook-into-sawaal-for-selection)
+        - [Ability to specify multiple values for an option](#ability-to-specify-multiple-values-for-an-option)
+    - [Compatibility upgrades](#compatibility-upgrades)
+        - [Not supporting ruby versions 1.9.3 and jruby-19mode](#not-supporting-ruby-versions-193-and-jruby-19mode)
+    - [Bugfix](#bugfix)
+        - [Make sure specs are executing in CI](#make-sure-specs-are-executing-in-ci)
+        - [Upgrade and fix style issues in rubocop](#upgrade-and-fix-style-issues-in-rubocop)
+    - [Minor Improvements](#minor-improvements)
+        - [Enable all auto fixable rubocops](#enable-all-auto-fixable-rubocops)
 - [2.1.1 / 2015-07-15](#211--2015-07-15)
     - [Bugfix](#bugfix)
 - [2.1.0 / 2015-07-15](#210--2015-07-15)
@@ -118,6 +129,38 @@ item in this nested table for further details.
 
 <!-- markdown-toc end -->
 
+
+2.2.0 / 2015-07-28
+==================
+
+Some shiny new features coming in this release.
+
+## Features
+
+### Ability to hook into sawaal for selection
+
+`[Sawaal](https://github.com/anshulverma/sawaal)` allows us to allow
+users to use arrow keys to make selection in a list of items.
+
+### Ability to specify multiple values for an option
+
+Now we can specify multiple values for a option. Simple set
+`multi_valued` property to true for a option to make it multi_valued.
+
+## Compatibility upgrades
+
+### Not supporting ruby versions 1.9.3 and jruby-19mode
+
+## Bugfix
+
+### Make sure specs are executing in CI
+
+### Upgrade and fix style issues in rubocop
+
+## Minor Improvements
+
+### Enable all auto fixable rubocops
+
 2.1.1 / 2015-07-15
 ==================
 

data/Rakefile

@@ -13,7 +13,7 @@ FileList['tasks/*.rake'].each(&method(:import))
 desc 'run code coverage checker'
 task :coverage do
   ENV['COVERAGE'] = 'true'
-  Rake::Task['spec'].execute
+  Rake::Task['spec'].invoke
 end
 
 desc 'default rake task'
@@ -22,7 +22,7 @@ task default: [:clean, :coverage, :rubocop, :verify_measurements, :yardstick_mea
 desc 'run CI tasks'
 task :ci do
   ENV['CI'] = 'true'
-  Rake::Task['default'].execute
+  Rake::Task['default'].invoke
 end
 
 desc 'Load gem inside irb console'

data/lib/cliqr/argument_validation/option_validator.rb

@@ -18,8 +18,10 @@ module Cliqr
       # Run all the validators for a option
       #
       # @return [Cliqr::ValidationErrors]
-      def validate(argument, option, errors)
-        @validators.each { |validator| validator.validate(argument, option, errors) }
+      def validate(values, option, errors)
+        @validators.each do |validator|
+          values.each { |value| validator.validate(value, option, errors) }
+        end
         errors
       end
     end

data/lib/cliqr/argument_validation/validator.rb

@@ -39,9 +39,9 @@ module Cliqr
       # Validate a argument for an option and return errors
       #
       # @return [Cliqr::ValidationErrors]
-      def validate_argument(argument, option, errors)
+      def validate_argument(values, option, errors)
         option_validator = get_option_validator(option)
-        option_validator.validate(argument, option, errors)
+        option_validator.validate(values, option, errors)
         errors
       end
 

data/lib/cliqr/command/command_context.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'sawaal'
+
 require 'cliqr/command/color'
 require 'cliqr/command/argument_operator_context'
 require 'cliqr/events/invoker'
@@ -119,6 +121,13 @@ module Cliqr
         @executor.call(args, options)
       end
 
+      # Run the [Sawaal] selector on a set of options
+      #
+      # @return [Object] Selected key
+      def ask(question, options)
+        Sawaal.select(question, options)
+      end
+
       # Invoke an event
       #
       # @return [Boolean] <tt>true</tt> if the event was handled by any event handler
@@ -139,7 +148,7 @@ module Cliqr
       def get_or_check_option(name)
         option_name = name.to_s.chomp('?')
         existence_check = name.to_s.end_with?('?')
-        existence_check ? option?(option_name) : option(option_name).value \
+        existence_check ? option?(option_name) : option(option_name) \
           if @config.option?(option_name)
       end
 
@@ -148,7 +157,7 @@ module Cliqr
       # @return [Object]
       def default(name)
         option_config = @config.option(name)
-        CommandOption.new([name, option_config.default], option_config)
+        CommandOption.new(name, [option_config.default], option_config)
       end
 
       # Check if running in a bash environment
@@ -203,8 +212,8 @@ module Cliqr
       #
       # @return [Cliqr::Command::CommandContext] A newly created CommandContext instance
       def build
-        option_contexts = @parsed_input.options.map do |option|
-          CommandOption.new(option, @config.option(option.first))
+        option_contexts = @parsed_input.options.map do |option_name, option_values|
+          CommandOption.new(option_name, option_values, @config.option(option_name))
         end
 
         CommandContext.new @config,
@@ -239,27 +248,43 @@ module Cliqr
       # @return [String]
       attr_accessor :name
 
-      # Value for the command line argument's option
+      # Value array for the command line argument's option
       #
-      # @return [Object]
-      attr_accessor :value
+      # @return [Array]
+      attr_accessor :values
 
       # Create a new command line option instance
       #
-      # @param [Array] option Parsed arguments for creating a command line option
+      # @param [String] name Name of the option
+      # @param [Array] values Parsed values for this option
       # @param [Cliqr::Config::Option] option_config Option's config settings
       #
       # @return [Cliqr::Command::CommandContext] A new CommandOption object
-      def initialize(option, option_config)
-        @value = run_value_operator(option.pop, option_config.operator)
-        @name = option.pop
+      def initialize(name, values, option_config)
+        @name = name
+        @values = values.map { |value| run_value_operator(value, option_config.operator) }
+      end
+
+      # Get value for this option
+      #
+      # @return [Object] Joins in a CSV format if multiple
+      def value
+        return values.first if values.length == 1
+        values.join(',')
+      end
+
+      # Get string representation for this option
+      #
+      # @return [String]
+      def to_s
+        value.to_s
       end
 
       private
 
-      # Run the operator for a named attribute for a value
+      # Run the operator for a named attribute for option's values
       #
-      # @return [Nothing]
+      # @return [Array]
       def run_value_operator(value, operator)
         if operator.is_a?(Proc)
           Command::ArgumentOperatorContext.new(value).instance_eval(&operator)

data/lib/cliqr/command/shell_command.rb

@@ -110,7 +110,7 @@ module Cliqr
           @context.puts "unknown action \"#{action_name}\""
           return Cliqr::Executor::ExitCode.code(nil)
         end
-        @context.forward("#{@base_command} #{command}", :environment => @context.environment)
+        @context.forward("#{@base_command} #{command}", environment: @context.environment)
       rescue StandardError => e
         @context.puts e.message
       end

data/lib/cliqr/config/base.rb

@@ -28,9 +28,9 @@ module Cliqr
 
     # Default values based on argument type
     ARGUMENT_DEFAULTS = {
-        NUMERIC_ARGUMENT_TYPE => 0,
-        BOOLEAN_ARGUMENT_TYPE => false,
-        ANY_ARGUMENT_TYPE => nil
+      NUMERIC_ARGUMENT_TYPE => 0,
+      BOOLEAN_ARGUMENT_TYPE => false,
+      ANY_ARGUMENT_TYPE => nil
     }
 
     # Get the passed param value if current attribute is unset

data/lib/cliqr/config/option.rb

@@ -33,6 +33,13 @@ module Cliqr
                   { type_of: Proc }
                 ]
 
+      # Enable or disable multiple values for this option
+      #
+      # @return [Boolean]
+      attr_accessor :multi_valued
+      validates :multi_valued,
+                inclusion: [true, false]
+
       # Default value for this option
       #
       # @return [Object]
@@ -46,6 +53,7 @@ module Cliqr
         @type = UNSET
         @operator = UNSET
         @default = UNSET
+        @multi_valued = UNSET
       end
 
       # Finalize option's config by adding default values for unset values
@@ -59,6 +67,7 @@ module Cliqr
         @operator = Util.ensure_instance(
           Config.get_if_unset(@operator, Cliqr::Command::ArgumentOperator.for_type(@type)))
         @default = Config.get_if_unset(@default, ARGUMENT_DEFAULTS[@type])
+        @multi_valued = Config.get_if_unset(@multi_valued, false)
 
         self
       end
@@ -90,6 +99,11 @@ module Cliqr
       def default?
         !@default.nil?
       end
+
+      # Check if this option supports multiple values
+      def multi_valued?
+        @multi_valued
+      end
     end
   end
 end

data/lib/cliqr/config/validation/validator_factory.rb

@@ -373,17 +373,17 @@ module Cliqr
 
         # A hash of validator type id to validator class
         VALIDATORS = {
-            :non_empty => NonEmptyValidator,
-            :non_empty_format => NonEmptyFormatValidator,
-            :non_empty_nil_ok_format => NonEmptyNilOkFormatValidator,
-            :format => FormatValidator,
-            :extend => TypeHierarchyValidator,
-            :collection => CollectionValidator,
-            :hash => HashValidator,
-            :inclusion => InclusionValidator,
-            :one_of => OneOfValidator,
-            :type_of => TypeOfValidator,
-            :child => ChildValidator
+          non_empty: NonEmptyValidator,
+          non_empty_format: NonEmptyFormatValidator,
+          non_empty_nil_ok_format: NonEmptyNilOkFormatValidator,
+          format: FormatValidator,
+          extend: TypeHierarchyValidator,
+          collection: CollectionValidator,
+          hash: HashValidator,
+          inclusion: InclusionValidator,
+          one_of: OneOfValidator,
+          type_of: TypeOfValidator,
+          child: ChildValidator
         }
 
         # Get a new validator based on the type and config param

data/lib/cliqr/executor/command_runner_factory.rb

@@ -50,9 +50,9 @@ module Cliqr
         $stderr = old_stderr.is_a?(StringIO) ? old_stderr : StringIO.new('', 'w')
         yield
         {
-            :stdout => $stdout.string,
-            :stderr => $stderr.string,
-            :status => 0
+          stdout: $stdout.string,
+          stderr: $stderr.string,
+          status: 0
         }
       ensure
         $stdout = old_stdout

data/lib/cliqr/interface.rb

@@ -49,8 +49,8 @@ module Cliqr
     # @return [Integer] Exit code
     def execute_internal(args = [], **options)
       options = {
-          :output => :default,
-          :environment => :cli
+        output: :default,
+        environment: :cli
       }.merge(options)
       @runner.execute(args, options)
     end

data/lib/cliqr/parser/option_token.rb

@@ -32,8 +32,8 @@ module Cliqr
       # @return [Hash] A hash of the option name and its value
       def build
         {
-            :name => @name.to_s,
-            :value => @value
+          name: @name.to_s,
+          value: @value
         }
       end
 

data/lib/cliqr/parser/parsed_input.rb

@@ -23,11 +23,7 @@ module Cliqr
       # Initialize a new parsed input
       def initialize(parsed_arguments)
         @command = parsed_arguments[:command]
-
-        @options = Hash[parsed_arguments[:options].collect \
-            { |option| [option[:name].to_s, option[:value]] }]\
-            if parsed_arguments.key?(:options)
-
+        @options = parsed_arguments[:options]
         @arguments = parsed_arguments[:arguments]
       end
 

data/lib/cliqr/parser/parsed_input_builder.rb

@@ -52,14 +52,25 @@ module Cliqr
       #
       # @return [Cliqr::Parser::ParsedInput] Parsed arguments wrapper
       def build
-        ParsedInput.new(:command => @config.name,
-                        :actions => @actions,
-                        :options => @options,
-                        :arguments => @arguments)
+        ParsedInput.new(command: @config.name,
+                        actions: @actions,
+                        options: grouped_options,
+                        arguments: @arguments)
       end
 
       private
 
+      # Group options in a hash of option name to an array of its values
+      #
+      # @return [Hash]
+      def grouped_options
+        @options.group_by { |option| option[:name] }.each_with_object({}) do |(name, group), hash|
+          hash[name] ||= []
+          group.each { |item| hash[name].push(item[:value]) }
+          hash
+        end
+      end
+
       # Add option's name to a list of already added options and fail if duplicate
       #
       # @param [Cliqr::CLI::Parser::Token] token A parsed token from command line arguments
@@ -68,8 +79,8 @@ module Cliqr
       def add_option_name(token)
         option_config = @action_config.option(token.name)
         old_config = @option_names.add?(option_config.name)
-        fail Cliqr::Error::MultipleOptionValues,
-             "multiple values for option \"#{token.arg}\"" if old_config.nil?
+        fail Cliqr::Error::MultipleOptionValues, "multiple values for option \"#{token.arg}\"" \
+          if old_config.nil? && !option_config.multi_valued?
         @option_names.add(option_config.short) if option_config.short?
         @option_names
       end

data/lib/cliqr/usage/usage_builder.rb

@@ -13,8 +13,8 @@ module Cliqr
       TEMPLATES_PATH = "#{File.expand_path(File.dirname(__FILE__))}/templates"
 
       USAGE_TYPES = {
-          :cli => "#{TEMPLATES_PATH}/usage/cli.erb",
-          :shell => "#{TEMPLATES_PATH}/usage/shell.erb"
+        cli: "#{TEMPLATES_PATH}/usage/cli.erb",
+        shell: "#{TEMPLATES_PATH}/usage/shell.erb"
       }
 
       # Create a new usage builder

data/lib/cliqr/version.rb

@@ -2,5 +2,5 @@
 
 # Versioned gem
 module Cliqr
-  VERSION = '2.1.1'
+  VERSION = '2.2.0'
 end

data/spec/argument_parser_spec_helper.rb

@@ -10,6 +10,6 @@ require 'fixtures/test_command'
 def assert_results(config, args, expected_result, expected_config = nil)
   expected_config ||= config
   action_config, actual_parsed_input = Cliqr::Parser.parse(config, args)
-  expect(actual_parsed_input).to eq(expected_result)
+  expect(actual_parsed_input).to(match(expected_result))
   expect(action_config).to eq(expected_config)
 end

data/spec/config/option_config_validator_spec.rb

@@ -140,4 +140,17 @@ describe Cliqr::Config::Option do
     end.to(raise_error(Cliqr::Error::ValidationError,
                        "invalid Cliqr interface configuration - [option \"option-1\" - invalid type '']"))
   end
+
+  it 'only allows boolean values for multi_valued field' do
+    def define_interface
+      Cliqr.interface do
+        name 'my-command'
+        option 'test' do
+          multi_valued Object
+        end
+      end
+    end
+    expect { define_interface }.to(raise_error(Cliqr::Error::ValidationError,
+                                               "invalid Cliqr interface configuration - [option \"test\" - invalid type 'Object']"))
+  end
 end

data/spec/dsl/usage_spec.rb

@@ -247,7 +247,7 @@ Available options:
           end
 
           option 'hash-option' do
-            default(:key => 'val')
+            default(key: 'val')
           end
         end
 

data/spec/executor/event_executor_spec.rb

@@ -143,7 +143,7 @@ Time
           puts "invoked #{event.name} : #{event.command} : #{ch} : #{num}"
           puts "#{event.name} #{(event.parent? ? "has parent => #{event.parent.name}" : 'does not have parent')}"
           sleep 1
-          invoke :baz, 'b', 2, :t => 1
+          invoke :baz, 'b', 2, t: 1
           puts "#{event.name} ending"
         end
         on :baz do |event, ch, num, hash|
@@ -152,7 +152,7 @@ Time
           puts "parent: #{event.parent.name} : #{event.parent.command}"
           puts "diff => #{event.timestamp.to_i - event.parent.timestamp.to_i}"
           sleep 1
-          invoke :foo, 'c', 3, :s => 2
+          invoke :foo, 'c', 3, s: 2
           puts "#{event.name} ending"
         end
         handler do

data/spec/executor/executor_spec.rb

@@ -572,4 +572,61 @@ a question?
       end
     end
   end
+
+  it 'can get multiple values for an option' do
+    cli = Cliqr.interface do
+      name 'my-command'
+
+      option 'foo' do
+        multi_valued true
+      end
+
+      handler do
+        puts foo
+        puts foo.value
+        puts foo.values.first
+      end
+    end
+
+    result = cli.execute_internal %w(--foo v1 --foo v2 --foo v3), output: :buffer
+    expect(result[:stdout]).to eq <<-EOS
+v1,v2,v3
+v1,v2,v3
+v1
+    EOS
+  end
+
+  it 'operates on multi option values' do
+    cli = Cliqr.interface do
+      name 'my-command'
+
+      option 'foo' do
+        multi_valued true
+        type :numeric
+      end
+
+      option 'bar' do
+        multi_valued true
+        type :boolean
+      end
+
+      handler do
+        puts foo
+        puts foo.values.map(&:class)
+        puts bar
+        puts bar.values.map(&:class)
+      end
+    end
+
+    result = cli.execute_internal %w(--foo 123 --foo 987 --bar --bar --no-bar), output: :buffer
+    expect(result[:stdout]).to eq <<-EOS
+123,987
+Fixnum
+Fixnum
+true,true,false
+TrueClass
+TrueClass
+FalseClass
+    EOS
+  end
 end

data/spec/executor/selection_spec.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Cliqr::Command::CommandContext do
+  it 'allows selection of an item from a list' do
+    allow(Sawaal).to(receive(:select)).and_return(3)
+    cli = Cliqr.interface do
+      name 'my-command'
+      handler do
+        food_items = %w(pizza salad coke lasagna apple)
+        selected = ask('what would you like?', food_items)
+        puts selected
+        puts food_items[selected]
+      end
+    end
+    result = cli.execute_internal ['my-command'], output: :buffer
+    expect(result[:stdout]).to eq <<-EOS
+3
+lasagna
+    EOS
+  end
+end

data/spec/fixtures/test_invoker_event_handler.rb

@@ -4,6 +4,6 @@
 class TestInvokerEventHandler < Cliqr.event_handler
   def handle(event, ch, num)
     puts "invoked #{event.name} : #{event.command} : #{ch} : #{num}"
-    invoke :foo, 'b', 2, :t => 1
+    invoke :foo, 'b', 2, t: 1
   end
 end

data/spec/parser/action_argument_parser_spec.rb

@@ -13,8 +13,8 @@ describe Cliqr::Parser do
       end
     end
     config = cli.config
-    parsed_input = Cliqr::Parser::ParsedInput.new(:command => 'my-command',
-                                                  :options => [])
+    parsed_input = Cliqr::Parser::ParsedInput.new(command: 'my-command',
+                                                  options: {})
     assert_results(config, ['my-action'], parsed_input, config.action('my-action'))
   end
 
@@ -36,8 +36,8 @@ describe Cliqr::Parser do
       end
     end
     config = cli.config
-    parsed_input = Cliqr::Parser::ParsedInput.new(:command => 'my-command',
-                                                  :options => [])
+    parsed_input = Cliqr::Parser::ParsedInput.new(command: 'my-command',
+                                                  options: {})
     assert_results(config, %w(my-action-1 my-action-2 my-action-3), parsed_input,
                    config.action('my-action-1').action('my-action-2').action('my-action-3'))
   end
@@ -60,17 +60,11 @@ describe Cliqr::Parser do
       end
     end
     config = cli.config
-    parsed_input = Cliqr::Parser::ParsedInput.new(:command => 'my-command',
-                                                  :options => [
-                                                    {
-                                                        :name => 'test-option-1',
-                                                        :value => 'abcd'
-                                                    },
-                                                    {
-                                                        :name => 'test-option-2',
-                                                        :value => 'qwe'
-                                                    }
-                                                  ])
+    parsed_input = Cliqr::Parser::ParsedInput.new(command: 'my-command',
+                                                  options: {
+                                                    'test-option-1' => ['abcd'],
+                                                    'test-option-2' => ['qwe']
+                                                  })
     assert_results(config, %w(my-action -t abcd --test-option-2 qwe), parsed_input, config.action('my-action'))
   end
 
@@ -96,17 +90,11 @@ describe Cliqr::Parser do
       end
     end
     config = cli.config
-    parsed_input = Cliqr::Parser::ParsedInput.new(:command => 'my-command',
-                                                  :options => [
-                                                    {
-                                                        :name => 'test-option-1',
-                                                        :value => 'abcd'
-                                                    },
-                                                    {
-                                                        :name => 'test-option-2',
-                                                        :value => 'qwe'
-                                                    }
-                                                  ])
+    parsed_input = Cliqr::Parser::ParsedInput.new(command: 'my-command',
+                                                  options: {
+                                                    'test-option-1' => ['abcd'],
+                                                    'test-option-2' => ['qwe']
+                                                  })
     assert_results(config, %w(my-action-1 -t abcd --test-option-2 qwe my-action-2), parsed_input,
                    config.action('my-action-1').action('my-action-2'))
   end

data/spec/parser/argument_parser_spec.rb

@@ -15,32 +15,23 @@ describe Cliqr::Parser do
   CONFIG = TEST_CLI.config
 
   it 'can parse no argument command' do
-    assert_results(CONFIG, [], Cliqr::Parser::ParsedInput.new(:command => 'my-command', :options => []))
+    assert_results(CONFIG, [], Cliqr::Parser::ParsedInput.new(command: 'my-command', options: {}))
   end
 
   it 'can parse command with option using long name' do
-    parsed_input = Cliqr::Parser::ParsedInput.new(:command => 'my-command',
-                                                  :options => [
-                                                    {
-                                                        :name => 'test-option',
-                                                        :value => 'abcd'
-                                                    }
-                                                  ])
+    parsed_input = Cliqr::Parser::ParsedInput.new(command: 'my-command',
+                                                  options: {
+                                                    'test-option' => ['abcd']
+                                                  })
     assert_results(CONFIG, %w(--test-option abcd), parsed_input)
   end
 
   it 'can parse multiple options' do
-    parsed_input = Cliqr::Parser::ParsedInput.new(:command => 'my-command',
-                                                  :options => [
-                                                    {
-                                                        :name => 'test-option-1',
-                                                        :value => 'abcd'
-                                                    },
-                                                    {
-                                                        :name => 'test-option-2',
-                                                        :value => 'xyz'
-                                                    }
-                                                  ])
+    parsed_input = Cliqr::Parser::ParsedInput.new(command: 'my-command',
+                                                  options: {
+                                                    'test-option-1' => ['abcd'],
+                                                    'test-option-2' => ['xyz']
+                                                  })
     cli = Cliqr.interface do
       name 'my-command'
       handler TestCommand
@@ -52,13 +43,10 @@ describe Cliqr::Parser do
   end
 
   it 'can parse command with option using short name' do
-    parsed_input = Cliqr::Parser::ParsedInput.new(:command => 'my-command',
-                                                  :options => [
-                                                    {
-                                                        :name => 'test-option',
-                                                        :value => 'abcd'
-                                                    }
-                                                  ])
+    parsed_input = Cliqr::Parser::ParsedInput.new(command: 'my-command',
+                                                  options: {
+                                                    'test-option' => ['abcd']
+                                                  })
     assert_results(CONFIG, %w(-t abcd), parsed_input)
   end
 
@@ -96,20 +84,18 @@ describe Cliqr::Parser do
         short 't'
       end
     end
-    parsed_input = Cliqr::Parser::ParsedInput.new(:command => 'my-command',
-                                                  :options => {},
-                                                  :arguments => ['value1'])
+    parsed_input = Cliqr::Parser::ParsedInput.new(command: 'my-command',
+                                                  options: {},
+                                                  arguments: ['value1'])
     assert_results(cli.config, ['value1'], 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'])
+    parsed_input = Cliqr::Parser::ParsedInput.new(command: 'my-command',
+                                                  options: {
+                                                    'test-option' => ['abcd']
+                                                  },
+                                                  arguments: ['value1'])
     cli = Cliqr.interface do
       name 'my-command'
       handler TestCommand
@@ -139,20 +125,70 @@ describe Cliqr::Parser do
       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'
-                                                    }
-                                                  ])
+    parsed_input = Cliqr::Parser::ParsedInput.new(command: 'my-command',
+                                                  arguments: %w(value1 value2),
+                                                  options: {
+                                                    'test-option-1' => ['abcd'],
+                                                    'test-option-2' => ['qwe']
+                                                  })
     assert_results(config, %w(-t abcd -p qwe value1 value2), parsed_input)
     assert_results(config, %w(value1 -t abcd value2 -p qwe), parsed_input)
     assert_results(config, %w(-t abcd value1 -p qwe value2), parsed_input)
   end
+
+  it 'can parse command with multiple arguments for a option' do
+    cli = Cliqr.interface do
+      name 'my-command'
+      arguments :enable
+
+      option 'test-option' do
+        short 't'
+        multi_valued true
+      end
+
+      option 'test-option-2' do
+        short 'p'
+        multi_valued false
+      end
+    end
+    parsed_input = Cliqr::Parser::ParsedInput.new(command: 'my-command',
+                                                  arguments: [],
+                                                  options: {
+                                                    'test-option' => %w(v1 v2 v3),
+                                                    'test-option-2' => %w(x)
+                                                  })
+    assert_results(cli.config, %w(--test-option v1 -t v2 --test-option v3 -p x), parsed_input)
+  end
+
+  it 'can parse command with multiple arguments for a numeric option' do
+    cli = Cliqr.interface do
+      name 'my-command'
+      arguments :enable
+
+      option 'test-option' do
+        multi_valued true
+        type :numeric
+      end
+    end
+    parsed_input = Cliqr::Parser::ParsedInput.new(command: 'my-command',
+                                                  options: {},
+                                                  arguments: ['value1'])
+    assert_results(cli.config, ['value1'], parsed_input)
+  end
+
+  it 'can parse command with multiple arguments for a boolean option' do
+    cli = Cliqr.interface do
+      name 'my-command'
+      arguments :enable
+
+      option 'test-option' do
+        multi_valued true
+        type :boolean
+      end
+    end
+    parsed_input = Cliqr::Parser::ParsedInput.new(command: 'my-command',
+                                                  options: {},
+                                                  arguments: ['value1'])
+    assert_results(cli.config, ['value1'], parsed_input)
+  end
 end

data/spec/shell/shell_executor_spec.rb

@@ -1,8 +1,7 @@
 # encoding: utf-8
 
-require 'tempfile'
-
 require 'spec_helper'
+require 'spec_util'
 
 require 'fixtures/test_command'
 require 'fixtures/test_shell_prompt'
@@ -679,27 +678,3 @@ shell exited with code 0.
     end
   end
 end
-
-def with_input_output(lines, &block)
-  old_stdin = $stdin
-  old_stdout = $stdout
-  input_file = Tempfile.new('cliqr').tap do |file|
-    lines.push('exit').each { |line| file.write("#{line}\n") }
-  end
-  output_file = Tempfile.new('cliqr')
-  begin
-    $stdin = input_file.open
-    $stdout = output_file.open
-    output_getter = proc  do
-      IO.read(output_file.path).gsub(/(.*)\n/, "\\1.\n")
-    end
-    block.call(output_getter)
-  ensure
-    $stdin = old_stdin
-    $stdout = old_stdout
-    input_file.close
-    output_file.close
-    input_file.unlink
-    output_file.unlink
-  end
-end

data/spec/spec_util.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+require 'tempfile'
+
+def with_input_output(lines, &block)
+  old_stdin = $stdin
+  old_stdout = $stdout
+  input_file = Tempfile.new('cliqr').tap do |file|
+    lines.push('exit').each { |line| file.write("#{line}\n") }
+  end
+  output_file = Tempfile.new('cliqr')
+  begin
+    $stdin = input_file.open
+    $stdout = output_file.open
+    output_getter = proc  do
+      IO.read(output_file.path).gsub(/(.*)\n/, "\\1.\n")
+    end
+    block.call(output_getter)
+  ensure
+    $stdin = old_stdin
+    $stdout = old_stdout
+    input_file.close
+    output_file.close
+    input_file.unlink
+    output_file.unlink
+  end
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cliqr
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Anshul Verma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: log4r
+  name: sawaal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +131,7 @@ files:
 - spec/executor/event_executor_spec.rb
 - spec/executor/executor_spec.rb
 - spec/executor/help_executor_spec.rb
+- spec/executor/selection_spec.rb
 - spec/fixtures/action_reader_command.rb
 - spec/fixtures/always_error_command.rb
 - spec/fixtures/argument_reader_command.rb
@@ -150,6 +151,7 @@ files:
 - spec/parser/argument_parser_spec.rb
 - spec/shell/shell_executor_spec.rb
 - spec/spec_helper.rb
+- spec/spec_util.rb
 - spec/validation/action_argument_validator_spec.rb
 - spec/validation/command_argument_validation_spec.rb
 - spec/validation/error_spec.rb
@@ -195,6 +197,7 @@ test_files:
 - spec/executor/event_executor_spec.rb
 - spec/executor/executor_spec.rb
 - spec/executor/help_executor_spec.rb
+- spec/executor/selection_spec.rb
 - spec/fixtures/action_reader_command.rb
 - spec/fixtures/always_error_command.rb
 - spec/fixtures/argument_reader_command.rb
@@ -214,6 +217,7 @@ test_files:
 - spec/parser/argument_parser_spec.rb
 - spec/shell/shell_executor_spec.rb
 - spec/spec_helper.rb
+- spec/spec_util.rb
 - spec/validation/action_argument_validator_spec.rb
 - spec/validation/command_argument_validation_spec.rb
 - spec/validation/error_spec.rb