args_parser 0.1.3 → 0.1.4

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.4 2013-01-26
+
+* run lambda in default value
+
 === 0.1.3 2013-01-04
 
 * use bundler gem template

data/lib/args_parser/parser.rb

@@ -53,6 +53,7 @@ module ArgsParser
       instance_eval(&block)
     end
 
+    private
     def arg(name, description, opts={})
       name = name.to_sym
       params[name][:default] = opts[:default]
@@ -90,6 +91,12 @@ module ArgsParser
       end
     end
 
+    def default(key)
+      d = params[key.to_sym][:default]
+      (d and d.kind_of? Proc) ? d.call : d
+    end
+
+    public
     def args
       params.keys
     end
@@ -115,7 +122,7 @@ module ArgsParser
     end
 
     def [](key)
-      params[key.to_sym][:value] || params[key.to_sym][:default]
+      params[key.to_sym][:value] or default(key)
     end
 
     def []=(key, value)
@@ -166,7 +173,7 @@ module ArgsParser
         line += " (-#{i[:alias]})" if i[:alias]
         line = line.ljust(len+2)
         line += i[:description].to_s
-        line += " : default - #{i[:default]}" if i[:default]
+        line += " : default - #{default i[:name]}" if i[:default]
         line
       }.join("\n")
     end

data/lib/args_parser/version.rb

@@ -1,3 +1,3 @@
 module ArgsParser
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/samples/download_webpage.rb

@@ -9,6 +9,7 @@ parser = ArgsParser.parse ARGV do
   arg :url, 'URL', :alias => :u
   arg :output, 'output file', :alias => :o, :default => 'out.html'
   arg :verbose, 'verbose mode'
+  arg :time, 'time', :default => lambda{ Time.now }
   arg :help, 'show help', :alias => :h
 
   filter :url do |v|

data/test/test_default.rb

@@ -0,0 +1,26 @@
+require File.expand_path 'test_helper', File.dirname(__FILE__)
+
+class TestArgsParserDefault < MiniTest::Unit::TestCase
+  def setup
+    @argv = ['--age', '40']
+    @parser = ArgsParser.parse @argv do
+      arg :name, 'use name', :default => 'shokai'
+      arg :age, 'age', :default => 14
+      arg :time, 'time', :default => lambda{ Time.now }
+    end
+  end
+
+  def test_default
+    assert @parser[:name] == 'shokai'
+  end
+
+  def test_overwrite
+    assert @parser[:age] == 40
+  end
+
+  def test_name
+    old = @parser[:time]
+    sleep 1
+    assert old < @parser[:time]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: args_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies: []
 description: Parse ARGV from command line with DSL.
 email:
@@ -38,6 +38,7 @@ files:
 - samples/twitter_timeline.rb
 - test/test_args_parser.rb
 - test/test_args_parser_style_equal.rb
+- test/test_default.rb
 - test/test_filter.rb
 - test/test_helper.rb
 - test/test_validator.rb
@@ -69,6 +70,7 @@ summary: Parse ARGV from command line with DSL.
 test_files:
 - test/test_args_parser.rb
 - test/test_args_parser_style_equal.rb
+- test/test_default.rb
 - test/test_filter.rb
 - test/test_helper.rb
 - test/test_validator.rb