test-unit-notify 0.1.0 → 0.2.0

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.2.0 / 2011-02-10
+
+* 1 major enhancements
+
+  * supported Mac OS X by growlnotify.
+
 === 0.1.0 / 2010-11-25
 
 * 2 major enhancements

data/Manifest.txt

@@ -9,3 +9,4 @@ data/icons/kinotan/pass.png
 data/icons/kinotan/pending.png
 lib/test/unit/notify.rb
 screenshot/notify-on-gnome.png
+screenshot/notify-on-mac-os-x.png

data/README.txt

@@ -8,11 +8,11 @@ Test::Unit::Notify - A test result notify extention for Test::Unit.
 
 == FEATURES/PROBLEMS:
 
-* This provides all Test::Unit extensions just one require line.
+* This provides test result notification support.
 
 == INSTALL:
 
-* sudo gem install test-unit-full
+* sudo gem install test-unit-notify
 
 == USAGE:
 
@@ -28,7 +28,7 @@ See screenshot/notify-on-gnome.png for example on GNOME.
 
 LGPLv2.1 or later.
 
-(Kouhei Sutou has a right to change the license inclidng
+(Kouhei Sutou has a right to change the license including
 contributed patches.)
 
 == AUTHORS:

data/lib/test/unit/notify.rb

@@ -3,7 +3,7 @@
 # Author:: Kouhei Sutou
 # Copyright::
 #   * Copyright (c) 2010 Kouhei Sutou <kou@clear-code.com>
-# License:: Ruby license.
+# License:: LGPLv2+
 
 require 'pathname'
 require 'erb'
@@ -17,14 +17,15 @@ module Test
 
     AutoRunner.setup_option do |auto_runner, options|
       options.on("--[no-]notify",
-                 "Notify test result at the last.") do |use_notify|
+                 "Notify test result at the last.",
+                 "(default is auto [#{Notify.enable?}])") do |use_notify|
         Notify.disable(auto_runner)
         Notify.enable(auto_runner) if use_notify
       end
     end
 
     module Notify
-      VERSION = "0.1.0"
+      VERSION = "0.2.0"
 
       class << self
         def enable(auto_runner)
@@ -37,19 +38,113 @@ module Test
           end
         end
 
-        @@enable = false
+        @@enable = nil
         def enable=(enable)
           @@enable = enable
         end
 
         def enable?
+          if @@enable.nil?
+            @@enable = Notifier.available?
+          end
           @@enable
         end
       end
 
-      class Notifier
+      class NotifyCommand
+        def available?
+          paths.any? do |path|
+            File.exist?(File.join(path, @command))
+          end
+        end
+
+        private
+        def paths
+          path_env = ENV["PATH"]
+          if path_env.nil?
+            default_paths
+          else
+            path_env.split(File::PATH_SEPARATOR)
+          end
+        end
+
+        def default_paths
+          ["/usr/local/bin", "/usr/bin", "/bin"]
+        end
+      end
+
+      class NotifySend < NotifyCommand
         include ERB::Util
 
+        def initialize
+          @command = "notify-send"
+        end
+
+        def run(parameters)
+          expire_time = parameters[:expire_time] * 1000
+          urgency = parameters[:urgency]
+          title = parameters[:title]
+          message = h(parameters[:message])
+          icon = parameters[:icon]
+
+          command_line = [@command,
+                          "--expire-time", expire_time.to_s,
+                          "--urgency", urgency]
+          command_line.concat(["--icon", icon]) if icon
+          command_line << title
+          command_line << message
+          system(*command_line)
+        end
+      end
+
+      class Growlnotify < NotifyCommand
+        def initialize
+          @command = "growlnotify"
+        end
+
+        def run(parameters)
+          expire_time = parameters[:expire_time]
+          priority = urgency_to_piroity(parameters[:urgency])
+          title = parameters[:title]
+          message = parameters[:message]
+          image = parameters[:icon]
+
+          command_line = [@command,
+                          "--priority", priority,
+                          "--message", message]
+          command_line.concat(["--image", image]) if image
+          command_line << title
+          system(*command_line)
+        end
+
+        private
+        def urgency_to_piroity(urgency)
+          case urgency
+          when "normal"
+            "Normal"
+          when "critical"
+            "Emergency"
+          else
+            "Normal"
+          end
+        end
+      end
+
+      class Notifier
+        class << self
+          def available?
+            not command.nil?
+          end
+
+          def command
+            @@command ||= commands.find {|command| command.available?}
+          end
+
+          def commands
+            [NotifySend.new, Growlnotify.new]
+          end
+        end
+
         base_dir = Pathname(__FILE__).dirname.parent.parent.parent.expand_path
         ICON_DIR = base_dir + "data" + "icons"
         def initialize
@@ -68,30 +163,23 @@ module Test
         end
 
         def finished(elapsed_time)
-          case RUBY_PLATFORM
-          when /mswin|mingw|cygwin/
-            # how?
-          when /darwin/
-            # growl?
-          else
-            notify_by_notify_send(elapsed_time)
-          end
-        end
+          command = self.class.command
+          return if command.nil?
 
-        def notify_by_notify_send(elapsed_time)
-          icon = guess_suitable_icon
-          args = ["notify-send",
-                  "--expire-time", "5000",
-                  "--urgency", urgency]
-          args.concat(["--icon", icon.to_s]) if icon
           title = "%s [%g%%] (%gs)" % [@result.status,
                                        @result.pass_percentage,
                                        elapsed_time]
-          args << title
-          args << h(@result.summary)
-          system(*args)
+          parameters = {
+            :expire_time => 5,
+            :icon => guess_suitable_icon,
+            :urgency => urgency,
+            :title => title,
+            :message => @result.summary,
+          }
+          command.run(parameters)
         end
 
+        private
         def guess_suitable_icon
           icon_dir = ICON_DIR + @theme
           status = @result.status

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: test-unit-notify
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-25 00:00:00 +09:00
+date: 2011-02-10 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,37 +35,21 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: hoe
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 31
         segments: 
         - 2
-        - 0
         - 4
-        version: 2.0.4
+        - 0
+        version: 2.4.0
   type: :development
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 6
-        - 1
-        version: 2.6.1
-  type: :development
-  version_requirements: *id003
 description: Test::Unit::Notify - A test result notify extention for Test::Unit.
 email: 
 - kou@clear-code.com
@@ -89,6 +73,7 @@ files:
 - data/icons/kinotan/pending.png
 - lib/test/unit/notify.rb
 - screenshot/notify-on-gnome.png
+- screenshot/notify-on-mac-os-x.png
 has_rdoc: true
 homepage: http://rubyforge.org/projects/test-unit/
 licenses: []