optopus 0.1.5 → 0.1.6

data/README

@@ -2,7 +2,7 @@
 
 == Description
 
-Enhanced option parser.
+optopus is an easy-to-use option purser.
 
 == Install
 
@@ -51,3 +51,4 @@ gem install optopus
   end
   
   p opts
+  p opts.config_file

data/lib/optopus.rb

@@ -131,22 +131,12 @@ module Optopus
       options = {}
       has_arg_v = false
       has_arg_h = false
-
-      @opts_args.each do |name, args, defval, block, required|
-        options[name] = defval unless defval.nil?
-        has_arg_v = (args.first == '-v')
-        has_arg_h = (args.first == '-h')
-
-        @parser.on(*args) do |*v|
-          value = v.first || true
-          options[name] = value
-          CheckerContext.evaluate(v, value, &block) if block
-        end
-      end
+      options.instance_eval("def config_file; @__config_file__; end")
 
       if @file_args
         @parser.on(*@file_args) do |v|
           config = YAML.load_file(v)
+          options.instance_variable_set(:@__config_file__, config)
 
           @opts_args.each do |name, args, defval, block, required|
             if args[1].kind_of?(String) and args[1] =~ /-+([^\s=]+)/
@@ -155,7 +145,7 @@ module Optopus
               key = name.to_s
             end
 
-            value = config[key] || config[name.to_s]
+            value = config[key] || config[key.gsub(/[-_]/, '-')] || key.gsub(/[-_]/, '_')
 
             next unless value
 
@@ -174,6 +164,18 @@ module Optopus
         end
       end
 
+      @opts_args.each do |name, args, defval, block, required|
+        options[name] = defval unless defval.nil?
+        has_arg_v = (args.first == '-v')
+        has_arg_h = (args.first == '-h')
+
+        @parser.on(*args) do |*v|
+          value = v.first || true
+          options[name] = value
+          CheckerContext.evaluate(v, value, &block) if block
+        end
+      end
+
       unless has_arg_v
         @parser.on_tail('-v', '--version', 'show version') do
           v = @parser.ver or abort("#{@parser.program_name}: version unknown")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: optopus
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - winebarrel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-01 00:00:00 Z
+date: 2011-11-03 00:00:00 Z
 dependencies: []
 
 description: