kwalify 0.6.1 → 0.7.0

data/lib/kwalify/util/assert-text-equal.rb

@@ -1,7 +1,7 @@
 ###
-### $Rev: 51 $
-### $Release: 0.6.1 $
-### copyright(c) 2005 kuwata-lab all rights reserved.
+### $Rev: 83 $
+### $Release: 0.7.0 $
+### copyright(c) 2005-2008 kuwata-lab all rights reserved.
 ###
 
 require 'test/unit/testcase'
@@ -10,35 +10,37 @@ require 'tempfile'
 
 class Test::Unit::TestCase  # :nodoc:
 
-   def assert_text_equal(expected, actual, message=nil, options={}) # :nodoc:
-      diffopt  = options[:diffopt] || '-u'
-      flag_cut = options.key?(:cut) ? options[:key] : true
+  def assert_text_equal(expected, actual, message=nil, options={}) # :nodoc:
+    expected = expected.to_s
+    actual   = actual.to_s
+    diffopt  = options[:diffopt] || '-u'
+    flag_cut = options.key?(:cut) ? options[:key] : true
 
-      if expected == actual
-         assert(true)
-         return
-      end
-      if expected[-1] != ?\n || actual[-1] != ?\n
-         expected += "\n"
-         actual   += "\n"
-      end
-      begin
-         expfile = Tempfile.new(".expected.")
-         expfile.write(expected); expfile.flush()
-         actfile = Tempfile.new(".actual.")
-         actfile.write(actual);   actfile.flush()
-         diff = `diff #{diffopt} #{expfile.path} #{actfile.path}`
-      ensure
-         expfile.close(true) if expfile
-         actfile.close(true) if actfile
-      end
-      # cut 1st & 2nd lines
-      message = (flag_cut ? diff.gsub(/\A.*\n.*\n/, '') : diff) unless message
-      #raise Test::Unit::AssertionFailedError.new(message)
-      assert_block(message) { false }  # or assert(false, message)
-   end
+    if expected == actual
+      assert(true)
+      return
+    end
+    if expected[-1] != ?\n || actual[-1] != ?\n
+      expected += "\n"
+      actual   += "\n"
+    end
+    begin
+      expfile = Tempfile.new(".expected.")
+      expfile.write(expected); expfile.flush()
+      actfile = Tempfile.new(".actual.")
+      actfile.write(actual);   actfile.flush()
+      diff = `diff #{diffopt} #{expfile.path} #{actfile.path}`
+    ensure
+      expfile.close(true) if expfile
+      actfile.close(true) if actfile
+    end
+    # cut 1st & 2nd lines
+    message = (flag_cut ? diff.gsub(/\A.*\n.*\n/, '') : diff) unless message
+    #raise Test::Unit::AssertionFailedError.new(message)
+    assert_block(message) { false }  # or assert(false, message)
+  end
 
-   alias assert_equal_with_diff assert_text_equal    # for compatibility
-   alias assert_text_equals     assert_text_equal    # for typo
+  alias assert_equal_with_diff assert_text_equal    # for compatibility
+  alias assert_text_equals     assert_text_equal    # for typo
 
 end

data/lib/kwalify/util/hash-interface.rb

@@ -1,37 +1,18 @@
 ###
-### $Rev: 51 $$
-### $Release: 0.6.1 $
-### copyright(c) 2005 kuwata-lab all rights reserved.
+### $Rev: 88 $$
+### $Release: 0.7.0 $
+### copyright(c) 2005-2008 kuwata-lab all rights reserved.
 ###
 
-module Kwalify
-
-   module HashInterface
-
-      def [](key)
-         instance_variable_get("@{key}")
-      end
-
-      def []=(key, val)
-         instance_variable_set("@{key}", val)
-      end
+require 'kwalify/util/hashlike'
 
-      def keys()
-         instance_variables.collect { |name| name[1, name.length-1] }
-      end
-
-      def key?(key)
-         instance_variables.include?("@#{key}")
-      end
-
-      def each
-         instance_variables.each do |name|
-            key = name[1, name.length-1]
-            val = instance_varaible_get(name)
-            yield(key, val)
-         end
-      end
+module Kwalify
 
-   end
+  ##
+  ## OBSOLETE: use Hash::Util::HashLike instead.
+  ##
+  module HashInterface
+    include Kwalify::Util::HashLike
+  end
 
 end

data/lib/kwalify/util/hashlike.rb

@@ -0,0 +1,51 @@
+###
+### $Rev: 89 $
+### $Release: 0.7.0 $
+### copyright(c) 2005-2008 kuwata-lab all rights reserved.
+###
+
+module Kwalify
+
+  module Util
+
+    ##
+    ## add hash-like methods
+    ##
+    module HashLike
+
+      def [](key)
+        instance_variable_get("@#{key}")
+      end
+
+      def []=(key, val)
+        instance_variable_set("@#{key}", val)
+      end
+
+      #--
+      #def keys()
+      #  instance_variables().collect { |name| name[1, name.length-1] }
+      #end
+      #++
+
+      def key?(key)
+        instance_variables().include?("@#{key}")
+      end
+      if Object.instance_methods.include?('instance_variable_defined?')
+        def key?(key)
+          instance_variable_defined?("@#{key}")
+        end
+      end
+
+      def each   # not necessary
+        instance_variables().each do |name|
+          key = name[1, name.length-1]
+          val = instance_variable_get(name)
+          yield(key, val)
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/kwalify/util/option-parser.rb

@@ -1,29 +1,29 @@
 ###
-### $Rev: 51 $
-### $Release: 0.6.1 $
-### copyright(c) 2005 kuwata-lab all rights reserved.
+### $Rev: 83 $
+### $Release: 0.7.0 $
+### copyright(c) 2005-2008 kuwata-lab all rights reserved.
 ###
 
 class CommandOptionError < StandardError
-   def initialize(option, error_symbol, message=nil)
-      if !message
-         case error_symbol
-         when :no_argument
-            message = "-%s: argument required." % option
-         when :unknown_option
-            message = "-%s: unknown option." % option
-         when :invalid_property
-            message = "-%s: invalid property." % option
-         else
-            message = "*** internal error(optchar=#{option}, error_symbol=#{error_symbol}) ***"
-         end
+  def initialize(option, error_symbol, message=nil)
+    if !message
+      case error_symbol
+      when :no_argument
+        message = "-%s: argument required." % option
+      when :unknown_option
+        message = "-%s: unknown option." % option
+      when :invalid_property
+        message = "-%s: invalid property." % option
+      else
+        message = "*** internal error(optchar=#{option}, error_symbol=#{error_symbol}) ***"
       end
-      super(message)
-      @option = option
-      @error_symbol = error_symbol
-   end
+    end
+    super(message)
+    @option = option
+    @error_symbol = error_symbol
+  end
 
-   attr_reader :option, :error_symbol
+  attr_reader :option, :error_symbol
 end
 
 
@@ -86,135 +86,135 @@ end
 
 class CommandOptionParser
 
-   ## arg_none:      option string which takes no argument
-   ## arg_required:  option string which takes argument
-   ## arg_otpional:  option string which may takes argument optionally
-   def initialize(arg_none=nil, arg_required=nil, arg_optional=nil)
-      @arg_none      = arg_none     || ""
-      @arg_required  = arg_required || ""
-      @arg_optional  = arg_optional || ""
-   end
-
-
-   def self.to_value(str)
-      case str
-      when nil, "null", "nil"         ;   return nil
-      when "true", "yes"              ;   return true
-      when "false", "no"              ;   return false
-      when /\A\d+\z/                  ;   return str.to_i
-      when /\A\d+\.\d+\z/             ;   return str.to_f
-      when /\/(.*)\//                 ;   return Regexp.new($1)
-      when /\A'.*'\z/, /\A".*"\z/     ;   return eval(str)
-      else                            ;   return str
+  ## arg_none:      option string which takes no argument
+  ## arg_required:  option string which takes argument
+  ## arg_otpional:  option string which may takes argument optionally
+  def initialize(arg_none=nil, arg_required=nil, arg_optional=nil)
+    @arg_none      = arg_none     || ""
+    @arg_required  = arg_required || ""
+    @arg_optional  = arg_optional || ""
+  end
+
+
+  def self.to_value(str)
+    case str
+    when nil, "null", "nil"         ;   return nil
+    when "true", "yes"              ;   return true
+    when "false", "no"              ;   return false
+    when /\A\d+\z/                  ;   return str.to_i
+    when /\A\d+\.\d+\z/             ;   return str.to_f
+    when /\/(.*)\//                 ;   return Regexp.new($1)
+    when /\A'.*'\z/, /\A".*"\z/     ;   return eval(str)
+    else                            ;   return str
+    end
+  end
+
+
+  ## argv:: array of string
+  ## auto_convert::  if true, convert properties value to int, boolean, string, regexp, ... (default false)
+  def parse(argv, auto_convert=false)
+    options = {}
+    properties = {}
+    while argv[0] && argv[0][0] == ?-
+      optstr = argv.shift
+      optstr = optstr[1, optstr.length-1]
+      #
+      if optstr[0] == ?-    ## property
+        unless optstr =~ /\A\-([-\w]+)(?:=(.*))?/
+          raise CommandOptionError.new(optstr, :invalid_property)
+        end
+        prop_name = $1;  prop_value = $2
+        if auto_convert
+          key   = prop_name.gsub(/-/, '_').intern
+          value = prop_value.nil? ? true : CommandOptionParser.to_value(prop_value)
+          properties[key] = value
+        else
+          properties[prop_name] = prop_value
+        end
+        #
+      else                  ## options
+        while optstr && !optstr.empty?
+          optchar = optstr[0]
+          optstr[0,1] = ""
+          #puts "*** debug: optchar=#{optchar.chr}, optstr=#{optstr.inspect}"
+          if @arg_none.include?(optchar)
+            options[optchar] = true
+          elsif @arg_required.include?(optchar)
+            arg = optstr.empty? ? argv.shift : optstr
+            raise CommandOptionError.new(optchar.chr, :no_argument) unless arg
+            options[optchar] = arg
+            optstr = nil
+          elsif @arg_optional.include?(optchar)
+            arg = optstr.empty? ? true : optstr
+            options[optchar] = arg
+            optstr = nil
+          else
+            raise CommandOptionError.new(optchar.chr, :unknown_option)
+          end
+        end
       end
-   end
-
-
-   ## argv:: array of string
-   ## auto_convert::  if true, convert properties value to int, boolean, string, regexp, ... (default false)
-   def parse(argv, auto_convert=false)
-      options = {}
-      properties = {}
-      while argv[0] && argv[0][0] == ?-
-         optstr = argv.shift
-         optstr = optstr[1, optstr.length-1]
-         #
-         if optstr[0] == ?-    ## property
-            unless optstr =~ /\A\-([-\w]+)(?:=(.*))?/
-               raise CommandOptionError.new(optstr, :invalid_property)
-            end
-            prop_name = $1;  prop_value = $2
-            if auto_convert
-               key   = prop_name.gsub(/-/, '_').intern
-               value = prop_value == nil ? true : CommandOptionParser.to_value(prop_value)
-               properties[key] = value
-            else
-               properties[prop_name] = prop_value
-            end
-         #
-         else                  ## options
-            while optstr && !optstr.empty?
-               optchar = optstr[0]
-               optstr[0,1] = ""
-               #puts "*** debug: optchar=#{optchar.chr}, optstr=#{optstr.inspect}"
-               if @arg_none.include?(optchar)
-                  options[optchar] = true
-               elsif @arg_required.include?(optchar)
-                  arg = optstr.empty? ? argv.shift : optstr
-                  raise CommandOptionError.new(optchar.chr, :no_argument) unless arg
-                  options[optchar] = arg
-                  optstr = nil
-               elsif @arg_optional.include?(optchar)
-                  arg = optstr.empty? ? true : optstr
-                  options[optchar] = arg
-                  optstr = nil
-               else
-                  raise CommandOptionError.new(optchar.chr, :unknown_option)
-               end
-            end
-         end
-         #
-      end  # end of while
-
-      return options, properties
-   end
+      #
+    end  # end of while
+
+    return options, properties
+  end
 
 end
 
 
 if __FILE__ == $0
-   ## create parser
-   arg_none     = "hv"      # ex. -h -v
-   arg_required = "xf"      # ex. -x suffix -f filename
-   arg_optional = "i"       # ex. -i  (or -i10)
-   parser = CommandOptionParser.new(arg_none, arg_required, arg_optional)
-
-   ## parse options
-   argv = %w[-h -v -f filename -i 10 aaa bbb]
-   options, properties = parser.parse(argv)
-   p options   #=> { ?h=>true, ?v=>true, ?f=>"filename", ?i=>true }
-   p argv      #=> ["10", "aaa", "bbb"]
-
-   ## parse options #2
-   argv = %w[-hvx.txt -ffilename -i10 aaa bbb]
-   options, properties = parser.parse(argv)
-   p options   #=> { ?h=>true, ?v=>true, ?x=>".txt", ?f=>"filename", ?i=>"10" }
-   p argv      #=> ["aaa", "bbb"]
-
-   ## parse properties
-   argv = %w[-hi --index=10 --user-name=foo --help]
-   options, properties = parser.parse(argv)
-   p options     #=> {?h=>true, ?i=>true}
-   p properties  #=> {"index"=>"10", "user-name"=>"foo", "help"=>nil}
-
-   ## parse properties with auto-convert
-   argv = %w[-hi --index=10 --user-name=foo --help]
-   options, properties = parser.parse(argv, true)
-   p options     #=> {?h=>true, ?i=>true}
-   p properties  #=> {:index=>10, :user_name=>foo, :help=>true}
-
-   ## -a: unknown option.
-   argv = %w[-abc]
-   begin
-      options, properties = parser.parse(argv)
-   rescue CommandOptionError => ex
-      $stderr.puts ex.message     # -a: unknown option.
-   end
-
-   ## -f: argument required.
-   argv = %w[-f]
-   begin
-      options, properties = parser.parse(argv)
-   rescue CommandOptionError => ex
-      $stderr.puts ex.message     # -f: argument required.
-   end
-
-   ## --@prop=10: invalid property.
-   argv = %w[--@prop=10]
-   begin
-      options, properties = parser.parse(argv)
-   rescue CommandOptionError => ex
-      $stderr.puts ex.message     # --@prop=10: invalid property.
-   end
+  ## create parser
+  arg_none     = "hv"      # ex. -h -v
+  arg_required = "xf"      # ex. -x suffix -f filename
+  arg_optional = "i"       # ex. -i  (or -i10)
+  parser = CommandOptionParser.new(arg_none, arg_required, arg_optional)
+
+  ## parse options
+  argv = %w[-h -v -f filename -i 10 aaa bbb]
+  options, properties = parser.parse(argv)
+  p options   #=> { ?h=>true, ?v=>true, ?f=>"filename", ?i=>true }
+  p argv      #=> ["10", "aaa", "bbb"]
+
+  ## parse options #2
+  argv = %w[-hvx.txt -ffilename -i10 aaa bbb]
+  options, properties = parser.parse(argv)
+  p options   #=> { ?h=>true, ?v=>true, ?x=>".txt", ?f=>"filename", ?i=>"10" }
+  p argv      #=> ["aaa", "bbb"]
+
+  ## parse properties
+  argv = %w[-hi --index=10 --user-name=foo --help]
+  options, properties = parser.parse(argv)
+  p options     #=> {?h=>true, ?i=>true}
+  p properties  #=> {"index"=>"10", "user-name"=>"foo", "help"=>nil}
+
+  ## parse properties with auto-convert
+  argv = %w[-hi --index=10 --user-name=foo --help]
+  options, properties = parser.parse(argv, true)
+  p options     #=> {?h=>true, ?i=>true}
+  p properties  #=> {:index=>10, :user_name=>foo, :help=>true}
+
+  ## -a: unknown option.
+  argv = %w[-abc]
+  begin
+    options, properties = parser.parse(argv)
+  rescue CommandOptionError => ex
+    $stderr.puts ex.message     # -a: unknown option.
+  end
+
+  ## -f: argument required.
+  argv = %w[-f]
+  begin
+    options, properties = parser.parse(argv)
+  rescue CommandOptionError => ex
+    $stderr.puts ex.message     # -f: argument required.
+  end
+
+  ## --@prop=10: invalid property.
+  argv = %w[--@prop=10]
+  begin
+    options, properties = parser.parse(argv)
+  rescue CommandOptionError => ex
+    $stderr.puts ex.message     # --@prop=10: invalid property.
+  end
 
 end