verify 0.3 → 0.3.1

data/RELEASE

@@ -1,3 +1,11 @@
+v 0.3.1
+2009-06-24 Verify
+-----------------
+* Heavy refactoring, the code sucks much less now.
+* Trying to get it to run with JRuby --1.9, no such luck, waiting for the next release.
+
+
+v 0.3
 2009-06-18 Verify ( Mockify )
 -----------------------------
 

data/lib/verify.rb

@@ -63,77 +63,100 @@
 
 module Lab419
   module Verify
-    VERSION = "0.3"
+    VERSION = "0.3.1"
     AUTHOR  = "Robert Dober"
     URLS    = %w{http://labrador.rubyforge.org/verify}
   end 
 end
 
-total_failed   = 0
-total_verified = 0
-report_stream  = $stderr
+# First we will create an annonymous statistics object into which
+# we will extend all the functionalities now expressed by lambdas
 
-optional_message = lambda do | msg |
-  msg ? "#{msg}: " : ""
+ignore_messages = Object::new
+ignore_messages.instance_eval do
+  def method_missing *args, &blk; nil end
 end
 
-percentage = lambda do | all, nok |
-  all.zero? ? "(***.**%)" :
-    "(%6.2f%%)" % ( 10_000 * ( all - nok ).to_f / all / 100 )
-end
+new_stats = lambda do | parent = ignore_messages |
+  { failed: 0,
+    verified: 0, 
+    report_stream: $stderr, 
+    messages: [], 
+    parent: parent
+  }.extend(
+  Module::new do
+    def success
+      self[ :verified ] += 1 
+      self[ :parent ].success
+    end
+    def failure 
+      self[ :failed ] += 1 
+      self[ :parent ].failure
+    end
 
-total_report = lambda do
-  report_stream << "\n"
-  resume = 
-    "+++  S u m m a r y: Verifications: #{total_verified+total_failed}, failed: #{total_failed}, succeeded: #{total_verified} #{percentage[ total_verified + total_failed, total_failed ]}  +++"
-    rchar = total_failed.zero? ? "=" : "*"
-    s = resume.size
-    report_stream << "+" * s
-    report_stream << "\n"
-    report_stream << "+++" << " " * ( s - 6 ) << "+++"
-    report_stream << "\n"
-    report_stream << ( resume << "\n" )
-    report_stream << "+++" << " " * ( s - 6 ) << "+++"
-    report_stream << "\n"
-    report_stream << ( rchar * resume.size.pred << "\n" )
-end
+    def fail_verification level, msg
+      p caller if $DEBUG
+      messages = fetch :messages
+      if level then
+        messages << "Error: #{msg} #{caller[level - 1]}"
+      else
+        messages << "Error: #{msg}"
+      end
+      failure
+    end
 
-include(  Module::new do
-  define_method :Verify do  |ver_msg=nil, ver_stream=nil, &ver_blk|
-  report_stream = ver_stream if ver_stream
-  messages = []
-  failed = 0
-  verified = 0
-
-  fail_verification = lambda do | level, msg |
-    p caller if $DEBUG
-  if level then
-    messages << "Error: #{msg} #{caller[level]}"
-  else
-    messages << "Error: #{msg}"
-  end
-  failed += 1 
-  total_failed += 1
-  end
-
-  report = lambda do | msg = nil, stream = $stderr |
-    #stream << "\n"
-    messages.map{ |m| m << "\n" }.each do | line |
-    stream << line
+    def percentage
+      verified, failed = values_at( :verified, :failed )
+      total = verified + failed
+      total.zero? ?
+        "(***.**%)" :
+        "(%6.2f%%)" % ( 10_000 * ( verified ).to_f / total / 100 )
+    end
+
+    define_method :report do | msg = nil | 
+      report_stream, messages, verified, failed = values_at( :report_stream, :messages, :verified, :failed )
+      messages.map{ |m| m << "\n" }.each do | line |
+        report_stream << line
+      end
+
+      rchar = failed.zero? ? "=" : "*"
+      resume = 
+      "#{rchar}#{rchar} #{msg ? "#{msg}: " : ""}Verifications: #{verified+failed}, failed: #{failed}, succeeded: #{verified} #{percentage}"
+      report_stream << ( resume << "\n" )
     end
 
-  rchar = failed.zero? ? "=" : "*"
-  resume = 
-      "#{rchar}#{rchar} #{optional_message[ msg ]}Verifications: #{verified+failed}, failed: #{failed}, succeeded: #{verified} #{percentage[ verified + failed, failed ]}"
-      stream << ( resume << "\n" )
-      #stream << ( rchar * resume.size << "\n" )
-  end
+    def summary
+      report_stream, verified, failed = values_at( :report_stream, :verified, :failed )
+      report_stream << "\n"
+      resume = 
+        "+++  S u m m a r y: Verifications: #{verified+failed}, failed: #{failed}, succeeded: #{verified} #{percentage}  +++"
+      rchar = failed.zero? ? "=" : "*"
+      s = resume.size
+      report_stream << "+" * s
+      report_stream << "\n"
+      report_stream << "+++" << " " * ( s - 6 ) << "+++"
+      report_stream << "\n"
+      report_stream << ( resume << "\n" )
+      report_stream << "+++" << " " * ( s - 6 ) << "+++"
+      report_stream << "\n"
+      report_stream << ( rchar * resume.size.pred << "\n" )
+    end
 
-  succeed_verification = lambda do 
-    verified += 1
-    total_verified += 1
-  end
+  end)
 
+end
+
+total_stats = new_stats.call
+
+at_exit do
+ at_exit do
+   at_exit do
+     total_stats.summary
+   end
+ end
+end
+
+new_verifer = lambda do | stats |
   Module::new do
 
     begin
@@ -149,14 +172,14 @@ include(  Module::new do
           a = msg[ :actual ]
           msg = msg[ :message ] || msg[ :msg ]
           return fail_verification [ 2, "#{msg}\n.. target: #{t.inspect}\n.. actual: #{a.inspect}\n.. #{msg} in " ] unless t==a
-          return succeed_verification[]
+          return stats.success
         end
-        return fail_verification[ 2, "#{msg} in " ] unless blk[]
-        succeed_verification[]
+        return stats.fail_verification( 2, "#{msg} in " ) unless blk[]
+        stats.success
       rescue Exception => e
-        fail_verification[ nil, "#{msg} #{e.message} in #{e.backtrace.first}" ]
+        stats.fail_verification( nil, "#{msg} #{e.message} in #{e.backtrace.first}" )
       end
-    end
+    end # :verify
 
     define_method :refute do | msg=nil, &blk |
       begin
@@ -164,42 +187,50 @@ include(  Module::new do
           t = msg[ :target ]
           a = msg[ :actual ]
           msg = msg[ :message ] || msg[ :msg ]
-          return fail_verification [ 2, "#{msg}\n.. target: #{t.inspect}\n.. actual: #{a.inspect}\n.. #{msg} in " ] if t==a
-          return succeed_verification[]
+          return stats.fail_verification( 2, "#{msg}\n.. target: #{t.inspect}\n.. actual: #{a.inspect}\n.. #{msg} in " ) if t==a
+          return stats.success
         end
-        return fail_verification[ 2, "#{msg} in " ] if blk[]
-        succeed_verification[]
+        return stats.fail_verification( 2, "#{msg} in " ) if blk[]
+        stats.success
       rescue Exception => e
-        fail_verification[ nil, "#{msg} #{e.message} in #{e.backtrace.first}" ]
+        stats.fail_verification( nil, "#{msg} #{e.message} in #{e.backtrace.first}" )
       end
-    end
+    end # :refute
 
     define_method :verify_exceptions do | *excpts, &blk |
       begin
         blk[]
         fail_verification[ 2, "None of #{excpts} thrown in " ]
       rescue *excpts
-        succeed_verification[]
+        stats.success
       rescue Exception => e
-        fail_verification[ 3, "#{e} #{e.class} was thrown, but one of \"#{excpts}\" was expected in " ]
+        stats.fail_verification( 3, "#{e} #{e.class} was thrown, but one of \"#{excpts}\" was expected in " )
       end
-    end
+    end # :verify_exception
 
     extend self
-    module_eval( &ver_blk )
-    report[ ver_msg, ver_stream || report_stream ]
-
-  end
-
-  end
-  end
-       )
-
-       at_exit do
-         at_exit do
-           at_exit do
-             total_report[]
-           end
-         end
-       end
-       # vim: sw=2 sts=2 ft=ruby nu expandtab:
+  end # Module::new
+end # new_verifier
+
+include(  Module::new do
+  if RUBY_ENGINE =~ /jruby/i then # BEGIN go away after fix of JRUBY-3774
+    define_method :__Verify__JRUBY_3774_workaround do |ver_msg, ver_blk|
+      stats = new_stats[ total_stats ]
+      verifier = new_verifer[ stats ]
+      verifier.module_eval( &ver_blk )
+      stats.report ver_msg
+    end
+    def Verify ver_msg = nil, &ver_rvlk
+      __Verify__JRUBY_3774_workaround ver_msg, ver_rvlk
+    end
+  else # END go away after fix of JRUBY-3774
+  define_method :Verify do  |ver_msg=nil, &ver_blk|
+    stats = new_stats[ total_stats ]
+    verifier = new_verifer[ stats ]
+    verifier.module_eval( &ver_blk )
+    stats.report ver_msg
+  end # : Verify
+  end # go away after fix of JRUBY-3774
+end )
+
+# vim: sw=2 sts=2 ft=ruby nu expandtab:

data/test/verify-verify-01.rb

@@ -10,7 +10,7 @@ Verify "metadata" do
     'Robert Dober' == Lab419::Verify::AUTHOR
   end
   verify "version" do
-    '0.3' == Lab419::Verify::VERSION
+    '0.3.1' == Lab419::Verify::VERSION
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: verify
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: 0.3.1
 platform: ruby
 authors: 
 - Robert