applix 0.2.2 → 0.3.0

data/Gemfile

@@ -0,0 +1,11 @@
+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", "~> 1.5.2"
+  gem "rcov", ">= 0"
+  gem "ZenTest", ">= 4.4.2"
+end

data/Rakefile

@@ -1,4 +1,12 @@
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
 
 begin
@@ -42,8 +50,9 @@ begin
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
+Jeweler::RubygemsDotOrgTasks.new
 
-
+require 'rspec/core'
 require "rspec/core/rake_task"
 namespace :test do
   desc "Run all specs."

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/lib/applix/hash.rb

@@ -0,0 +1,51 @@
+module ApplixHash
+
+  module ClassMethods
+    # #from_argv builds hash from ARGV like argument vector 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 [:args]. eg:
+    #     Hash.from_argv %w(--foo --bar=loo 123 now)
+    # becomes  
+    #     { :foo => true, :bar => 'loo', :args => ["123", "now"] }
+    #
+    def from_argv argv, opts = {}
+      args, h = argv.clone, {}
+      while arg = args.first
+        key, val = ApplixHash.parse(arg)
+        break unless key
+        h[key] = val
+        args.shift
+      end 
+      #[args, h]
+      h[:args] = args
+      h
+    end
+  end # ClassMethods
+
+  # parse single flag/option into a [key, value] tuple. returns nil on non
+  # option/flag arguments.
+  def self.parse(arg)
+    m = /^(-(\w)|--(\w\w+))(([=:])(.+))?$/.match(arg)
+    return [nil, arg] unless m # neither option nor flag -> straight arg
+    key = (m[2] || m[3]).to_sym
+    value = m[6][/(['"]?)(.*)\1$/,2] rescue true
+    value = eval(value) if m[5] == ':'
+    [key, value]
+  end
+end
+
+Hash.extend ApplixHash::ClassMethods

data/lib/applix.rb

@@ -1,51 +1,74 @@
-module ApplixHash
-
-  module ClassMethods
-    # #from_argv builds hash from ARGV like argument vector 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 [:args]. eg:
-    #     Hash.from_argv %w(--foo --bar=loo 123 now)
-    # becomes  
-    #     { :foo => true, :bar => 'loo', :args => ["123", "now"] }
-    #
-    def from_argv argv, opts = {}
-      args, h = argv.clone, {}
-      while arg = args.first
-        key, val = ApplixHash.parse(arg)
-        break unless key
-        h[key] = val
-        args.shift
-      end 
-      #[args, h]
-      h[:args] = args
-      h
-    end
-  end # ClassMethods
-
-  # parse single flag/option into a [key, value] tuple. returns nil on non
-  # option/flag arguments.
-  def self.parse(arg)
-    m = /^(-(\w)|--(\w\w+))(([=:])(.+))?$/.match(arg)
-    return [nil, arg] unless m # neither option nor flag -> straight arg
-    key = (m[2] || m[3]).to_sym
-    value = m[6][/(['"]?)(.*)\1$/,2] rescue true
-    value = eval(value) if m[5] == ':'
-    [key, value]
+require 'applix/hash'
+
+class Applix 
+  def self.main argv, defaults = {}, &blk
+    app = Applix.new
+    app.instance_eval(&blk)
+    app.run(argv, defaults)
+  rescue => e
+    puts <<-EOT
+
+## #{e}
+
+usage: #{__FILE__} <args...>
+
+--- #{e.backtrace.join "\n    "}
+    EOT
+  end
+
+  def run argv, defaults
+    options = (Hash.from_argv argv)
+    options = (defaults.merge options)
+    args = (options.delete :args)
+
+    # which task to run depends on first line argument..
+    (name = args.shift) or (raise "no task")
+    (task = tasks[name.to_sym]) or (raise "no such task: '#{name}'")
+    task[:code].call(*args, options)
+  end
+
+  private 
+
+  def handle name, &blk
+    tasks[name.to_sym] = { :code => blk }
+  end
+
+  def tasks
+    @tasks ||= {}
   end
 end
 
-Hash.extend ApplixHash::ClassMethods
+__END__
+#
+def main args, options = {}
+  options = (Defaults.merge options)
+  options[:date] = Date.parse(options[:date]) # up-type string date
+
+  action = args.shift or raise "no action"
+
+  # account is an command line arg but password is prompted, never have that in
+  # a config or on the command line!
+  #
+  username = args.shift # or raise "no username"
+  password = prompt_for_password
+
+  # which method to run depend on first command line argument..
+  send action, username, password, options
+end
+
+params = Hash.from_argv ARGV
+begin 
+  main params[:args], params
+rescue => e
+  puts <<-EOT
+
+## #{e}
+
+usage: #{__FILE__} <task> <username>
+
+--- #{e.backtrace.join "\n    "}
+  EOT
+end
+
+__END__
+

data/spec/applix_spec.rb

@@ -1,10 +1,35 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Applix" do
-  #it "fails" do
-  #  fail "hey buddy, you should probably rename this file and start specing for real"
-  #end
-  
+
+  it 'should call actions by first argument names' do
+    argv = ['func']
+    Applix.main(argv) do
+      handle(:func) { :func_return }
+    end.should == :func_return
+  end
+
+  it 'should pass arguments to function' do
+    argv = ['func', 'p1', 'p2']
+    Applix.main(argv) do
+      handle(:func) { |*args, options| args }
+    end.should == %w{p1 p2}
+  end
+
+  it 'should pass emtpy options to function on default' do
+    argv = %w(func)
+    Applix.main(argv) do
+      handle(:func) { |*_, options| options }
+    end.should == {}
+  end
+
+  it 'should pass a processed options hash' do
+    argv = %w(-a --bar func)
+    Applix.main(argv) do
+      handle(:func) { |*_, options| options }
+    end.should == {:a => true, :bar => true}
+  end
+
   it "should parse the old unit test..." do
     #   -f                becomes { :f      => true }
     #   --flag            becomes { :flag   => true }

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: applix
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 2
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - dirk luesebrink
@@ -15,55 +10,97 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 +01:00
+date: 2011-08-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
         version: 2.3.0
   type: :development
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rcov
-  prerelease: false
+  name: bundler
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: ZenTest
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 4.4.2
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: ZenTest
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 4
-        - 4
-        - 2
         version: 4.4.2
   type: :development
-  version_requirements: *id003
+  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"
 email: dirk@sebrink.de
 executables: []
@@ -77,11 +114,13 @@ files:
 - .autotest
 - .document
 - .rspec
+- Gemfile
 - LICENSE
 - README.mkd
 - Rakefile
 - VERSION
 - lib/applix.rb
+- lib/applix/hash.rb
 - lib/applix/oattr.rb
 - spec/applix_spec.rb
 - spec/oattr_spec.rb
@@ -100,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 2866843717498845092
       segments: 
       - 0
       version: "0"
@@ -109,14 +148,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: build typed option hashed from command line arguments