optopus 0.1.3 → 0.1.4

data/README

@@ -14,9 +14,8 @@ gem install optopus
   require 'optopus'
   
   opts = optopus do
-    desc 'program information'
-    option :info, '-I'
-
+    option :info, '-I', :desc => 'program information'
+  
     desc 'print lots of debugging information'
     option :debug, '-d', '--debug'
   
@@ -24,23 +23,26 @@ gem install optopus
     option :output_file, '-o', '--output-file FILE', :default => '/var/log/xxx.log'
   
     desc 'set number of retries to NUMBER (0 unlimits)'
-    option :tries, '-t', '--tries NUMBER', :type => Integer, :default => 0 do
+    option :tries, '-t', '--tries NUMBER', :type => Integer, :default => 0 do |value|
       # custom validation
-      invalid_argument if @value < 0
+      invalid_argument if value < 0
     end
   
     desc 'comma-separated list of accepted extensions'
     option :accept, '-A', '--accept LIST', :type => Array, :default => []
   
+    desc 'access protocol'
+    option :protocol, '-P', '--protocol PROTO', :type => [:http, :ftp]
+  
     desc 'access timestamp'
     option :timestamp, '-T', '--timestamp TIME', :type => Time
   
     # read yaml config file and overwrite options
     config_file '-c', '--config-file FILE'
   
-    after do
+    after do |options|
       # postprocessing
-      # @options.each { ... }
+      # options.each { ... }
     end
   
     error do |e|

data/lib/optopus.rb

@@ -48,15 +48,15 @@ module Optopus
   end # DefinerContext
 
   class CheckerContext
-    def self.evaluate(args, vars = {}, &block)
-      self.new(args, vars).instance_eval(&block)
+    def self.evaluate(args, pass, &block)
+      self.new(args, &block).evaluate(pass)
     end
 
-    def initialize(value, vars = {})
+    def initialize(value, &block)
       @args = value ? [value] : []
 
-      vars.each do |name, value|
-        instance_variable_set("@#{name}", value)
+      if block
+        (class<<self; self; end).send(:define_method, :evaluate, &block)
       end
     end
 
@@ -137,7 +137,7 @@ module Optopus
         @parser.on(*args) do |*v|
           value = v.first || true
           options[name] = value
-          CheckerContext.evaluate(v, {:value => value}, &block) if block
+          CheckerContext.evaluate(v, value, &block) if block
         end
       end
 
@@ -187,7 +187,7 @@ module Optopus
       end
 
       @parser.parse!
-      CheckerContext.evaluate([], {:options => options},&@on_after) if @on_after
+      CheckerContext.evaluate([], options, &@on_after) if @on_after
 
       return options
     rescue => e

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: optopus
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - winebarrel