testkit123 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 560dc7d23a4b2dc3330982f8ca4ddbba94461f17ff22c4296d842eda8c92cd19
-  data.tar.gz: 3a5643258d69a643a57395f77d335acf78887187d70168e536c33d7141719955
+  metadata.gz: 2bb68a709ae975a1f5fdb89fd11258535f4245868ca3a788027cb222bd379d4a
+  data.tar.gz: 3f3406a2e22fce8f96a0d9c357bfd285fcfd9220ed722dee9a5699bbff766e9e
 SHA512:
-  metadata.gz: 6daac63a4f2e865788879f9541dde921f9dfd98580a48f0d725699ec535c43059087e1f9f6e36585d042bdee550e5a180f363a58a844c133ec62ebe95a315b3d
-  data.tar.gz: 219ebfe3cabc637e4db9966978843787f5d7cff22ece377052f4b64a5e3ca2a16e61f84d50a3bc80136ad9b14e31bd7651a6271a5e64aafd2ae312e982de691c
+  metadata.gz: 5e7cc861ff7fa8782c0e5457b47f62130c3d0daa7e511640ece793477b2c9aff91d8ed0daec117b41b099522ba5cb240fca7e4848170694cfd4bbb35c0a505be
+  data.tar.gz: eb47de3581c38f7010589c1b885e9bca6bb160859303270e1749f43758e60492d55ce6649346939287ae4df82d49c639742c2209f307e66b46263b148c7cd7fb

data/lib/testkit123.rb

@@ -2,10 +2,10 @@
 
 # file: testkit123.rb
 
-require 'rxfhelper'
 require 'fileutils'
 require 'testdata_text'
 require 'simple-config'
+require 'rxfreadwrite'
 
 
 module StringFormat
@@ -49,7 +49,7 @@ class TestKit123
     puts '@project_config: ' + @project_config.inspect if @debug   
     puts 'localpath: ' + localpath.inspect if @debug
         
-    if File.exists? @project_config then
+    if File.exist? @project_config then
       
       config = SimpleConfig.new(@project_config, debug: false).to_h
       puts ('config: ' + config.inspect).debug if @debug
@@ -73,7 +73,7 @@ class TestKit123
   #
   def add_test(testnode)    
     
-    s2 , filetype = RXFHelper.read @testdata_file
+    s2 , filetype = RXFReader.read @testdata_file
     puts 'filetype: ' + filetype.inspect if @debug
 
     xml = if s2.lstrip[0] == '<' then
@@ -97,7 +97,7 @@ class TestKit123
 
     puts '1) Reading the config file' if @debug
     raise "missing the config file " unless @project_config
-    raise "config file not found" unless File.exists? @project_config
+    raise "config file not found" unless File.exist? @project_config
 
     config_file = @project_config
     
@@ -136,7 +136,7 @@ class TestKit123
 
     testdata = @h[:testdata].gsub(/(?<=\.)\w+$/, ext)
     puts 'testdata: ' + testdata.inspect if @debug
-    buffer_testdata, _ = RXFHelper.read(testdata)
+    buffer_testdata, _ = RXFReader.read(testdata)
     
     FileUtils.mkdir_p datafilepath
     
@@ -144,7 +144,7 @@ class TestKit123
     File.write testdata_file, eval('%{' + buffer_testdata + '}') 
 
     test_template_rsf = @h[:testx]
-    buffer_test, _ = RXFHelper.read(test_template_rsf)
+    buffer_test, _ = RXFReader.read(test_template_rsf)
 
     test_rsffile = File.join(config[:data_path], "#{proj}.rsf")
     File.write test_rsffile, eval('%{' + buffer_test + '}') 
@@ -179,7 +179,8 @@ end
   def create_standalone(n)
     
     # use the test number to find the test to copy from the test file
-    
+    puts '@project_config: ' + @project_config.inspect
+
     config = SimpleConfig.new(@project_config, debug: false).to_h
     puts ('config: ' + config.inspect).debug if @debug
     
@@ -212,7 +213,7 @@ end
       [r[:test], r[:raw_args].split(/, */)]
     end
 
-    s2 , filetype = RXFHelper.read testdata_file
+    s2 , filetype = RXFReader.read testdata_file
     puts 'filetype: ' + filetype.inspect if @debug
 
     xml = if s2.lstrip[0] == '<' then
@@ -251,16 +252,26 @@ end
     
     input_vars = testnode.xpath('records/input/summary/*/name()')
     
-    puts 'input_vars: '  + input_vars.inspect
-    puts 'tests[i][1]: '  + tests[i][1].inspect
-    puts 'zip: ' + tests[i][1].zip(input_vars).inspect
+    if @debug then
+      puts 'input_vars: '  + input_vars.inspect
+      puts 'tests[i][1]: '  + tests[i][1].inspect
+      puts 'zip: ' + tests[i][1].zip(input_vars).inspect
+    end
+
     tests[i][1].zip(input_vars).each do |x|
       testcode.gsub!(/\b#{x[0]}\b/, 'test_' + x[1])
     end  
 
     args = testnode.xpath('records/input/summary/*').map do |input|
-      "test_%s =<<EOF\n%s\nEOF\n" % [input.name, 
-                                     input.texts.join.gsub(/'/,"\'").strip]
+
+      value = input.texts.join.gsub(/'/,"\'").strip
+
+      if value.lines.length > 1 then
+        "test_%s =<<EOF\n%s\nEOF\n" % [input.name, value ]
+      else
+        "test_%s = '%s'\n" % [input.name, value ]
+      end
+
     end
     
     vars = testnode.xpath('records/input/summary/*').map(&:name)
@@ -268,7 +279,7 @@ end
     puts 'args: ' + args.inspect if @debug    
     
     vars.each do |var|
-      testcode.gsub!(/\b#{var}\b/, 'test_' + var)
+      testcode.gsub!(/\b#{var}[^:]\b/, 'test_' + var)
     end
     
     puts 'gems: ' + require_gems.inspect if @debug
@@ -279,7 +290,8 @@ end
         % [n, title, testnode.text('summary/type')] + \
     "# --------------------------------------------\n\n" + \
     "require '#{proj}'\n" + require_gems.map {|x| "require '%s'" \
-                                              % x}.join("\n") + "\n\n\n" \
+                                              % x}.join("\n") + \
+                                   "\nrequire 'rxfreadwrite'\n\n\n" \
      + before_test.gsub(/^    /,'') + "\n" + args.join("\n") \
      + codex[0..-2].join + 'puts ' + codex.last
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testkit123
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,52 +11,32 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwMjAxMjA0MzE4WhcN
-  MjIwMjAxMjA0MzE4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDYLk88
-  mTT4qYC19ZG6k74St4hkvxBobe3p57tvSRljHhahLrVtUFM0i2YzjyJi9PM7q1jm
-  RCtp69apz9E5l9s3y0NBbipKGVvksf48WmwO1tWKxks9E6CG3D+qVE+lw9yGgbid
-  vSAOSmY7kARA/PWNpokk4AGSK9au2z0xM6TAGRuTeXoRswTc0u2WW+LJCNgapTVB
-  OnclLXN9sNLJCRHWGRXwCdXd1ln1KRxtIZgnVxttHDtCL8UjpIw+JI+tGKqRwiOg
-  HQDS8SqH4+KxR8+0XvRoVqQ3d8ozuDgtsaW6diEYXgR4z/ys9LJUiKpOB2Tquobs
-  n9L96U0M3zUF5WGGM/Q2Ux1TY4h0OOOgEwb8V8/u0hHIJKOuDClYjTRWu7FBJRx7
-  2f7NqbErCfutAfm2hQpj9thMrpjgMlf68ZTcrHiK8Loq4+LZoB+bAlZ+VQb5eYvR
-  UXfpjmEP30rnulkQFt9qwTtQUUY5/5/MeU29eoSgRg+dPKebapwxF80Fgb0CAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUmNd64gCU
-  Me3RqaJGrXkwrpyEigswJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjIxMTUyMzQ4WhcN
+  MjMwMjIxMTUyMzQ4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCykPDD
+  C99+OQXgdvHqnfGSurPttKSrB8nC+v8TchYliuwE/YeVjoNb33nSlT+vE+ZLDWLm
+  CA0Gtu6bE2+gOXVZvprKKwyztqmk+fLwJfPeBwB5/Aj7roVmN74yrunUffzNPDRM
+  cTaJ1SX4ODD6s36Hx28FNkcWZHLzzLR822E8wTyjHy/eMK4V69PW3z/nKSQy9EAV
+  ErKHk0ERJm6dUXb0WNkdFTQRVYU5fzlASid3yxMw9uq3P63xB4kl8f/OZYEfr4QT
+  u9q1ueZtcVZnNDzseyuNm3fNLpai+LDWJ6DA1zWuQZin+1g9jk0HKlM86weRrWxN
+  mzJ+C6GTgHlwMe37fmLXqD6YAILAbV19x8W06ZS/N/DU6FclKc4ly/T9mVJgqAMx
+  9e+fpbx6HCLwnz928nP+M52qfvMly0++QWawYk0aTTNs9+/5GBZxmrOq3CAEAcKs
+  Tp41e4lGloinqnC9HdCbjK8vpYUEki+MuGs6Y19RrCRjzD1lbZ7IbYGZ5EkCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUNqtk/CYY
+  +9THwv6U+woEXfZQOo4wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEA1RgOx9puiSkwKJn487dnDiuRSVsuBJFMZZhp+shk
-  ajXuyuC1TXrV97c14khNoUNofRhusOTgKkO6l/ouJsObSzUIFIQHt8ljFowM7rM6
-  ZOrFT08G0akM84d1dUCGCpTZyW7M0HmNxh4Yn2hIChejsfgwYZmesL7grqJ3WKvE
-  KZF9E6c0A0a60gAZWXb0Of0yXTSqiX2uNEkM7STyG+yu/XzLus+z2rEYdUFaxfvW
-  +AAeovOz8G+IQhuHZ6zG3KtRYeHq0057/tC44obGbyNOXC0twIUGJ0ajRedNKEc2
-  OC0wzHol3qEYmVai7DkQL8xX7m3VsWd/0JbS+tzchySc/e2R1I3FAGeOSzmUSN6o
-  0CPM0BbOB4yUW+Ev7o3g31CsFuQ+5bCgR7n64QwTeHjlgFelmaJ1XalvnBC97S6k
-  /B2OocR7kLmSGm860fyULSY2RzLBKLOhjQHnrSiHj6n9pWrmkd+7Zxo/up/Jq4Xv
-  0cPz7gMjFOVqEBQuSfoVKd9K
+  BgkqhkiG9w0BAQsFAAOCAYEAfdkypqOi4heDFVtNrQXwCHBv312S6Ivo3ZUhtpbR
+  DAlYC0efVgGy2Xic/noETRT4/FMnTyKmQ9E3U/xCWSC1acZM51yB1vYA6boKt9xz
+  jNvpR7089iGJUvo7CUy+3LFe91fzZGGDiB3g2PgtOm1QnO8OPQqx7eqkKzsfZhrv
+  jsqQ+xmYGai4kc+lKOqhRot2cg8yhjr5x9CbOTKPC5cwq8h6bvKkD81ty/GQzSda
+  Y7veJQStbysuq2zUwx4TvATlFbOl4qA8PLT99wLPqUMrNl+JoWPuUrHnBr/Tp73q
+  HcBJ7t1jV+r747CBLN9Av0Fh0fsB2yxdMQnwbVdY6s3Ku+8cWvH8MUq/HpzRdX4i
+  oo9BUrJRFuzP3FNuq2We336yf1C+HnnH/mxSTwQhiP+A5aavkTnmm2GQzzOORN6I
+  DN5UNRowuQ2fXKFO7nmgUH33wBhFAs2KXZPPR6sWn2JxLUlMMngzSypdB7zQn7my
+  FmX/ZG5sgd+RpEYbxgC2cdNk
   -----END CERTIFICATE-----
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rxfhelper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: simple-config
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +46,7 @@ dependencies:
         version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +56,7 @@ dependencies:
         version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: testdata_text
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +78,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.2
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -123,8 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.4.4
 signing_key: 
 specification_version: 4
 summary: Generates a test suite of files (for use with the testdata gem) from a config