testkit123 0.2.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eeae4cbfeefae68b91b80d42998690091b949d77e6ccfd76d5a99e01cf16f9d7
-  data.tar.gz: c41884dc3440835042dec691831bf73d1dea1b3f7d9d92b14e83a18cacaa3afb
+  metadata.gz: 076b25cb13801fa21a785e8fc79f3907725af4ad499daa6f82901bb7896fdadd
+  data.tar.gz: bf84ef76c61f536d6b9a21e65966d75dc37e1dbf5d554ae8bb02103e8dabc9d5
 SHA512:
-  metadata.gz: 9568eda11b89bb92c4765a25373bbf29b2ae2e022291530e1da7d45c8120f15d9e721adb23ae7f00c40f8129c3effca088debbc945b026124014ad76df505d3c
-  data.tar.gz: 0e8ec37cfb4406b7551b5a9bf97ea8641b531cd07bef1e2379f7214cc0b55b758f334ff057a78ba4c2a20a8c970734c2fb5d4058c540a730ab37bb4e54e5a129
+  metadata.gz: e8a89f4616ebbed893740f995269dc06541bec6187b1587dfe89d375c17233dc69b7aa63d4e899d0746fc05922aeb1e3bce0384cc80602ec9bc923e6a7e599a5
+  data.tar.gz: a3bae8298736a349801abea83dcdede98c9ca3edf03ee3191acbdcea0f1e1042eeb18b7208a5487ae1244eb2afb2cd7688c15c556835b9b2ef7801477829eed6

data/lib/testkit123.rb

@@ -2,47 +2,95 @@
 
 # file: testkit123.rb
 
-require 'rxfhelper'
 require 'fileutils'
 require 'testdata_text'
 require 'simple-config'
+require 'rxfreadwrite'
 
 
 module StringFormat
-  
+
   refine String do
-    
+
     def camelize
-      self.split('_').collect(&:capitalize).join 
+      self.split('_').collect(&:capitalize).join
     end
-    
+
   end
-  
+
 end
 
 class TestKit123
   using StringFormat
-  
-  def initialize(templates: {testdata: nil, testx: nil}, project: nil, 
-        debug: false, localpath: nil, datapath: nil, 
+  using ColouredText
+
+  attr_reader :testdata_file
+
+  def initialize(templates: {testdata: nil, testx: nil}, project: nil,
+        debug: true, localpath: nil, datapath: nil,
         gemtest_url: nil, rubyver: 'ruby-2.5.1')
 
     @debug = debug
     @h = templates
-    
+
+    #return unless project
+
+    @localpath, @datapath, @gemtest_url = localpath, datapath, gemtest_url
+    @rubyver = rubyver
+
+    return unless project
+
     @project_config = if project =~ /\.txt$/ then
       project
-    elsif project
-      File.join(localpath, project + '.txt')      
+    else
+      File.join(localpath, project + '.txt')
     end
+
     puts '@project_config: ' + @project_config.inspect if @debug
-    
+    puts 'localpath: ' + localpath.inspect if @debug
 
-    @localpath, @datapath, @gemtest_url = localpath, datapath, gemtest_url
-    @rubyver = rubyver
+    if File.exists? @project_config then
+
+      config = SimpleConfig.new(@project_config, debug: false).to_h
+      puts ('config: ' + config.inspect).debug if @debug
+
+      proj = config[:project]
+      puts 'create_standalone: proj: ' + proj.inspect if @debug
+
+      raise 'config[:data_path] not found' unless config[:data_path]
+
+      datafilepath = config[:data_path] + '/' + proj
+      test_rbfile = File.join(datafilepath, "test_#{proj}.rb")
+
+      ext = (config[:testdata_ext] and config[:testdata_ext][/\.?td$/]) ? 'td' : 'xml'
+      @testdata_file = File.join(datafilepath, "testdata_#{proj}.#{ext}")
+
+    end
 
   end
 
+  # expects a test node; see new_testnode()
+  #
+  def add_test(testnode)
+
+    s2 , filetype = RXFReader.read @testdata_file
+    puts 'filetype: ' + filetype.inspect if @debug
+
+    xml = if s2.lstrip[0] == '<' then
+      s2
+    else
+      TestdataText.parse s2
+    end
+
+    puts 'xml: ' + xml.inspect if @debug
+
+    doc = Rexle.new(xml)
+    id = doc.root.xpath('records/test/summary/path/text()').last.to_i + 1
+    testnode.root.element('summary/path').text = id.to_s
+    doc.root.element('records').add testnode
+    return doc
+  end
+
   def create_files(project=@project_config)
 
     puts 'running create_files ...' if @debug
@@ -52,9 +100,9 @@ class TestKit123
     raise "config file not found" unless File.exists? @project_config
 
     config_file = @project_config
-    
+
     puts 'config_file: ' + config_file.inspect if @debug
-    
+
     config = SimpleConfig.new(config_file).to_h
     puts 'config : ' + config.inspect if @debug
 
@@ -88,18 +136,18 @@ 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
-    
+
     testdata_file = File.join(datafilepath, "testdata_#{proj}.#{ext}")
-    File.write testdata_file, eval('%{' + buffer_testdata + '}') 
+    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 + '}') 
+    File.write test_rsffile, eval('%{' + buffer_test + '}')
 
 buffer_rb = %{#!/usr/bin/env ruby
 
@@ -107,9 +155,9 @@ buffer_rb = %{#!/usr/bin/env ruby
 
 #require 'timecop'
 
-    
+
 class Test#{config[:classname]} < Testdata::Base
-  
+
   # 2011-07-24 19:52:15
   #Timecop.freeze(Time.local(2011, 7, 24, 19, 52, 15))
 
@@ -123,43 +171,49 @@ end
 
     test_rbfile = File.join(datafilepath, "test_#{proj}.rb")
     puts 'reading the ruby template file ...' if @debug
-    File.write test_rbfile, eval('%{' + buffer_rb + '}') 
+    File.write test_rbfile, eval('%{' + buffer_rb + '}')
 
     "finished processing #{proj}"
   end
-  
+
   def create_standalone(n)
-    
+
     # use the test number to find the test to copy from the test file
-    
-    config = SimpleConfig.new(@project_config).to_h
-    
+    puts '@project_config: ' + @project_config.inspect
+
+    config = SimpleConfig.new(@project_config, debug: false).to_h
+    puts ('config: ' + config.inspect).debug if @debug
+
     proj = config[:project]
     puts 'create_standalone: proj: ' + proj.inspect if @debug
+
+    raise 'config[:data_path] not found' unless config[:data_path]
+
     datafilepath = config[:data_path] + '/' + proj
-    test_rbfile = File.join(datafilepath, "test_#{proj}.rb")    
-    
-    ext = config[:testdata_ext][/\.?td$/] ? 'td' : 'xml'
+    test_rbfile = File.join(datafilepath, "test_#{proj}.rb")
+
+    ext = (config[:testdata_ext] and config[:testdata_ext][/\.?td$/]) ? 'td' : 'xml'
     testdata_file = File.join(datafilepath, "testdata_#{proj}.#{ext}")
     puts 'testdata_file: ' + testdata_file.inspect if @debug
     puts 'source code filepath: '  + test_rbfile.inspect if @debug
-    
+
     s = File.read(test_rbfile).gsub(/^(  )?end/,'')
     require_gems = s.scan(/^require +['"]([^'"]+)/).map(&:first)
-    
+
     before_test = s[/(?<=def tests\(\)).*/m].split(/    test /)[0].lstrip
     puts '** before_test: ' + before_test.inspect
 
     a = s.split(/(?=    test )/)
     a.shift
+    puts 'a: ' + a.inspect if @debug
 
     tests = a.map do |x|
-      r = a[0].match(/(?<=['"])(?<test>[^"']+)['"]\s+do\s+\|(?<raw_args>[^\|]+)/)
-      
+      r = x.match(/(?<=['"])(?<test>[^"']+)['"]\s+do\s+\|(?<raw_args>[^\|]+)/)
+
       [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
@@ -169,103 +223,125 @@ end
     end
 
     puts 'xml: ' + xml.inspect if @debug
-    
+
     doc = Rexle.new(xml)
     puts 'after doc : ' if @debug
     r = doc.root.xpath('records//test') || doc.root.xpath('records/test')
-    
+
     if @debug then
-      puts 'r: ' + r.inspect 
+      puts 'r: ' + r.inspect
       puts 'r.length: '  + r.length.inspect
       puts 'n: ' + n.inspect
     end
-    
+
     testnode = r[n-1]
     puts 'testnode: ' + testnode.xml.inspect if @debug
-    
+
     title = testnode.text('summary/type')
+    puts ('title: ' + title.inspect).debug if @debug
+    puts ('tests: ' + tests.inspect).debug if @debug
     i = tests.index tests.assoc(title)
-        
+    puts 'i: ' + i.inspect if @debug
+
     testcode = a[i].strip.lines[1..-2].map do |line|
       line.sub(/^ {6}/,'')
     end.join
-    
-    # replace the input variable names with the input variable names defined 
+
+    # replace the input variable names with the input variable names defined
     # in the testdata file and prefix them with *test_*.
-    
+
     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!(x[0], 'test_' + x[1])
-    end  
+      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)
-    
-    puts 'args: ' + args.inspect if @debug    
-    
+
+    puts 'args: ' + args.inspect if @debug
+
     vars.each do |var|
       testcode.gsub!(/\b#{var}\b/, 'test_' + var)
     end
-    
+
     puts 'gems: ' + require_gems.inspect if @debug
-    
+
     codex = testcode.rstrip.lines
-    
+
     "# Test %d. Type: %s\n# Description: %s\n" \
         % [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
 
   end
 
   def delete_files(s=nil)
-    
+
     filepath = if s =~ /\.txt$/ then
       project
     elsif s
-      File.join(@localpath, s + '.txt')      
+      File.join(@localpath, s + '.txt')
     else
       @project_config
     end
-    
+
     puts 'filepath: ' + filepath.inspect if @debug
-    
+
     config = SimpleConfig.new(filepath).to_h
-    
+
     proj = config[:project]
     datafilepath = config[:data_path] + '/' + proj
     FileUtils.rm_rf datafilepath
-        
+
     filepath = config[:local_path] + '/' + proj
     FileUtils.rm_rf filepath
-    
+
     FileUtils.rm File.join(config[:data_path], "#{proj}.rsf")
-    
+
     proj + ' test files deleted'
-    
+
   end
-  
-  def make_testdata(s)
-    
-    inputs = s.scan(/test_([\w]+) += +['"]([^'"]+)/)\
-        .inject({}){|r,x| r.merge(x.first.to_sym => x.last)}    
-    
+
+  def new_testnode(s=nil, type: '', inputs: {}, outputs: {result: ''})
+
+    if s then
+
+      # the scan is intended to find the input variables from an
+      # example Ruby script
+
+      inputs = s.scan(/test_([\w]+) += +['"]([^'"]+)/)\
+          .inject({}){|r,x| r.merge(x.first.to_sym => x.last)}
+    end
+
+    # observe *test* is masked with *_test* because it is a built-in method name.
+
     h = {
       _test: {
         summary: {
           path: '',
-          type: '',
+          type: type,
           description: ''
         },
         records: {
@@ -274,21 +350,22 @@ end
             records: {}
           },
           output: {
-            summary: {result: ''},
+            summary: outputs,
             records: {}
           }
-        }      
+        }
       }
     }
 
-    a = RexleBuilder.new(h).to_a
+    a = RexleBuilder.new(h, debug: false).to_a
+
+    Rexle.new(a)
 
-    Rexle.new(a).xml pretty: true
-    
   end
 
   def new_project(project='myproject', classname=nil, save: false)
 
+    puts 'inside new_project: ' + [project, classname].inspect if @debug
     classname ||= project.camelize
 
 s =<<EOF
@@ -311,8 +388,8 @@ test:
   end
 EOF
 
-
     if save then
+      puts '@localpath: ' + @localpath.inspect if @debug
       filepath = File.join(@localpath, project + '.txt')
       File.write filepath, s
       puts 'file saved ' + filepath if @debug

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testkit123
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,68 +10,53 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwNzE1MTYwNTQ4WhcN
-  MTkwNzE1MTYwNTQ4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtgJ54
-  gKuobwa5Won07os+Evt07yvbyEB7OBxwD3rnv1oNLxlx1wkOD2DNeZd4Otw1Dl6M
-  plfQUJCzRU9sQ5cAKqHVDPpf+EJIPm2bATJlO8w//F/LULbN1h8VsbGBcXUu3VoX
-  m2Bf6EesFKM/+BiMujEDX9EBy3hCJp7Bkn4WMk4PRwUdEBE8TEFj9T947+JVqZdR
-  3s4+DtYzFWbX9MuNzeQlAxcjV1iFgTS2G/GY6k6hJl0HhFnHfqftfqKgLIRZY4yF
-  LIkb5Kvj/yA1gYctId0lk1PrntSchvQvzYDAOrf8lOY3M3JLkiOWzwcRWDoPWCaI
-  PdYjRk0ij/x2zKS3AgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFJig7R4v8LRxNY/3qFTqBFgZT6FzMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAAaMtjTuuZeFtw4VuH9W
-  UozGqMeTxP2VkMw2vmaN+IF6jhNFBIDhgrQGNwijCsFZfMwl7efQ6PM2XIqXtJCZ
-  O8CrfJ+Y64IszwHeNSzyxi1FFMfUYAafQq3E+E8KTk0PaCl9AEa1zxwkBWkGHzKG
-  P1svw5bfBxQ9epcI9Ir00sKkx0S1mANSrwH6k2pKwOSpxhhX2Wlx6L4mnME0CTq8
-  6nk4O0PjUWuXrqQKUG4AtGeMPImOKz8uo+/wyaRZR/I+suAoL2xHo7RYqZwoCfQv
-  MBi32Noiyau3znLWYXucwnOR8dh4RhcwxaP82ZX6Up19+qVqJqravkDQ+OBff6o+
-  m3U=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  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
+  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: 2018-11-21 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rxfhelper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: simple-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: testdata_text
   requirement: !ruby/object:Gem::Requirement
@@ -93,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: []
@@ -118,8 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Generates a test suite of files (for use with the testdata gem) from a config