ArgsParser 0.0.10 → 1.0.0

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.0 2011-06-22
+
+* default value
+
 === 0.0.10 2010-12-1
 
 * fix help string of long argument

data/README.rdoc

@@ -10,16 +10,16 @@
 
     parser = ArgsParser.parser
     parser.bind(:help, :h, "show help")
-    parser.bind(:size, :s, "size")
+    parser.bind(:size, :s, "size", "320x240") # name, shortname, comment, default
     parser.comment(:min, "min size")
     parser.comment(:max, "max size")
-    parser.comment(:debug, "debug mode")
+    parser.comment(:debug, "debug mode", false) # name, comment, default
     
     params = parser.parse(ARGV)
     
     if parser.has_option(:help) or !parser.has_params([:size, :max, :min])
        puts parser.help
-       puts 'e.g.  ./example.rb -s 320x240 -min 100 -max 500'
+       puts 'e.g.   ruby example.rb -s 320x240 -min 100 -max 500'
     end
     
     puts params[:size]

data/examples/example.rb

@@ -1,18 +1,20 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require '../lib/ArgsParser'
+require 'rubygems'
+#require 'ArgsParser'
+require File.dirname(__FILE__)+'/../lib/ArgsParser'
 
 parser = ArgsParser.parser
 parser.bind(:help, :h, "show help")
 parser.bind(:frame, :f, "frame image (required)")
-parser.bind(:message, :m, "message (required)") # name, shortname, comment for help
+parser.bind(:message, :m, "message (required)", 'hello!!') # name, shortname, comment, default
 parser.bind(:size, :s, "size (required)")
-parser.comment(:min, "minimum size") # add comment for help
+parser.comment(:min, "minimum size")
 parser.comment(:max, "maximum size")
-parser.comment(:debug, "debug mode")
+parser.comment(:debug, "debug mode", false) # name, comment, default
 
 first, params = parser.parse(ARGV)
-required_params = [:frame, :message, :size]
+required_params = [:frame, :size]
 
 if parser.has_option(:help) or !parser.has_params(required_params)
   puts parser.help

data/examples/math.rb

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require '../lib/ArgsParser'
+require 'rubygems'
+# require 'ArgsParser'
+require File.dirname(__FILE__)+'/../lib/ArgsParser'
 
 parser = ArgsParser.parser
 parser.bind(:help, :h, "show help")

data/examples/sum.rb

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require '../lib/ArgsParser'
+require 'rubygems'
+require 'ArgsParser'
+require File.dirname(__FILE__)+'/../lib/ArgsParser'
 
 parser = ArgsParser.parser
 parser.bind(:help, :h, "show help")

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.10'
+  VERSION = '1.0.0'
 
   def ArgsParser.parser
     Parser.new

data/lib/ArgsParser/Parser.rb

@@ -1,105 +1,117 @@
 # -*- coding: utf-8 -*-
 # ARGSのparser
 
-class Parser
+module ArgsParser
+  class Parser
+    attr_reader :params, :comments, :first
 
-  attr_reader :params, :comments, :first
-
-  def initialize
-    @binds = Hash.new
-    @comments = Hash.new
-  end
-
-  def parse(argv)
-    # parse
-    @first = nil
-    if argv.size > 0 and !(argv.first =~ /^-+.+/)
-      @first = argv.shift
+    def initialize
+      @binds = Hash.new
+      @comments = Hash.new
+      @defaults = Hash.new
     end
 
-    @params = Hash.new
-    for i in 0...argv.size do
-      if argv[i].match(/^-+.+/)
-        term = argv[i].match(/^-+(.+)/)[1].to_sym
-        if i == argv.size-1 || argv[i+1].match(/^-+.+/)
-          @params[term] = true # option
-        else
-          @params[term] = argv[i+1] # param
-        end
+    def parse(argv)
+      # parse
+      @first = nil
+      if argv.size > 0 and !(argv.first =~ /^-+.+/)
+        @first = argv.shift
       end
-    end
-    
-    @binds.keys.each{|name|
-      fullname = @binds[name]
-      if @params[fullname] == nil && @params[name] != nil
-        @params[fullname] = @params[name]
-        @params.delete(name)
+
+      @params = Hash.new
+      for i in 0...argv.size do
+        if argv[i].match(/^-+.+/)
+          term = argv[i].match(/^-+(.+)/)[1].to_sym
+          if i == argv.size-1 || argv[i+1].match(/^-+.+/)
+            @params[term] = true # option
+          else
+            @params[term] = argv[i+1] # param
+          end
+        end
       end
-    }
-    
-    return @first, @params
-  end
+      
+      @binds.keys.each{|name|
+        fullname = @binds[name]
+        if @params[fullname] == nil && @params[name] != nil
+          @params[fullname] = @params[name]
+          @params.delete(name)
+        end
+      }
 
-  def bind(fullname, name, comment=nil)
-    @binds[name.to_sym] = fullname.to_sym
-    if comment != nil
-      comment(fullname, comment)
+      @defaults.each{|k,v|
+        if @params[k] == nil
+          @params[k] = v
+        end
+      }
+      
+      return @first, @params
     end
-  end
 
-  def has_param(name)
-    @params[name].class == String
-  end
+    def bind(fullname, name, comment, default=nil)
+      @binds[name.to_sym] = fullname.to_sym
+      comment(fullname, comment, default)
+    end
 
-  def has_params(params_arr)
-    params_arr.each{|name|
-      return false if !has_param(name)
-    }
-    return true
-  end
+    def comment(name, comment, default=nil)
+      @comments[name.to_sym] = comment.to_s
+      @defaults[name.to_sym] = default if default != nil
+    end
 
-  def has_option(name)
-    @params[name] == true
-  end
+    def has_param(name)
+      @params[name].class == String
+    end
 
-  def has_options(options_arr)
-    options_arr.each{|name|
-      return false if !has_option(name)
-    }
-    return true
-  end
+    def has_params(params_arr)
+      params_arr.each{|name|
+        return false if !has_param(name)
+      }
+      return true
+    end
 
-  def comment(name, comment)
-    @comments[name.to_sym] = comment.to_s
-  end
-  
-  def help
-    lines = Hash.new
-    @comments.each{|k,v|
-      lines[k] = {:comment => v}
-    }
+    def has_option(name)
+      @params[name] == true
+    end
 
-    @binds.each{|k,v|
-      lines[v][:binds] = k
-    }
-    
-    most_long = 0
-    lines.each{|k,v|
-      name = " -#{k}"
-      name += " (-#{v[:binds]})" if v[:binds]
-      most_long = name.size if most_long < name.size
-    }
+    def has_options(options_arr)
+      options_arr.each{|name|
+        return false if !has_option(name)
+      }
+      return true
+    end
     
-    s = ""
-    lines.each{|k,v|
-      name = " -#{k}"
-      name += " (-#{v[:binds]})" if v[:binds]
-      line = name.ljust(most_long+2)
-      line += v[:comment]
-      s += line+"\n"
-    }
-    s = "options:\n" + s
-    return s
-  end
+    def help
+      lines = Hash.new
+      @comments.each{|k,v|
+        lines[k] = {:comment => v}
+      }
+
+      @binds.each{|k,v|
+        lines[v][:binds] = k
+      }
 
+      @defaults.each{|k,v|
+        lines[k][:default] = v
+      }
+      
+      most_long = 0
+      lines.each{|k,v|
+        name = " -#{k}"
+        name += " (-#{v[:binds]})" if v[:binds]
+        most_long = name.size if most_long < name.size
+      }
+      
+      s = ""
+      lines.each{|k,v|
+        name = " -#{k}"
+        name += " (-#{v[:binds]})" if v[:binds]
+        line = name.ljust(most_long+2)
+        line += v[:comment]
+        line += " : default - " + v[:default].to_s if v[:default] != nil
+        s += line+"\n"
+      }
+      s = "options:\n" + s
+      return s
+    end
+
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ArgsParser
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
+  - 1
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  version: 1.0.0
 platform: ruby
 authors: 
 - shokai
@@ -15,41 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 +09:00
-default_executable: 
+date: 2011-06-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: hoe
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 35
         segments: 
         - 2
-        - 0
+        - 9
         - 4
-        version: 2.0.4
+        version: 2.9.4
   type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 6
-        - 2
-        version: 2.6.2
-  type: :development
-  version_requirements: *id002
 description: "* Parse args from command line."
 email: 
 - hashimoto@shokai.org
@@ -77,7 +60,7 @@ files:
 - spec/parser_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
+- .gemtest
 homepage: http://github.com/shokai/argsparser-ruby
 licenses: []
 
@@ -108,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ArgsParser
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: "* Parse args from command line."