main 2.5.0 → 2.6.0

data/lib/main/cast.rb

@@ -15,9 +15,9 @@ module Main
 
     cast :boolean do |obj|
       case obj.to_s
-        when 'true'
+        when %r/^(true|t|1)$/ 
           true
-        when 'false'
+        when %r/^(false|f|0)$/ 
           false
         else
           !!obj
@@ -40,17 +40,43 @@ module Main
       String obj
     end
 
+    cast :symbol do |obj|
+      String(obj).to_sym
+    end
+
     cast :uri do |obj|
       require 'uri'
       ::URI.parse obj.to_s
     end
 
+    cast :time do |obj|
+      require 'time'
+      ::Time.parse obj.to_s
+    end
+
+    cast :date do |obj|
+      require 'date'
+      ::Date.parse obj.to_s
+    end
+
     cast :list do |*objs|
       [*objs].flatten.join(',').split(/,/)
     end
 
+  # add list_of_xxx methods
+    List.dup.each do |type|
+      next if type.to_s =~ %r/list/ 
+      m = "list_of_#{ type }"
+      define_method m do |*objs|
+        list(*objs).map{|obj| send type, obj}
+      end
+      export m 
+      List << m
+    end
+
+  # add list_of_xxx_from_file
     List.dup.each do |type|
-      next if type.to_s == 'list' 
+      next if type.to_s =~ %r/list/ 
       m = "list_of_#{ type }"
       define_method m do |*objs|
         list(*objs).map{|obj| send type, obj}

data/lib/main/logger.rb

@@ -0,0 +1,51 @@
+module Main
+  ### because active_record fubars the hell out of Logger ;-(
+  class Logger < ::Logger
+    def self.new *a, &b
+      super(*a, &b).instance_eval{ @default_formatter = @formatter = Formatter.new; self }
+    end
+    def format_message(severity, datetime, progname, msg)
+      (@formatter || @default_formatter).call(severity, datetime, progname, msg)
+    end
+
+    def device
+      @logdev.instance_eval{ @dev }
+    end
+
+    def tty?
+      device.respond_to?('tty?') and device.tty?
+    end
+
+    def turn which
+      @logdev.extend OnOff unless OnOff === @logdev
+      @logdev.turn which
+    end
+
+    def on
+      turn :on
+    end
+    alias_method "on!", "on"
+    def self.on *a, &b
+      new(*a, &b).instance_eval{ turn :on; self }
+    end
+
+    def off
+      turn :off
+    end
+    alias_method "off!", "off"
+    def self.off *a, &b
+      new(*a, &b).instance_eval{ turn :off; self }
+    end
+
+    module OnOff
+      def turn which
+        @turned = which.to_s =~ %r/on/i ? :on : :off
+      end
+
+      def write message 
+        return message.to_s.size if @turned == :off
+        super
+      end
+    end
+  end
+end

data/lib/main/parameter.rb

@@ -65,6 +65,7 @@ module Main
     attribute 'synopsis'
     attribute('values'){ [] }
     attribute('defaults'){ [] }
+    attribute('examples'){ [] }
 
     attribute 'arity' => 1
     attribute 'required' => false
@@ -94,6 +95,11 @@ module Main
       end
 
       DSL.evaluate(self, &block) if block
+      sanity_check!
+    end
+
+    def sanity_check!
+      raise Arity, "#{ name } with arity -1 (zero or more args) cannot be required" if(arity == -1 and required?)
     end
 
     def name
@@ -138,6 +144,7 @@ module Main
       self.required !bool
     end
 
+=begin
     def setup!
       return false unless given?
       adding_handlers do
@@ -147,9 +154,22 @@ module Main
       end
       true
     end
+=end
+
+    def setup!
+      adding_handlers do
+        check_arity
+        apply_casting
+        check_validation
+      end
+    end
 
     def check_arity 
-      (raise Arity, "#{ typename })" if values.size.zero? and argument_required?) unless arity == -1
+      return true if not given? and optional?
+
+      ex = values.size == 0 ? NotGiven : Arity
+
+      (raise ex, "#{ typename })" if values.size.zero? and argument_required?) unless arity == -1
 
       if arity >= 0
         min = arity
@@ -161,11 +181,19 @@ module Main
 
       arity = min
 
+=begin
+puts
+p :values => values
+p :arity => arity
+p :argument_required => argument_required?
+p :argument_none => argument_none?
+puts
+=end
       if values.size < arity
-        if argument_required? or argument_none?
-          raise Arity, "#{ typename }) #{ values.size }/#{ sign }#{ arity }" if(values.size < arity)
-        elsif argument_optional?
-          raise Arity, "#{ typename }) #{ values.size }/#{ sign }#{ arity }" if(values.size < arity and values.size > 0)
+        if argument_optional?
+          raise ex, "#{ typename }) #{ values.size }/#{ sign }#{ arity }" if(values.size < arity and values.size > 0)
+        elsif argument_required? or argument_none?
+          raise ex, "#{ typename }) #{ values.size }/#{ sign }#{ arity }" if(values.size < arity)
         end
       end
     end
@@ -226,13 +254,14 @@ module Main
         label = name
         op = required ? "->" : "~>"
         value = defaults.size > 0 ? "#{ name }=#{ defaults.join ',' }" : name 
-        value = "#{ cast }(#{ value })" if cast
+        value = "#{ cast }(#{ value })" if(cast and not cast.respond_to?(:call))
         "#{ label } (#{ arity } #{ op } #{ value })"
       end
     end
 
     class Option < Parameter
       attribute 'required' => false
+      attribute 'arity' => 0
 
       attribute 'synopsis' do
         long, *short = names
@@ -242,7 +271,7 @@ module Main
         unless argument_none?
           op = required ? "->" : "~>"
           value = defaults.size > 0 ? "#{ name }=#{ defaults.join ',' }" : name 
-          value = "#{ cast }(#{ value })" if cast
+          value = "#{ cast }(#{ value })" if(cast and not cast.respond_to?(:call))
           "#{ label } (#{ arity } #{ op } #{ value })"
         else
           label
@@ -258,7 +287,7 @@ module Main
         label = "#{ name }=#{ name }"
         op = required ? "->" : "~>"
         value = defaults.size > 0 ? "#{ name }=#{ defaults.join ',' }" : name 
-        value = "#{ cast }(#{ value })" if cast
+        value = "#{ cast }(#{ value })" if(cast and not cast.respond_to?(:call))
         "#{ label } (#{ arity } #{ op } #{ value })"
       end
     end
@@ -270,13 +299,18 @@ module Main
         label = "env[#{ name }]=#{ name }"
         op = required ? "->" : "~>"
         value = defaults.size > 0 ? "#{ name }=#{ defaults.join ',' }" : name 
-        value = "#{ cast }(#{ value })" if cast
+        value = "#{ cast }(#{ value })" if(cast and not cast.respond_to?(:call))
         "#{ label } (#{ arity } #{ op } #{ value })"
       end
     end
 
     class List < ::Array
       def parse argv, env
+        ignore, stop = [], argv.index('--')
+        if stop
+          ignore = argv[stop .. -1]
+          (argv.size - stop).times{ argv.pop }
+        end
         parse_options argv
         return 'help' if detect{|p| p.name.to_s == 'help' and p.given?}
         parse_keywords argv
@@ -284,6 +318,7 @@ module Main
         parse_environment env
         defaults!
         validate!
+        argv.push *ignore[1 .. -1] unless ignore.empty? 
         self
       end
 
@@ -330,9 +365,11 @@ module Main
           raise ex
         end
 
+=begin
         params.each do |p|
           p.setup!
         end
+=end
       end
 
       def parse_arguments argv, params=nil
@@ -359,9 +396,11 @@ module Main
           end
         end
 
+=begin
         params.each do |p|
           p.setup!
         end
+=end
       end
 
       def parse_keywords argv, params=nil
@@ -371,19 +410,27 @@ module Main
 
         params.each do |p|
           names = p.names
-          name = names.first
+          name = names.sort_by{|n| [n.size,n]}.last
 
           kre = %r/^\s*(#{ names.join '|' })\s*=/
           opt = "--#{ name }"
-          i = 0
+          i = -1 
 
           argv.each_with_index do |a, idx|
+            i += 1
             b = argv[idx + 1]
-            m, key, *ignored = kre.match("#{ a }#{ b }").to_a
+            s = "#{ a }#{ b }"
+            m, key, *ignored = kre.match(s).to_a
             if m
               replacements[i] ||= a.gsub %r/^\s*#{ key }/, opt
+              next
             end
-            i += 1
+=begin
+            abbrev = name.index(key) == 0
+            if abbrev
+              replacements[i] ||= a.gsub %r/^\s*#{ key }/, opt
+            end
+=end
           end
         end
 
@@ -405,9 +452,11 @@ module Main
           p.add_value value
         end
 
+=begin
         params.each do |p|
           p.setup!
         end
+=end
       end
 
       def defaults!
@@ -422,10 +471,11 @@ module Main
 
       def validate!
         each do |p|
-          p.adding_handlers do
-            next if p.arity == -1
-            raise NotGiven, "#{ p.typename } not given" if(p.required? and (not p.given?))
-          end
+          #p.adding_handlers do
+            #next if p.arity == -1
+            #raise NotGiven, "#{ p.typename } not given" if(p.required? and (not p.given?))
+          #end
+          p.setup!
         end
       end
 
@@ -465,115 +515,145 @@ module Main
       def self.evaluate param, &block
         new(param).evaluate(&block)
       end
-      attr 'p'
+
+      # attr 'p'
+      attr 'param'
       alias_method 'evaluate', 'instance_eval'
       def initialize param
-        @p = param
+        @param = param
+      end
+
+      def attribute a = nil, &block
+        name = param.name
+        a ||= name
+        b = attribute_block_for name, &block 
+        Main.current.module_eval{ attribute *a, &b }
+      end
+
+      def attribute_block_for name, &block
+        #block ||= lambda{|param| param.arity == 1 ? param.value : param.values}
+        block ||= lambda{|param| param.arity.abs <= 1 ? param.value : param.values }
+        lambda{ block.call self.param[name] }
+      end
+
+      def attr *a, &b
+        attribute *a, &b
+      end
+
+      def example *list
+        list.flatten.compact.each do |elem|
+          param.examples << elem.to_s
+        end
       end
+      alias_method "examples", "example"
 
-      def type sym
-        p.type = sym
+
+      def type *sym
+        sym.size == 0 ? param.type : (param.type = sym.first)
       end
       def type?
-        p.type?
+        param.type?
       end
 
-      def synopsis arg 
-        p.synopsis arg 
+      def synopsis *arg 
+        arg.size == 0 ? param.synopsis : (param.synopsis arg.first)
       end
 
       def argument arg 
-        p.argument arg 
+        param.argument arg 
       end
       def argument_required bool = true
         if bool
-          p.argument :required
+          param.argument :required
         else
-          p.argument false 
+          param.argument false 
         end
       end
       def argument_required?
-        p.argument_required?
+        param.argument_required?
       end
 
       def argument_optional bool = true
         if bool
-          p.argument :optional
+          param.argument :optional
         else
-          p.argument false 
+          param.argument false 
         end
       end
       def argument_optional?
-        p.argument_optional?
+        param.argument_optional?
       end
 
       def required bool = true 
-        p.required = bool 
+        param.required = bool 
       end
       def required?
-        p.required?
+        param.required?
       end
 
       def optional bool = true 
         if bool 
-          p.required !bool  
+          param.required !bool  
         else
-          p.required bool  
+          param.required bool  
         end
       end
       def optional?
-        p.optional?
+        param.optional?
       end
 
       def cast sym=nil, &b 
-        p.cast = sym || b 
+        param.cast = sym || b 
       end
       def cast?
-        p.cast?
+        param.cast?
       end
 
       def validate sym=nil, &b 
-        p.validate = sym || b 
+        param.validate = sym || b 
       end
       def validate?
-        p.validate?
+        param.validate?
       end
 
       def description s 
-        p.description = s.to_s
+        param.description = s.to_s
       end
       def description?
-        p.description?
+        param.description?
       end
       alias_method 'desc', 'description'
 
       def default value, *values
-        p.defaults.push value 
-        p.defaults.push *values
-        p.defaults
+        param.defaults.push value 
+        param.defaults.push *values
+        param.defaults
       end
       def defaults?
-        p.defaults?
+        param.defaults?
       end
       def defaults value, *values 
-        p.defaults.push value 
-        p.defaults.push *values
-        p.defaults
+        param.defaults.push value 
+        param.defaults.push *values
+        param.defaults
       end
       def defaults?
-        p.defaults?
+        param.defaults?
       end
 
       def arity value
         value = -1 if value.to_s == '*'
-        p.arity = Integer value
+        param.arity = Integer value
+        if param.arity == -1
+          optional true
+        end
       end
       def arity?
-        p.arity?
+        param.arity?
       end
 
       def error which = :instead, &block
-        p.send "error_handler_#{ which }=", block
+        param.send "error_handler_#{ which }=", block
       end
     end