optopus 0.1.1 → 0.1.2

data/README

@@ -14,6 +14,9 @@ gem install optopus
   require 'optopus'
   
   opts = optopus do
+    desc 'program information'
+    option :info, '-I'
+
     desc 'print lots of debugging information'
     option :debug, '-d', '--debug'
   
@@ -33,7 +36,7 @@ gem install optopus
     option :timestamp, '-T', '--timestamp TIME', :type => Time
   
     # read yaml config file and overwrite options
-    file '-c', '--config-file FILE'
+    config_file '-c', '--config-file FILE'
   
     after do
       # postprocessing
@@ -41,8 +44,7 @@ gem install optopus
     end
   
     error do |e|
-      $stderr.puts e.message
-      exit 1
+      abort(e.message)
     end
   end
   

data/lib/optopus.rb

@@ -15,6 +15,14 @@ module Optopus
       @opts = opts
     end
 
+    def banner=(v)         ; @opts.banner = v         ; end
+    def program_name=(v)   ; @opts.program_name = v   ; end
+    def summary_width=(v)  ; @opts.psummary_width = v ; end
+    def summary_indent=(v) ; @opts.summary_indent = v ; end
+    def default_argv=(v)   ; @opts.default_argv = v   ; end
+    def version=(v)        ; @opts.version = v        ; end
+    def release=(v)        ; @opts.release = v        ; end
+
     def desc(str)
       @desc = str
     end
@@ -24,7 +32,7 @@ module Optopus
       @desc = nil
     end
 
-    def file(args_hd, *args_tl)
+    def config_file(args_hd, *args_tl)
       @desc ||= 'reading config file'
       @opts.add_file([args_hd] + args_tl, @desc)
       @desc = nil
@@ -85,15 +93,25 @@ module Optopus
 
   class Options
     def initialize
+      @parser = OptionParser.new
       @opts_args = []
     end
 
+    def banner=(v)         ; @parser.banner = v         ; end
+    def program_name=(v)   ; @parser.program_name = v   ; end
+    def summary_width=(v)  ; @parser.psummary_width = v ; end
+    def summary_indent=(v) ; @parser.summary_indent = v ; end
+    def default_argv=(v)   ; @parser.default_argv = v   ; end
+    def version=(v)        ; @parser.version = v        ; end
+    def release=(v)        ; @parser.release = v        ; end
+
     def add(name, args, desc, block)
       args, defval = fix_args(args, desc)
       @opts_args << [name.to_sym, args, defval, block]
     end
 
     def add_file(args, desc)
+      raise 'config file option is defined' if @file_args
       args, defval = fix_args(args, desc)
       @file_args = args
     end
@@ -107,15 +125,16 @@ module Optopus
     end
 
     def parse!
-      parser = OptionParser.new
       options = {}
+      has_arg_v = false
       has_arg_h = false
 
       @opts_args.each do |name, args, defval, block|
         options[name] = defval
+        has_arg_v = (args.first == '-v')
         has_arg_h = (args.first == '-h')
 
-        parser.on(*args) do |*v|
+        @parser.on(*args) do |*v|
           value = v.first || true
           options[name] = value
           CheckerContext.evaluate(v, {:value => value}, &block) if block
@@ -123,11 +142,17 @@ module Optopus
       end
 
       if @file_args
-        parser.on(*@file_args) do |v|
+        @parser.on(*@file_args) do |v|
           config = YAML.load_file(v)
 
           @opts_args.each do |name, args, defval, block|
-            value = config[name] || config[name.to_s]
+            if args[1].kind_of?(String) and args[1] =~ /-+([^\s=]+)/
+              key = $1
+            else
+              key = name.to_s
+            end
+
+            value = config[key] || config[name.to_s]
 
             next unless value
 
@@ -136,7 +161,7 @@ module Optopus
             pat, conv =  OptionParser::DefaultList.atype[type]
 
             if pat and pat !~ value
-              raise OptionParser::InvalidArgument.new("(#{name}: #{value})")
+              raise OptionParser::InvalidArgument.new(v, "(#{name}: #{value})")
             end
 
             value = conv.call(value) if conv
@@ -146,14 +171,22 @@ module Optopus
         end
       end
 
+      unless has_arg_v
+        @parser.on_tail('-v', '--version', 'show version') do
+          v = @parser.ver or abort("#{@parser.program_name}: version unknown")
+          puts v
+          exit
+        end
+      end
+
       unless has_arg_h
-        parser.on_tail('-h', '--help', 'Show this message') do
-          puts parser.help
+        @parser.on_tail('-h', '--help', 'show this message') do
+          puts @parser.help
           exit
         end
       end
 
-      parser.parse!(ARGV)
+      @parser.parse!
       CheckerContext.evaluate([], {:options => options},&@on_after) if @on_after
 
       return options

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: optopus
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - winebarrel
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 +09:00
-default_executable: 
+date: 2011-05-31 00:00:00 Z
 dependencies: []
 
 description: 
@@ -30,7 +29,6 @@ extra_rdoc_files: []
 files: 
 - README
 - lib/optopus.rb
-has_rdoc: true
 homepage: https://bitbucket.org/winebarrel/optopus
 licenses: []
 
@@ -60,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Enhanced option parser.