testkit123 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 076b25cb13801fa21a785e8fc79f3907725af4ad499daa6f82901bb7896fdadd
-  data.tar.gz: bf84ef76c61f536d6b9a21e65966d75dc37e1dbf5d554ae8bb02103e8dabc9d5
+  metadata.gz: 2bb68a709ae975a1f5fdb89fd11258535f4245868ca3a788027cb222bd379d4a
+  data.tar.gz: 3f3406a2e22fce8f96a0d9c357bfd285fcfd9220ed722dee9a5699bbff766e9e
 SHA512:
-  metadata.gz: e8a89f4616ebbed893740f995269dc06541bec6187b1587dfe89d375c17233dc69b7aa63d4e899d0746fc05922aeb1e3bce0384cc80602ec9bc923e6a7e599a5
-  data.tar.gz: a3bae8298736a349801abea83dcdede98c9ca3edf03ee3191acbdcea0f1e1042eeb18b7208a5487ae1244eb2afb2cd7688c15c556835b9b2ef7801477829eed6
+  metadata.gz: 5e7cc861ff7fa8782c0e5457b47f62130c3d0daa7e511640ece793477b2c9aff91d8ed0daec117b41b099522ba5cb240fca7e4848170694cfd4bbb35c0a505be
+  data.tar.gz: eb47de3581c38f7010589c1b885e9bca6bb160859303270e1749f43758e60492d55ce6649346939287ae4df82d49c639742c2209f307e66b46263b148c7cd7fb

data/lib/testkit123.rb

@@ -9,70 +9,70 @@ 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
   using ColouredText
-
+  
   attr_reader :testdata_file
-
-  def initialize(templates: {testdata: nil, testx: nil}, project: nil,
-        debug: true, localpath: nil, datapath: nil,
+  
+  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
-
+    @rubyver = rubyver    
+    
     return unless project
-
+    
     @project_config = if project =~ /\.txt$/ then
       project
     else
-      File.join(localpath, project + '.txt')
+      File.join(localpath, project + '.txt')      
     end
-
-    puts '@project_config: ' + @project_config.inspect if @debug
+    
+    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
-
+      
       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")
-
+      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}")
-
+      @testdata_file = File.join(datafilepath, "testdata_#{proj}.#{ext}")      
+      
     end
 
   end
 
   # expects a test node; see new_testnode()
   #
-  def add_test(testnode)
-
+  def add_test(testnode)    
+    
     s2 , filetype = RXFReader.read @testdata_file
     puts 'filetype: ' + filetype.inspect if @debug
 
@@ -83,13 +83,13 @@ class TestKit123
     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
+  end  
 
   def create_files(project=@project_config)
 
@@ -97,12 +97,12 @@ 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
-
+    
     puts 'config_file: ' + config_file.inspect if @debug
-
+    
     config = SimpleConfig.new(config_file).to_h
     puts 'config : ' + config.inspect if @debug
 
@@ -137,17 +137,17 @@ class TestKit123
     testdata = @h[:testdata].gsub(/(?<=\.)\w+$/, ext)
     puts 'testdata: ' + testdata.inspect if @debug
     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, _ = 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
 
@@ -155,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))
 
@@ -171,45 +171,45 @@ 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
     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")
-
+    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 = x.match(/(?<=['"])(?<test>[^"']+)['"]\s+do\s+\|(?<raw_args>[^\|]+)/)
-
+      
       [r[:test], r[:raw_args].split(/, */)]
     end
 
@@ -223,35 +223,35 @@ 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()')
-
+    
     if @debug then
       puts 'input_vars: '  + input_vars.inspect
       puts 'tests[i][1]: '  + tests[i][1].inspect
@@ -260,7 +260,7 @@ end
 
     tests[i][1].zip(input_vars).each do |x|
       testcode.gsub!(/\b#{x[0]}\b/, 'test_' + x[1])
-    end
+    end  
 
     args = testnode.xpath('records/input/summary/*').map do |input|
 
@@ -273,19 +273,19 @@ end
       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)
+      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" + \
@@ -298,45 +298,45 @@ end
   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 new_testnode(s=nil, type: '', inputs: {}, outputs: {result: ''})
-
+    
     if s then
-
-      # the scan is intended to find the input variables from an
+      
+      # 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)}
+          .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: {
@@ -353,14 +353,14 @@ end
             summary: outputs,
             records: {}
           }
-        }
+        }      
       }
     }
 
     a = RexleBuilder.new(h, debug: false).to_a
 
     Rexle.new(a)
-
+    
   end
 
   def new_project(project='myproject', classname=nil, save: false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testkit123
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   DN5UNRowuQ2fXKFO7nmgUH33wBhFAs2KXZPPR6sWn2JxLUlMMngzSypdB7zQn7my
   FmX/ZG5sgd+RpEYbxgC2cdNk
   -----END CERTIFICATE-----
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple-config
@@ -46,7 +46,7 @@ dependencies:
         version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: testdata_text
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+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