ArgsParser 0.0.4 → 0.0.5

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.5 2010-03-15
+
+* parse first arg
+
 === 0.0.1 2010-02-23
 
 * 1 major enhancement:

data/examples/example.rb

@@ -4,14 +4,14 @@ require '../lib/ArgsParser'
 
 parser = ArgsParser.parser
 parser.bind(:help, :h, "show help")
-parser.bind(:frame, :f)
-parser.bind(:message, :m, "message") # name, shortname, comment for help
-parser.bind(:size, :s, "size")
+parser.bind(:frame, :f, "frame image (required)")
+parser.bind(:message, :m, "message (required)") # name, shortname, comment for help
+parser.bind(:size, :s, "size (required)")
 parser.comment(:min, "minimum size") # add comment for help
 parser.comment(:max, "maximum size")
 parser.comment(:debug, "debug mode")
 
-params = parser.parse(ARGV)
+first, params = parser.parse(ARGV)
 required_params = [:frame, :message, :size]
 
 if parser.has_option(:help) or !parser.has_params(required_params)
@@ -25,6 +25,10 @@ if parser.has_option(:help) or !parser.has_params(required_params)
   exit 1
 end
 
+if first
+  puts 'first arg : ' + first
+end
+
 if parser.has_param(:size)
   puts 'size : ' + params[:size]
 end

data/lib/ArgsParser.rb

@@ -6,7 +6,7 @@ directory = File.expand_path(File.dirname(__FILE__))
 require File.join(directory, 'ArgsParser', 'Parser')
 
 module ArgsParser
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 
   def ArgsParser.parser
     Parser.new

data/lib/ArgsParser/Parser.rb

@@ -3,10 +3,8 @@
 
 class Parser
 
-  def params
-    @params
-  end
-  
+  attr_reader :params, :comments, :first
+
   def initialize
     @binds = Hash.new
     @comments = Hash.new
@@ -14,6 +12,11 @@ class Parser
 
   def parse(argv)
     # parse
+    @first = nil
+    if argv.size > 0 and !(argv.first =~ /^-+.+/)
+      @first = argv.shift
+    end
+
     @params = Hash.new
     for i in 0...argv.size do
       if argv[i].match(/^-+.+/)
@@ -34,7 +37,7 @@ class Parser
       end
     }
     
-    return @params
+    return @first, @params
   end
 
   def bind(fullname, name, comment=nil)
@@ -70,10 +73,6 @@ class Parser
     @comments[name.to_sym] = comment.to_s
   end
   
-  def comments
-    @comments
-  end
-
   def help
     binds_reversed = Hash.new
     most_longname_size = 0

data/spec/parser_spec.rb

@@ -1,8 +1,52 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe "options" do
+describe "test of parsing first-arg" do
+  before do
+    @argv = ['foo']
+    @parser = ArgsParser.parser
+    @parser.parse(@argv)
+  end
+
+  it "has first-arg" do
+    @parser.first.should == 'foo'
+  end
+
+  it "has not params" do
+    @parser.params.size.should == 0
+  end
+end
+
+describe "test of parsing params" do
   before do
     @argv = ['-x', '320',
+             '-yscale', '240',
+             '-debug']
+    @parser = ArgsParser.parser
+    @parser.comment(:debug, "debug mode")
+    @parser.bind(:xscale, :x, "width")
+    @parser.bind(:yscale, :y, "height")
+    @first, @params = @parser.parse(@argv)
+  end
+
+  it "has not first-arg" do
+    @first.should == nil
+  end
+
+  it "has params" do
+    @parser.has_params([:xscale, :yscale]).should == true
+    @params[:xscale].to_i.should == 320
+    @params[:yscale].to_i.should == 240
+  end
+
+  it "has an option" do
+    @parser.has_option(:debug).should == true
+  end
+end
+
+describe "test of parsing first-arg and params" do
+  before do
+    @argv = ['foo',
+             '-x', '320',
              '-yscale', '240',
              '-m', 'hello world',
              '-h', 
@@ -15,7 +59,11 @@ describe "options" do
     @parser.bind(:help, :h, "show help")
     @parser.bind(:xscale, :x, "width")
     @parser.bind(:yscale, :y, "height")
-    @params = @parser.parse(@argv)
+    @first, @params = @parser.parse(@argv)
+  end
+
+  it "has the first-arg" do
+    @first.should == 'foo'
   end
 
   it "has param" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - shokai
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-12 00:00:00 +09:00
+date: 2010-03-15 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency