optopus 0.2.1 → 0.2.2

data/lib/optopus.rb

@@ -44,6 +44,10 @@ module Optopus
       @desc = nil
     end
 
+    def before(&block)
+      @opts.add_before(block)
+    end
+
     def after(&block)
       @opts.add_after(block)
     end
@@ -131,6 +135,10 @@ module Optopus
       @file_args = args
     end
 
+    def add_before(block)
+      @on_before = block
+    end
+
     def add_after(block)
       @on_after = block
     end
@@ -145,60 +153,77 @@ module Optopus
       has_arg_h = false
       options.instance_eval("def config_file; @__config_file__; end")
 
-      if @file_args
-        @parser.on(*@file_args) do |v|
+      file_args_checker = lambda do |v|
+        if v.kind_of?(Hash)
+          config = v
+        else
           config = YAML.load_file(v)
-          options.instance_variable_set(:@__config_file__, config)
+          @on_before.call(config) if @on_before
+        end
 
-          @opts_args.each do |name, args, defval, block, required, multiple|
-            if args[1].kind_of?(String) and args[1] =~ /-+([^\s=]+)/
-              key = $1
-            else
-              key = name.to_s
-            end
+        config.keys.each do |key|
+          next unless key.kind_of?(Symbol)
+          config[key.to_s.gsub('_', '-')] = config[key]
+        end
+
+        options.instance_variable_set(:@__config_file__, config)
+
+        @opts_args.each do |name, args, defval, block, required, multiple|
+          if args[1].kind_of?(String) and args[1] =~ /-+([^\s=]+)/
+            key = $1
+          else
+            key = name.to_s
+          end
 
-            values = nil
+          value = nil
 
-            [key, key.gsub(/[-_]/, '-'), key.gsub(/[-_]/, '_')].each do |k|
-              if values = config[k]
-                key = k
-                break
-              end
+          [key, key.gsub(/[-_]/, '-'), key.gsub(/[-_]/, '_')].each do |k|
+            if value = config[k]
+              key = k
+              break
             end
+          end
 
-            next unless values
+          next unless value
 
-            check = lambda do |value|
-              value = orig_val = value.to_s
-              type = args.find {|i| i.kind_of?(Class) }
-              pat, conv =  OptionParser::DefaultList.atype[type]
+          value = orig_val = value.to_s
 
-              if pat and pat !~ value
-                raise OptionParser::InvalidArgument.new(v, "(#{key}: #{value})")
-              end
+          if type = args.find {|i| i.kind_of?(Class) }
+            pat, conv =  OptionParser::DefaultList.atype[type]
 
-              value = conv.call(value) if conv
+            if pat and pat !~ value
+              raise OptionParser::InvalidArgument.new(v, "(#{key}: #{value})")
+            end
 
-              if value and block
-                begin
-                  CheckerContext.evaluate(v, value, &block)
-                rescue OptionParser::ParseError => e
-                  errmsg = "#{e.message}: #{key}=#{orig_val}"
-                  raise OptionParser::ParseError, errmsg
-                end
-              end
+            value = conv.call(value) if conv
+          elsif type = args.find {|i| i.kind_of?(Array) }
+            unless type.map {|i| i.to_s }.include?(value.to_s)
+              raise OptionParser::InvalidArgument.new(key, value)
+            end
 
-              return value
-            end # lambda
+            value = value.to_s.to_sym
+          end
 
-            if values.kind_of?(Array)
-              options[name] = values.map {|i| check.call(i) }
-            else
-              options[name] = check.call(values)
+          if value and block
+            begin
+              CheckerContext.evaluate(v, value, &block)
+            rescue OptionParser::ParseError => e
+              errmsg = "#{e.message}: #{key}=#{orig_val}"
+              raise OptionParser::ParseError, errmsg
             end
           end
+
+          options[name] = value
         end
-      end # if @file_args
+      end # file_args_checker
+
+      if @file_args
+        @parser.on(*@file_args, &file_args_checker)
+      elsif @on_before
+        config = {}
+        @on_before.call(config)
+        file_args_checker.call(config)
+      end
 
       @opts_args.each do |name, args, defval, block, required, multiple|
         options[name] = defval unless defval.nil?
@@ -242,6 +267,12 @@ module Optopus
         end
       end
 
+      (options.config_file || {}).each do |key, value|
+        next if key.kind_of?(Symbol)
+        key = key.to_s.gsub('-', '_').to_sym
+        options[key] = value unless options.has_key?(key)
+      end
+
       CheckerContext.evaluate([], 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: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - winebarrel
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-17 00:00:00 +09:00
-default_executable: 
+date: 2011-12-26 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.8.11
 signing_key: 
 specification_version: 3
 summary: optopus is an easy-to-use option purser.