applix 0.3.8 → 0.4.2

data/.gitignore

@@ -0,0 +1,6 @@
+*.sw?
+Gemfile.lock
+.DS_Store
+coverage
+rdoc
+pkg

data/Gemfile

@@ -1,11 +1,3 @@
 source "http://rubygems.org"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "bundler", "> 1.0.0"
-  gem "jeweler"
-  gem "rcov", ">= 0"
-  gem "ZenTest", ">= 4.4.2"
-end
+gemspec # see applix.gemspec for dependencies

data/Guardfile

@@ -0,0 +1,9 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+  watch('lib/applix.rb')  { "spec" }
+end

data/Rakefile

@@ -1,3 +1,7 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+__END__
 require 'rubygems'
 require 'bundler'
 begin

data/VERSION

@@ -1 +1 @@
-0.3.8
+0.4.0

data/applix.gemspec

@@ -0,0 +1,51 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = 'applix'
+  s.version     = '0.4.2'
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ['art+com/dirk luesebrink']
+  s.email       = ['dirk.luesebrink@artcom.de']
+  s.homepage    = 'http://github.com/crux/applix'
+  s.summary     = 'extracting typed option hashes from command line arguments'
+  s.description = %q{
+    ApplixHash#from_argv builds hashes from ARGV like argument vectors
+    according to following examples: 
+      
+         '-f'                  --> { :f      => true }
+         '--flag'              --> { :flag   => true }
+         '--flag:false'        --> { :flag   => false }
+         '--flag=false'        --> { :flag   => 'false' }
+         '--option=value'      --> { :option => "value" }
+         '--int=1'             --> { :int    => "1" }
+         '--float=2.3'         --> { :float  => "2.3" }
+         '--float:2.3'         --> { :float  => 2.3 }
+         '--txt="foo bar"'     --> { :txt    => "foo bar" }
+         '--txt:'"foo bar"''   --> { :txt    => "foo bar" }
+         '--txt:%w{foo bar}'   --> { :txt    => ["foo", "bar"] }
+         '--now:Time.now'      --> { :now    => #<Date: 3588595/2,0,2299161> }
+      
+     remaining arguments(non flag/options) are inserted as [:arguments,
+     args], eg:
+         Hash.from_argv %w(--foo --bar=loo 123 now)
+     becomes  
+         { :foo => true, :bar => 'loo', :arguments => ["123", "now"] }
+  }
+
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec-mocks'
+  s.add_development_dependency 'guard'
+  s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency 'growl'
+
+  s.add_development_dependency 'ruby-debug19'
+  s.add_development_dependency 'ruby-debug-base19'
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map do |f| 
+    File.basename(f)
+  end
+  s.require_paths = ["lib"]
+end

data/lib/applix.rb

@@ -52,7 +52,12 @@ usage: #{$0} <args...>
 
     # cluster for nesting or direct calling?
     if task[:cluster]
-      rc = Applix.main(args, options, &task[:code])
+      #rc = Applix.main(args, options, &task[:code])
+      cluster_task = args.first.to_sym
+      cluster_options = options.merge(options[cluster_task] || {})
+      cluster_options.delete(cluster_task)
+      cluster_options.merge!(Hash.from_argv argv)
+      rc = Applix.main(args, cluster_options, &task[:code])
     else
       rc = task[:code].call(*args, options)
     end

data/spec/applix_spec.rb

@@ -2,6 +2,21 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Applix" do
 
+  it 'cluster defaults shadow globals' do
+    args = %w(-c=5 global cluster)
+    Applix.main(args, a: :global, b: 2, :cluster => {a: :cluster, c: 3}) do
+      handle(:cluster) do 
+        raise 'should not be called!'
+      end
+      cluster(:global) do
+        handle(:cluster) do |*args, options|
+          options.should == {:a => :cluster, :b => 2, :c => '5'}
+          args
+        end
+      end
+    end
+  end
+
   it 'calls cluster prolog' do
     Applix.main(%w(foo a b)) do
       cluster(:foo) do

metadata

@@ -1,164 +1,173 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: applix
-version: !ruby/object:Gem::Version
-  version: 0.3.8
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 2
+  version: 0.4.2
 platform: ruby
-authors:
-- dirk luesebrink
+authors: 
+- art+com/dirk luesebrink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-28 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-03-20 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2156881460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :development
   prerelease: false
-  version_requirements: *2156881460
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &2156880080 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec-mocks
   prerelease: false
-  version_requirements: *2156880080
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &2156878580 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: guard
   prerelease: false
-  version_requirements: *2156878580
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &2156877440 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: guard-rspec
   prerelease: false
-  version_requirements: *2156877440
-- !ruby/object:Gem::Dependency
-  name: ZenTest
-  requirement: &2156876200 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 4.4.2
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: growl
   prerelease: false
-  version_requirements: *2156876200
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2156865360 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug19
   prerelease: false
-  version_requirements: *2156865360
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &2156864240 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug-base19
   prerelease: false
-  version_requirements: *2156864240
-- !ruby/object:Gem::Dependency
-  name: ZenTest
-  requirement: &2156862960 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 4.4.2
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  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
+  version_requirements: *id007
+description: "\n    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  "
+email: 
+- dirk.luesebrink@artcom.de
 executables: []
+
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.mkd
-files:
+
+extra_rdoc_files: []
+
+files: 
 - .autotest
 - .document
+- .gitignore
 - .rspec
 - Gemfile
+- Guardfile
 - LICENSE
 - README.mkd
 - Rakefile
 - VERSION
+- applix.gemspec
 - lib/applix.rb
 - lib/applix/hash.rb
 - lib/applix/oattr.rb
 - 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
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
       - 0
-      hash: 3511513831159462149
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: build typed option hashed from command line arguments
-test_files: []
+summary: extracting typed option hashes from command line arguments
+test_files: 
+- spec/applix_spec.rb
+- spec/oattr_spec.rb
+- spec/spec_helper.rb