testdata 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cf7b1c61241032094b96f7dd7b35451a0ea5d6adbd8a82301dc7205a15279ae
-  data.tar.gz: 9dd7d90fde6a9b3287eeaf52d142300feeb6dff1c650221fabed4129f92b0ffa
+  metadata.gz: 32849b0ae198aae1f9d452d43546af0b38a536a1020244a1c665e57849f2a737
+  data.tar.gz: d36e7b2b424dba8d996e340ec339efc5d2994ce50d19b5b2597d2c257617a7c4
 SHA512:
-  metadata.gz: b075f26248e733a201a4f30f0812b54540c5233625039dd4a8e376d20b0968da2758b63d686c7574e1eb53d815a19bad9504734a3e38ce447cf0f8658de04d8b
-  data.tar.gz: 756309f4520e95053f0dd45ab1b6e659682a20435768c21a225f5382328be1b8787bc1ac5a83f638646c3246fe7d4274ef219be6d73555436a395d04ec081528
+  metadata.gz: 0afd9e441d73dc0c4a46e46d85a19eb9e48c41d9660a20c0526ea9526c510d86657542bd2949aa0fa499ef73706935127e67108ac72c0f13063d0972fe1e0b78
+  data.tar.gz: eae8ad80bd813f4c18b61062ac7c406a32f5f3fd0258ebd6cc1f6cdb4f7f126032cb55e01f602333a7602ee1aab74ba14c29b37f7839d9af4cd40393bc3ac5fb

data/lib/testdata.rb

@@ -4,7 +4,7 @@
 
 require 'app-routes'
 require 'testdata_text'
-require 'diffy'
+require 'diffyc32'
 require 'polyrex'
 require 'yaml'
 
@@ -15,6 +15,7 @@ end
 module Testdata
   
   class Base
+    using ColouredText
 
     include AppRoutes
 
@@ -167,10 +168,10 @@ module Testdata
             inputs = input_names.zip(inputs).map{|x| '  ' + x.join(": ")}\
               .join("\n")
 
-            puts "\ninputs: \n" + inputs
-            puts "\ntype or description:\n %s: %s" % [type, @desc]
-            puts "\nexpected : \n  " + b.inspect
-            puts "\nactual : \n  " + a.inspect + "\n"
+            puts "\ninputs: \n".bold + inputs
+            puts "\ntype or description:".bold + "\n %s %s".cyan % [type, @desc]
+            puts "\nexpected : \n  ".bold + b.inspect
+            puts "\nactual : \n  ".bold + a.inspect + "\n"
           end
 
           result = a == b
@@ -178,7 +179,13 @@ module Testdata
           if (@debug == true or @debug2 == true) and result == false then
 
             # diff the expected and actual valuess
-            puts Diffy::Diff.new(a.first, b.first)
+            r = Diffy::Diff.new(a.first, b.first).to_s
+            r2 = r.lines.map do |line|
+              line.sub(/^\- {4}/) {|x| "-    ".light_green}\
+                  .sub(/^\+ {4}/) {|x| "+    ".light_red}
+            end
+            #puts 'r: ' + r.lines.inspect
+            puts r2
           end
         else
           result = [raw_actual].compact == expected
@@ -277,11 +284,19 @@ module Testdata
     def summary()
       success = @success.map(&:first)
       a = @success.map(&:last).sort
-      {
+      h = {
         passed: success.all?,
         score:  [success.grep(true), success].map(&:length).join('/'),
         failed:  @success.select{|x| x[0] == false}.map(&:last).sort
       }
+      
+      def h.to_s()
+        passed = self[:passed] ? self[:passed].to_s.light_green : self[:passed].to_s.light_red
+        "{passed: #{passed}, score: #{self[:score]}, failed: #{self[:failed]}}"        
+        
+      end
+      
+      h
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testdata
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   U1Tt/KPr9FeWlvj5ihis4H6UPWZxY2G9k94y2W7ylWkcKNXR8i45F+nCzDL3W0Ll
   Vt/9GDfEI95Jg3QNvXMDdzNf
   -----END CERTIFICATE-----
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2020-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: app-routes
@@ -78,25 +78,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: diffy
+  name: diffyc32
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 0.1.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 0.1.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: polyrex
   requirement: !ruby/object:Gem::Requirement