rkwalify 1.4.0.pre.beta → 1.4.0

data/bin/kwalify

@@ -2,14 +2,14 @@
 
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
 #--begin of require 'kwalify'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2006 kuwata-lab.com all rights reserved.
 ###
 
@@ -17,13 +17,13 @@
 ### copyright(c) 2006 kuwata-lab.com all rights reserved.
 
 module Kwalify
-  RELEASE = '1.4.0-beta' # Same as in the gemspec file.
+  RELEASE = '1.4.0' # Same as in the gemspec file.
 end
 #--end of require 'kwalify/version'
 #--begin of require 'kwalify/types'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
@@ -181,7 +181,7 @@ end
 #--begin of require 'kwalify/messages'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
@@ -356,7 +356,7 @@ end
 #--begin of require 'kwalify/errors'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
@@ -485,10 +485,9 @@ end
 #--begin of require 'kwalify/rule'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
-# frozen_string_literal: false
 
 #--already included require 'kwalify/messages'
 #--already included require 'kwalify/errors'
@@ -1049,7 +1048,7 @@ end
 #--begin of require 'kwalify/validator'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
@@ -1333,7 +1332,7 @@ end
 #--begin of require 'kwalify/meta-validator'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
@@ -1343,7 +1342,7 @@ end
 #--begin of require 'kwalify/parser/yaml'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
@@ -1352,10 +1351,9 @@ end
 #--begin of require 'kwalify/util'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
-# frozen_string_literal: false
 
 module Kwalify
 
@@ -1473,7 +1471,7 @@ module Kwalify
       hashlist.each do |hash|
         key = hash[primarykey]
         unless key
-          riase "primary key '#{key}' not found."
+          raise "primary key '#{key}' not found."
         end
         if flag_duplicate_check && hashtable.key?(key)
           raise "primary key '#{key}' duplicated (value '#{hashtable[key]}')"
@@ -1513,10 +1511,9 @@ end
 #--begin of require 'kwalify/parser/base'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
-# frozen_string_literal: false
 
 require 'strscan'
 #--already included require 'kwalify/errors'
@@ -2153,7 +2150,7 @@ class Kwalify::Yaml::Parser < Kwalify::BaseParser
       else  # indicator == '>'
         if !text.empty? && spaces.length == indent
           if s.sub!(/\r?\n((\r?\n)+)\z/, '\1')
-            nil
+            # Ruby will return "nil"
           elsif is_folded
             s.sub!(/\r?\n\z/, ' ')
           end
@@ -2168,7 +2165,7 @@ class Kwalify::Yaml::Parser < Kwalify::BaseParser
     end
     ## chomping
     if chomping == '+'
-      nil
+      # Ruby will return "nil"
     elsif chomping == '-'
       s.sub!(/(\r?\n)+\z/, '')
     else
@@ -2231,7 +2228,7 @@ class Kwalify::Yaml::Parser < Kwalify::BaseParser
     scan('[')
     skip_spaces_and_comments()
     if scan(']')
-      nil
+      # Ruby will return "nil"
     else
       rule = seq_rule ? seq_rule.sequence[0] : nil                         #*V
       uniq_table = rule ? rule._uniqueness_check_table() : nil             #*V
@@ -2270,7 +2267,7 @@ class Kwalify::Yaml::Parser < Kwalify::BaseParser
     scan('{')
     skip_spaces_and_comments()
     if scan('}')
-      nil
+      # Ruby will return "nil"
     else
       path.push(nil)
       is_merged = false
@@ -2742,17 +2739,14 @@ end
 #--begin of require 'kwalify/yaml-parser'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
-# frozen_string_literal: false
 
 #--already included require 'kwalify/messages'
 #--already included require 'kwalify/errors'
 #--already included require 'kwalify/types'
 
-require 'date'
-
 
 module Kwalify
 
@@ -3298,7 +3292,7 @@ module Kwalify
       s = ''
       empty = ''
       min_indent = -1
-      while line = _getline()
+      while (line = _getline())
         line =~ /^( *)(.*)/
         indent = $1.length
         if $2.empty?
@@ -3447,8 +3441,10 @@ module Kwalify
         if tzone_h
           diff_sec = tzone_h.to_i * 60 * 60
           if tzone_m
-            if diff_sec > 0 ; diff_sec += tzone_m.to_i * 60
-            else            ; diff_sec -= tzone_m.to_i * 60
+            if diff_sec > 0
+              diff_sec += tzone_m.to_i * 60
+            else
+              diff_sec -= tzone_m.to_i * 60
             end
           end
           p diff_sec
@@ -3663,10 +3659,9 @@ end
 #--begin of require 'kwalify/main'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
-# frozen_string_literal: false
 
 require 'yaml'
 require 'erb'
@@ -3675,7 +3670,7 @@ require 'erb'
 #--begin of require 'kwalify/util/ordered-hash'
 ###
 ### $Rev$
-### 1.4.0-beta
+### 1.4.0
 ### $COPYRIGHT$
 ###
 
@@ -3850,7 +3845,7 @@ module Kwalify
         exit 1
       rescue Kwalify::KwalifyError => ex
         raise ex if main.debug?
-        $stderr.puts "ERROR: #{ex.to_s}"
+        $stderr.puts "ERROR: #{ex}"
         exit 1
       #rescue => ex
       #  if main.debug?

data/bin/kwalify.rb

@@ -2,14 +2,14 @@
 
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
 #--begin of require 'kwalify'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2006 kuwata-lab.com all rights reserved.
 ###
 
@@ -17,13 +17,13 @@
 ### copyright(c) 2006 kuwata-lab.com all rights reserved.
 
 module Kwalify
-  RELEASE = '1.4.0-beta' # Same as in the gemspec file.
+  RELEASE = '1.4.0' # Same as in the gemspec file.
 end
 #--end of require 'kwalify/version'
 #--begin of require 'kwalify/types'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
@@ -181,7 +181,7 @@ end
 #--begin of require 'kwalify/messages'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
@@ -356,7 +356,7 @@ end
 #--begin of require 'kwalify/errors'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
@@ -485,10 +485,9 @@ end
 #--begin of require 'kwalify/rule'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
-# frozen_string_literal: false
 
 #--already included require 'kwalify/messages'
 #--already included require 'kwalify/errors'
@@ -1049,7 +1048,7 @@ end
 #--begin of require 'kwalify/validator'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
@@ -1333,7 +1332,7 @@ end
 #--begin of require 'kwalify/meta-validator'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
@@ -1343,7 +1342,7 @@ end
 #--begin of require 'kwalify/parser/yaml'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
@@ -1352,10 +1351,9 @@ end
 #--begin of require 'kwalify/util'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
-# frozen_string_literal: false
 
 module Kwalify
 
@@ -1473,7 +1471,7 @@ module Kwalify
       hashlist.each do |hash|
         key = hash[primarykey]
         unless key
-          riase "primary key '#{key}' not found."
+          raise "primary key '#{key}' not found."
         end
         if flag_duplicate_check && hashtable.key?(key)
           raise "primary key '#{key}' duplicated (value '#{hashtable[key]}')"
@@ -1513,10 +1511,9 @@ end
 #--begin of require 'kwalify/parser/base'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
-# frozen_string_literal: false
 
 require 'strscan'
 #--already included require 'kwalify/errors'
@@ -2153,7 +2150,7 @@ class Kwalify::Yaml::Parser < Kwalify::BaseParser
       else  # indicator == '>'
         if !text.empty? && spaces.length == indent
           if s.sub!(/\r?\n((\r?\n)+)\z/, '\1')
-            nil
+            # Ruby will return "nil"
           elsif is_folded
             s.sub!(/\r?\n\z/, ' ')
           end
@@ -2168,7 +2165,7 @@ class Kwalify::Yaml::Parser < Kwalify::BaseParser
     end
     ## chomping
     if chomping == '+'
-      nil
+      # Ruby will return "nil"
     elsif chomping == '-'
       s.sub!(/(\r?\n)+\z/, '')
     else
@@ -2231,7 +2228,7 @@ class Kwalify::Yaml::Parser < Kwalify::BaseParser
     scan('[')
     skip_spaces_and_comments()
     if scan(']')
-      nil
+      # Ruby will return "nil"
     else
       rule = seq_rule ? seq_rule.sequence[0] : nil                         #*V
       uniq_table = rule ? rule._uniqueness_check_table() : nil             #*V
@@ -2270,7 +2267,7 @@ class Kwalify::Yaml::Parser < Kwalify::BaseParser
     scan('{')
     skip_spaces_and_comments()
     if scan('}')
-      nil
+      # Ruby will return "nil"
     else
       path.push(nil)
       is_merged = false
@@ -2742,17 +2739,14 @@ end
 #--begin of require 'kwalify/yaml-parser'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
-# frozen_string_literal: false
 
 #--already included require 'kwalify/messages'
 #--already included require 'kwalify/errors'
 #--already included require 'kwalify/types'
 
-require 'date'
-
 
 module Kwalify
 
@@ -3298,7 +3292,7 @@ module Kwalify
       s = ''
       empty = ''
       min_indent = -1
-      while line = _getline()
+      while (line = _getline())
         line =~ /^( *)(.*)/
         indent = $1.length
         if $2.empty?
@@ -3447,8 +3441,10 @@ module Kwalify
         if tzone_h
           diff_sec = tzone_h.to_i * 60 * 60
           if tzone_m
-            if diff_sec > 0 ; diff_sec += tzone_m.to_i * 60
-            else            ; diff_sec -= tzone_m.to_i * 60
+            if diff_sec > 0
+              diff_sec += tzone_m.to_i * 60
+            else
+              diff_sec -= tzone_m.to_i * 60
             end
           end
           p diff_sec
@@ -3663,10 +3659,9 @@ end
 #--begin of require 'kwalify/main'
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
-# frozen_string_literal: false
 
 require 'yaml'
 require 'erb'
@@ -3675,7 +3670,7 @@ require 'erb'
 #--begin of require 'kwalify/util/ordered-hash'
 ###
 ### $Rev$
-### 1.4.0-beta
+### 1.4.0
 ### $COPYRIGHT$
 ###
 
@@ -3850,7 +3845,7 @@ module Kwalify
         exit 1
       rescue Kwalify::KwalifyError => ex
         raise ex if main.debug?
-        $stderr.puts "ERROR: #{ex.to_s}"
+        $stderr.puts "ERROR: #{ex}"
         exit 1
       #rescue => ex
       #  if main.debug?

data/devbin/README.md

@@ -1,3 +1,4 @@
+
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
@@ -18,12 +19,15 @@ Currently these scripts include:
      * ruby_docs_wordlist.txt - list of words from ruby doc  (not included)
        * ruby_3_4_1_complete_rdocs (not included)
    * chk-rad-repo.sh - Test code against ruby-advisory-db repo.
-   * smoke-tests.sh - short and dirty version of testsuite., 
-     * smoke-tests.golden
+   * run-smoketest.sh - Wrapper to run the "smoke-tests.sh script.
+     * smoke-tests.sh - short and dirty version of testsuite., 
+       * smoke-tests.golden
+   * rubycheck.sh - Test code against "ruby -d -v".
    * runtests.sh
 
  * PACKAGING:
    * mkbig-rkwalify.sh - Combine all the code into 1 file.
+     * inline-require (node-js tool to incline all require code into 1 file)
 
  * RELEASING:
    * chkcopyrights.sh - Check copyright lines in files.

data/{contrib → devbin}/inline-require

@@ -6,7 +6,7 @@
 ### usage: inline-require [-h] [-I path[,path2,..]] script
 ###
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
-### Release 1.4.0-beta
+### Release 1.4.0
 ### $Rev: 10 $
 ###
 

data/devbin/mkbig-rkwalify.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
 unset RUBYLIB
-ruby ./contrib/inline-require -I ./lib ./bin/kwalify.rb > ./contrib/kwalify
-chmod a+x ./contrib/kwalify
+ruby ./devbin/inline-require -I ./lib ./bin/kwalify.rb > ./bin/kwalify
 cp ./lib/kwalify/kwalify.schema.yaml ./bin
-cp ./contrib/kwalify                 ./bin

data/devbin/mktag

@@ -1,3 +1,3 @@
-HASHTAG="TBD"
-git tag -a v1.4.0-beta "${HASHTAG}" -m "Release version 1.4.0-beta"
+HASHTAG="990cb946d1a32d99a9ffc034fb83f1d60a2267f0"
+git tag -a v1.4.0 "${HASHTAG}" -m "Release version 1.4.0"
 git push origin --tags

data/devbin/rubycheck.sh

@@ -0,0 +1,39 @@
+function run1chk() {
+    CMD="ruby -d -v -i.:lib:test"
+    if [ "X$2X" == "X-nX" ] ; then
+        echo "$1: $(${CMD} $1 2>&1 | wc -l)"
+    else
+        ${CMD} $1 2>&1
+    fi
+}
+
+# 7
+#run1chk test/test-hashlike.rb $1
+
+# 7
+run1chk test/test-action.rb $1
+exit
+# 7
+run1chk test/test-main.rb $1
+# 7
+run1chk test/test-parser-yaml.rb $1
+# 7
+run1chk test/test-util.rb $1
+
+# 8
+run1chk test/test-databinding.rb $1
+# 8
+run1chk test/test_logger.rb $1
+# 8
+run1chk test/test-metavalidator.rb $1
+# 8
+run1chk test/test-rule.rb $1
+# 8
+run1chk test/test-validator.rb $1
+# 8
+run1chk test/test-yaml-parser.rb $1
+
+# 504
+run1chk test/test.rb $1
+# 852
+run1chk test/test-users-guide.rb $1

data/devbin/run-smoketest.sh

@@ -0,0 +1,17 @@
+set +x
+
+${HOME}/Projects/rkwalify/devbin/smoke-tests.sh 2>&1 \
+| sed -e "s,0x[0-9a-f]*,HEX," > /tmp/$$_RST
+
+sed -e "s,0x[0-9a-f]*,HEX," \
+  ${HOME}/Projects/rkwalify/devbin/smoke-tests.golden > /tmp/$$_GOLDEN
+
+if [ "X$1X" == "XgoldenX" ] ; then
+    cp /tmp/$$_RST ${HOME}/Projects/rkwalify/devbin/smoke-tests.golden
+else
+    diff /tmp/$$_GOLDEN /tmp/$$_RST
+fi
+
+rm -f /tmp/$$_RST /tmp/$$_GOLDEN
+
+#EX: 00007563d1482df8