kwalify 0.7.1 → 0.7.2

data/CHANGES.txt

@@ -1,9 +1,18 @@
 .=title:          ChangeLog
-.?release:        $Release: 0.7.1 $
-.?lastupdate:     $Date: 2008-01-28 15:27:12 +0900 (Mon, 28 Jan 2008) $
-.?version:        $Rev: 99 $
+.?release:        $Release: 0.7.2 $
+.?lastupdate:     $Date$
+.?version:        $Rev$
 
 
+.: Release 0.7.2 (2010-07-18)
+
+   .* bugfix:
+
+      .- Fix a bug that kwalify command raised error when YAML document is empty (thanks to Nuttall).
+
+      .- Fix a bug that Kwalify::Util.untabify() removed tailing empty strings.
+         
+
 .: Release 0.7.1 (2008-01-28)
 
    .* bugfix:

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-copyright(c) 2005-2008 kuwata-lab all rights reserved.
+copyright(c) 2005-2010 kuwata-lab all rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.txt

@@ -1,8 +1,8 @@
 = README
 
-release::	0.7.1
-lastupdate::	$Date: 2008-01-28 15:27:12 +0900 (Mon, 28 Jan 2008) $
-copyright::	copyright(c) 2005-2008 kuwata-lab all rights reserved.
+release::	0.7.2
+lastupdate::	$Date$
+copyright::	copyright(c) 2005-2010 kuwata-lab all rights reserved.
 
 
 
@@ -23,14 +23,14 @@ If you have installed RubyGems, just type 'gem install kwalify'
    
 Else if you can be root user, use 'setup.rb' as following:
 
-  $ tar xjf kwalify-0.7.1.tar.bz2
-  $ cd kwalify-0.7.1/
+  $ tar xjf kwalify-0.7.2.tar.bz2
+  $ cd kwalify-0.7.2/
   $ sudo ruby setup.rb install
 
 Else copy script and libraries to proper directory.
 
-  $ tar xjf kwalify-0.7.1.tar.bz2
-  $ cd kwalify-0.7.1/
+  $ tar xjf kwalify-0.7.2.tar.bz2
+  $ cd kwalify-0.7.2/
   $ mkdir -p $HOME/bin
   $ cp -a bin/* $HOME/bin
   $ export PATH=$PATH:$HOME/bin
@@ -41,8 +41,8 @@ Else copy script and libraries to proper directory.
 (Optional) 'contrib/inline-require' script to concatenate all script
 and libraries into a file.
   
-  $ tar xjf kwalify-0.7.1.tar.bz2
-  $ cd kwalify-0.7.1/
+  $ tar xjf kwalify-0.7.2.tar.bz2
+  $ cd kwalify-0.7.2/
   $ unset RUBYLIB
   $ ruby contrib/inline-require -I ./lib bin/kwalify > contrib/kwalify
   $ chmod a+x contrib/kwalify
@@ -58,4 +58,4 @@ and libraries into a file.
 
 == Copyright
 
-   copyright(c) 2005-2008 kuwata-lab all rights reserved.
+   copyright(c) 2005-2010 kuwata-lab all rights reserved.

data/bin/kwalify

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
 ###
-### $Rev: 83 $
-### $Release: 0.7.1 $
-### copyright(c) 2005-2008 kuwata-lab all rights reserved.
+### $Rev$
+### $Release: 0.7.2 $
+### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
 require 'kwalify'

data/contrib/inline-require

@@ -5,14 +5,19 @@
 ###
 ### usage: inline-require [-h] [-I path[,path2,..]] script
 ###
-### copyright(c) 2005-2008 kuwata-lab all rights reserved.
-### 0.7.1
-### $Rev: 2 $
+### copyright(c) 2005-2010 kuwata-lab all rights reserved.
+### 0.7.2
+### $Rev: 10 $
 ###
 
 
 class InlineRequire
 
+   def initialize(opts={})
+      @opts = opts.dup
+   end
+   attr_accessor :opts
+
    def expand(filename)
       sbuf = ''
       inlined = []
@@ -25,6 +30,10 @@ class InlineRequire
 
    def expand_require(filename, sbuf, inlined, level)
       raise "*** assertion error" if inlined.include?(filename)
+      remove_comment  = @opts[:remove_comment]
+      expand_indented = @opts[:expand_indented]
+      keep_filename   = @opts[:keep_filename]
+      loaded_features = @opts[:loaded_features]
       inlined << filename
       prog = File.read(filename)
       n = 0
@@ -48,7 +57,9 @@ class InlineRequire
 
          ## find 'require "foo"' and expand it to inline code
          flag_inline = false
-         if line =~ /^\s*require ['"](.*)["']\s*$/
+         pattern = expand_indented ? /^[ \t]*require ['"](.*)["']\s*$/ \
+                                   :       /^require ['"](.*)["']\s*$/
+         if line =~ pattern
             libname = $1
             libpath = find_library(libname)
             $stderr.puts "*** debug: libpath=#{libpath.inspect}" if $debug_mode
@@ -60,13 +71,19 @@ class InlineRequire
             end
          end
          if !flag_inline
-            sbuf << line
+            sbuf << line   unless remove_comment && line =~ /^[ \t]*\#/
          elsif inlined.include?(libpath)
-            sbuf << "#--already included #{line}"
+            sbuf << "#--already included #{line}"     unless remove_comment
          else
-            sbuf << "#--begin of #{line}"
+            if keep_filename
+               @n ||= 0;  @n += 1;  n = @n
+            end
+            sbuf << "#--begin of #{line}"             unless remove_comment
+            sbuf << "$LOADED_FEATURES << '#{libname}.rb'\n" if loaded_features
+            sbuf << "eval <<'END_OF_SCRIPT__#{n}', TOPLEVEL_BINDING, '#{libpath}', 1\n" if keep_filename
             expand_require(libpath, sbuf, inlined, level+1)
-            sbuf << "#--end of #{line}"
+            sbuf << "END_OF_SCRIPT__#{n}\n"               if keep_filename
+            sbuf << "#--end of #{line}"               unless remove_comment
          end
       end
       #sbuf << "\n" if sbuf[-1] != ?\n
@@ -105,38 +122,47 @@ end
 if __FILE__ == $0
 
    begin
-      rubylib_paths = []
-      flag_help = false
-      while ARGV[0] && ARGV[0][0] == ?-
-         opt = ARGV.shift
-         case opt
-         when '-h', '--help'
-            flag_help = true
-         when '-I'
-            arg = ARGV.shift
-            raise "-I: library path required." unless arg
-            rubylib_paths.concat(arg.split(/,/))
-         when '-D'
-            $debug_mode = true
-         else
-            raise "#{opt}: invalid option."
-         end
-      end
-
-      if flag_help
+      require "optparse"
+      op = OptionParser.new
+      options = {}
+      op.on("-h", "--help") {|v| options[:help] = v }
+      op.on("-I libpath")   {|v| options[:libpath] = v }
+      op.on("-i")           {|v| options[:expand_indented] = v }
+      op.on("-c")           {|v| options[:remove_comment] = v }
+      op.on("-k")           {|v| options[:keep_filename] = v }
+      op.on("-l")           {|v| options[:loaded_features] = v }
+      op.on("-D")           {|v| options[:debug] = v }
+      op.parse!()
+
+      $debug_mode = options[:debug]
+
+      if options[:help]
          command = File.basename($0)
          puts "Usage: #{command} [-h] [-I path[,path2,..]] script"
          puts "  -h                   : help"
+         puts "  -i                   : expand indented require(), too"
+         puts "  -c                   : remove comment lines start with '#'"
+         puts "  -k                   : keep filename (for debugging)"
+         puts "  -l                   : append libs to $LOADED_FEATURES"
          puts "  -I path[,path2,...]  : ruby library path"
          exit(0)
       end
 
+      if options[:libpath]
+         rubylib_paths = options[:libpath].split(/,/)
+      else
+         rubylib_paths = []
+      end
       $stderr.puts "*** debug: rubylib_paths=#{rubylib_paths.inspect}" if $debug_mode
       $LOAD_PATH.concat(rubylib_paths)
 
       filenames = ARGV
 
-      inline_require = InlineRequire.new
+      opts = { :expand_indented => options[:expand_indented],
+               :remove_comment  => options[:remove_comment],
+               :keep_filename   => options[:keep_filename],
+               :loaded_features => options[:loaded_features] }
+      inline_require = InlineRequire.new(opts)
       filenames.each do |filename|
          print inline_require.expand(filename)
       end

data/contrib/kwalify

@@ -1,30 +1,30 @@
 #!/usr/bin/env ruby
 
 ###
-### $Rev: 83 $
-### $Release: 0.7.1 $
-### copyright(c) 2005-2008 kuwata-lab all rights reserved.
+### $Rev$
+### $Release: 0.7.2 $
+### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
 #--begin of require 'kwalify'
 ###
-### $Rev: 99 $
-### $Release: 0.7.1 $
+### $Rev$
+### $Release: 0.7.2 $
 ### copyright(c) 2006 kuwata-lab.com all rights reserved.
 ###
 
 
 module Kwalify
 
-  RELEASE = ("$Release: 0.7.1 $" =~ /[.\d]+/) && $&
+  RELEASE = ("$Release: 0.7.2 $" =~ /[.\d]+/) && $&
 
 end
 
 #--begin of require 'kwalify/types'
 ###
-### $Rev: 87 $
-### $Release: 0.7.1 $
-### copyright(c) 2005-2008 kuwata-lab all rights reserved.
+### $Rev$
+### $Release: 0.7.2 $
+### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
 require 'date'
@@ -180,9 +180,9 @@ end
 #--end of require 'kwalify/types'
 #--begin of require 'kwalify/messages'
 ###
-### $Rev: 95 $
-### $Release: 0.7.1 $
-### copyright(c) 2005-2008 kuwata-lab all rights reserved.
+### $Rev$
+### $Release: 0.7.2 $
+### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
 module Kwalify
@@ -355,9 +355,9 @@ end
 #--end of require 'kwalify/messages'
 #--begin of require 'kwalify/errors'
 ###
-### $Rev: 99 $
-### $Release: 0.7.1 $
-### copyright(c) 2005-2008 kuwata-lab all rights reserved.
+### $Rev$
+### $Release: 0.7.2 $
+### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
 #--already included require 'kwalify/messages'
@@ -484,9 +484,9 @@ end
 #--end of require 'kwalify/errors'
 #--begin of require 'kwalify/rule'
 ###
-### $Rev: 95 $
-### $Release: 0.7.1 $
-### copyright(c) 2005-2008 kuwata-lab all rights reserved.
+### $Rev$
+### $Release: 0.7.2 $
+### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
 #--already included require 'kwalify/messages'
@@ -1045,9 +1045,9 @@ end
 #--end of require 'kwalify/rule'
 #--begin of require 'kwalify/validator'
 ###
-### $Rev: 99 $
-### $Release: 0.7.1 $
-### copyright(c) 2005-2008 kuwata-lab all rights reserved.
+### $Rev$
+### $Release: 0.7.2 $
+### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
 #--already included require 'kwalify/messages'
@@ -1329,9 +1329,9 @@ end
 #--end of require 'kwalify/validator'
 #--begin of require 'kwalify/meta-validator'
 ###
-### $Rev: 95 $
-### $Release: 0.7.1 $
-### copyright(c) 2005-2008 kuwata-lab all rights reserved.
+### $Rev$
+### $Release: 0.7.2 $
+### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
 #--already included require 'kwalify/errors'
@@ -1339,18 +1339,18 @@ end
 #--already included require 'kwalify/validator'
 #--begin of require 'kwalify/parser/yaml'
 ###
-### $Rev: 99 $
-### $Release: 0.7.1 $
-### copyright(c) 2005-2008 kuwata-lab all rights reserved.
+### $Rev$
+### $Release: 0.7.2 $
+### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
 #--already included require 'kwalify/validator'
 #--already included require 'kwalify/errors'
 #--begin of require 'kwalify/util'
 ###
-### $Rev: 88 $
-### $Release: 0.7.1 $
-### copyright(c) 2005-2008 kuwata-lab all rights reserved.
+### $Rev$
+### $Release: 0.7.2 $
+### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
 module Kwalify
@@ -1366,7 +1366,8 @@ module Kwalify
     ##   untabified_str = YamlHelper.untabify(tabbed_str)
     ##
     def untabify(str, width=8)
-      list = str.split(/\t/)
+      return str if str.nil?
+      list = str.split(/\t/, -1)   # if 2nd arg is negative then split() doesn't remove tailing empty strings
       last = list.pop
       sb = ''
       list.each do |s|
@@ -1386,7 +1387,7 @@ module Kwalify
     ##   Kwalify::Util.traverse_schema(schema) do |rulehash|
     ##     ## add module prefix to class name
     ##     if rulehash['class']
-    ##       rulehash['class'] = "MyModule::' + rulehash['class']
+    ##       rulehash['class'] = 'MyModule::' + rulehash['class']
     ##     end
     ##   end
     def traverse_schema(schema, &block)  #:yield: rulehash
@@ -1507,9 +1508,9 @@ end
 #--end of require 'kwalify/util'
 #--begin of require 'kwalify/parser/base'
 ###
-### $Rev: 92 $
-### $Release: 0.7.1 $
-### copyright(c) 2005-2008 kuwata-lab all rights reserved.
+### $Rev$
+### $Release: 0.7.2 $
+### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
 require 'strscan'
@@ -2734,9 +2735,9 @@ end
 #--end of require 'kwalify/meta-validator'
 #--begin of require 'kwalify/yaml-parser'
 ###
-### $Rev: 81 $
-### $Release: 0.7.1 $
-### copyright(c) 2005-2008 kuwata-lab all rights reserved.
+### $Rev$
+### $Release: 0.7.2 $
+### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
 #--already included require 'kwalify/messages'
@@ -3654,9 +3655,9 @@ end
 #--end of require 'kwalify'
 #--begin of require 'kwalify/main'
 ###
-### $Rev: 95 $
-### $Release: 0.7.1 $
-### copyright(c) 2005-2008 kuwata-lab all rights reserved.
+### $Rev$
+### $Release: 0.7.2 $
+### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
 require 'yaml'
@@ -3665,8 +3666,8 @@ require 'erb'
 #--already included require 'kwalify/util'
 #--begin of require 'kwalify/util/ordered-hash'
 ###
-### $Rev: 84 $
-### 0.7.1
+### $Rev$
+### 0.7.2
 ### $COPYRIGHT$
 ###
 
@@ -4036,7 +4037,7 @@ module Kwalify
         end
       elsif ydoc.nil?
         #* key=:validation_empty  msg="%s#%d: empty.\n"
-        puts kwalify.msg(:validation_empty) % [filename, i]
+        puts Kwalify.msg(:validation_empty) % [filename, i]
       else
         #* key=:validation_valid  msg="%s#%d: valid."
         puts Kwalify.msg(:validation_valid) % [filename, i] unless @options[:quiet]

data/doc-api/classes/CommandOptionError.html

@@ -80,7 +80,7 @@
 
     <div id="description">
       <p>
-$Rev: 83 $ $Release: 0.7.1 $ copyright(c) 2005-2008 kuwata-lab all rights reserved.
+$Rev$ $Release: 0.7.2 $ copyright(c) 2005-2010 kuwata-lab all rights reserved.
 </p>
 
     </div>
@@ -92,7 +92,7 @@ $Rev: 83 $ $Release: 0.7.1 $ copyright(c) 2005-2008 kuwata-lab all rights reserv
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000001">new</a>&nbsp;&nbsp;
+      <a href="#M000004">new</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -132,19 +132,19 @@ $Rev: 83 $ $Release: 0.7.1 $ copyright(c) 2005-2008 kuwata-lab all rights reserv
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000001" class="method-detail">
-        <a name="M000001"></a>
+      <div id="method-M000004" class="method-detail">
+        <a name="M000004"></a>
 
         <div class="method-heading">
-          <a href="#M000001" class="method-signature">
+          <a href="#M000004" class="method-signature">
           <span class="method-name">new</span><span class="method-args">(option, error_symbol, message=nil)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000001-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000001-source">
+            onclick="toggleCode('M000004-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000004-source">
 <pre>
 <span class="ruby-comment cmt"># File kwalify/util/option-parser.rb, line 8</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">option</span>, <span class="ruby-identifier">error_symbol</span>, <span class="ruby-identifier">message</span>=<span class="ruby-keyword kw">nil</span>)