applix 0.3.7 → 0.3.8

data/Gemfile

@@ -4,8 +4,8 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
+  gem "bundler", "> 1.0.0"
+  gem "jeweler"
   gem "rcov", ">= 0"
   gem "ZenTest", ">= 4.4.2"
 end

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/lib/applix.rb

@@ -50,8 +50,12 @@ usage: #{$0} <args...>
     # see it as its first argument, 
     (args.unshift name.to_s) if(name != :any && task[:name] == :any)
 
-    # do the call
-    rc = task[:code].call(*args, options)
+    # cluster for nesting or direct calling?
+    if task[:cluster]
+      rc = Applix.main(args, options, &task[:code])
+    else
+      rc = task[:code].call(*args, options)
+    end
 
     # post handle
     unless @epilog_cb.nil?
@@ -75,6 +79,10 @@ usage: #{$0} <args...>
     tasks[:any] = { :name => :any, :code => blk }
   end
 
+  def cluster name, &blk
+    tasks[name.to_sym] = { :name => name, :code => blk, :cluster => true }
+  end
+
   def handle name, &blk
     tasks[name.to_sym] = { :name => name, :code => blk }
   end

data/spec/applix_spec.rb

@@ -2,13 +2,57 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Applix" do
 
+  it 'calls cluster prolog' do
+    Applix.main(%w(foo a b)) do
+      cluster(:foo) do
+        prolog { |args, options|
+          args.should == %w(a b)
+          args.reverse!
+        }
+        handle(:a) { raise 'should not be called!' }
+        handle(:b) { :b_was_called }
+      end
+    end.should == :b_was_called
+  end
+
+  it 'support :cluster for nesting' do
+    args = %w(-a -b:2 foo bar p1 p2)
+    Applix.main(args) do
+      handle(:foo) do 
+        raise 'should not be called!' 
+      end
+      cluster(:foo) do
+        handle(:bar) do |*args, options|
+          args.should == %w(p1 p2)
+          options.should == {:a => true, :b => 2}
+          args
+        end
+      end
+    end.should == %w{p1 p2}
+  end
+
+  it 'can even cluster clusters' do
+    args = %w(foo bar f p1 p2)
+    Applix.main(args) do
+      cluster(:foo) do
+        cluster(:bar) do
+          handle(:f) do |*args, options|
+            args.should == %w(p1 p2)
+            options.should == {}
+            args
+          end
+        end
+      end
+    end.should == %w{p1 p2}
+  end
+
   it 'prolog can even temper with arguments to modify the handle sequence' do
     Applix.main(['a', 'b']) do
       prolog { |args, options|
         args.should == ['a', 'b']
         args.reverse!
       }
-      handle(:a) { raise 'shoule not be called!' }
+      handle(:a) { raise 'should not be called!' }
       handle(:b) { :b_was_called }
     end.should == :b_was_called
   end

metadata

@@ -1,116 +1,125 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: applix
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.8
   prerelease: 
-  version: 0.3.7
 platform: ruby
-authors: 
+authors:
 - dirk luesebrink
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-22 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-28 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156881460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156881460
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2156880080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156880080
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2156878580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.5.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156878580
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2156877440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156877440
+- !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2156876200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 4.4.2
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156876200
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2156865360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156865360
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2156864240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156864240
+- !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &2156862960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 4.4.2
   type: :development
   prerelease: false
-  version_requirements: *id008
-description: "      ApplixHash#from_argv builds hashes from ARGV like argument vectors\n      according to following examples: \n      \n         '-f'                  --> { :f      => true }\n         '--flag'              --> { :flag   => true }\n         '--flag:false'        --> { :flag   => false }\n         '--flag=false'        --> { :flag   => 'false' }\n         '--option=value'      --> { :option => \"value\" }\n         '--int=1'             --> { :int    => \"1\" }\n         '--float=2.3'         --> { :float  => \"2.3\" }\n         '--float:2.3'         --> { :float  => 2.3 }\n         '--txt=\"foo bar\"'     --> { :txt    => \"foo bar\" }\n         '--txt:'\"foo bar\"'' --> { :txt    => \"foo bar\" }\n         '--txt:%w{foo bar}'   --> { :txt    => [\"foo\", \"bar\"] }\n         '--now:Time.now'      --> { :now    => #<Date: 3588595/2,0,2299161> }\n      \n       remaining arguments(non flag/options) are inserted as [:arguments,\n       args], eg:\n           Hash.from_argv %w(--foo --bar=loo 123 now)\n       becomes  \n           { :foo => true, :bar => 'loo', :arguments => [\"123\", \"now\"] }\n      \n"
+  version_requirements: *2156862960
+description: ! "      ApplixHash#from_argv builds hashes from ARGV like argument vectors\n
+  \     according to following examples: \n      \n         '-f'                  -->
+  { :f      => true }\n         '--flag'              --> { :flag   => true }\n         '--flag:false'
+  \       --> { :flag   => false }\n         '--flag=false'        --> { :flag   =>
+  'false' }\n         '--option=value'      --> { :option => \"value\" }\n         '--int=1'
+  \            --> { :int    => \"1\" }\n         '--float=2.3'         --> { :float
+  \ => \"2.3\" }\n         '--float:2.3'         --> { :float  => 2.3 }\n         '--txt=\"foo
+  bar\"'     --> { :txt    => \"foo bar\" }\n         '--txt:'\"foo bar\"'' --> {
+  :txt    => \"foo bar\" }\n         '--txt:%w{foo bar}'   --> { :txt    => [\"foo\",
+  \"bar\"] }\n         '--now:Time.now'      --> { :now    => #<Date: 3588595/2,0,2299161>
+  }\n      \n       remaining arguments(non flag/options) are inserted as [:arguments,\n
+  \      args], eg:\n           Hash.from_argv %w(--foo --bar=loo 123 now)\n       becomes
+  \ \n           { :foo => true, :bar => 'loo', :arguments => [\"123\", \"now\"] }\n
+  \     \n"
 email: dirk@sebrink.de
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.mkd
-files: 
+files:
 - .autotest
 - .document
 - .rspec
@@ -125,38 +134,31 @@ files:
 - spec/applix_spec.rb
 - spec/oattr_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/crux/applix
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3100699751538142693
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3511513831159462149
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: build typed option hashed from command line arguments
-test_files: 
-- spec/applix_spec.rb
-- spec/oattr_spec.rb
-- spec/spec_helper.rb
+test_files: []