test_notifier 0.3.4 → 0.3.5.rc.1

data/README.rdoc

@@ -49,7 +49,7 @@ You can define your notifier.
 
   TestNotifier.default_notifier = :growl
 
-The available notifiers are <tt>:growl</tt>, <tt>:kdialog</tt>, <tt>:knotify</tt>, <tt>:notify_send</tt>, <tt>:osd_cat</tt> and <tt>:snarl</tt>.
+The available notifiers are <tt>:growl</tt>, <tt>:kdialog</tt>, <tt>:knotify</tt>, <tt>:notify_send</tt>, <tt>:osd_cat</tt>, and <tt>:snarl</tt></tt>.
 
 == Maintainer
 

data/lib/test_notifier/notifier/growl.rb

@@ -7,7 +7,7 @@ module TestNotifier
       FILE = File.expand_path("~/.test_notifier-growl")
 
       def supported?
-        RUBY_PLATFORM =~ /darwin/ && `ps -Al | grep GrowlHelper` && `which growlnotify` && $? == 0
+        RUBY_PLATFORM =~ /darwin/ && `ps -Al | grep GrowlHelper` && `which growlnotify` && $?.exitstatus == 0
       end
 
       def notify(options)

data/lib/test_notifier/notifier/kdialog.rb

@@ -4,7 +4,7 @@ module TestNotifier
       extend self
 
       def supported?
-        RUBY_PLATFORM =~ /(linux|freebsd)/ && `which kdialog &> /dev/null` && $? == 0
+        RUBY_PLATFORM =~ /(linux|freebsd)/ && `which kdialog &> /dev/null` && $?.exitstatus == 0
       end
 
       def notify(options)

data/lib/test_notifier/notifier/knotify.rb

@@ -4,7 +4,7 @@ module TestNotifier
       extend self
 
       def supported?
-        RUBY_PLATFORM =~ /(linux|freebsd)/ && `ps -Al | grep dcop` && $? == 0
+        RUBY_PLATFORM =~ /(linux|freebsd)/ && `ps -Al | grep dcop` && $?.exitstatus == 0
       end
 
       def notify(options)

data/lib/test_notifier/notifier/notify_send.rb

@@ -4,7 +4,7 @@ module TestNotifier
       extend self
 
       def supported?
-        RUBY_PLATFORM =~ /(linux|freebsd)/ && `which notify-send &> /dev/null` && $? == 0
+        RUBY_PLATFORM =~ /(linux|freebsd)/ && `which notify-send &> /dev/null` && $?.exitstatus == 0
       end
 
       def notify(options)

data/lib/test_notifier/notifier/osd_cat.rb

@@ -14,7 +14,7 @@ module TestNotifier
       }
 
       def supported?
-        RUBY_PLATFORM =~ /(linux|freebsd)/ && `which osd_cat &> /dev/null` && $? == 0
+        RUBY_PLATFORM =~ /(linux|freebsd)/ && `which osd_cat &> /dev/null` && $?.exitstatus == 0
       end
 
       def notify(options)

data/lib/test_notifier/notifier/placebo.rb

@@ -0,0 +1,14 @@
+module TestNotifier
+  module Notifier
+    module Placebo
+      extend self
+
+      def supported?
+        true
+      end
+
+      def notify(options)
+      end
+    end
+  end
+end

data/lib/test_notifier/notifier.rb

@@ -6,6 +6,7 @@ module TestNotifier
     autoload :Knotify,    "test_notifier/notifier/knotify"
     autoload :Kdialog,    "test_notifier/notifier/kdialog"
     autoload :NotifySend, "test_notifier/notifier/notify_send"
+    autoload :Placebo,    "test_notifier/notifier/placebo"
 
     extend self
 
@@ -21,7 +22,7 @@ module TestNotifier
 
     def from_name(name)
       notifier = const_get(classify(name.to_s))
-    rescue NameError
+    rescue Exception
       nil
     end
 

data/lib/test_notifier/runner/rspec.rb

@@ -1,5 +1,5 @@
 require "test_notifier"
-require "rspec/core/formatters/base_text_formatter"
+require "rspec/core/formatters"
 
 class RSpec::Core::Formatters::BaseTextFormatter
   alias dump_summary_original dump_summary

data/lib/test_notifier/version.rb

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

data/lib/test_notifier.rb

@@ -6,7 +6,7 @@ module TestNotifier
 
   extend self
 
-  class UnsupportedNotifierError < StandardError; end
+  NO_NOTIFIERS_MESSAGE = "[TEST NOTIFIER] You have no supported notifiers installed. Please read documentation."
 
   IMAGES = {
     :fail    => File.dirname(__FILE__) + "/../resources/fail.png",
@@ -31,11 +31,11 @@ module TestNotifier
 
   def notifier
     self.__notifier__ ||= begin
-      notifier = nil
-      notifier = TestNotifier::Notifier.supported_notifier_from_name(default_notifier) if default_notifier
-      notifier = TestNotifier::Notifier.supported_notifiers.first unless notifier
+      notifier = TestNotifier::Notifier.supported_notifier_from_name(default_notifier)
+      notifier ||= TestNotifier::Notifier.supported_notifiers.first
+
+      STDERR << NO_NOTIFIERS_MESSAGE if notifier == TestNotifier::Notifier::Placebo
 
-      raise UnsupportedNotifierError, "You have no supported notifiers installed. Please read documentation." unless notifier
       notifier
     end
   end

data/test/notifier_test.rb

@@ -13,7 +13,7 @@ class TestNotifier::NotifierTest < Test::Unit::TestCase
   end
 
   test "retrieve list of all notifiers" do
-    assert_equal 6, TestNotifier::Notifier.notifiers.size
+    assert_equal 7, TestNotifier::Notifier.notifiers.size
   end
 
   test "return notifier by its name" do

data/test/test_notifier_test.rb

@@ -20,10 +20,11 @@ class TestNotifierTest < Test::Unit::TestCase
     assert_equal TestNotifier::Notifier::Snarl, TestNotifier.notifier
   end
 
-  test "raise error when there's no supported notifier" do
-    assert_raise TestNotifier::UnsupportedNotifierError do
-      TestNotifier.notifier
-    end
+  test "output error message to $stderr when there's no supported notifier" do
+    STDERR.expects(:<<).with(TestNotifier::NO_NOTIFIERS_MESSAGE).once
+    TestNotifier::Notifier::Placebo.expects(:supported?).returns(true)
+    TestNotifier::Notifier::Placebo.expects(:notify).once
+    TestNotifier.notify :status => :fail, :message => "You have failed!"
   end
 
   test "send notification to supported notifier" do

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: test_notifier
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  - rc
+  - 1
+  version: 0.3.5.rc.1
 platform: ruby
 authors: 
 - Nando Vieira
@@ -14,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 -03:00
+date: 2010-10-28 00:00:00 -02:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +38,7 @@ files:
 - lib/test_notifier/notifier/knotify.rb
 - lib/test_notifier/notifier/notify_send.rb
 - lib/test_notifier/notifier/osd_cat.rb
+- lib/test_notifier/notifier/placebo.rb
 - lib/test_notifier/notifier/snarl.rb
 - lib/test_notifier/rspec.rb
 - lib/test_notifier/runner.rb
@@ -74,11 +77,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: 
 - You'll need Growl (Mac OS X), Libnotify, OSD or KDE (Linux) or Snarl (Windows)
 rubyforge_project: