args_parser 0.0.4 → 0.0.5

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.5 2012-09-24
+
+* add filter and validator
+
 === 0.0.4 2012-09-24
 
 * use bundler

data/Manifest.txt

@@ -6,6 +6,8 @@ README.rdoc
 Rakefile
 lib/args_parser.rb
 lib/args_parser/parser.rb
+lib/args_parser/filter.rb
+lib/args_parser/validator.rb
 samples/download_webpage.rb
 script/console
 script/destroy

data/README.rdoc

@@ -8,7 +8,7 @@ ARGV parser - Parse args from command line.
 
 == SYNOPSIS:
 
-  % ruby sample.rb -url http://example.com -o out.html
+  % ruby samples/download_webpage.rb -url http://example.com -o out.html
 
 parse ARGV
 
@@ -20,6 +20,14 @@ parse ARGV
     arg :output, 'output file', :alias => :o, :default => 'out.html'
     arg :verbose, 'verbose mode'
     arg :help, 'show help', :alias => :h
+
+    filter :url do |v|
+      v.strip
+    end
+
+    validate :url, "invalid URL" do |v|
+      v =~ /^https?:\/\/.+$/
+    end
   end
   
   if parser.has_option? :help or !parser.has_param?(:url, :output)

data/lib/args_parser.rb

@@ -2,7 +2,9 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'args_parser/parser'
+require 'args_parser/filter'
+require 'args_parser/validator'
 
 module ArgsParser
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/args_parser/filter.rb

@@ -0,0 +1,22 @@
+
+module ArgsParser
+  class Filter
+    def filters
+      @filters ||= []
+    end
+
+    def add(name, filter)
+      name = name.to_sym if name
+      filters.push({:name => name, :filter => filter})
+    end
+
+    def filter(name, value)
+      filters.each do |f|
+        if !f[:name] or f[:name] == name
+          value = f[:filter].call(value)
+        end
+      end
+      value
+    end
+  end
+end

data/lib/args_parser/parser.rb

@@ -1,7 +1,9 @@
 
 module ArgsParser
   def self.parse(argv=[], &block)
-    Parser.new(argv, &block)
+    parser = Parser.new(&block)
+    parser.parse argv
+    parser
   end
 
   class Parser
@@ -26,12 +28,19 @@ module ArgsParser
     end
 
     public
-    def initialize(argv=[], &block)
+    def initialize(&block)
       unless block_given?
         raise ArgumentError, 'initialize block was not given'
       end
+      @filter = Filter.new
+      @validator = Validator.new
       instance_eval(&block)
-      parse argv
+      filter do |v|
+        (v.kind_of? String and v =~ /^\d+$/) ? v.to_i : v
+      end
+      filter do |v|
+        (v.kind_of? String and v =~ /^\d+\.\d+$/) ? v.to_f : v
+      end
     end
 
     def arg(name, description, opts={})
@@ -42,6 +51,18 @@ module ArgsParser
       aliases[opts[:alias]] = name if opts[:alias]
     end
 
+    def filter(name=nil, &block)
+      if block_given?
+        @filter.add name, block
+      end
+    end
+
+    def validate(name, message, &block)
+      if block_given?
+        @validator.add name, message, block
+      end
+    end
+
     def args
       params.keys
     end
@@ -62,8 +83,12 @@ module ArgsParser
             k = arg.scan(/^-+([^-\s]+)$/)[0][0].strip.to_sym
             k = aliases[k]  if aliases[k]
           else
-            arg = arg.to_i if arg =~ /^\d+$/
-            arg = arg.to_f if arg =~ /^\d+\.\d+$/
+            arg = @filter.filter k, arg
+            msg = @validator.validate k, arg
+            if msg
+              STDERR.puts "Error: #{msg} (--#{k} #{arg})"
+              exit 1
+            end
             params[k][:value] = arg
             k = nil
           end

data/lib/args_parser/validator.rb

@@ -0,0 +1,22 @@
+
+module ArgsParser
+  class Validator
+    def validators
+      @validators ||= []
+    end
+
+    def add(name, message, validator)
+      name = name.to_sym if name
+      validators.push({:name => name, :message => message, :validator => validator})
+    end
+
+    def validate(name, value)
+      validators.each do |f|
+        if !f[:name] or f[:name] == name
+          return f[:message] unless f[:validator].call(value)
+        end
+      end
+      nil
+    end
+  end
+end

data/samples/download_webpage.rb

@@ -1,13 +1,21 @@
 #!/usr/bin/env ruby
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'rubygems'
 require 'args_parser'
-## require File.dirname(__FILE__)+'/../lib/args_parser'
 
 parser = ArgsParser.parse ARGV do
   arg :url, 'URL', :alias => :u
   arg :output, 'output file', :alias => :o, :default => 'out.html'
   arg :verbose, 'verbose mode'
   arg :help, 'show help', :alias => :h
+
+  filter :url do |v|
+    v.strip
+  end
+
+  validate :url, "invalid URL" do |v|
+    v =~ /^https?:\/\/.+$/
+  end
 end
 
 if parser.has_option? :help or !parser.has_param?(:url, :output)

data/test/test_args_parser.rb

@@ -2,11 +2,20 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestArgsParser < Test::Unit::TestCase
   def setup
-    @argv = 'test --input ~/tmp -a --o ./out -h --depth 030 --pi 3.14'.split(/\s+/)
+    @argv = 'test --input http://shokai.org -a --o ./out -h --depth 030 --pi 3.14 --n ShoKaI'.split(/\s+/)
     @parser = ArgsParser.parse @argv do
-      arg :input, 'input dir', :alias => :i
+      arg :input, 'input', :alias => :i
       arg :output, 'output dir', :alias => :o
+      arg :name, 'user name', :alias => :n
       arg :help, 'show help', :alias => :h
+
+      filter :name do |v|
+        v.downcase
+      end
+
+      validate :input, "input must be valid URL" do |v|
+        v =~ /^https?:\/\/.+/
+      end
     end
   end
 
@@ -15,7 +24,7 @@ class TestArgsParser < Test::Unit::TestCase
   end
 
   def test_arg
-    assert @parser[:input] == '~/tmp'
+    assert @parser[:input] == 'http://shokai.org'
   end
 
   def test_alias
@@ -32,6 +41,10 @@ class TestArgsParser < Test::Unit::TestCase
     assert @parser[:pi].class == Float
   end
 
+  def test_filter
+    assert @parser[:name] == 'shokai'
+  end
+
   def test_missing_arg
     assert @parser[:b] != true
   end
@@ -45,10 +58,11 @@ class TestArgsParser < Test::Unit::TestCase
     assert @parser.has_param? :output
     assert @parser.has_param? :depth
     assert @parser.has_param? :pi
+    assert @parser.has_param? :name
   end
 
   def test_has_params?
-    assert @parser.has_param? :input, :output, :depth, :pi
+    assert @parser.has_param? :input, :output, :depth, :pi, :name
   end
 
   def test_has_not_param?

metadata

@@ -1,118 +1,107 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: args_parser
-version: !ruby/object:Gem::Version
-  version: 0.0.4
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.5
 platform: ruby
-authors:
-- Sho Hashimoto
+authors: 
+  - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: newgem
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.3
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
+
+date: 2012-09-24 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: rdoc
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: "3.10"
+    type: :development
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: newgem
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.5.3
+    type: :development
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: hoe
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: "3.1"
+    type: :development
+    version_requirements: *id003
 description: ARGV parser - Parse args from command line.
-email:
-- hashimoto@shokai.org
+email: 
+  - hashimoto@shokai.org
 executables: []
+
 extensions: []
-extra_rdoc_files:
-- History.txt
-- Manifest.txt
-- README.rdoc
-files:
-- Gemfile
-- Gemfile.lock
-- History.txt
-- Manifest.txt
-- README.rdoc
-- Rakefile
-- lib/args_parser.rb
-- lib/args_parser/parser.rb
-- samples/download_webpage.rb
-- script/console
-- script/destroy
-- script/generate
-- test/test_args_parser.rb
-- test/test_helper.rb
-- .gemtest
+
+extra_rdoc_files: 
+  - History.txt
+  - Manifest.txt
+  - README.rdoc
+files: 
+  - Gemfile
+  - Gemfile.lock
+  - History.txt
+  - Manifest.txt
+  - README.rdoc
+  - Rakefile
+  - lib/args_parser.rb
+  - lib/args_parser/parser.rb
+  - lib/args_parser/filter.rb
+  - lib/args_parser/validator.rb
+  - samples/download_webpage.rb
+  - script/console
+  - script/destroy
+  - script/generate
+  - test/test_args_parser.rb
+  - test/test_helper.rb
+  - .gemtest
 homepage: http://github.com/shokai/args_parser
 licenses: []
+
 post_install_message: 
-rdoc_options:
-- --main
-- README.rdoc
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
+rdoc_options: 
+  - --main
+  - README.rdoc
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3362374231966488383
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+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: args_parser
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: ARGV parser - Parse args from command line.
-test_files:
-- test/test_args_parser.rb
-- test/test_helper.rb
+test_files: 
+  - test/test_args_parser.rb
+  - test/test_helper.rb