testkit123 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0080e9b7a855daa8c8cc92c6eeac89d02003680fe353842f5719dba83e7d2d9
-  data.tar.gz: 2c8e70d98c9aaab9261390e2933b3f026e3af1417b941e98ed705122903ec9dd
+  metadata.gz: f614e8e95327241b534bbf266dad46525c6cd71adbedf8ca8044527cc9882a62
+  data.tar.gz: 0777ac2e0d3c01b7d4a6238a428be34496f2cb3910f5bcb86075af1f37329325
 SHA512:
-  metadata.gz: c9f17b05aa914b53b55ebf4a88079beb47245a0f55c1e5167e3fe016f99105622d5a35c48ffb2b59eb2f1b6846684e682951eb4d6591f873c3d256fb85d2fb74
-  data.tar.gz: a2c06414eaa20598951a3f1efef279b941906e2b6ab6728eb4577c11c586fab0595c06460f4fdbc57110def3e04e213d0a3e7983f0f8473a02ecd4358c680f5f
+  metadata.gz: c36ff119e0864242544c179d34a2674524873b2458a65b43384018a46bff12ea9f9ed8579fa76b31a22e1723656a38d23ecea3bb001ccf160ec70b3191e1eb54
+  data.tar.gz: 5596f0154676cb0893ad1db11bf20a35430ec566e5abd4f77f6208cce7af4f7d3ded1cff57848e55469a3d033669a2f1a2870a2124fda5b8e3277380328b20bc

data/lib/testkit123.rb

@@ -20,6 +20,7 @@ class TestKit123
         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,8 +28,9 @@ 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
 
@@ -126,6 +128,7 @@ end
     config = SimpleConfig.new(@project_config).to_h
     
     proj = config[:project]
+    puts 'create_standalone: proj: ' + proj.inspect if @debug
     datafilepath = config[:data_path] + '/' + proj
     test_rbfile = File.join(datafilepath, "test_#{proj}.rb")    
     
@@ -133,8 +136,10 @@ end
     testdata_file = File.join(datafilepath, "testdata_#{proj}.#{ext}")
     puts 'testdata_file: ' + testdata_file.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\(\)).*(?=\n    test )/m].lstrip
         
     a = s.split(/(?=    test )/)
     a.shift
@@ -166,7 +171,8 @@ end
     end.join
 
     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)
@@ -181,10 +187,10 @@ end
     
     "# 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") + testcode
 
   end
 
@@ -284,4 +290,3 @@ EOF
   end
 
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testkit123
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   MBi32Noiyau3znLWYXucwnOR8dh4RhcwxaP82ZX6Up19+qVqJqravkDQ+OBff6o+
   m3U=
   -----END CERTIFICATE-----
-date: 2018-08-16 00:00:00.000000000 Z
+date: 2018-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfhelper
@@ -41,7 +41,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.8.5
 - !ruby/object:Gem::Dependency
   name: simple-config
   requirement: !ruby/object:Gem::Requirement