futest 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c02550d3a79fd48b5707e6764d207645d7ecfc90
-  data.tar.gz: e8ef4c6177b957dd742d5d57d4fbf4af85ebfd07
+  metadata.gz: 8850fe934a2e18c66630fe2c567d5d79bbc9c816
+  data.tar.gz: 9386f5dccf59dd019fcc4ffb30f64ee04ffbb1d3
 SHA512:
-  metadata.gz: fff0bec4d45a6d0c7150ee59ca2c0454e710ddb2d8d634f1afb10c9d589a83ae673bdf53cc9da2596e23d4fd82de1df32343d28039e54dca1b2b9443d3f8edd4
-  data.tar.gz: 59479094d301dfa2ad9bc368a57f7b6365da3cf6bb4e369d4795f24da959f8dff0efc6a2a777d680a8364cbee76651b98c86b44cbebce068d1c7ef1907a14718
+  metadata.gz: c36054e94dbd1e77271a7b4c7810e00c8d2a24b67d874b25f3ea9982efa02edbb430721a52b8a69b24153af527ba9f77be68724c804f884e2ea54bfbd615ca29
+  data.tar.gz: c153c95d2e09ccd370d0d36395583a4c5af9e38469bf76514dfbb7fdbd1af1b82a0f34d3e34eb0fcd6d3cf8b60e4a873a780c9fd6830650cd3988c14c7b0dc4f

data/lib/futest.rb

@@ -8,9 +8,10 @@ module Futest
     # Prints error message and stops execution
     def halt(str, obj = nil, n = x(caller))
       m = "#{n}: #{str}"
-      if obj and obj.errors.any?
-        n = obj.errors.messages
-        m += ":\n=> " + n.each{|k, v| n[k] = v.join(', ')}.to_json[1..-2].gsub('","', '", "')
+      # Support for errors when using Object DB ORM
+      if obj and obj.errors and obj.errors.any? and obj.errors.messages
+        q = obj.errors.messages
+        m += ":\n=> " + q.each{|k, v| q[k] = v.join(', ')}.to_json[1..-2].gsub('","', '", "')
       end
       puts red(%{#{m}})
       puts
@@ -26,17 +27,28 @@ module Futest
 
     # Equality tester
     def is(v1, v2, n = x(caller))
-      halt("#{v1} is #{v2}", nil, n) unless v1 == v2
-    end
+      v2 = {:eq => v2} unless v2.is_a?(Hash)
+      # Extract options here with delete.
+      # No options available at the moment.
 
-    # Greater than tester
-    def gt(v1, v2, n = x(caller))
-      halt("#{v1} gt #{v2}", nil, n) unless v1 > v2
-    end
+      # For key output
+      def fs(y);{:eq => '==', :gt => '>', :lt => '<', :a? => 'is a'}[y] rescue y;end
 
-    # Less than tester
-    def lt(v1, v2, n = x(caller))
-      halt("#{v1} lt #{v2}", nil, n) unless v1 < v2
+      # Symbolize keys and extract values
+      k, v = v2.inject({}){|q,(k,v)|q[k.to_sym] = v; q}.to_a.flatten
+      s = ["#{v1.class} #{v1} #{fs(k)} #{v}", nil, n]
+      case k
+      when :eq
+        halt(*s) unless v1 == v
+      when :gt
+        halt(*s) unless v1 > v
+      when :lt
+        halt(*s) unless v1 < v
+      when :a?
+        halt(*s) unless v1.is_a?(v)
+      else
+        puts "#{k}: Command not supported."
+      end
     end
 
     ##############
@@ -52,7 +64,7 @@ module Futest
     # Print error message
     def e(y)
       y.backtrace.first.match(/(\/.+\/.*.rb):(\d{1,9}):/)
-      halt(%{#{y.message}\n=> ~/#{$1.split('/')[3..-1].join('/')}}, nil, $2) if $1.present? and $2.present?
+      halt(%{#{y.message}\n=> ~/#{$1.split('/')[3..-1].join('/')}}, nil, $2) if $1 and $2
       halt(%{#{y.message}\n=> #{y.backtrace.join("\n")}})
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: futest
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Fugroup Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-04 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies: []
 description: Program your tests as normal scripts without dependencies, mocks, stubs
   and rules.