test_notifier 0.1.2 → 0.1.3

data/README.rdoc

@@ -25,7 +25,7 @@ If you're a linux guy, you can choose on of these methods:
 
 * Install libnotify-bin and its dependencies: <tt>sudo aptitude install libnotify-bin</tt>
 * Install xosd-bin: <tt>sudo aptitude install xosd-bin</tt>
-* KDE users don't need to install anything: Test Notifier will use +knotify+.
+* KDE users don't need to install anything: Test Notifier will use +knotify+ and in in KDE4 Test Notifier will use +kdialog+.
 
 === Windows
 
@@ -54,7 +54,7 @@ and save the images <tt>none.png</tt>, <tt>passed.png<tt>, <tt>failure.png</tt>
 
 == Collaborators
 
-* jeznet - http://github.com/jeznet
+* Szymon (jeznet) Jeż - http://github.com/jeznet
 * Steve Halasz - http://github.com/woodchuck
 
 == License

data/lib/test_notifier.rb

@@ -7,15 +7,19 @@ module TestNotifier
   ERROR_IMAGE = "error.png"
   FAILURE_TITLE = "FAILED"
   PASSED_TITLE = "Passed"
-  
+
   RSPEC_REGEX = /(\d+) examples?, (\d+) failures?(, (\d+) pendings?)?/
   TEST_UNIT_REGEX = /(\d+)\stests,\s(\d+)\sassertions,\s(\d+)\sfailures,\s(\d+)\serrors/
-  
+
   GROWL_REGISTER_FILE = File.expand_path("~/.test_notifier-growl")
-  
+
+  HELP_HINT = "For more information see:\n" +
+             " * http://github.com/fnando/test_notifier (online)\n" +
+             " * #{File.dirname(__FILE__)}/README.markdown (offline)"
+
   def self.notify(image, title, message)
     image ||= "none.png"
-    
+
     custom_image = File.join(File.expand_path("~/.test_notifier"), image)
     image = File.exists?(custom_image) ? custom_image : File.join(File.dirname(__FILE__), "test_notifier", "icons", image)
 
@@ -25,23 +29,26 @@ module TestNotifier
           script = File.dirname(__FILE__) + "/test_notifier/register-growl.scpt"
           system "osascript #{script} > #{GROWL_REGISTER_FILE}"
         end
-        
-        system("growlnotify -n test_notifier --image #{image} -p 2 -m \"#{message}\" -t \"#{title}\"")
+        system "growlnotify -n test_notifier --image #{image} -p 2" +
+               "-m \"#{message}\" -t \"#{title}\""
       else
         puts "No compatible popup notification system installed."
-        puts "Try installing these:\n* growl"
+        puts "Try installing these:\n* Growl"
+        puts HELP_HINT
       end
     elsif RUBY_PLATFORM =~ /mswin/
       begin
         require 'snarl'
       rescue LoadError
-        puts 'To be notified by a popup please install Snarl and a ruby gem "snarl".'
+        puts 'To be notified by a popup please install Snarl and a ruby gem "ruby-snarl".'
+        puts HELP_HINT
       else
         Snarl.show_message(title, message, image)
       end
     elsif RUBY_PLATFORM =~ /(linux|freebsd)/
       # if osd_cat is avaible
       if `which osd_cat` && $? == 0
+        require 'test_notifier/osd_cat'
         color = case image
           when /#{PASSED_IMAGE}/
             'green'
@@ -55,9 +62,9 @@ module TestNotifier
         OsdCat.send "#{title} \n #{message}", color
       # if dcop server is running
       elsif `ps -Al | grep dcop` && $? == 0
-        def self.knotify title, msg
+        def self.knotify title, message
           system "dcop knotify default notify " +
-               "eventname \'#{title}\' \'#{msg}\' '' '' 16 2"
+               "eventname \'#{title}\' \'#{message}\' '' '' 16 2"
         end
         knotify title, message
       # if kdialog is available
@@ -65,10 +72,15 @@ module TestNotifier
         system("kdialog --title #{title} --passivepopup \"#{message}\" 5")
       # if notify-send is avaible
       elsif `which notify-send` && $? == 0
-        system("notify-send -i #{image} #{title} \"#{message}\"")
+        system "notify-send -i #{image} #{title} \"#{message}\""
       else
         puts "No popup notification software installed."
-        puts "Try installing one of this:\n * osd_cat (apt-get install xosd-bin),\n * knotify (use KDE),\n * notify-send (apt-get install libnotify-bin)"
+        puts "Try installing one of this:\n" +
+             " * osd_cat (apt-get install xosd-bin),\n" +
+             " * knotify (use KDE),\n" +
+             " * kdialog (use KDE4),\n" +
+             " * notify-send (apt-get install libnotify-bin)"
+        puts HELP_HINT
       end
     end
   end
@@ -76,12 +88,12 @@ module TestNotifier
   def self.rspec?(content)
     (RSPEC_REGEX =~ content)
   end
-  
+
   def self.notification_for_rspec(content)
     matches, *output = *content.to_s.match(RSPEC_REGEX)
     output = output.map {|i| i.to_i }
     e, f, none, p = output
-    
+
     if f > 0
       # test has failed
       title = FAILURE_TITLE
@@ -94,16 +106,16 @@ module TestNotifier
       # no examples
       return
     end
-    
+
     message = "#{e} examples, #{f} failures, #{p} pending"
     notify(image, title, message)
   end
-  
+
   def self.notification_for_test_unit(content)
     matches, *output = *content.to_s.match(TEST_UNIT_REGEX)
     output = output.map {|i| i.to_i }
     t, a, f, e = output
-    
+
     if f > 0 || e > 0
       # test has failed or raised an error
       title = FAILURE_TITLE
@@ -116,31 +128,9 @@ module TestNotifier
       # no assertions
       return
     end
-    
+
     message = "#{t} tests, #{a} assertions, #{f} failures, #{e} errors"
     notify(image, title, message)
   end
 end
 
-# Provides a method for popup notifications using osd_cat
-# Extracted from http://theadmin.org/articles/2008/2/10/fail-loudly-with-osd_cat-and-autotest
-module OsdCat
-  # TODO move this module to a separate file
-
-  # Use xlsfonts to find the different fonts
-  FONT = "-bitstream-charter-bold-r-normal--33-240-100-100-p-206-iso8859-1"
-
-  # Will display the message on the top of the screen centered, adjust these numbers to suit.
-  POSITION = "top"             # top|middle|bottom
-  POSITION_OFFSET = "0"         # Pixels from position to display (think CSS margin)
-  ALIGN = "center"             # left|right|center
-
-  def self.send msg, color='green'
-    osd_command = "echo #{msg.inspect} | osd_cat --font=#{FONT} --shadow=0 --pos=#{POSITION} -o #{POSITION_OFFSET} --delay=4 --outline=4 --align=#{ALIGN} -c #{color}"
-
-    # osd_cat blocks so start a new thread, otherwise Autotest will wait
-    Thread.new do
-      `#{osd_command}`
-    end
-  end
-end

data/lib/test_notifier/osd_cat.rb

@@ -0,0 +1,20 @@
+# Provides a method for popup notifications using osd_cat
+# Extracted from http://theadmin.org/articles/2008/2/10/fail-loudly-with-osd_cat-and-autotest
+module OsdCat
+  # Use xlsfonts to find the different fonts
+  FONT = "-bitstream-charter-bold-r-normal--33-240-100-100-p-206-iso8859-1"
+
+  # Will display the message on the top of the screen centered, adjust these numbers to suit.
+  POSITION = "top"             # top|middle|bottom
+  POSITION_OFFSET = "0"         # Pixels from position to display (think CSS margin)
+  ALIGN = "center"             # left|right|center
+
+  def self.send message, color='green'
+    osd_command = "echo #{message.inspect} | osd_cat --font=#{FONT} --shadow=0 --pos=#{POSITION} -o #{POSITION_OFFSET} --delay=4 --outline=4 --align=#{ALIGN} -c #{color}"
+
+    # osd_cat blocks so start a new thread, otherwise Autotest will wait
+    Thread.new do
+      `#{osd_command}`
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Nando Vieira
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-11 00:00:00 -03:00
+date: 2010-05-23 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -37,6 +37,7 @@ files:
 - lib/test_notifier/icons/error.png
 - lib/test_notifier/icons/failure.png
 - lib/test_notifier/icons/passed.png
+- lib/test_notifier/osd_cat.rb
 - lib/test_notifier/register-growl.scpt
 - lib/test_notifier/rspec.rb
 - lib/test_notifier/test_unit.rb