carlosbrando-autotest-notification 1.8.0 → 1.8.1

data/autotest-notification.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{autotest-notification}
-  s.version = "1.8.0"
+  s.version = "1.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Carlos Brando", "Rodrigo Urubatan", "Alexandre da Silva", "Carlos J\303\272nior", "Davis Zanetti Cabral", "Marcos Tapaj\303\263s", "Thiago Pradi", "Oz\303\251ias Sant'ana", "Samuel Flores", "Diego Carrion"]
-  s.date = %q{2009-01-26}
+  s.date = %q{2009-02-01}
   s.description = %q{This gem set the autotest (ZenTest) to send messages to software as Growl, LibNotify, and Snarl, displaying a window with the results.}
   s.email = ["autotest-notification@carlosbrando.com"]
   s.executables = ["an-install", "an-uninstall", "playsound"]

data/config/requirements.rb

@@ -4,7 +4,7 @@ include FileUtils
 require 'rubygems'
 %w[rake hoe newgem rubigen ZenTest].each do |req_gem|
   begin
-    require req_gem
+    require req_gem.downcase
   rescue LoadError
     puts "This Rakefile requires the '#{req_gem}' RubyGem."
     puts "Installation: gem install #{req_gem} -y"

data/lib/autotest_notification.rb

@@ -1,13 +1,26 @@
 $:.unshift(File.dirname(__FILE__))
-%w{ linux mac windows cygwin doom buuf }.each { |x| require "autotest_notification/#{x}" }
 
 module AutotestNotification
-  IMAGES_DIRECTORY = File.expand_path(File.dirname(__FILE__) + "/../images/")
-  SUCCESS_IMAGE    = "#{IMAGES_DIRECTORY}/pass.png";
-  FAIL_IMAGE       = "#{IMAGES_DIRECTORY}/fail.png";
-  PENDING_IMAGE    = "#{IMAGES_DIRECTORY}/pending.png"
+  class Config
+
+    class << self
+      attr_reader :images_directory
+      attr_accessor :success_image, :fail_image, :pending_image, :expiration_in_seconds
+
+      def images_directory=(path)
+        @images_directory = File.expand_path(path)
+
+        @success_image = "#{@images_directory}/pass.png"
+        @fail_image    = "#{@images_directory}/fail.png"
+        @pending_image = "#{@images_directory}/pending.png"
+      end
+    end
 
-  EXPIRATION_IN_SECONDS = 3
+    self.images_directory = "#{File.dirname(__FILE__)}/../../images/"
+
+    self.expiration_in_seconds = 3
+
+  end
 
   Autotest.add_hook :ran_command do |at|
     result = at.results.is_a?(Array) ? at.results.last : at.results.split("\n").last
@@ -29,11 +42,11 @@ module AutotestNotification
       end
 
       if @failures > 0 || @errors > 0
-        notify "FAIL", msg, FAIL_IMAGE, @tests + @examples, @failures + @errors, 2
+        notify "FAIL", msg, Config.fail_image, @tests + @examples, @failures + @errors, 2
       elsif PENDING && @pendings > 0
-        notify "Pending", msg, PENDING_IMAGE, @tests + @examples, @failures + @errors, 1
+        notify "Pending", msg, Config.pending_image, @tests + @examples, @failures + @errors, 1
       else
-        notify "Pass", msg, SUCCESS_IMAGE, @tests + @examples, 0, -2
+        notify "Pass", msg, Config.success_image, @tests + @examples, 0, -2
       end
 
       puts "\e[#{code}m#{'=' * 80}\e[0m\n\n"
@@ -41,14 +54,14 @@ module AutotestNotification
   end
 
   class << self
-    def notify(title, msg, img = SUCCESS_IMAGE, total = 1, failures = 0, priority = 0)
+    def notify(title, msg, img = Config.success_image, total = 1, failures = 0, priority = 0)
 
       img = Doom.image(total, failures) if DOOM_EDITION
       img = Buuf.image(title.downcase) if BUUF
 
       case RUBY_PLATFORM
       when /linux/
-        Linux.notify(title, msg, img, total, failures)
+        Linux.notify(title, msg, img, total, failures, priority)
       when /darwin/
         Mac.notify(title, msg, img, total, failures, priority)
       when /cygwin/
@@ -71,3 +84,5 @@ module AutotestNotification
     end
   end
 end
+
+%w{ linux mac windows cygwin doom buuf }.each { |x| require "autotest_notification/#{x}" }

data/lib/autotest_notification/buuf.rb

@@ -2,7 +2,7 @@ module AutotestNotification
   class Buuf
     class << self
       def image(notification)
-        "#{IMAGES_DIRECTORY}/buuf/#{notification}.png"
+        "#{Config.images_directory}/buuf/#{notification}.png"
       end
     end
   end

data/lib/autotest_notification/cygwin.rb

@@ -3,7 +3,7 @@ module AutotestNotification
     class << self
       def notify(title, msg, img)
         img = get_image_path(img).strip
-        system "sncmd /m '#{title}' '#{msg}' '#{img}' /t #{EXPIRATION_IN_SECONDS}"
+        system "sncmd /m '#{title}' '#{msg}' '#{img}' /t #{Config.expiration_in_seconds}"
       end
       
       def get_image_path(img)

data/lib/autotest_notification/doom.rb

@@ -2,7 +2,7 @@ module AutotestNotification
   class Doom
     class << self
       def image(total, failures)
-        "#{IMAGES_DIRECTORY}/doom/doom_#{percent(total, failures)}.png"
+        "#{Config.images_directory}/doom/doom_#{percent(total, failures)}.png"
       end
 
       def play_sound(total, failures)

data/lib/autotest_notification/linux.rb

@@ -2,9 +2,11 @@ module AutotestNotification
   class Linux
     class << self
 
-      def notify(title, msg, img, total = 1, failures = 0)
+      def notify(title, msg, img, total = 1, failures = 0, priority = 0)
+        Config.expiration_in_seconds = 0 if failures > 0 && STICKY
+
         if has_notify?
-          notify_send(title, msg, img)
+          notify_send(title, msg, img, priority)
         elsif has_zenity?
           zenity(title, msg, img)
         elsif has_kdialog?
@@ -17,23 +19,24 @@ module AutotestNotification
       protected
 
         def has_notify?
-          system "which notify-send 2> /dev/null"
+          system "which notify-send > /dev/null 2>&1"
         end
       
         def has_kdialog?
-          system "which kdialog 2> /dev/null"
+          system "which kdialog > /dev/null 2>&1"
         end
       
         def has_zenity?
-          system "which zenity 2> /dev/null"
+          system "which zenity > /dev/null 2>&1"
         end
         
-        def notify_send(title, msg, img)
-          system "notify-send -t #{EXPIRATION_IN_SECONDS * 1000} -i #{img} '#{title}' '#{msg}'"
+        def notify_send(title, msg, img, priority = 0)
+          urgency = priority > 1 ? 'critical' : priority < 0 ? 'low' : 'normal'
+          system "notify-send -t #{Config.expiration_in_seconds * 1000} -i #{img} -u #{urgency} '#{title}' '#{msg}'"
         end
 
         def kdialog(title, msg, img)
-          system "kdialog --title '#{title}' --passivepopup '#{msg}' #{EXPIRATION_IN_SECONDS}"
+          system "kdialog --title '#{title}' --passivepopup '<img src=\"#{img}\" align=\"middle\"> #{msg}' #{Config.expiration_in_seconds}"
         end
 
         def zenity(title, msg, img)

data/lib/autotest_notification/version.rb

@@ -2,7 +2,7 @@ module AutotestNotification #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 8
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/autotest_notification/test_linux.rb

@@ -53,12 +53,12 @@ class TestLinux < Test::Unit::TestCase
   end
 
   def test_notify_send
-    AutotestNotification::Linux.expects(:system).with('notify-send -t 3000 -i image \'title\' \'msg\'')
+    AutotestNotification::Linux.expects(:system).with('notify-send -t 3000 -i image -u normal \'title\' \'msg\'')
     AutotestNotification::Linux.notify_send("title", "msg", "image")
   end
 
   def test_notify_kdialog
-    AutotestNotification::Linux.expects(:system).with('kdialog --title \'title\' --passivepopup \'msg\' 3')
+    AutotestNotification::Linux.expects(:system).with('kdialog --title \'title\' --passivepopup \'<img src="image" align="middle"> msg\' 3')
     AutotestNotification::Linux.kdialog("title", "msg", "image")
   end
 
@@ -68,17 +68,17 @@ class TestLinux < Test::Unit::TestCase
   end
 
   def test_has_zenity?
-    AutotestNotification::Linux.expects(:system).with('which zenity 2> /dev/null')
+    AutotestNotification::Linux.expects(:system).with('which zenity > /dev/null 2>&1')
     AutotestNotification::Linux.has_zenity?
   end
 
   def test_has_notify?
-    AutotestNotification::Linux.expects(:system).with('which notify-send 2> /dev/null')
+    AutotestNotification::Linux.expects(:system).with('which notify-send > /dev/null 2>&1')
     AutotestNotification::Linux.has_notify?
   end
 
   def test_has_kdialog?
-    AutotestNotification::Linux.expects(:system).with('which kdialog 2> /dev/null')
+    AutotestNotification::Linux.expects(:system).with('which kdialog > /dev/null 2>&1')
     AutotestNotification::Linux.has_kdialog?
   end
 
@@ -88,4 +88,4 @@ class TestLinux < Test::Unit::TestCase
     AutotestNotification::Linux.expects(method).returns("title", "msg", "image", 1)
     AutotestNotification::Linux.notify("title", "msg", "image", 1, 1)
   end
-end
+end

data/test/test_autotest_notification.rb

@@ -26,7 +26,7 @@ class TestAutotestNotification < Test::Unit::TestCase
   end
   
   def test_notify_when_os_is_linux
-    AutotestNotification::Linux.expects(:notify).with(@title, @msg, @image, @total, @failures)
+    AutotestNotification::Linux.expects(:notify).with(@title, @msg, @image, @total, @failures, @priority)
     verify_to("linux")
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: carlosbrando-autotest-notification
 version: !ruby/object:Gem::Version 
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors: 
 - Carlos Brando
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-26 00:00:00 -08:00
+date: 2009-02-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency