ArgsParser 0.0.9 → 0.0.10

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.10 2010-12-1
+
+* fix help string of long argument
+
 === 0.0.8 2010-06-26
 
 * fix my name

data/lib/ArgsParser/Parser.rb

@@ -74,26 +74,31 @@ class Parser
   end
   
   def help
-    binds_reversed = Hash.new
-    most_longname_size = 0
-    @binds.keys.each{|key|
-      value = @binds[key]
-      binds_reversed[value] = key
-      if most_longname_size < len = key.to_s.size + value.to_s.size
-        most_longname_size = len
-      end
+    lines = Hash.new
+    @comments.each{|k,v|
+      lines[k] = {:comment => v}
     }
 
-    s = "options:\n"
-    @comments.keys.sort{|a,b| a.to_s <=> b.to_s }.each{|name|
-      comment = @comments[name]
-      if shortname = binds_reversed[name]
-        s += " -#{name} (-#{shortname})" +
-          " "*(most_longname_size-name.to_s.size-shortname.to_s.size+2) + "#{comment}\n"
-      else
-        s += " -#{name}" + " "*(most_longname_size-name.to_s.size+6) + "#{comment}\n"
-      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
+    }
+    
+    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
 

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

data/spec/parser_spec.rb

@@ -22,12 +22,17 @@ describe "test of parsing params" do
              '-yscale', '240',
              '-debug']
     @parser = ArgsParser.parser
-    @parser.comment(:debug, "debug mode")
-    @parser.bind(:xscale, :x, "width")
-    @parser.bind(:yscale, :y, "height")
+    @parser.comment(:debug, 'debug mode')
+    @parser.bind(:xscale, :x, 'width')
+    @parser.bind(:yscale, :y, 'height')
+    @parser.comment(:test_for_error_cauased_by_long_argument, 'long arguent')
     @first, @params = @parser.parse(@argv)
   end
 
+  it 'should return help as string' do
+    @parser.help.class.should == String
+  end
+
   it "has not first-arg" do
     @first.should == nil
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ArgsParser
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - shokai
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-05 00:00:00 +09:00
+date: 2010-12-01 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 19
         segments: 
         - 2
         - 6
-        - 1
-        version: 2.6.1
+        - 2
+        version: 2.6.2
   type: :development
   version_requirements: *id002
 description: "* Parse args from command line."