riel 1.1.17 → 1.2.0

data/lib/riel/log/logger.rb

@@ -1,266 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-#
-# = logger.rb
-#
-# Logging Module
-#
-# Author:: Jeff Pace <jpace@incava.org>
-# Documentation:: Author
-#
-
-require 'rubygems'
-require 'rainbow'
-require 'riel/log/severity'
-require 'riel/log/format'
-
-#
-# == Logger
-#
-# This class logs messages. You probably don't want to use this directly; Log is
-# the class containing the necessary class methods.
-#
-# == Examples
-#
-# See the unit tests in log_test.rb
-# 
-
-module RIEL
-  class Logger
-    $LOGGING_LEVEL = nil
-
-    attr_accessor :quiet
-    attr_accessor :output
-    attr_accessor :colorize_line
-    attr_accessor :level
-    attr_accessor :ignored_files
-    attr_accessor :ignored_methods
-    attr_accessor :ignored_classes
-    attr_accessor :trim
-
-    include Log::Severity
-
-    FRAME_RE = Regexp.new('(.*):(\d+)(?::in \`(.*)\')?')
-
-    def initialize
-      set_defaults
-    end
-    
-    def verbose= v
-      @level = case v
-               when TrueClass 
-                 DEBUG
-               when FalseClass 
-                 FATAL
-               when Integer
-                 v
-               end
-    end
-
-    def set_defaults
-      $LOGGING_LEVEL   = @level = FATAL
-      @ignored_files   = Hash.new
-      @ignored_methods = Hash.new
-      @ignored_classes = Hash.new
-      @width           = 0
-      @output          = $stdout
-      @colors          = Array.new
-      @colorize_line   = false
-      @quiet           = false
-      @trim            = true
-
-      set_default_widths
-    end
-
-    def set_default_widths
-      set_widths Log::DEFAULT_FILENAME_WIDTH, Log::DEFAULT_LINENUM_WIDTH, Log::DEFAULT_FUNCTION_WIDTH
-    end
-
-    def verbose
-      level <= DEBUG
-    end
-
-    # Assigns output to a file with the given name. Returns the file; client
-    # is responsible for closing it.
-    def outfile= f
-      @output = f.kind_of?(IO) ? f : File.new(f, "w")
-    end
-
-    # Creates a printf format for the given widths, for aligning output. To lead
-    # lines with zeros (e.g., "00317") the line_width argument must be a string,
-    # not an integer.
-    def set_widths file_width, line_width, func_width
-      @file_width = file_width
-      @line_width = line_width
-      @function_width = func_width
-      
-      @format = "[%#{file_width}s:%#{line_width}d] {%#{func_width}s}"
-    end
-
-    def ignore_file fname
-      ignored_files[fname] = true
-    end
-    
-    def ignore_method methname
-      ignored_methods[methname] = true
-    end
-    
-    def ignore_class classname
-      ignored_classes[classname] = true
-    end
-
-    def log_file fname
-      ignored_files.delete fname
-    end
-    
-    def log_method methname
-      ignored_methods.delete methname
-    end
-    
-    def log_class classname
-      ignored_classes.delete classname
-    end
-
-    def debug msg = "", depth = 1, &blk
-      log msg, DEBUG, depth + 1, &blk
-    end
-
-    def info msg = "", depth = 1, &blk
-      log msg, INFO, depth + 1, &blk
-    end
-
-    def warn msg = "", depth = 1, &blk
-      log msg, WARN, depth + 1, &blk
-    end
-
-    def error msg = "", depth = 1, &blk
-      log msg, ERROR, depth + 1, &blk
-    end
-
-    def fatal msg = "", depth = 1, &blk
-      log msg, FATAL, depth + 1, &blk
-    end
-
-    # Logs the given message.
-    def log msg = "", lvl = DEBUG, depth = 1, cname = nil, &blk
-      if lvl >= level
-        frame = nil
-
-        stk = caller 0
-        stk.reverse.each_with_index do |frm, idx|
-          if frm.index(%r{riel/log/log.*:\d+:in\b})
-            break
-          else
-            frame = frm
-          end
-        end
-
-        print_stack_frame frame, cname, msg, lvl, &blk
-      end
-    end
-
-    # Shows the current stack.
-    def stack msg = "", lvl = DEBUG, depth = 1, cname = nil, &blk
-      if lvl >= level
-        stk = caller depth
-        for frame in stk
-          print_stack_frame frame, cname, msg, lvl, &blk
-          cname = nil
-          msg = ""
-        end
-      end
-    end
-
-    def print_stack_frame frame, cname, msg, lvl, &blk
-      md = FRAME_RE.match frame
-      file, line, func = md[1], md[2], (md[3] || "")
-      # file.sub!(/.*\//, "")
-
-      # Ruby 1.9 expands the file name, but 1.8 doesn't:
-      pn = Pathname.new(file).expand_path
-      
-      file = pn.to_s
-
-      if cname
-        func = cname + "#" + func
-      end
-      
-      if ignored_files[file] || (cname && ignored_classes[cname]) || ignored_methods[func]
-        # skip this one.
-      else
-        print_formatted(file, line, func, msg, lvl, &blk)
-      end
-    end
-
-    def print_formatted file, line, func, msg, lvl, &blk
-      if trim
-        fmt = Format.new
-        file = fmt.trim_right file, @file_width
-        line = fmt.trim_left  line, @line_width
-        func = fmt.trim_left  func, @function_width
-      end
-
-      hdr = sprintf @format, file, line, func
-      print hdr, msg, lvl, &blk
-    end
-    
-    def print hdr, msg, lvl, &blk
-      if blk
-        x = blk.call
-        if x.kind_of? String
-          msg = x
-        else
-          return
-        end
-      end
-
-      msg = msg.to_s.chomp
-
-      if lvlcol = @colors[lvl]
-        if colorize_line
-          line = hdr + " " + msg
-          @output.puts line.color(lvlcol)
-        else
-          @output.puts hdr + " " + msg.color(lvlcol)
-        end
-      else
-        @output.puts hdr + " " + msg
-      end      
-    end
-
-    def set_color lvl, color
-      @colors[lvl] = color
-    end
-
-    def method_missing meth, *args, &blk
-      validcolors = Sickill::Rainbow::TERM_COLORS
-      # only handling foregrounds, not backgrounds
-      if code = validcolors[meth]
-        add_color_method meth.to_s, code + 30
-        send meth, *args, &blk
-      else
-        super
-      end
-    end
-
-    def respond_to? meth
-      validcolors = Sickill::Rainbow::TERM_COLORS
-      validcolors.include?(meth) || super
-    end
-
-    def add_color_method color, code
-      instmeth = Array.new
-      instmeth << "def #{color}(msg = \"\", lvl = DEBUG, depth = 1, cname = nil, &blk)"
-      instmeth << "  log(\"\\e[#{code}m\#{msg\}\\e[0m\", lvl, depth + 1, cname, &blk)"
-      instmeth << "end"
-      instance_eval instmeth.join("\n")
-
-      clsmeth = Array.new
-      clsmeth << "def #{color}(msg = \"\", lvl = DEBUG, depth = 1, cname = nil, &blk)"
-      clsmeth << "  logger.#{color}(\"\\e[#{code}m\#{msg\}\\e[0m\", lvl, depth + 1, cname, &blk)"
-      clsmeth << "end"
-
-      class_eval clsmeth.join("\n")
-    end
-  end
-end

data/lib/riel/log/severity.rb

@@ -1,22 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-#
-# = severity.rb
-#
-# Logging Module
-#
-# Author:: Jeff Pace <jpace@incava.org>
-# Documentation:: Author
-#
-
-module RIEL
-  class Log
-    module Severity
-      DEBUG = 0
-      INFO  = 1
-      WARN  = 2
-      ERROR = 3
-      FATAL = 4
-    end
-  end
-end

data/lib/riel/log.rb

@@ -1,21 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-#
-# = log.rb
-#
-# Logging Module
-#
-# Author:: Jeff Pace <jpace@incava.org>
-# Documentation:: Author
-#
-
-require 'riel/log/loggable'
-require 'riel/log/log'
-
-module RIEL
-  class AppLog < Log
-    include Log::Severity
-  end
-end
-
-include RIEL

data/lib/riel/optproc.rb

@@ -1,296 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'riel/log'
-
-module OptProc
-  class Option
-    include Loggable
-
-    attr_reader :md, :tags, :res
-
-    ARG_INTEGER = %r{^ ([\-\+]?\d+)               $ }x
-    ARG_FLOAT   = %r{^ ([\-\+]?\d* (?:\.\d+)?)    $ }x
-    ARG_STRING  = %r{^ [\"\']? (.*?) [\"\']?      $ }x
-    ARG_BOOLEAN = %r{^ (yes|true|on|no|false|off) $ }ix
-
-    ARG_TYPES = Array.new
-    ARG_TYPES << [ :integer, ARG_INTEGER ]
-    ARG_TYPES << [ :float,   ARG_FLOAT   ]
-    ARG_TYPES << [ :string,  ARG_STRING  ]
-    ARG_TYPES << [ :boolean, ARG_BOOLEAN ]
-
-    def initialize args = Hash.new, &blk
-      @tags    = args[:tags] || Array.new
-      @rc      = args[:rc]
-      @rc      = [ @rc ] if @rc.kind_of?(String)
-      @md      = nil
-      @set     = blk || args[:set]
-      
-      @type    = nil
-      @valuere = nil
-      
-      @argtype = nil
-
-      @res     = args[:res]
-      @res     = [ @res ] if @res.kind_of?(Regexp)
-      
-      if args[:arg]
-        demargs = args[:arg].dup
-        while arg = demargs.shift
-          case arg
-          when :required
-            @type = "required"
-          when :optional
-            @type = "optional"
-          when :none
-            @type = nil
-          when :regexp
-            @valuere = demargs.shift
-          else
-            if re = ARG_TYPES.assoc(arg)
-              @valuere   = re[1]
-              @argtype   = arg
-              @type    ||= "required"
-            end
-          end
-        end
-      end
-    end
-
-    def inspect
-      '[' + @tags.collect { |t| t.inspect }.join(" ") + ']'
-    end
-
-    def to_str
-      to_s
-    end
-
-    def to_s
-      @tags.join " "
-    end
-
-    def match_rc? field
-      @rc && @rc.include?(field)
-    end
-
-    def match_value val
-      @md = @valuere && @valuere.match(val)
-      @md && @md[1]
-    end
-
-    def match_tag tag
-      if tm = @tags.detect do |t|
-          t.index(tag) == 0 && tag.length <= t.length
-        end
-        
-        if tag.length == tm.length
-          1.0
-        else
-          tag.length.to_f * 0.01
-        end
-      else
-        nil
-      end
-    end
-    
-    def match args, opt = args[0]
-      return nil unless %r{^-}.match opt
-
-      tag = opt.split('=', 2)[0] || opt
-
-      @md = nil
-      
-      if @res && (@md = @res.collect { |re| re.match(opt) }.detect)
-        1.0
-      else
-        match_tag tag
-      end
-    end
-
-    def set_value args, opt = args[0]
-      val = opt.split('=', 2)[1]
-      args.shift
-
-      if @md
-        # already have match data
-      elsif @type == "required"
-        if val
-          # already have value
-        elsif args.size > 0
-          val = args.shift
-        else
-          $stderr.puts "value expected"
-        end
-
-        if val
-          match_value val
-        end
-      elsif @type == "optional"
-        if val
-          # already have value
-          match_value val
-        elsif args.size > 0
-          if %r{^-}.match args[0]
-            # skipping next value; apparently option
-          elsif match_value args[0]
-            # value matches
-            args.shift
-          end
-        end
-      end
-
-      value = value_from_match
-
-      set value, opt, args
-    end
-
-    def value_from_match
-      if @md 
-        if @argtype.nil? || @argtype == :regexp
-          @md
-        else
-          convert_value @md[1]
-        end
-      elsif @argtype == :boolean
-        true
-      end
-    end
-
-    def convert_value val
-      if val
-        case @argtype
-        when :string
-          val
-        when :integer
-          val.to_i
-        when :float
-          val.to_f
-        when :boolean
-          to_boolean val
-        when :regexp
-          val
-        when nil
-          val
-        else
-          log { "unknown argument type: #{@type.inspect}" }
-        end
-      elsif @argtype == :boolean
-        true
-      end
-    end
-
-    def to_boolean val
-      %w{ yes true on soitenly }.include? val.downcase
-    end
-
-    def set val, opt = nil, args = nil
-      setargs = [ val, opt, args ].select_with_index { |x, i| i < @set.arity }
-      @set.call(*setargs)
-    end
-  end
-
-  class OptionSet
-    attr_reader :options
-    
-    def initialize data
-      @options   = Array.new
-      @shortopts = Array.new
-      @longopts  = Array.new
-      @regexps   = Hash.new
-      
-      data.each do |optdata|
-        opt = OptProc::Option.new optdata
-        @options << opt
-
-        opt.tags.each do |tag|
-          ch = tag[0]
-          if ch == 45  # 45 = '-'
-            ch = tag[1]
-            assocopts = nil
-            if ch == tag
-              ch = tag[2]
-              assocopts = @longopts
-            else
-              assocopts = @shortopts
-            end
-            
-            (assocopts[ch] ||= Array.new) << opt
-          end
-          
-          if res = opt.res
-            res.each do |re|
-              (@regexps[re] ||= Array.new) << opt
-            end
-          end
-        end
-      end
-    end
-
-    COMBINED_OPTS_RES = [
-      #               -number       non-num
-      Regexp.new('^ ( - \d+   )     ( \D+.* ) $ ', Regexp::EXTENDED),
-      #               -letter       anything
-      Regexp.new('^ ( - [a-zA-Z] )  ( .+    ) $ ', Regexp::EXTENDED)
-    ]
-
-    def process_option args
-      opt = args[0]
-
-      if md = COMBINED_OPTS_RES.collect { |re| re.match opt }.detect
-        lhs = md[1]
-        rhs = "-" + md[2]
-        args[0, 1] = lhs, rhs
-        
-        return process_option args
-      elsif opt[0] == 45
-        ch = opt[1]
-        assocopts = if ch == 45  # 45 = '-'
-                      ch = opt[2]
-                      @longopts[ch]
-                    elsif ch.nil?
-                      nil
-                    else
-                      @shortopts[ch]
-                    end
-
-        if assocopts && x = set_option(assocopts, args)
-          return x
-        end
-      end
-
-      if x = set_option(@options, args)
-        return x
-      elsif @bestmatch
-        if @bestopts.size == 1
-          @bestopts[0].set_value args
-          return @bestopts[0]
-        else
-          optstr = @bestopts.collect { |y| '(' + y.tags.join(', ') + ')' }.join(', ')
-          $stderr.puts "ERROR: ambiguous match of '#{args[0]}'; matches options: #{optstr}"
-          exit 2
-        end
-      end
-
-      nil
-    end
-
-    def set_option optlist, args
-      @bestmatch = nil
-      @bestopts  = Array.new
-      
-      optlist.each do |option|
-        next unless mv = option.match(args)
-        if mv >= 1.0
-          # exact match:
-          option.set_value args
-          return option
-        elsif !@bestmatch || @bestmatch <= mv
-          @bestmatch = mv
-          @bestopts  << option
-        end
-      end
-      nil
-    end
-  end
-end

data/test/riel/array_test.rb

@@ -1,22 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'test/unit'
-require 'riel/array'
-
-class ArrayTestCase < Test::Unit::TestCase
-
-  def test_to_s
-    a = %w{ this is a test }
-    assert_equal "[ this, is, a, test ]", a.to_s
-  end
-
-  def test_rand
-    a = %w{ this is a test }
-    10.times do
-      r = a.rand
-      assert_not_nil r
-      assert a.include?(r)
-    end
-  end
-end

data/test/riel/log/format_test.rb

@@ -1,48 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'pathname'
-require 'test/unit'
-require 'stringio'
-require 'riel/log/format'
-require 'riel/log/loggable'
-
-module RIEL
-  class FormatTestCase < Test::Unit::TestCase
-    include RIEL::Loggable
-
-    def run_trim_left_test expected, length, str = "something"
-      trimmed = Format.new.trim_left(str, length)
-      assert_equal expected, trimmed
-    end
-
-    def test_trim_left_short_positive_number
-      run_trim_left_test "some", 4
-    end
-
-    def test_trim_left_long
-      run_trim_left_test "something", 10
-    end
-
-    def test_trim_left_short_negative_number
-      run_trim_left_test "some", -4
-    end
-
-    def run_trim_right_test expected, length, str = "something"
-      trimmed = Format.new.trim_right(str, length)
-      assert_equal expected, trimmed
-    end
-
-    def test_trim_right_short_positive_number
-      run_trim_right_test "  ...", 5
-    end
-
-    def test_trim_right_long
-      run_trim_right_test "something", 10
-    end
-
-    def test_trim_right_short_negative_number
-      run_trim_right_test "  ...", -5
-    end
-  end
-end