test_notifier 0.3.5.rc.2 → 0.3.5.rc.3

data/lib/test_notifier.rb

@@ -1,6 +1,7 @@
+require "notifier"
+
 module TestNotifier
   class << self
-    attr_accessor :__notifier__
     attr_accessor :default_notifier
   end
 
@@ -30,17 +31,12 @@ module TestNotifier
   end
 
   def notifier
-    self.__notifier__ ||= begin
-      notifier = TestNotifier::Notifier.supported_notifier_from_name(default_notifier)
-      notifier ||= TestNotifier::Notifier.supported_notifiers.first
-
-      STDERR << NO_NOTIFIERS_MESSAGE if notifier == TestNotifier::Notifier::Placebo
-
-      notifier
-    end
+    Notifier.default_notifier = default_notifier
+    notifier = Notifier.notifier
+    STDERR << NO_NOTIFIERS_MESSAGE if notifier == Notifier::Placebo
+    notifier
   end
 
-  autoload :Notifier,   "test_notifier/notifier"
   autoload :Runner,     "test_notifier/runner"
   autoload :Stats,      "test_notifier/stats"
 end

data/test/test_helper.rb

@@ -7,9 +7,8 @@ require "test_notifier"
 class Test::Unit::TestCase
   private
   def unsupport_all_notifiers
-    TestNotifier::Notifier.constants.each do |name|
-      notifier = TestNotifier::Notifier.const_get(name)
-      notifier.stubs(:supported?).returns(false)
+    Notifier.notifiers.each do |notifier|
+      notifier.stubs(:supported?).returns(false) unless notifier == Notifier::Placebo
     end
   end
 end

data/test/test_notifier_test.rb

@@ -2,34 +2,27 @@ require "test_helper"
 
 class TestNotifierTest < Test::Unit::TestCase
   def setup
-    TestNotifier.__notifier__ = nil
     unsupport_all_notifiers
   end
 
-  test "return default notifier when is set" do
-    TestNotifier.default_notifier = :osd_cat
-    TestNotifier::Notifier::OsdCat.expects(:supported?).returns(true)
+  test "use default notifier" do
+    Notifier::Growl.stubs(:supported?).returns(true)
+    Notifier::Snarl.stubs(:supported?).returns(true)
+    TestNotifier.default_notifier = :snarl
 
-    assert_equal TestNotifier::Notifier::OsdCat, TestNotifier.notifier
-  end
-
-  test "return next available notifier when default notifier is not supported" do
-    TestNotifier.default_notifier = :osd_cat
-    TestNotifier::Notifier::Snarl.expects(:supported?).returns(true)
-
-    assert_equal TestNotifier::Notifier::Snarl, TestNotifier.notifier
+    assert_equal Notifier::Snarl, 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
+    Notifier::Placebo.expects(:supported?).returns(true)
+    Notifier::Placebo.expects(:notify).once
     TestNotifier.notify :status => :fail, :message => "You have failed!"
   end
 
   test "send notification to supported notifier" do
-    TestNotifier::Notifier::Snarl.expects(:supported?).returns(true)
-    TestNotifier::Notifier::Snarl.expects(:notify).with({
+    Notifier::Snarl.expects(:supported?).returns(true)
+    Notifier::Snarl.expects(:notify).with({
       :status  => :fail,
       :message => "You have failed!",
       :title   => TestNotifier::TITLES[:fail],

data/test_notifier.gemspec

@@ -4,7 +4,7 @@ require "test_notifier/version"
 
 Gem::Specification.new do |s|
   s.name        = "test_notifier"
-  s.version     = "#{TestNotifier::Version::STRING}.rc.2"
+  s.version     = "#{TestNotifier::Version::STRING}.rc.3"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Nando Vieira"]
   s.email       = ["fnando.vieira@gmail.com"]
@@ -21,8 +21,7 @@ DESC
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.requirements << "You'll need Growl (Mac OS X), Libnotify, OSD or KDE (Linux) or Snarl (Windows)"
-
+  s.add_dependency "notifier"
   s.add_development_dependency "test-unit"
   s.add_development_dependency "mocha"
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 3
   - 5
   - rc
-  - 2
-  version: 0.3.5.rc.2
+  - 3
+  version: 0.3.5.rc.3
 platform: ruby
 authors: 
 - Nando Vieira
@@ -20,7 +20,7 @@ date: 2010-11-12 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: test-unit
+  name: notifier
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -30,10 +30,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: test-unit
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -45,6 +45,19 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: |
   Display system notifications (dbus, growl and snarl) after
   running tests. It works on Mac OS X, Linux and Windows. Powerful when used
@@ -64,14 +77,6 @@ files:
 - Rakefile
 - lib/test_notifier.rb
 - lib/test_notifier/autotest.rb
-- lib/test_notifier/notifier.rb
-- lib/test_notifier/notifier/growl.rb
-- lib/test_notifier/notifier/kdialog.rb
-- 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
 - lib/test_notifier/runner/autotest.rb
@@ -85,7 +90,6 @@ files:
 - resources/fail.png
 - resources/register-growl.scpt
 - resources/success.png
-- test/notifier_test.rb
 - test/stats_test.rb
 - test/test_helper.rb
 - test/test_notifier_test.rb
@@ -117,15 +121,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       - 3
       - 1
       version: 1.3.1
-requirements: 
-- You'll need Growl (Mac OS X), Libnotify, OSD or KDE (Linux) or Snarl (Windows)
+requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Display system notifications (dbus, growl and snarl) after running tests.
 test_files: 
-- test/notifier_test.rb
 - test/stats_test.rb
 - test/test_helper.rb
 - test/test_notifier_test.rb

data/lib/test_notifier/notifier/growl.rb

@@ -1,25 +0,0 @@
-module TestNotifier
-  module Notifier
-    module Growl
-      extend self
-
-      SCRIPT = File.dirname(__FILE__) + "/../../../resources/register-growl.scpt"
-      FILE = File.expand_path("~/.test_notifier-growl")
-
-      def supported?
-        RUBY_PLATFORM =~ /darwin/ && `ps -Al | grep GrowlHelper` && `which growlnotify` && $?.exitstatus == 0
-      end
-
-      def notify(options)
-        Thread.new do
-          `growlnotify -n test_notifier --image #{options[:image]} -p 2 -m '#{options[:message]}' -t '#{options[:title]}'`
-        end
-      end
-
-      def register
-        return if File.file?(FILE)
-        system "osascript #{SCRIPT} > #{FILE}"
-      end
-    end
-  end
-end

data/lib/test_notifier/notifier/kdialog.rb

@@ -1,17 +0,0 @@
-module TestNotifier
-  module Notifier
-    module Kdialog
-      extend self
-
-      def supported?
-        RUBY_PLATFORM =~ /(linux|freebsd)/ && `which kdialog > /dev/null` && $? == 0
-      end
-
-      def notify(options)
-        Thread.new do
-          `kdialog --title #{options[:title]} --passivepopup \"#{options[:message]}\" 5`
-        end
-      end
-    end
-  end
-end

data/lib/test_notifier/notifier/knotify.rb

@@ -1,17 +0,0 @@
-module TestNotifier
-  module Notifier
-    module Knotify
-      extend self
-
-      def supported?
-        RUBY_PLATFORM =~ /(linux|freebsd)/ && `ps -Al | grep dcop` && $?.exitstatus == 0
-      end
-
-      def notify(options)
-        Thread.new do
-          `dcop knotify default notify eventname \'#{options[:title]}\' \'#{options[:message]}\' '' '' 16 2`
-        end
-      end
-    end
-  end
-end

data/lib/test_notifier/notifier/notify_send.rb

@@ -1,17 +0,0 @@
-module TestNotifier
-  module Notifier
-    module NotifySend
-      extend self
-
-      def supported?
-        RUBY_PLATFORM =~ /(linux|freebsd)/ && `which notify-send > /dev/null` && $? == 0
-      end
-
-      def notify(options)
-        Thread.new do
-          `notify-send -i #{options[:image]} #{options[:title]} \"#{options[:message]}\"`
-        end
-      end
-    end
-  end
-end

data/lib/test_notifier/notifier/osd_cat.rb

@@ -1,27 +0,0 @@
-module TestNotifier
-  module Notifier
-    module OsdCat
-      extend self
-
-      FONT = "-bitstream-charter-bold-r-normal--33-240-100-100-p-206-iso8859-1"
-      POSITION = "top"
-      POSITION_OFFSET = "0"
-      ALIGN = "center"
-      COLORS = {
-        :fail => "orange",
-        :success => "green",
-        :error => "red"
-      }
-
-      def supported?
-        RUBY_PLATFORM =~ /(linux|freebsd)/ && `which osd_cat > /dev/null` && $? == 0
-      end
-
-      def notify(options)
-        Thread.new do
-          `echo #{options[:message].inspect} | osd_cat --font=#{FONT} --shadow=0 --pos=#{POSITION} -o #{POSITION_OFFSET} --delay=4 --outline=4 --align=#{ALIGN} -c #{COLORS[options[:status]]}`
-        end
-      end
-    end
-  end
-end

data/lib/test_notifier/notifier/placebo.rb

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

data/lib/test_notifier/notifier/snarl.rb

@@ -1,22 +0,0 @@
-module TestNotifier
-  module Notifier
-    module Snarl
-      extend self
-
-      def supported?
-        return false unless RUBY_PLATFORM =~ /(mswin|mingw)/
-
-        begin
-          require "snarl" unless defined?(::Snarl)
-          true
-        rescue LoadError
-          false
-        end
-      end
-
-      def notify(options)
-        ::Snarl.show_message(options[:title], options[:message], options[:image])
-      end
-    end
-  end
-end

data/lib/test_notifier/notifier.rb

@@ -1,39 +0,0 @@
-module TestNotifier
-  module Notifier
-    autoload :Growl,      "test_notifier/notifier/growl"
-    autoload :Snarl,      "test_notifier/notifier/snarl"
-    autoload :OsdCat,     "test_notifier/notifier/osd_cat"
-    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
-
-    def notifiers
-      constants.collect do |name|
-        const_get(name) unless name.to_s == "Placebo"
-      end.compact + [Placebo]
-    end
-
-    def supported_notifiers
-      notifiers.select {|notifier| notifier.supported?}
-    end
-
-    def from_name(name)
-      notifier = const_get(classify(name.to_s))
-    rescue Exception
-      nil
-    end
-
-    def supported_notifier_from_name(name)
-      notifier = from_name(name)
-      notifier && notifier.supported? ? notifier : nil
-    end
-
-    private
-    def classify(string)
-      string.gsub(/_(.)/sm) { "#{$1.upcase}" }.gsub(/^(.)/) { "#{$1.upcase}" }
-    end
-  end
-end

data/test/notifier_test.rb

@@ -1,43 +0,0 @@
-require "test_helper"
-
-class TestNotifier::NotifierTest < Test::Unit::TestCase
-  def setup
-    unsupport_all_notifiers
-  end
-
-  test "retrieve list of supported notifiers" do
-    TestNotifier::Notifier::Snarl.expects(:supported?).returns(true)
-    TestNotifier::Notifier::Knotify.expects(:supported?).returns(true)
-
-    assert_equal 2, TestNotifier::Notifier.supported_notifiers.size
-  end
-
-  test "retrieve list of all notifiers" do
-    assert_equal 7, TestNotifier::Notifier.notifiers.size
-  end
-
-  test "consider Placebo as fallback notifier" do
-    assert_equal TestNotifier::Notifier::Placebo, TestNotifier::Notifier.notifiers.last
-  end
-
-  test "return notifier by its name" do
-    assert_equal TestNotifier::Notifier::OsdCat, TestNotifier::Notifier.from_name(:osd_cat)
-    assert_equal TestNotifier::Notifier::NotifySend, TestNotifier::Notifier.from_name(:notify_send)
-    assert_equal TestNotifier::Notifier::Growl, TestNotifier::Notifier.from_name(:growl)
-  end
-
-  test "return notifier by its name when supported" do
-    TestNotifier::Notifier::Snarl.expects(:supported?).returns(true)
-
-    assert_equal TestNotifier::Notifier::Snarl, TestNotifier::Notifier.supported_notifier_from_name(:snarl)
-  end
-
-  test "return nil when have supported notifiers" do
-    assert_nil TestNotifier::Notifier.supported_notifier_from_name(:snarl)
-  end
-
-  test "return nil when an invalid notifier name is provided" do
-    assert_nil TestNotifier::Notifier.from_name(:invalid)
-    assert_nil TestNotifier::Notifier.supported_notifier_from_name(:invalid)
-  end
-end