cri 2.5.0 → 2.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTY4ZDU4NjdmNGI4NDNhM2UxMTA1YTA1MDBjZmEzYWZiNDgwOTY0ZA==
-  data.tar.gz: !binary |-
-    MjkxMmY1ZDA1M2ExNDUxYmUxOTYyNjVjZTE3OWExM2Y1NmVhODg2Mg==
+SHA1:
+  metadata.gz: 0b5c4be8a90bd61c37d60ee1a789c51147f3d096
+  data.tar.gz: 19f03a77cb1414c4c5ae591d47a93027642160db
 SHA512:
-  metadata.gz: !binary |-
-    MTNjMmU4ZTViYjg2YzFiYjI5MjZiZTcyNzViNGYyYTEzZjdiMzY5MTc4Mzlk
-    MWIwYWNlNzI4Njk3Y2JlYTFkNDI4NDkyNGQ0YmVhMWE5Mzk1YjFhM2VjZDBm
-    ZjMxZmYzMDVkMzM2MGQ1OTVhYmI4NDUxMTFiNWEyZDU5MGQ5ZWE=
-  data.tar.gz: !binary |-
-    MmEwYjAzNDVhYzg0MWExM2MyODhmMzJlMDE1ZDkwY2U4Y2U2ZGFkNjYxZjk5
-    YjYxNGMxNTJlYjk5N2U0MDRkYzYyNDg3Mjc0NjlhODg5MDkyNGFmNWZlYTU2
-    YjRlY2EyNGU0NjlhYWM2NTMzZmE1MGU1MjRkMDRkNjZiODFiYjc=
+  metadata.gz: 592d029e4b6294136592855225f57340d18f0e75511e01fed4ff1f14e2babb1f01bb8929671b96eefc2e373f4046d2aa283fe539dea65ef932a48919dea30ced
+  data.tar.gz: 0c402294f210d83b2ed2680b59e01303be52dd097a932c65169cee955684be620a5364db00ef1fd72abfce735d7b4a1dc7ff581b4c5f159b9380e7870fa24dec

data/Gemfile

@@ -1,2 +1,9 @@
 source 'https://rubygems.org'
+
 gemspec
+
+gem 'coveralls'
+gem 'rake'
+gem 'minitest'
+gem 'yard'
+gem 'asciidoctor'

data/Gemfile.lock

@@ -1,21 +1,45 @@
 PATH
   remote: .
   specs:
-    cri (2.5.0)
-      colored (>= 1.2)
+    cri (2.6.0)
+      colored (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    asciidoctor (0.1.4)
     colored (1.2)
-    minitest (5.3.0)
-    rake (10.1.1)
-    yard (0.8.7.3)
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
+    docile (1.1.3)
+    mime-types (2.2)
+    minitest (5.3.2)
+    multi_json (1.9.2)
+    rake (10.2.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.19.1)
+    tins (1.0.1)
+    yard (0.8.7.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  asciidoctor
+  bundler (~> 1.6)
+  coveralls
   cri!
   minitest
   rake

data/NEWS.md

@@ -1,6 +1,11 @@
 Cri News
 ========
 
+2.6.0
+-----
+
+* Added support for multi-valued options [Toon Willems]
+
 2.5.0
 -----
 

data/README.adoc

@@ -1,5 +1,11 @@
 = Cri =
 
+link:http://rubygems.org/gems/cri[image:http://img.shields.io/gem/v/cri.svg[]]
+link:https://travis-ci.org/ddfreyne/cri[image:http://img.shields.io/travis/ddfreyne/cri.svg[]]
+link:https://coveralls.io/r/ddfreyne/cri[image:http://img.shields.io/coveralls/ddfreyne/cri.svg[]]
+link:https://codeclimate.com/github/ddfreyne/cri[image:http://img.shields.io/codeclimate/github/ddfreyne/cri.svg[]]
+link:http://inch-pages.github.io/github/ddfreyne/cri/[image:http://inch-pages.github.io/github/ddfreyne/cri.png[]]
+
 Cri is a library for building easy-to-use commandline tools with support for
 nested commands.
 
@@ -25,7 +31,7 @@ command = Cri::Command.define do
     exit 0
   end
   flag   nil, :more,  'do even more stuff'
-  option :s,  :stuff, 'specify stuff to do', :argument => :required
+  option :s,  :stuff, 'specify stuff to do', argument: :required
 
   run do |opts, args, cmd|
     stuff = opts.fetch(:stuff, 'generic stuff')
@@ -64,6 +70,8 @@ options:
     -s --stuff     specify stuff to do
 --------------------------------------------------------------------------------
 
+=== General command metadata ===
+
 Let’s disect the command definition and start with the first five lines:
 
 [source,ruby]
@@ -83,6 +91,8 @@ the supercommand, because the latter will be automatically prepended.
 
 Aliases don’t make sense for root commands, but for subcommands they do.
 
+=== Command-line options ===
+
 The next few lines contain the command’s option definitions:
 
 [source,ruby]
@@ -92,7 +102,7 @@ flag   :h,  :help,  'show help for this command' do |value, cmd|
   exit 0
 end
 flag   nil, :more,  'do even more stuff'
-option :s,  :stuff, 'specify stuff to do', :argument => :required
+option :s,  :stuff, 'specify stuff to do', argument: :required
 --------------------------------------------------------------------------------
 
 Options can be defined using the following methods:
@@ -111,6 +121,34 @@ Each of the above methods also take a block, which will be executed when the
 option is found. The argument to the block are the option value (`true` in
 case the option does not have an argument) and the command.
 
+==== Multivalued options ====
+
+Each of these four methods take a `:multiple` option. When set to true, multiple
+option valus are accepted, and the option values will be stored in an array.
+
+For example, to parse the command line options string `-o foo.txt -o bar.txt`
+into an array, so that `options[:output]` contains `[ 'foo.txt', 'bar.txt' ]`,
+you can use an option definition like this:
+
+[source,ruby]
+--------------------------------------------------------------------------------
+option :o, :output, 'specify output paths', argument: :required, multiple: true
+--------------------------------------------------------------------------------
+
+This can also be used for flags (options without arguments). In this case, the
+length of the options array is relevant.
+
+For example, you can allow setting the verbosity level using `-v -v -v`. The
+value of `options[:verbose].size` would then be the verbosity level (three in
+this example). The option definition would then look like this:
+
+[source,ruby]
+--------------------------------------------------------------------------------
+flag :v, :verbose, 'be verbose (use up to three times)', multiple: true
+--------------------------------------------------------------------------------
+
+=== The run block ===
+
 The last part of the command defines the execution itself:
 
 [source,ruby]
@@ -134,6 +172,8 @@ _command runner_ class (`Cri::CommandRunner`) that will perform the actual
 execution of the command. This makes it easier to break up large run blocks
 into manageable pieces.
 
+=== Subcommands ===
+
 Commands can have subcommands. For example, the `git` commandline tool would be
 represented by a command that has subcommands named `commit`, `add`, and so on.
 Commands with subcommands do not use a run block; execution will always be

data/Rakefile

@@ -1,44 +1,24 @@
 # encoing: utf-8
 
-##### Requirements
-
-# Rake etc
-require 'rake'
-require 'minitest'
-require 'minitest/unit'
-
-# Cri itself
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/lib'))
-require 'cri'
-
-##### Documentation
-
+require 'rake/testtask'
 require 'yard'
 
 YARD::Rake::YardocTask.new(:doc) do |yard|
   yard.files   = Dir['lib/**/*.rb']
   yard.options = [
     '--markup',        'markdown',
-    '--readme',        'README.md',
+    '--readme',        'README.adoc',
     '--files',         'NEWS.md,LICENSE',
     '--output-dir',    'doc/yardoc',
   ]
 end
 
-##### Testing
-
-desc 'Runs all tests'
 task :test do
-  ENV['QUIET'] ||= 'true'
-
-  $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
-
-  MiniTest.autorun
-
-  require 'test/helper.rb'
+  require './test/helper.rb'
 
-  test_files = Dir['test/test_*.rb']
-  test_files.each { |f| require f }
+  FileList['./test/**/test_*.rb', './test/**/*_spec.rb'].each do |fn|
+    require fn
+  end
 end
 
 task :default => :test

data/cri.gemspec

@@ -21,9 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('colored', '~> 1.2')
 
-  s.add_development_dependency('rake',     '~> 10.1')
-  s.add_development_dependency('minitest', '~> 5.3')
-  s.add_development_dependency('yard',     '~> 0.8')
+  s.add_development_dependency('bundler', '~> 1.6')
 
   s.rdoc_options     = [ '--main', 'README.adoc' ]
   s.extra_rdoc_files = [ 'LICENSE', 'README.adoc', 'NEWS.md' ]

data/lib/cri.rb

@@ -1,6 +1,9 @@
 # encoding: utf-8
+
 require 'cri/version'
 
+# The namespace for Cri, a library for building easy-to-use commandline tools
+# with support for nested commands.
 module Cri
 
   # A generic error class for all Cri-specific errors.

data/lib/cri/command.rb

@@ -251,7 +251,7 @@ module Cri
         run_this(opts_and_args, parent_opts)
       else
         # Handle options
-        self.handle_options(opts_before_subcmd)
+        handle_options(opts_before_subcmd)
 
         # Get command
         if subcmd_name.nil?
@@ -282,13 +282,13 @@ module Cri
       # Parse
       parser = Cri::OptionParser.new(
         opts_and_args, self.global_option_definitions)
-      self.handle_parser_errors_while { parser.run }
+      handle_parser_errors_while { parser.run }
       local_opts  = parser.options
       global_opts = parent_opts.merge(parser.options)
       args = parser.arguments
 
       # Handle options
-      self.handle_options(local_opts)
+      handle_options(local_opts)
 
       # Execute
       if self.block.nil?
@@ -299,16 +299,25 @@ module Cri
     end
 
     # @return [String] The help text for this command
+    #
+    # @option params [Boolean] :verbose true if the help output should be
+    #   verbose, false otherwise.
     def help(params={})
       HelpRenderer.new(self, params).render
     end
 
     # Compares this command's name to the other given command's name.
+    #
+    # @param [Cri::Command] other The command to compare with
+    #
+    # @return [-1, 0, 1] The result of the comparison between names
+    #
+    # @see Object<=>
     def <=>(other)
       self.name <=> other.name
     end
 
-  protected
+  private
 
     def handle_options(opts)
       opts.each_pair do |key, value|
@@ -323,7 +332,7 @@ module Cri
       delegate = Cri::Command::OptionParserPartitioningDelegate.new
       parser = Cri::OptionParser.new(opts_and_args, global_option_definitions)
       parser.delegate = delegate
-      self.handle_parser_errors_while { parser.run }
+      handle_parser_errors_while { parser.run }
       parser
 
       # Extract

data/lib/cri/command_dsl.rb

@@ -6,6 +6,10 @@ module Cri
   # commands.
   class CommandDSL
 
+    # Creates a new DSL, intended to be used for building a single command. A
+    # {CommandDSL} instance is not reusable; create a new instance if you want
+    # to build another command.
+    #
     # @param [Cri::Command, nil] command The command to modify, or nil if a
     #   new command should be created
     def initialize(command=nil)
@@ -101,10 +105,26 @@ module Cri
     # @option params [:forbidden, :required, :optional] :argument Whether the
     #   argument is forbidden, required or optional
     #
+    # @option params [Boolean] :multiple Whether or not the option should
+    #   be multi-valued
+    #
     # @return [void]
     def option(short, long, desc, params={}, &block)
-      requiredness = params[:argument] || :forbidden
-      self.add_option(short, long, desc, requiredness, block)
+      requiredness = params.fetch(:argument, :forbidden)
+      multiple = params.fetch(:multiple, false)
+
+      if short.nil? && long.nil?
+        raise ArgumentError, "short and long options cannot both be nil"
+      end
+
+      @command.option_definitions << {
+        :short    => short.nil? ? nil : short.to_s,
+        :long     => long.nil? ? nil : long.to_s,
+        :desc     => desc,
+        :argument => requiredness,
+        :multiple => multiple,
+        :block    => block,
+      }
     end
     alias_method :opt, :option
 
@@ -117,11 +137,15 @@ module Cri
     #
     # @param [String] desc The option description
     #
+    # @option params [Boolean] :multiple Whether or not the option should
+    #   be multi-valued
+    #
     # @return [void]
     #
     # @see {#option}
-    def required(short, long, desc, &block)
-      self.add_option(short, long, desc, :required, block)
+    def required(short, long, desc, params={}, &block)
+      params = params.merge(:argument => :required)
+      self.option(short, long, desc, params, &block)
     end
 
     # Adds a new option with a forbidden argument to the command. If a block
@@ -133,11 +157,15 @@ module Cri
     #
     # @param [String] desc The option description
     #
+    # @option params [Boolean] :multiple Whether or not the option should
+    #   be multi-valued
+    #
     # @return [void]
     #
     # @see {#option}
-    def flag(short, long, desc, &block)
-      self.add_option(short, long, desc, :forbidden, block)
+    def flag(short, long, desc, params={}, &block)
+      params = params.merge(:argument => :forbidden)
+      self.option(short, long, desc, params, &block)
     end
     alias_method :forbidden, :flag
 
@@ -150,11 +178,15 @@ module Cri
     #
     # @param [String] desc The option description
     #
+    # @option params [Boolean] :multiple Whether or not the option should
+    #   be multi-valued
+    #
     # @return [void]
     #
     # @see {#option}
-    def optional(short, long, desc, &block)
-      self.add_option(short, long, desc, :optional, block)
+    def optional(short, long, desc, params={}, &block)
+      params = params.merge(:argument => :optional)
+      self.option(short, long, desc, params, &block)
     end
 
     # Sets the run block to the given block. The given block should have two
@@ -162,9 +194,15 @@ module Cri
     # Calling this will override existing run block or runner declarations
     # (using {#run} and {#runner}, respectively).
     #
+    # @yieldparam [Hash<Symbol,Object>] opts A map of option names, as defined
+    #   in the option definitions, onto strings (when single-valued) or arrays
+    #   (when multi-valued)
+    #
+    # @yieldparam [Array<String>] args A list of arguments
+    #
     # @return [void]
     def run(&block)
-      unless block.arity != 2 || block.arity != 3
+      unless [2, 3].include?(block.arity)
         raise ArgumentError,
           "The block given to Cri::Command#run expects two or three args"
       end
@@ -185,22 +223,5 @@ module Cri
         klass.new(opts, args, cmd).call
       end
     end
-
-  protected
-
-    def add_option(short, long, desc, argument, block)
-      if short.nil? && long.nil?
-        raise ArgumentError, "short and long options cannot both be nil"
-      end
-
-      @command.option_definitions << {
-        :short    => short.nil? ? nil : short.to_s,
-        :long     => long.nil? ? nil : long.to_s,
-        :desc     => desc,
-        :argument => argument,
-        :block    => block }
-    end
-
   end
-
 end

data/lib/cri/command_runner.rb

@@ -15,6 +15,8 @@ module Cri
     # @return [Command] The command
     attr_reader :command
 
+    # Creates a command runner from the given options, arguments and command.
+    #
     # @param [Hash] options A hash contain the options and their values
     #
     # @param [Array] arguments The list of arguments

data/lib/cri/core_ext/string.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require 'colored'
 
 module Cri::CoreExtensions

data/lib/cri/help_renderer.rb

@@ -2,13 +2,22 @@
 
 module Cri
 
+  # The {HelpRenderer} class is responsible for generating a string containing
+  # the help for a given command, intended to be printed on the command line.
   class HelpRenderer
 
+    # Creates a new help renderer for the given command.
+    #
+    # @param [Cri::Command] cmd The command to generate the help for
+    #
+    # @option params [Boolean] :verbose true if the help output should be
+    #   verbose, false otherwise.
     def initialize(cmd, params={})
       @cmd        = cmd
       @is_verbose = params.fetch(:verbose, false)
     end
 
+    # @return [String] The help text for this command
     def render
       text = ''
 

data/lib/cri/option_parser.rb

@@ -16,8 +16,8 @@ module Cri
   # A sample array of definition hashes could look like this:
   #
   #     [
-  #       { :short => 'a', :long => 'all',  :argument => :forbidden },
-  #       { :short => 'p', :long => 'port', :argument => :required  },
+  #       { :short => 'a', :long => 'all',  :argument => :forbidden, :multiple => true },
+  #       { :short => 'p', :long => 'port', :argument => :required, :multiple => false },
   #     ]
   #
   # For example, the following commandline options (which should not be
@@ -258,7 +258,13 @@ module Cri
 
     def add_option(definition, value)
       key = (definition[:long] || definition[:short]).to_sym
-      options[key] = value
+      if definition[:multiple]
+        options[key] ||= []
+        options[key] << value
+      else
+        options[key] = value
+      end
+
       delegate.option_added(key, value, self) unless delegate.nil?
     end
 

data/lib/cri/version.rb

@@ -1,6 +1,8 @@
+# encoding: utf-8
+
 module Cri
 
   # The current Cri version.
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 
 end

data/test/helper.rb

@@ -1,5 +1,13 @@
 # encoding: utf-8
 
+require 'coveralls'
+Coveralls.wear!
+
+require 'minitest'
+require 'minitest/autorun'
+
+require 'cri'
+
 require 'stringio'
 
 class Cri::TestCase < Minitest::Test

data/test/test_command.rb

@@ -85,7 +85,6 @@ class Cri::CommandTestCase < Cri::TestCase
       description 'Sinks stuff (like ships and the like).'
 
       run do |opts, args|
-        $stdout.puts "Sinking!"
       end
     end
 
@@ -438,6 +437,16 @@ class Cri::CommandTestCase < Cri::TestCase
     assert_equal "args=foo,bar args.raw=foo,--,bar\n", out
   end
 
+  def test_run_without_block
+    cmd = Cri::Command.define do
+      name 'moo'
+    end
+
+    assert_raises(Cri::NotImplementedError) do
+      cmd.run([])
+    end
+  end
+
   def test_runner_with_raw_args
     cmd = Cri::Command.define do
       name 'moo'
@@ -454,4 +463,12 @@ class Cri::CommandTestCase < Cri::TestCase
     assert_equal "args=foo,bar args.raw=foo,--,bar\n", out
   end
 
+  def test_compare
+    foo = Cri::Command.define { name 'foo' }
+    bar = Cri::Command.define { name 'bar' }
+    qux = Cri::Command.define { name 'qux' }
+
+    assert_equal [ bar, foo, qux ], [ foo, bar, qux ].sort
+  end
+
 end

data/test/test_command_dsl.rb

@@ -5,13 +5,13 @@ class Cri::CommandDSLTestCase < Cri::TestCase
   def test_create_command
     # Define
     dsl = Cri::CommandDSL.new
-    dsl.instance_eval do 
+    dsl.instance_eval do
       name        'moo'
       usage       'dunno whatever'
       summary     'does stuff'
       description 'This command does a lot of stuff.'
 
-      option    :a, :aaa, 'opt a', :argument => :optional
+      option    :a, :aaa, 'opt a', :argument => :optional, :multiple => true
       required  :b, :bbb, 'opt b'
       optional  :c, :ccc, 'opt c'
       flag      :d, :ddd, 'opt d'
@@ -36,11 +36,11 @@ class Cri::CommandDSLTestCase < Cri::TestCase
 
     # Check options
     expected_option_definitions = Set.new([
-      { :short => 'a', :long => 'aaa', :desc => 'opt a', :argument => :optional,  :block => nil },
-      { :short => 'b', :long => 'bbb', :desc => 'opt b', :argument => :required,  :block => nil },
-      { :short => 'c', :long => 'ccc', :desc => 'opt c', :argument => :optional,  :block => nil },
-      { :short => 'd', :long => 'ddd', :desc => 'opt d', :argument => :forbidden, :block => nil },
-      { :short => 'e', :long => 'eee', :desc => 'opt e', :argument => :forbidden, :block => nil }
+      { :short => 'a', :long => 'aaa', :desc => 'opt a', :argument => :optional, :multiple => true,   :block => nil },
+      { :short => 'b', :long => 'bbb', :desc => 'opt b', :argument => :required, :multiple => false,  :block => nil },
+      { :short => 'c', :long => 'ccc', :desc => 'opt c', :argument => :optional, :multiple => false,  :block => nil },
+      { :short => 'd', :long => 'ddd', :desc => 'opt d', :argument => :forbidden, :multiple => false, :block => nil },
+      { :short => 'e', :long => 'eee', :desc => 'opt e', :argument => :forbidden, :multiple => false, :block => nil }
       ])
     actual_option_definitions = Set.new(command.option_definitions)
     assert_equal expected_option_definitions, actual_option_definitions
@@ -71,21 +71,58 @@ class Cri::CommandDSLTestCase < Cri::TestCase
 
     # Check options
     expected_option_definitions = Set.new([
-      { :short => 's', :long => nil,    :desc => 'short', :argument => :forbidden, :block => nil },
-      { :short => nil, :long => 'long', :desc => 'long',  :argument => :forbidden, :block => nil }
-      ])
+      { :short => 's', :long => nil,    :desc => 'short', :argument => :forbidden, :multiple => false, :block => nil },
+      { :short => nil, :long => 'long', :desc => 'long',  :argument => :forbidden, :multiple => false, :block => nil }
+    ])
     actual_option_definitions = Set.new(command.option_definitions)
     assert_equal expected_option_definitions, actual_option_definitions
   end
 
-  def test_optional_options
+  def test_multiple
+    # Define
+    dsl = Cri::CommandDSL.new
+    dsl.instance_eval do
+      flag     :f, :flag,     'sample flag option',     :multiple => true
+      required :r, :required, 'sample required option', :multiple => true
+      optional :o, :optional, 'sample optional option', :multiple => true
+
+      run { |opts, args| }
+    end
+    command = dsl.command
+
+    # Check options
+    expected_option_definitions = Set.new([
+      { :short => 'f', :long => 'flag',     :desc => 'sample flag option',     :argument => :forbidden, :multiple => true, :block => nil },
+      { :short => 'r', :long => 'required', :desc => 'sample required option', :argument => :required,  :multiple => true, :block => nil },
+      { :short => 'o', :long => 'optional', :desc => 'sample optional option', :argument => :optional,  :multiple => true, :block => nil },
+    ])
+    actual_option_definitions = Set.new(command.option_definitions)
+    assert_equal expected_option_definitions, actual_option_definitions
+  end
+
+  def test_required_short_and_long
     # Define
     dsl = Cri::CommandDSL.new
+    assert_raises ArgumentError do
+      dsl.instance_eval do
+        option nil, nil, 'meh'
+      end
+    end
     assert_raises ArgumentError do
       dsl.instance_eval do
         flag nil, nil, 'meh'
       end
     end
+    assert_raises ArgumentError do
+      dsl.instance_eval do
+        required nil, nil, 'meh'
+      end
+    end
+    assert_raises ArgumentError do
+      dsl.instance_eval do
+        optional nil, nil, 'meh'
+      end
+    end
   end
 
   def test_subcommand
@@ -117,6 +154,16 @@ class Cri::CommandDSLTestCase < Cri::TestCase
     assert_equal %w( aah moo ), command.aliases.sort
   end
 
+  def test_run_arity
+    dsl = Cri::CommandDSL.new
+    assert_raises ArgumentError do
+      dsl.instance_eval do
+        run do |a, b, c, d, e|
+        end
+      end
+    end
+  end
+
   def test_runner
     # Define
     dsl = Cri::CommandDSL.new

data/test/test_command_runner.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+
+class Cri::CommandRunnerTestCase < Cri::TestCase
+
+  def setup
+    super
+
+    @options   = { :vehicle => 'pig' }
+    @arguments = %w( baby_monkey )
+    @command   = Cri::Command.new
+  end
+
+  def test_initialize
+
+    runner = Cri::CommandRunner.new(@options, @arguments, @command)
+
+    assert_equal @options,   runner.options
+    assert_equal @arguments, runner.arguments
+    assert_equal @command,   runner.command
+  end
+
+  def test_call_run
+    assert_raises(Cri::NotImplementedError) do
+      Cri::CommandRunner.new(@options, @arguments, @command).call
+    end
+
+    assert_raises(Cri::NotImplementedError) do
+      Cri::CommandRunner.new(@options, @arguments, @command).run
+    end
+  end
+
+end

data/test/test_option_parser.rb

@@ -23,7 +23,7 @@ class Cri::OptionParserTestCase < Cri::TestCase
     end
   end
 
-  def test_parse_without_options
+  def test_parse_with_unused_options
     input       = %w( foo )
     definitions = [
       { :long => 'aaa', :short => 'a', :argument => :forbidden }
@@ -279,4 +279,16 @@ class Cri::OptionParserTestCase < Cri::TestCase
     end
   end
 
+  def test_parse_with_multiple_options
+    input = %w( foo -o test -o test2 -v -v -v)
+    definitions = [
+      { :long => 'long', :short => 'o', :argument => :required, :multiple => true },
+      { :long => 'verbose', :short => 'v', :multiple => true }
+    ]
+    parser = Cri::OptionParser.parse(input, definitions)
+
+    assert_equal(['test', 'test2'], parser.options[:long])
+    assert_equal(3, parser.options[:verbose].size)
+  end
+
 end

metadata

@@ -1,71 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: cri
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.3'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.6'
 description: Cri allows building easy-to-use commandline interfaces with support for
   subcommands.
 email: denis.defreyne@stoneship.org
@@ -102,6 +74,7 @@ files:
 - test/test_basic_root.rb
 - test/test_command.rb
 - test/test_command_dsl.rb
+- test/test_command_runner.rb
 - test/test_core_ext.rb
 - test/test_option_parser.rb
 homepage: http://stoneship.org/software/cri/
@@ -110,23 +83,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.adoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: a library for building easy-to-use commandline tools