test_notifier 0.3.1 → 0.3.2

data/lib/test_notifier/runner/autotest.rb

@@ -9,23 +9,19 @@ Autotest.add_hook :ran_command do |at|
 
     if rspec_matches
       _, examples, failures, _, pending = *rspec_matches
-      status = failures.to_i > 0 ? :fail : :success
-      message = "#{examples} examples, #{failures} failed"
-      message << ", #{pending} pending" if pending
-      TestNotifier.notify(:status => status, :message => message) unless examples.to_i.zero?
+
+      stats = TestNotifier::Stats.new(:spec, :total => examples, :fail => failures, :pending => pending)
+      TestNotifier.notify(:status => stats.status, :message => stats.message) unless examples.to_i.zero?
     elsif test_unit_matches
       _, tests, assertions, failures, errors = *test_unit_matches
 
-      if errors.to_i.nonzero?
-        status = :error
-      elsif failures.to_i.nonzero?
-        status = :fail
-      else
-        status = :success
-      end
-
-      message = "#{tests} tests, #{assertions} assertions, #{failures} failures, #{errors} errors"
-      TestNotifier.notify(:status => status, :message => message) unless tests.to_i.zero?
+      stats = TestNotifier::Stats.new(:test_unit, {
+        :total => tests,
+        :assertions => assertions,
+        :fail => failures,
+        :errors => errors
+      })
+      TestNotifier.notify(:status => stats.status, :message => stats.message) unless tests.to_i.zero?
     end
   rescue
   end

data/lib/test_notifier/runner/rspec.rb

@@ -13,7 +13,7 @@ class RSpec::Core::Formatters::BaseTextFormatter
       :total   => example_count,
       :fail    => failure_count,
       :pending => pending_count,
-      :error   => examples.reject {|e| e.instance_variable_get("@exception").nil?}.count
+      :errors  => examples.reject {|e| e.instance_variable_get("@exception").nil?}.count
     })
 
     TestNotifier.notify(:status => stats.status, :message => stats.message)

data/lib/test_notifier/stats.rb

@@ -19,14 +19,14 @@ module TestNotifier
 
     private
     def normalize(options)
-      [:total, :success, :fail, :pending, :error, :assertions].inject({}) do |buffer, key|
+      [:total, :success, :fail, :pending, :errors, :assertions].inject({}) do |buffer, key|
         buffer[key] = options[key].to_i
         buffer
       end
     end
 
     def status_for_test_unit
-      if options[:error].nonzero?
+      if options[:errors].nonzero?
         :error
       elsif options[:fail].nonzero?
         :fail
@@ -36,7 +36,7 @@ module TestNotifier
     end
 
     def status_for_rspec
-      if options[:error].nonzero?
+      if options[:errors].nonzero?
         :error
       elsif options[:fail].nonzero?
         :fail
@@ -55,13 +55,13 @@ module TestNotifier
 
     def message_for_rspec
       options[:success] = options[:total] - options[:fail]
-      options[:fail] =  options[:fail] - options[:error]
+      options[:fail] =  options[:fail] - options[:errors]
 
       text = []
       text << "#{options[:total]} " + pluralize(options[:total], "example")
       text << "#{options[:fail]} failed" unless options[:fail].zero?
       text << "#{options[:pending]} pending" unless options[:pending].zero?
-      text << "#{options[:error]} " + pluralize(options[:error], "error") unless options[:error].zero?
+      text << "#{options[:errors]} " + pluralize(options[:errors], "error") unless options[:errors].zero?
       text.join(", ")
     end
 
@@ -78,7 +78,7 @@ module TestNotifier
       text << "#{options[:total]} " + pluralize(options[:total], "test")
       text << "#{options[:assertions]} " + pluralize(options[:assertions], "assertion")
       text << "#{options[:fail]} failed" unless options[:fail].zero?
-      text << "#{options[:error]} " + pluralize(options[:error], "error") unless options[:error].zero?
+      text << "#{options[:errors]} " + pluralize(options[:errors], "error") unless options[:errors].zero?
       text.join(", ")
     end
 

data/lib/test_notifier/version.rb

@@ -2,7 +2,7 @@ module TestNotifier
   module Version
     MAJOR = 0
     MINOR = 3
-    PATCH = 1
+    PATCH = 2
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/test/stats_test.rb

@@ -21,12 +21,12 @@ class TestNotifier::Stats::RSpecTest < Test::Unit::TestCase
   end
 
   test "message with error examples" do
-    @stats.options = { :total => 10, :fail => 5, :error => 5 }
+    @stats.options = { :total => 10, :fail => 5, :errors => 5 }
     assert_equal "10 examples, 5 errors", @stats.message
   end
 
   test "message with all types" do
-    @stats.options = { :total => 6, :fail => 3, :error => 2, :pending => 3 }
+    @stats.options = { :total => 6, :fail => 3, :errors => 2, :pending => 3 }
     assert_equal "6 examples, 1 failed, 3 pending, 2 errors", @stats.message
   end
 end
@@ -73,12 +73,12 @@ class TestNotifier::Stats::TestUnitTest < Test::Unit::TestCase
   end
 
   test "message with error examples" do
-    @stats.options = { :total => 10, :assertions => 20, :error => 5 }
+    @stats.options = { :total => 10, :assertions => 20, :errors => 5 }
     assert_equal "10 tests, 20 assertions, 5 errors", @stats.message
   end
 
   test "message with all types" do
-    @stats.options = { :total => 6, :fail => 2, :error => 3, :assertions => 20 }
+    @stats.options = { :total => 6, :fail => 2, :errors => 3, :assertions => 20 }
     assert_equal "6 tests, 20 assertions, 2 failed, 3 errors", @stats.message
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: test_notifier
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Nando Vieira