brass 1.2.0 → 1.2.1

data/.ruby

@@ -41,7 +41,7 @@ revision: 0
 created: '2012-01-24'
 summary: Bare-Metal Ruby Assertion System Standard
 title: BRASS
-version: 1.2.0
+version: 1.2.1
 name: brass
 description: ! 'BRASS stands for Bare-Metal Ruby Assertion System Standard. It is
   a very basic
@@ -50,4 +50,4 @@ description: ! 'BRASS stands for Bare-Metal Ruby Assertion System Standard. It i
 
   to make use so they can all work together harmoniously.'
 organization: Rubyworks
-date: '2012-01-25'
+date: '2012-02-09'

data/HISTORY.rdoc

@@ -1,5 +1,16 @@
 = HISTORY
 
+== 1.2.1 | 2012-02-09
+
+This release adds framework adapters for MiniTest and TestUnit, which allows
+those frameworks to recognize BRASS assertions as "failures" rather than
+as "errors".
+
+Changes:
+
+* Add framework adapters for MiniTest and TestUnit.
+
+
 == 1.2.0 | 2012-01-26
 
 The default error is `RuntimeError` rather than `StandardError` to

data/lib/brass.rb

@@ -7,15 +7,30 @@ class Exception
 
   # Set the the exception's assertion flag.
   def set_assertion(boolean)
-    @assertion = boolean  # ? true : false
+    @assertion = boolean # ? true : false
   end
 
   # Set message.
   # (not strictly needed here, but can be useful anyway).
+  #
+  # @todo Does the message have to be a string?
   def set_message(msg)
     @mesg = msg.to_str
   end
 
+  # TODO: Consider assertion parameters for future vresion.
+  ##
+  #def parameters
+  #  @parameters
+  #end
+  #
+  ## Set exception parameters. These are used to store specific information
+  ## relavent to a particular exception or assertion. Unlike the message,
+  ## which is a String, this is a Hash.
+  #def set_parameters(parameters)
+  #  @parameters = parameters.to_hash
+  #end
+
 end
 
 module Kernel
@@ -78,7 +93,7 @@ module Kernel
                   error_class = raise_arguments.shift
                   error_class.new(*raise_arguments)
                 else
-                  error_class = RuntimeError
+                  error_class = $! || RuntimeError
                   error_class.new(*raise_arguments)
                 end
 

data/lib/brass/adapters/minitest.rb

@@ -0,0 +1,26 @@
+module MiniTest #:nodoc:
+  class Unit #:nodoc:
+    # To teach MiniTest to recognize the expanded concept of assertions
+    # we add in an extra capture clause to the it's #puke method.
+    def puke c, m, x
+      case x
+      when MiniTest::Skip
+        @skips = @skips + 1
+        x = "Skipped:\n#{m}(#{c}) [#{location x}]:\n#{x.message}\n"
+      when MiniTest::Assertion
+        @failures = @failures + 1
+        x = "Failure:\n#{m}(#{c}) [#{location x}]:\n#{x.message}\n"
+      when x.respond_to?(:assertion?) && x.assertion?
+        @failures = @failures + 1
+        x = "Failure:\n#{m}(#{c}) [#{location x}]:\n#{x.message}\n"
+      else
+        @errors = @errors + 1
+        b = MiniTest::filter_backtrace(x.backtrace).join("\n    ")
+        x = "Error:\n#{m}(#{c}):\n#{x.class}: #{x.message}\n    #{b}\n"
+      end
+      @report << x
+      x[0, 1]
+    end
+  end
+end
+

data/lib/brass/adapters/testunit.rb

@@ -0,0 +1,36 @@
+module Test #:nodoc:
+  module Unit #:nodoc:
+
+    module BrassAssertionHandler
+      class << self
+        def included(base)
+          base.exception_handler(:handle_brass_assertion_failed_error)
+        end
+      end
+
+      private
+      def handle_brass_assertion_failed_error(exception)
+        return false unless exception.assertion?
+        problem_occurred
+        #parameters = exception.parameters    # TODO: assertion parameters
+        add_brass_failure exception.message, exception.backtrace,
+                    #:expected => exception.expected,
+                    #:actual => exception.actual,
+                    #:inspected_expected => exception.inspected_expected,
+                    #:inspected_actual => exception.inspected_actual,
+                    :user_message => exception.message #exception.user_message
+        true
+      end
+
+      def add_brass_failure(message, backtrace, options={})
+        failure = Failure.new(name, filter_backtrace(backtrace), message, options)
+        current_result.add_failure(failure)
+      end
+    end
+
+    class TestCase #:nodoc:
+      include BrassAssertionHandler
+    end
+  end
+end
+

data/lib/brass/adapters/testunit1.rb

@@ -0,0 +1,42 @@
+module Test #:nodoc:
+  module Unit #:nodoc:
+    class TestCase #:nodoc:
+      # Runs the individual test method represented by this
+      # instance of the fixture, collecting statistics, failures
+      # and errors in result.
+      def run(result)
+        yield(STARTED, name)
+        @_result = result
+        begin
+          setup
+          __send__(@method_name)
+        rescue AssertionFailedError => e
+          add_failure(e.message, e.backtrace)
+        rescue Exception => e
+          if e.respond_to?(:assertion?) && e.assertion?
+            add_failure(e.message, e.backtrace)
+          else
+            raise if PASSTHROUGH_EXCEPTIONS.include? $!.class
+            add_error($!)
+          end
+        ensure
+          begin
+            teardown
+          rescue AssertionFailedError => e
+            add_failure(e.message, e.backtrace)
+          rescue Exception => e
+            if e.respond_to?(:assertion?) && e.assertion?
+              add_failure(e.message, e.backtrace)
+            else
+              raise if PASSTHROUGH_EXCEPTIONS.include? $!.class
+              add_error($!)
+            end
+          end
+        end
+        result.add_run
+        yield(FINISHED, name)
+      end 
+    end
+  end
+end
+

data/lib/brass/expect.rb

@@ -16,7 +16,7 @@ module Kernel
     rescue error_class
       assert(true)
     rescue Exception => err
-      assert(false, error_class, "#{error_class} expected but #{err} was thrown")
+      assert(false, error_class, "#{error_class} expected but #{err.class} was thrown")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brass
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: detroit
-  requirement: &16988520 !ruby/object:Gem::Requirement
+  requirement: &16492980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16988520
+  version_requirements: *16492980
 - !ruby/object:Gem::Dependency
   name: lemon
-  requirement: &16987480 !ruby/object:Gem::Requirement
+  requirement: &16492280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16987480
+  version_requirements: *16492280
 - !ruby/object:Gem::Dependency
   name: rubytest
-  requirement: &16986520 !ruby/object:Gem::Requirement
+  requirement: &16491100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16986520
+  version_requirements: *16491100
 description: ! 'BRASS stands for Bare-Metal Ruby Assertion System Standard. It is
   a very basic
 
@@ -61,6 +61,9 @@ extra_rdoc_files:
 files:
 - .ruby
 - .yardopts
+- lib/brass/adapters/minitest.rb
+- lib/brass/adapters/testunit.rb
+- lib/brass/adapters/testunit1.rb
 - lib/brass/expect.rb
 - lib/brass.rb
 - test/case_brass.rb
@@ -88,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Bare-Metal Ruby Assertion System Standard