rubikon 0.5.3 → 0.6.0

data/test/test_config.rb

@@ -3,7 +3,7 @@
 #
 # Copyright (c) 2009-2010, Sebastian Staudt
 
-require 'test_helper'
+require 'helper'
 
 class TestConfig < Test::Unit::TestCase
 

data/test/test_has_arguments.rb

@@ -3,17 +3,18 @@
 #
 # Copyright (c) 2010, Sebastian Staudt
 
-require 'test_helper'
+require 'helper'
 require 'test_parameter'
 
 class HasArg
   include HasArguments
 
-  attr_reader :arg_names
-  public :<<, :active!, :arg_count, :args_full?, :check_args, :more_args?
+  attr_reader :arg_names, :arg_values
+  public :<<, :active!, :arg_count, :args_full?, :check_args, :more_args?,
+         :reset
 
-  def initialize(arg_count)
-     super(DummyApp.instance, 'dummy', arg_count)
+  def initialize(*options)
+     super DummyApp.instance, 'dummy', *options
   end
 end
 
@@ -22,31 +23,127 @@ class TestHasArguments < Test::Unit::TestCase
   context 'A parameter with arguments' do
 
     should 'allow a Numeric as argument count' do
-      has_arg = HasArg.new(1)
+      has_arg = HasArg.new 1
       assert_equal 1..1, has_arg.arg_count
-      assert_nil has_arg.arg_names
+      assert_equal [], has_arg.arg_names
+      assert_equal ({}), has_arg.arg_values
     end
 
     should 'allow a Range as argument count' do
-      has_arg = HasArg.new(1..3)
+      has_arg = HasArg.new 1..3
       assert_equal 1..3, has_arg.arg_count
-      assert_nil has_arg.arg_names
-    end
-
-    should 'allow an Array as argument count' do
-      has_arg = HasArg.new([2, 5, 6])
-      assert_equal 2..6, has_arg.arg_count
-      assert_nil has_arg.arg_names
+      assert_equal [], has_arg.arg_names
+      assert_equal ({}), has_arg.arg_values
     end
 
     should 'allow a Symbol Array as argument names' do
-      has_arg = HasArg.new([:arg1, :arg2, :arg3])
+      has_arg = HasArg.new :arg1, :arg2, :arg3
       assert_equal 3..3, has_arg.arg_count
       assert_equal [:arg1, :arg2, :arg3], has_arg.arg_names
+      assert_equal ({}), has_arg.arg_values
+    end
+
+    should 'allow a argument validation for normal arguments' do
+      has_arg = HasArg.new(:arg1, :arg2 => ['string', /regexp/, :numeric])
+      assert_equal 2..2, has_arg.arg_count
+      assert_equal [:arg1, :arg2], has_arg.arg_names
+      assert_equal 1, has_arg.arg_values.size
+      assert_equal /^(?-mix:string|(?-mix:regexp)|(?-mix:-?[0-9]+))$/, has_arg.arg_values[:arg2]
+
+      assert_nothing_raised do
+        has_arg << 'test'
+        has_arg << 'string'
+        has_arg.check_args
+      end
+
+      has_arg.reset
+
+      assert_nothing_raised do
+        has_arg << 'test'
+        has_arg << 'regexp'
+        has_arg.check_args
+      end
+
+      has_arg.reset
+
+      assert_nothing_raised do
+        has_arg << 'test'
+        has_arg << '123'
+        has_arg.check_args
+      end
+    end
+
+    should 'allow a argument validation for optional arguments' do
+      has_arg = HasArg.new(:arg1, :arg2 => [:optional, 'string', /regexp/, :numeric])
+      assert_equal 1..2, has_arg.arg_count
+      assert_equal [:arg1, :arg2], has_arg.arg_names
+      assert_equal 1, has_arg.arg_values.size
+      assert_equal /^(?-mix:string|(?-mix:regexp)|(?-mix:-?[0-9]+))$/, has_arg.arg_values[:arg2]
+
+      assert_nothing_raised do
+        has_arg << 'test'
+        has_arg.check_args
+      end
+
+      has_arg.reset
+
+      assert_nothing_raised do
+        has_arg << 'test'
+        has_arg << 'string'
+        has_arg.check_args
+      end
+
+      has_arg.reset
+
+      assert_nothing_raised do
+        has_arg << 'test'
+        has_arg << 'regexp'
+        has_arg.check_args
+      end
+
+      has_arg.reset
+
+      assert_nothing_raised do
+        has_arg << 'test'
+        has_arg << '123'
+        has_arg.check_args
+      end
+    end
+
+    should 'allow a argument validation for remainder arguments' do
+      has_arg = HasArg.new(:arg1, :arg2 => [:remainder, 'string', /regexp/, :numeric])
+      assert_equal 2..-1, has_arg.arg_count
+      assert_equal [:arg1, :arg2], has_arg.arg_names
+      assert_equal 1, has_arg.arg_values.size
+      assert_equal /^(?-mix:string|(?-mix:regexp)|(?-mix:-?[0-9]+))$/, has_arg.arg_values[:arg2]
+
+      assert_raise MissingArgumentError do
+        has_arg << 'test'
+        has_arg.check_args
+      end
+
+      has_arg.reset
+
+      assert_raise UnexpectedArgumentError do
+        has_arg << 'test'
+        has_arg << 'test'
+        has_arg.check_args
+      end
+
+      has_arg.reset
+
+      assert_nothing_raised do
+        has_arg << 'test'
+        has_arg << 'string'
+        has_arg << 'regexp'
+        has_arg << '123'
+        has_arg.check_args
+      end
     end
 
     should 'only have required arguments if argument count is > 0' do
-      has_arg = HasArg.new(2)
+      has_arg = HasArg.new 2
+      assert_equal 2..2, has_arg.arg_count
       assert !has_arg.args_full?
       assert has_arg.more_args?
       has_arg << 'argument'
@@ -65,7 +162,8 @@ class TestHasArguments < Test::Unit::TestCase
     end
 
     should 'have required and optional arguments if argument count is < 0' do
-      has_arg = HasArg.new(-1)
+      has_arg = HasArg.new -1
+      assert_equal 1..-1, has_arg.arg_count
       assert !has_arg.args_full?
       assert has_arg.more_args?
       assert_raise MissingArgumentError do
@@ -78,7 +176,8 @@ class TestHasArguments < Test::Unit::TestCase
     end
 
     should 'only have optional arguments if argument count is 0' do
-      has_arg = HasArg.new(0)
+      has_arg = HasArg.new 0
+      assert_equal 0..-1, has_arg.arg_count
       assert has_arg.args_full?
       assert has_arg.more_args?
       has_arg << 'argument'
@@ -86,7 +185,8 @@ class TestHasArguments < Test::Unit::TestCase
     end
 
     should 'provide named arguments' do
-      has_arg = HasArg.new([:named])
+      has_arg = HasArg.new :named
+      assert_equal 1..1, has_arg.arg_count
       has_arg << 'argument'
       assert_equal 'argument', has_arg[:named]
       assert_equal 'argument', has_arg.named
@@ -95,6 +195,47 @@ class TestHasArguments < Test::Unit::TestCase
       end
     end
 
+    should 'provide optional named arguments' do
+      has_arg = HasArg.new :required, :optional => :optional
+      assert_equal 1..2, has_arg.arg_count
+      has_arg << 'argument'
+      assert has_arg.args_full?
+      assert has_arg.more_args?
+      has_arg << 'argument'
+      assert !has_arg.more_args?
+      assert_equal 'argument', has_arg.required
+      assert_equal 'argument', has_arg.optional
+    end
+
+    should 'provide named arguments taking all remaining arguments' do
+      has_arg = HasArg.new :required, :remainder => :remainder
+      assert_equal 2..-1, has_arg.arg_count
+      has_arg << 'argument'
+      assert !has_arg.args_full?
+      assert has_arg.more_args?
+      has_arg << 'argument'
+      assert has_arg.args_full?
+      assert has_arg.more_args?
+      has_arg << 'argument'
+      assert has_arg.more_args?
+      assert_equal 'argument', has_arg.required
+      assert_equal %w{argument argument}, has_arg.remainder
+    end
+
+    should 'provide named arguments optionally taking all remaining arguments' do
+      has_arg = HasArg.new :required, :remainder => [:optional, :remainder]
+      assert_equal 1..-1, has_arg.arg_count
+      has_arg << 'argument'
+      assert has_arg.args_full?
+      assert has_arg.more_args?
+      has_arg << 'argument'
+      assert has_arg.more_args?
+      has_arg << 'argument'
+      assert has_arg.more_args?
+      assert_equal 'argument', has_arg.required
+      assert_equal %w{argument argument}, has_arg.remainder
+    end
+
     should 'call its code block if it is activated' do
       block_run = false
       has_arg = HasArg.new nil do

data/test/test_ini_provider.rb

@@ -3,7 +3,7 @@
 #
 # Copyright (c) 2010, Sebastian Staudt
 
-require 'test_helper'
+require 'helper'
 
 class TestIniProvider < Test::Unit::TestCase
 

data/test/test_parameter.rb

@@ -3,7 +3,7 @@
 #
 # Copyright (c) 2010, Sebastian Staudt
 
-require 'test_helper'
+require 'helper'
 require 'testapps'
 
 module TestParameter

data/test/test_progress_bar.rb

@@ -3,7 +3,7 @@
 #
 # Copyright (c) 2009-2010, Sebastian Staudt
 
-require 'test_helper'
+require 'helper'
 
 class TestProgressBar < Test::Unit::TestCase
 

data/test/test_throbber.rb

@@ -3,7 +3,7 @@
 #
 # Copyright (c) 2009-2010, Sebastian Staudt
 
-require 'test_helper'
+require 'helper'
 
 class TestThrobber < Test::Unit::TestCase
 

data/test/testapps.rb

@@ -1,7 +1,7 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2009-2010, Sebastian Staudt
+# Copyright (c) 2009-2011, Sebastian Staudt
 
 class DummyApp < Application::Base
 
@@ -13,10 +13,13 @@ end
 
 class TestApp < Application::Base
 
+  set :autohelp, false
   set :autorun, false
   set :name, 'Rubikon test application'
   set :raise_errors, true
 
+  attr_reader :commands, :global_parameters
+
   global_flag :gf1 => :gflag
   global_flag :gflag do
     @global = 'flag'
@@ -29,22 +32,22 @@ class TestApp < Application::Base
   end
   global_option :go2 => :gopt
 
-  default do
+  default '<hidden>' do
     'default command'
   end
 
-  option :arg, [:opt_arg] do
+  option :arg, :opt_arg do
     @result = []
     @result << opt_arg
   end
-  command :arguments, [:cmd_arg] do
+  command :arguments, :cmd_arg do
     @result << arg.opt_arg
     @result << cmd_arg
     @result
   end
 
   command :input do
-    input 'input'
+    [input('input'), input('validated', 'x')]
   end
 
   command :alias_before => :object_id
@@ -94,6 +97,8 @@ class TestAppWithoutDefault < Application::Base
   set :help_as_default, false
   set :raise_errors, true
 
+  attr_reader :commands
+
 end
 
 class TestAppWithHooks < Application::Base

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubikon
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
-  - 5
-  - 3
-  version: 0.5.3
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Sebastian Staudt
@@ -15,21 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 +01:00
+date: 2011-01-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: ore-tasks
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
         - 0
-        version: "0"
+        - 3
+        - 0
+        version: 0.3.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -38,12 +40,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 37
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 11
+        - 3
+        version: 2.11.3
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -52,12 +56,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
         - 0
-        version: "0"
+        - 6
+        - 4
+        version: 0.6.4
   type: :development
   version_requirements: *id003
 description: A simple to use, yet powerful Ruby framework for building console-based applications.
@@ -67,53 +73,63 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.md
 files: 
-- .yardopts
-- LICENSE
-- README.md
-- Rakefile
-- lib/core_ext/object.rb
-- lib/core_ext/string.rb
-- lib/rubikon.rb
-- lib/rubikon/application/base.rb
-- lib/rubikon/application/class_methods.rb
-- lib/rubikon/application/dsl_methods.rb
-- lib/rubikon/application/instance_methods.rb
-- lib/rubikon/application/sandbox.rb
-- lib/rubikon/colored_io.rb
-- lib/rubikon/command.rb
-- lib/rubikon/config/auto_provider.rb
-- lib/rubikon/config/factory.rb
-- lib/rubikon/config/ini_provider.rb
+- test/test_argument_vector.rb
 - lib/rubikon/config/yaml_provider.rb
-- lib/rubikon/exceptions.rb
-- lib/rubikon/flag.rb
-- lib/rubikon/has_arguments.rb
-- lib/rubikon/option.rb
-- lib/rubikon/parameter.rb
-- lib/rubikon/progress_bar.rb
-- lib/rubikon/throbber.rb
+- gemspec.yml
 - samples/config/config_sample.rb
-- samples/helloworld/hello_world.rb
-- test/commands/external_command.rb
-- test/test_application.rb
-- test/test_command.rb
-- test/test_config.rb
-- test/test_flag.rb
-- test/test_has_arguments.rb
-- test/test_helper.rb
+- lib/rubikon/config/factory.rb
+- lib/rubikon/command.rb
+- lib/rubikon/application/base.rb
+- .yardopts
 - test/test_ini_provider.rb
 - test/test_option.rb
-- test/test_parameter.rb
+- test/test_config.rb
+- LICENSE
+- test/config/test.ini
+- samples/helloworld/hello_world.rb
+- lib/rubikon/colored_io.rb
+- lib/rubikon/application/class_methods.rb
+- test/test_command.rb
+- test/config/2/config.yml
+- test/config/0/config.yml
+- samples/config/local/config.yml
+- lib/rubikon/parameter.rb
+- lib/rubikon/option.rb
+- lib/rubikon/flag.rb
+- lib/core_ext/enumerable.rb
+- Rakefile
+- README.md
 - test/test_progress_bar.rb
+- test/test_flag.rb
+- test/config/1/config.yml
+- lib/rubikon/progress_bar.rb
+- lib/rubikon/has_arguments.rb
+- lib/rubikon/application/sandbox.rb
 - test/test_throbber.rb
+- test/test_parameter.rb
+- test/test_has_arguments.rb
+- test/commands/external_command.rb
+- lib/rubikon/argument_vector.rb
+- lib/rubikon/errors.rb
+- lib/rubikon/application/instance_methods.rb
 - test/testapps.rb
-has_rdoc: false
+- lib/rubikon/version.rb
+- lib/rubikon/throbber.rb
+- lib/core_ext/string.rb
+- lib/core_ext/object.rb
+- test/test_application.rb
+- test/helper.rb
+- samples/config/global/config.yml
+- lib/rubikon/config/ini_provider.rb
+- lib/rubikon/config/auto_provider.rb
+- lib/rubikon/application/dsl_methods.rb
+- lib/rubikon.rb
+has_rdoc: true
 homepage: http://koraktor.github.com/rubikon
-licenses: []
-
+licenses: 
+- BSD
 post_install_message: 
 rdoc_options: []
 
@@ -140,21 +156,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubikon
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Rubikon - A Ruby console app framework
-test_files: 
-- test/commands/external_command.rb
-- test/test_application.rb
-- test/test_command.rb
-- test/test_config.rb
-- test/test_flag.rb
-- test/test_has_arguments.rb
-- test/test_helper.rb
-- test/test_ini_provider.rb
-- test/test_option.rb
-- test/test_parameter.rb
-- test/test_progress_bar.rb
-- test/test_throbber.rb
-- test/testapps.rb
+test_files: []
+