carlosbrando-autotest-notification 1.0.0 → 1.1.2

data/History.txt

@@ -1,4 +1,13 @@
-== 0.3.0
+== 1.1.2
+	* Refactoring code. 
+
+* 1.1.1 
+	* Changed to speak when passing the tests after a series of failures. Only in Mac.
+	
+* 1.1.0
+	* Now speaking in Linux too.
+
+* 0.3.0
 	* If a test failed, the computer will speak. Only for Mac.
 
 * 0.2.2 2008-05-13

data/Manifest.txt

@@ -9,9 +9,9 @@ config/requirements.rb
 lib/autotest_notification.rb
 lib/autotest_notification/version.rb
 lib/autotest_notification/linux.rb
-lib/autotest_notification/mac.rb
 lib/autotest_notification/windows.rb
 lib/autotest_notification/cygwin.rb
+lib/autotest_notification/mac.rb
 script/console
 script/destroy
 script/generate
@@ -24,8 +24,8 @@ test/test_autotest_notification.rb
 test/test_helper.rb
 test/autotest_notification/test_cygwin.rb
 test/autotest_notification/test_linux.rb
-test/autotest_notification/test_mac.rb
 test/autotest_notification/test_windows.rb
+test/autotest_notification/test_mac.rb
 website/index.html
 website/index.txt
 website/javascripts/rounded_corners_lite.inc.js

data/README.txt

@@ -25,6 +25,8 @@ Independent of operating system you are using, you must install the ZenTest:
     In your shell, cd to the directory on the Growl disk image containing growlnotify, and type ./install.sh.
     That script will install growlnotify to /usr/local/bin and the manpage to /usr/local/man.
 
+    If you want to be notified with voice of the test results, when running an-install, pass a "-s" switch, when you do not want voices notifications anymore, just run it again without the "-s" switch.
+
     
 * If you're using Windows (with cygwin):
     You need to have Snarl and sncmd installed on your machine.
@@ -60,6 +62,9 @@ Independent of operating system you are using, you must install the ZenTest:
     If you use KDE and do not have libnotify-bin installed, it will try to use kdialog wich is part of KDE.
     It also works if you have zenity installed.
 
+    If you want to be notified with voice of the test results, instal espeak [http://espeak.sourceforge.net/] too, it is not needed.
+    And when running an-install, pass a "-s" switch, when you do not want voices notifications anymore, just run it again without the "-s" switch.
+
 
 == INSTALL:
 
@@ -67,7 +72,7 @@ Independent of operating system you are using, you must install the ZenTest:
   
 Run it to let the notifier in automatic mode:
 
-  $ an-install [--speaking]
+  $ an-install
 
 In Windows without cygwin, it's necessary to install in the directory of the project:
   

data/autotest-notification.gemspec

@@ -1,17 +1,17 @@
 Gem::Specification.new do |s|
   s.name = %q{autotest-notification}
-  s.version = "1.0.0"
+  s.version = "1.1.2"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   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"]
-  s.date = %q{2008-05-16}
+  s.date = %q{2008-05-28}
   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 = ["eduardobrando@gmail.com"]
   s.executables = ["an-install", "an-uninstall"]
   s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "website/index.txt"]
-  s.files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "Rakefile", "config/hoe.rb", "config/requirements.rb", "lib/autotest_notification.rb", "lib/autotest_notification/version.rb", "lib/autotest_notification/linux.rb", "lib/autotest_notification/mac.rb", "lib/autotest_notification/windows.rb", "lib/autotest_notification/cygwin.rb", "script/console", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "tasks/deployment.rake", "tasks/environment.rake", "tasks/website.rake", "test/test_autotest_notification.rb", "test/test_helper.rb", "test/autotest_notification/test_cygwin.rb", "test/autotest_notification/test_linux.rb", "test/autotest_notification/test_mac.rb", "test/autotest_notification/test_windows.rb", "website/index.html", "website/index.txt", "website/javascripts/rounded_corners_lite.inc.js", "website/stylesheets/screen.css", "website/template.html.erb", "bin/an-install", "bin/an-uninstall", "images/pass.png", "images/fail.png", "autotest-notification.gemspec"]
+  s.files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "Rakefile", "config/hoe.rb", "config/requirements.rb", "lib/autotest_notification.rb", "lib/autotest_notification/version.rb", "lib/autotest_notification/linux.rb", "lib/autotest_notification/windows.rb", "lib/autotest_notification/cygwin.rb", "lib/autotest_notification/mac.rb", "script/console", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "tasks/deployment.rake", "tasks/environment.rake", "tasks/website.rake", "test/test_autotest_notification.rb", "test/test_helper.rb", "test/autotest_notification/test_cygwin.rb", "test/autotest_notification/test_linux.rb", "test/autotest_notification/test_windows.rb", "test/autotest_notification/test_mac.rb", "website/index.html", "website/index.txt", "website/javascripts/rounded_corners_lite.inc.js", "website/stylesheets/screen.css", "website/template.html.erb", "bin/an-install", "bin/an-uninstall", "images/pass.png", "images/fail.png", "autotest-notification.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/carlosbrando/autotest-notification/}
   s.post_install_message = %q{
@@ -32,4 +32,4 @@ To turn off:
   s.test_files = ["test/autotest_notification/test_cygwin.rb", "test/autotest_notification/test_linux.rb", "test/autotest_notification/test_mac.rb", "test/autotest_notification/test_windows.rb", "test/test_autotest_notification.rb", "test/test_helper.rb"]
 
   s.add_dependency(%q<ZenTest>, [">= 3.9.2"])
-end
+end

data/config/requirements.rb

@@ -2,7 +2,7 @@ require 'fileutils'
 include FileUtils
 
 require 'rubygems'
-%w[rake hoe newgem rubigen].each do |req_gem|
+%w[rake hoe newgem rubigen ZenTest].each do |req_gem|
   begin
     require req_gem
   rescue LoadError

data/lib/autotest_notification/cygwin.rb

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

data/lib/autotest_notification/linux.rb

@@ -1,7 +1,8 @@
 module AutotestNotification
   class Linux
     class << self
-      def notify(title, msg, img)
+
+      def notify(title, msg, img, failures=0)
         if has_notify?
           notify_send(title, msg, img)
         elsif has_zenity?
@@ -9,7 +10,8 @@ module AutotestNotification
         elsif has_kdialog?
           kdialog(title, msg, img)
         end
-        true # true, cause we did everything we could
+
+        talk(msg, failures)
       end
 
       protected
@@ -25,6 +27,14 @@ module AutotestNotification
           system "zenity --info --text='#{msg}' --title='#{title}'"
         end
 
+        def talk(msg, failures)
+          # TODO: check if user has espeak installed
+          begin
+            system("/usr/bin/espeak '#{failures} test#{'s' unless failures == 1} failed'") if SPEAKING && failures > 0
+          rescue
+          end
+        end
+
         def has_zenity?
           system "which zenity 2> /dev/null"
         end

data/lib/autotest_notification/mac.rb

@@ -1,9 +1,18 @@
 module AutotestNotification
   class Mac
+    @last_test_failed = false
+
     class << self
       def notify(title, msg, img, failures = 0, pri = 0)
         system "growlnotify -n autotest --image #{img} -p #{pri} -m '#{msg}' #{title}"
-        system("say #{failures} test#{'s' unless failures == 1} failed.") if SPEAKING && failures > 0
+
+        if SPEAKING && failures > 0
+          system("say #{failures} test#{'s' unless failures == 1} failed.")
+          @last_test_failed = true
+        elsif @last_test_failed
+          system("say All tests passed successfully.")
+          @last_test_failed = false
+        end
       end
     end
   end

data/lib/autotest_notification/version.rb

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

data/lib/autotest_notification.rb

@@ -1,51 +1,36 @@
 $:.unshift(File.dirname(__FILE__))
-require 'autotest_notification/linux'
-require 'autotest_notification/mac'
-require 'autotest_notification/windows'
-require 'autotest_notification/cygwin'
+%w{ linux mac windows cygwin }.each { |x| require "autotest_notification/#{x}" }
 
 module AutotestNotification
-  FAIL    = -1
-  PENDING = 0
-  SUCCESS = 1
-
-  EXPIRATION_IN_SECONDS = 3
-
   IMAGES_DIRECTORY = File.expand_path(File.dirname(__FILE__) + "/../images/")
   SUCCESS_IMAGE    = "#{IMAGES_DIRECTORY}/pass.png"
   FAIL_IMAGE       = "#{IMAGES_DIRECTORY}/fail.png"
 
-  Autotest.add_hook :ran_command do |at|
+  EXPIRATION_IN_SECONDS = 3
 
+  Autotest.add_hook :ran_command do |at|
     result = at.results.is_a?(Array) ? at.results.last : at.results.split("\n").last
 
     if result
+      %w{ test assertion error example pending failure }.each { |x| instance_variable_set "@#{x}s", result[/(\d+) #{x}/, 1].to_i }
 
-      # Test::Unit
-      tests      = result =~ /(\d+) test/ ? $1.to_i : 0
-      assertions = result =~ /(\d+) assertion/ ? $1.to_i : 0
-      errors     = result =~ /(\d+) error/ ? $1.to_i : 0
-
-      # RSpec
-      examples   = result =~ /(\d+) example/ ? $1.to_i : 0
-      pendings   = result =~ /(\d+) pending/ ? $1.to_i : 0
-
-      # Shared
-      failures   = result =~ /(\d+) failure/ ? $1.to_i : 0
-
-      code = 32
-      msg = if result =~ /test/
-        code = 31 if failures > 0 || errors > 0
-        "#{pluralize('test', tests)}, #{pluralize('assertion', assertions)}, #{pluralize('failure', failures)}, #{pluralize('error', errors)}"
+      case result
+      when /test/
+        code = 31 if @failures > 0 || @errors > 0
+        msg  = unit_test_message(@tests, @assertions, @failures, @errors)
+      when /example/
+        code = (@failures > 0) ? 31 : (@pendings > 0) ? 33 : 32
+        msg  = rspec_message(@examples, @failures, @pendings)
       else
-        code = (failures > 0) ? 31 : (pendings > 0) ? 33 : 32
-        "#{pluralize('example', examples)}, #{pluralize('failure', failures)}, #{pendings} pending"
+        code = 31
+        msg  = "1 exception occurred"
+        @failures = 1
       end
 
-      if failures > 0 || errors > 0
-        notify "FAIL", msg, FAIL_IMAGE, failures, 2
+      if @failures > 0 || @errors > 0
+        notify "FAIL", msg, FAIL_IMAGE, @failures + @errors, 2
       else
-        notify "Pass", msg, SUCCESS_IMAGE, failures
+        notify "Pass", msg, SUCCESS_IMAGE
       end
 
       puts "\e[#{code}m#{'=' * 80}\e[0m\n\n"
@@ -56,7 +41,7 @@ module AutotestNotification
     def notify(title, msg, img = SUCCESS_IMAGE, failures = 0, pri = 0)
       case RUBY_PLATFORM
       when /linux/
-        Linux.notify(title, msg, img)
+        Linux.notify(title, msg, img, failures)
       when /darwin/
         Mac.notify(title, msg, img, failures, pri)
       when /cygwin/
@@ -69,5 +54,13 @@ module AutotestNotification
     def pluralize(text, number)
       "#{number} #{text}#{'s' if number != 1}"
     end
+
+    def unit_test_message(tests, assertions, failures, errors)
+      "#{pluralize('test', tests)}, #{pluralize('assertion', assertions)}, #{pluralize('failure', failures)}, #{pluralize('error', errors)}"
+    end
+
+    def rspec_message(examples, failures, pendings)
+      "#{pluralize('example', examples)}, #{pluralize('failure', failures)}, #{pendings} pending"
+    end
   end
 end

data/test/autotest_notification/test_linux.rb

@@ -1,49 +1,76 @@
 require File.dirname(__FILE__) + '/../test_helper.rb'
 
 class TestLinux < Test::Unit::TestCase
-  
+
   def setup
     turn_methods_public AutotestNotification::Linux
   end
-  
-  def test_notify_when_use_notify
+
+  def test_notify_when_use_notify_without_speak
+    Object.const_set :SPEAKING, false
+    AutotestNotification::Linux.expects(:has_notify?).returns(true)
+    verify_notify(:notify_send)
+  end
+
+  def test_notify_when_use_zenity_without_speak
+    Object.const_set :SPEAKING, false
+    AutotestNotification::Linux.expects(:has_notify?).returns(false)
+    AutotestNotification::Linux.expects(:has_zenity?).returns(true)
+    verify_notify(:zenity)
+  end
+
+  def test_notify_when_use_kdialog_without_speak
+    Object.const_set :SPEAKING, false
+    AutotestNotification::Linux.expects(:has_notify?).returns(false)
+    AutotestNotification::Linux.expects(:has_zenity?).returns(false)
+    AutotestNotification::Linux.expects(:has_kdialog?).returns(true)
+    verify_notify(:kdialog)
+  end
+
+  def test_notify_when_use_notify_with_speak
+    Object.const_set :SPEAKING, true
     AutotestNotification::Linux.expects(:has_notify?).returns(true)
+    AutotestNotification::Linux.expects(:system).with("/usr/bin/espeak '1 test failed'")
     verify_notify(:notify_send)
   end
-  
-  def test_notify_when_use_zenity
+
+  def test_notify_when_use_zenity_with_speak
+    Object.const_set :SPEAKING, true
     AutotestNotification::Linux.expects(:has_notify?).returns(false)
     AutotestNotification::Linux.expects(:has_zenity?).returns(true)
+    AutotestNotification::Linux.expects(:system).with("/usr/bin/espeak '1 test failed'")
     verify_notify(:zenity)
   end
-  
-  def test_notify_when_use_kdialog
+
+  def test_notify_when_use_kdialog_with_speak
+    Object.const_set :SPEAKING, true
     AutotestNotification::Linux.expects(:has_notify?).returns(false)
     AutotestNotification::Linux.expects(:has_zenity?).returns(false)
     AutotestNotification::Linux.expects(:has_kdialog?).returns(true)
+    AutotestNotification::Linux.expects(:system).with("/usr/bin/espeak '1 test failed'")
     verify_notify(:kdialog)
   end
-  
+
   def test_notify_send
     AutotestNotification::Linux.expects(:system).with('notify-send -t 3000 -i image \'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.kdialog("title", "msg", "image")
   end
-  
+
   def test_notify_zenity
     AutotestNotification::Linux.expects(:system).with('zenity --info --text=\'msg\' --title=\'title\'')
     AutotestNotification::Linux.zenity("title", "msg", "image")
   end
-  
+
   def test_has_zenity?
     AutotestNotification::Linux.expects(:system).with('which zenity 2> /dev/null')
     AutotestNotification::Linux.has_zenity?
   end
-  
+
   def test_has_notify?
     AutotestNotification::Linux.expects(:system).with('which notify-send 2> /dev/null')
     AutotestNotification::Linux.has_notify?
@@ -53,12 +80,13 @@ class TestLinux < Test::Unit::TestCase
     AutotestNotification::Linux.expects(:system).with('which kdialog 2> /dev/null')
     AutotestNotification::Linux.has_kdialog?
   end
-  
+
   private
-  
+
   def verify_notify(method)
-    AutotestNotification::Linux.expects(method).returns("title", "msg", "image")
-    AutotestNotification::Linux.notify("title", "msg", "image")
+    AutotestNotification::Linux.expects(method).returns("title", "msg", "image", 1)
+    AutotestNotification::Linux.notify("title", "msg", "image",1)
   end
-  
+
 end
+

data/test/autotest_notification/test_mac.rb

@@ -1,10 +1,19 @@
 require File.dirname(__FILE__) + '/../test_helper.rb'
 
 class TestMac < Test::Unit::TestCase
-  
-  def test_notify
+
+  def test_notify_without_voice
+    Object.const_set :SPEAKING, false
+    AutotestNotification::Mac.expects(:system).with("growlnotify -n autotest --image image -p 0 -m 'msg' title")
+    AutotestNotification::Mac.notify("title", "msg", "image", 1)
+  end
+
+  def test_notify_with_voice
+    Object.const_set :SPEAKING, true
     AutotestNotification::Mac.expects(:system).with("growlnotify -n autotest --image image -p 0 -m 'msg' title")
-    AutotestNotification::Mac.notify("title", "msg", "image")
+    AutotestNotification::Mac.expects(:system).with("say 1 test failed.")
+    AutotestNotification::Mac.notify("title", "msg", "image", 1)
   end
-  
+
 end
+

data/test/test_autotest_notification.rb

@@ -20,12 +20,12 @@ class TestAutotestNotification < Test::Unit::TestCase
   end
   
   def test_notify_when_os_is_linux
-    AutotestNotification::Linux.expects(:notify).with(@title, @msg, @image)
+    AutotestNotification::Linux.expects(:notify).with(@title, @msg, @image,@pri)
     verify_to("linux")
   end
   
   def test_notify_when_os_is_mac
-    AutotestNotification::Mac.expects(:notify).with(@title, @msg, @image, @pri)
+    AutotestNotification::Mac.expects(:notify).with(@title, @msg, @image, @pri, 0)
     verify_to("darwin")
   end
   

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>autotest_notification</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/autotest_notification"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/autotest_notification" class="numbers">0.3.0</a>
+      <a href="http://rubyforge.org/projects/autotest_notification" class="numbers">1.1.2</a>
     </div>
     <h1>&#x2192; &#8216;autotest_notification&#8217;</h1>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: carlosbrando-autotest-notification
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.2
 platform: ruby
 authors: 
 - Carlos Brando
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-16 00:00:00 -07:00
+date: 2008-05-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,9 +53,9 @@ files:
 - lib/autotest_notification.rb
 - lib/autotest_notification/version.rb
 - lib/autotest_notification/linux.rb
-- lib/autotest_notification/mac.rb
 - lib/autotest_notification/windows.rb
 - lib/autotest_notification/cygwin.rb
+- lib/autotest_notification/mac.rb
 - script/console
 - script/destroy
 - script/generate
@@ -68,8 +68,8 @@ files:
 - test/test_helper.rb
 - test/autotest_notification/test_cygwin.rb
 - test/autotest_notification/test_linux.rb
-- test/autotest_notification/test_mac.rb
 - test/autotest_notification/test_windows.rb
+- test/autotest_notification/test_mac.rb
 - website/index.html
 - website/index.txt
 - website/javascripts/rounded_corners_lite.inc.js