args_parser 0.0.6 → 0.0.7

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.0.7 2012-09-26
+
+* add function ArgsParser#argv
+
+=== 0.0.6 2012-09-26
+
+* add equal style parser
+
 === 0.0.5 2012-09-24
 
 * add filter and validator

data/lib/args_parser/parser.rb

@@ -10,12 +10,20 @@ module ArgsParser
   end
 
   class Parser
-    attr_reader :first
+    attr_reader :argv, :params, :aliases
 
-    private
-    def params
-      @params ||=
-        Hash.new{|h,k|
+    public
+    def first
+      argv.first
+    end
+
+    def initialize(config, &block)
+      unless block_given?
+        raise ArgumentError, 'initialize block was not given'
+      end
+      @config = config
+      @argv = []
+      @params = Hash.new{|h,k|
         h[k] = {
           :default => nil,
           :description => nil,
@@ -24,18 +32,7 @@ module ArgsParser
           :index => -1
         }
       }
-    end
-
-    def aliases
-      @aliases ||= Hash.new
-    end
-
-    public
-    def initialize(config, &block)
-      @config = config
-      unless block_given?
-        raise ArgumentError, 'initialize block was not given'
-      end
+      @aliases = {}
       @filter = Filter.new
       @validator = Validator.new
       instance_eval(&block)

data/lib/args_parser/styles/default.rb

@@ -4,18 +4,19 @@ module ArgsParser
 
     def parse_style_default(argv)
       k = nil
+      is_key = /^-+([^-\s]+)$/
       argv.each_with_index do |arg, index|
         unless k
-          if arg =~ /^-+[^-\s]+$/
-            k = arg.scan(/^-+([^-\s]+)$/)[0][0].strip.to_sym
+          if arg =~ is_key
+            k = arg.scan(is_key)[0][0].strip.to_sym
             k = aliases[k]  if aliases[k]
-          elsif index == 0
-            @first = arg
+          else
+            self.argv.push arg
           end
         else
-          if arg =~ /^-+[^-\s]+$/
+          if arg =~ is_key
             params[k][:value] = true
-            k = arg.scan(/^-+([^-\s]+)$/)[0][0].strip.to_sym
+            k = arg.scan(is_key)[0][0].strip.to_sym
             k = aliases[k]  if aliases[k]
           else
             params[k][:value] = arg

data/lib/args_parser/styles/equal.rb

@@ -3,13 +3,15 @@ module ArgsParser
   class Parser
 
     def parse_style_equal(argv)
+      is_option = /^-+([^-=\s]+)$/
+      is_param = /^-+([^-=\s]+)=([^=\s]+)$/
       argv.each_with_index do |arg, i|
-        if arg =~ /^-+[^-=\s]+$/
-          k,v = [arg.scan(/^-+([^-=\s]+)$/)[0][0], true]
-        elsif arg =~ /^-+[^-=\s]+=[^=\s]+$/
-          k,v = arg.scan(/^-+([^-=\s]+)=([^=\s]+)$/)[0]
-        elsif i == 0
-          @first = arg
+        if arg =~ is_option
+          k,v = [arg.scan(is_option)[0][0], true]
+        elsif arg =~ is_param
+          k,v = arg.scan(is_param)[0]
+        else
+          self.argv.push arg
         end
         if k and v
           k = k.strip.to_sym

data/lib/args_parser.rb

@@ -9,5 +9,5 @@ require 'args_parser/validator'
 require 'args_parser/config'
 
 module ArgsParser
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/test/test_args_parser.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestArgsParser < Test::Unit::TestCase
   def setup
-    @argv = 'test --input http://shokai.org -a --o ./out -h --depth 030 --pi 3.14 --n ShoKaI'.split(/\s+/)
+    @argv = 'test --input http://shokai.org -a --o ./out -h --depth 030 foo bar --pi 3.14 --n ShoKaI'.split(/\s+/)
     @parser = ArgsParser.parse @argv do
       arg :input, 'input', :alias => :i
       arg :output, 'output dir', :alias => :o
@@ -23,6 +23,10 @@ class TestArgsParser < Test::Unit::TestCase
     assert @parser.first == 'test'
   end
 
+  def test_argv
+    assert @parser.argv == ['test', 'foo', 'bar']
+  end
+
   def test_arg
     assert @parser[:input] == 'http://shokai.org'
   end

data/test/test_args_parser_style_equal.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestArgsParserStyleEqual < Test::Unit::TestCase
   def setup
-    @argv = 'test --input=http://shokai.org --a --o=./out -h --depth=030 --pi=3.14 --n=ShoKaI'.split(/\s+/)
+    @argv = 'test --input=http://shokai.org --a --o=./out -h --depth=030 foo bar --pi=3.14 --n=ShoKaI'.split(/\s+/)
     @parser = ArgsParser.parse @argv, :style => :equal do
       arg :input, 'input', :alias => :i
       arg :output, 'output dir', :alias => :o
@@ -23,6 +23,10 @@ class TestArgsParserStyleEqual < Test::Unit::TestCase
     assert @parser.first == 'test'
   end
 
+  def test_argv
+    assert @parser.argv == ['test', 'foo', 'bar']
+  end
+
   def test_arg
     assert @parser[:input] == 'http://shokai.org'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: args_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3014351784407155723
+      hash: -3917309846175452703
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: