testkit123 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0080e9b7a855daa8c8cc92c6eeac89d02003680fe353842f5719dba83e7d2d9
-  data.tar.gz: 2c8e70d98c9aaab9261390e2933b3f026e3af1417b941e98ed705122903ec9dd
+  metadata.gz: 78e24b1565f8efab12a23a79131432444dbef249f1b5cb341b2a970485bebe65
+  data.tar.gz: 891ecd6e1d304083f3abcb703828e784270bba141a26b743824e4413223e3a52
 SHA512:
-  metadata.gz: c9f17b05aa914b53b55ebf4a88079beb47245a0f55c1e5167e3fe016f99105622d5a35c48ffb2b59eb2f1b6846684e682951eb4d6591f873c3d256fb85d2fb74
-  data.tar.gz: a2c06414eaa20598951a3f1efef279b941906e2b6ab6728eb4577c11c586fab0595c06460f4fdbc57110def3e04e213d0a3e7983f0f8473a02ecd4358c680f5f
+  metadata.gz: a7f9971e4ccd66cdc623f8667520218f9e795c78d7b7dc599ef14e90fd6cc821ad06f0576396f00c8158d11a6e87ccd02268a4180a9202ed15587ced1703708e
+  data.tar.gz: d3d94f0ae845bd38f0ae4f56f9be9b7ea3cee7195918a8c5ebd6224b7ade291a3dfb1e9f67cb792a0ea103eead48e1cc61a660e7a1600db70bc4d10a93a14c7b

data/lib/testkit123.rb

@@ -8,18 +8,29 @@ require 'testdata_text'
 require 'simple-config'
 
 
-class String
-  def camelize
-    self.split('_').collect(&:capitalize).join 
+module StringFormat
+  
+  refine String do
+    
+    def camelize
+      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: false, localpath: nil, datapath: nil, 
         gemtest_url: nil, rubyver: 'ruby-2.5.1')
 
+    @debug = debug
     @h = templates
     
     @project_config = if project =~ /\.txt$/ then
@@ -27,13 +38,54 @@ class TestKit123
     elsif project
       File.join(localpath, project + '.txt')      
     end
+    puts '@project_config: ' + @project_config.inspect if @debug
     
-    @debug = 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 = RXFHelper.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
@@ -123,24 +175,34 @@ end
     
     # use the test number to find the test to copy from the test file
     
-    config = SimpleConfig.new(@project_config).to_h
+    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'
+    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
+    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
@@ -157,16 +219,43 @@ end
     puts 'xml: ' + xml.inspect if @debug
     
     doc = Rexle.new(xml)
-    testnode = doc.root.xpath('records//test')[n-1]
+    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.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 
+    # 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
+    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 = '%s'" % [input.name, input.texts.join.gsub(/'/,"\'").strip]
+      "test_%s =<<EOF\n%s\nEOF\n" % [input.name, 
+                                     input.texts.join.gsub(/'/,"\'").strip]
     end
     
     vars = testnode.xpath('records/input/summary/*').map(&:name)
@@ -179,12 +268,15 @@ 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" + \
+    "# --------------------------------------------\n\n" + \
     "require '#{proj}'\n" + require_gems.map {|x| "require '%s'" \
                                               % x}.join("\n") + "\n\n\n" \
-     + args.join("\n") + testcode
+     + before_test.gsub(/^    /,'') + "\n" + args.join("\n") \
+     + codex[0..-2].join + 'puts ' + codex.last
 
   end
 
@@ -215,16 +307,24 @@ end
     
   end
   
-  def make_testdata(s)
+  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
     
-    inputs = s.scan(/test_([\w]+) += +['"]([^'"]+)/)\
-        .inject({}){|r,x| r.merge(x.first.to_sym => x.last)}    
+    # observe *test* is masked with *_test* because it is a built-in method name.
     
     h = {
       _test: {
         summary: {
           path: '',
-          type: '',
+          type: type,
           description: ''
         },
         records: {
@@ -233,16 +333,16 @@ 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).xml pretty: true
+    Rexle.new(a)
     
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testkit123
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ 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
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkxMDA3MDk0NDMwWhcN
+  MjAxMDA2MDk0NDMwWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDKZj/1
+  lg4PZhpHglK40avWXxaa6Kdmfd1VbYufjc8fAs5gyWJoOj7Sd0YSqHvBrJXngysg
+  eaWEw7q/6qeKTlOdESJPxDz9e7Aj6AV0DfblQciMQWGMIbdYKDgUQKlY1WHPZBeh
+  MA5NbHVxLoKL4pSXpM+LvWbY+RxOZiFjMU9PGKohopy0U1D2H6L/d4YgCnOpehsJ
+  GRFViuG86mybGKCKXqRwEeiir2ZTJd/2WH50E2tTUv1JLBG/AocAskgGaNm2FnIP
+  msksUf9zd//SrUaN5j3wMzU9ohP4rrHehHGhYvL5k4jrrgKeV6+owq2aZLmGgii1
+  im2QWeYbyrHtM/aqX2Yl/eq3QIs1JULF0wAlixp7+dIpbstOUeMsTzdyj/thMpcL
+  2VtZ6ld8I4+HrajF5KqPJs85ABwhQ9KFrrj2ZFJMGKphcJYiqdOpoaRSLqCsAQH9
+  ROMUJlXvFyDBXI4AkytI41YPszJfNwK/hgVxjaeuoQUO0CFOPSmuaaamHzcCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU/7xyE1E0
+  k5w8LQBvW606VxVQpOIwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAx2Bm/aDoe0xmXzcHyaZ+BihvkVt6e+wTi3ddzql6
+  KVOgJBWXCNri6TltTJNlQXxUD2IoHqi9f+XReh8xicw6dRep/D3qb74P1D3TOEr9
+  N5PHimc/YNhYLuNxJijbjDLQrlnw6vYM8mFT4p+YsaZRkdF1ABFgqpYz4bRucXrI
+  26tkFgV9dlAAgFYQrmdyC4f20rkOl9oJLEzLkUNOGrd1fXz1IWQOffoFZTPqGn4V
+  6jeOVIjbGjzCM9A9jfMC5V7wjVR2OKz+QKKwfixwDKWc186iFJ470zMQs1AuW1jX
+  LZq56q/Q/Xkx07FnhgPqUbe3630f4z+ULwDGVns+lgrEVmQXPqhUbwsOnJZM0s8m
+  mwmSZbk2b0bMllDLaDYMoUkkwRzBxEkKe6DMuC1q7/9lekcCdm2+1teA4j/l82cM
+  owBtF8qd/v9x+t6h+/j/LPTmgwDrPhKl4HmH77oloyec9426T3EW7OvcMiMXAfQG
+  KKJn9TVnRGoWZTIHtu1e5v36
   -----END CERTIFICATE-----
-date: 2018-08-16 00:00:00.000000000 Z
+date: 2020-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfhelper
@@ -38,40 +43,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 1.0.5
 - !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.1
   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.1
 - !ruby/object:Gem::Dependency
   name: testdata_text
   requirement: !ruby/object:Gem::Requirement
@@ -118,8 +123,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.0.3
 signing_key: 
 specification_version: 4
 summary: Generates a test suite of files (for use with the testdata gem) from a config