notify 0.3.0 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/notify.rb

@@ -1,24 +1,37 @@
-unless defined? __DIR__
-  __DIR__ = File.dirname(__FILE__)
+require 'fileutils'
+require 'erb'
+
+module Notify
+  def self.which(prog, path=ENV['PATH'])
+    if RUBY_PLATFORM.downcase =~ /mswin(?!ce)|mingw|bccwin|cygwin/
+      path.split(File::PATH_SEPARATOR).each {|dir|
+        f = File.join(dir,prog+".exe")
+        return f if File.executable?(File.join(f)) && !File.directory?(f)
+      }
+      nil
+    else
+      return system("which #{prog} > /dev/null 2>&1")
+    end
+  end
+
+  def self.html_escape(text)
+    ERB::Util.html_escape(text)
+  end
 end
 
+dir = File.dirname(__FILE__)
 if ENV['NOTIFY']
-  begin
-    require File.join(__DIR__, "notify/#{ENV['NOTIFY']}")
-  rescue LoadError
-  end
+  require File.join(dir, "notify/#{ENV['NOTIFY']}")
 else
-  unless defined? Notify
-    Dir[File.join(__DIR__, "notify/*.rb")].each do |filename|
-      break if defined? Notify
-      require filename
-    end
+  Dir[File.join(dir, "notify/*.rb")].each do |filename|
+    break if Notify.methods.include?(:notify)
+    require filename
   end
 end
 
-unless defined? Notify
-  module Notify
-    def self.notify(title, message)
+module Notify
+  unless methods.include?(:notify)
+    def self.notify(title, message, options = {})
       puts "#{title}: #{message}"
     end
   end

data/lib/notify/growlnotify.rb

@@ -1,5 +1,5 @@
-if system('which growlnotify > /dev/null 2>&1')
-  module Notify
+module Notify
+  if which('growlnotify')
     def self.notify(title, message, option = {})
       system 'growlnotify', '-t', title, '-m', message
     end

data/lib/notify/kdialog.rb

@@ -1,5 +1,5 @@
-if system('which kdialog > /dev/null 2>&1')
-  module Notify
+module Notify
+  if which('kdialog')
     def self.notify(title, message, option = {})
       system 'kdialog', '--passivepopup', message, '--title',title
     end

data/lib/notify/libnotify.rb

@@ -0,0 +1,9 @@
+module Notify
+  begin
+    require 'libnotify'
+    def self.notify(title, message, option={})
+      Libnotify.show(:summary => title, :body => html_escape(message), :icon_path => option[:icon])
+    end
+  rescue LoadError
+  end
+end

data/lib/notify/notify-send.rb

@@ -1,7 +1,7 @@
-if system('which notify-send > /dev/null 2>&1')
-  module Notify
+module Notify
+  if which('notify-send')
     def self.notify(title, message, option = {})
-      system 'notify-send', title, message
+      system 'notify-send', title, html_escape(message)
     end
   end
 end

data/lib/notify/ruby-growl.rb

@@ -1,11 +1,11 @@
-begin
-  require 'ruby-growl'
+module Notify
+  begin
+    require 'ruby-growl'
 
-  module Notify
     @@growl = Growl.new 'localhost', 'ruby', ['notify']
     def self.notify(title, message, option = {})
       @@growl.notify 'notify', title, message, option[:priority] || 0, option[:sticky] || false
     end
+  rescue LoadError
   end
-rescue LoadError
 end

data/lib/notify/ruby_gntp.rb

@@ -1,10 +1,10 @@
-begin
-  require 'ruby_gntp'
+module Notify
+  begin
+    require 'ruby_gntp'
 
-  module Notify
     def self.notify(title, message, option = {})
       GNTP.notify :app_name => "ruby", :title => title, :text => message, :icon => option[:icon] || "", :sticky => option[:sticky] || false
     end
+  rescue LoadError
   end
-rescue LoadError
 end

data/lib/notify/terminal-notifier.rb

@@ -0,0 +1,10 @@
+module Notify
+  begin
+    require 'terminal-notifier'
+
+    def self.notify(title, message, options = {})
+      TerminalNotifier.notify(message, {:title => title}.merge(options))
+    end
+  rescue LoadError
+  end
+end

data/notify.gemspec

@@ -0,0 +1,51 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "notify"
+  s.version = "0.4.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["jugyo"]
+  s.date = "2012-08-01"
+  s.description = "The \"notify\" provides a function to notify on cross platform."
+  s.email = "jugyo.org@gmail.com"
+  s.executables = ["notify"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.md"
+  ]
+  s.files = [
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "bin/notify",
+    "lib/notify.rb",
+    "lib/notify/growlnotify.rb",
+    "lib/notify/kdialog.rb",
+    "lib/notify/libnotify.rb",
+    "lib/notify/notify-send.rb",
+    "lib/notify/ruby-growl.rb",
+    "lib/notify/ruby_gntp.rb",
+    "lib/notify/terminal-notifier.rb",
+    "notify.gemspec",
+    "sample.rb"
+  ]
+  s.homepage = "http://github.com/jugyo/notify"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.23"
+  s.summary = "A function to notify on cross platform."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

metadata

@@ -1,33 +1,25 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: notify
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  version: 0.4.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - jugyo
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-09-29 00:00:00 +09:00
-default_executable: notify
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies: []
-
 description: The "notify" provides a function to notify on cross platform.
 email: jugyo.org@gmail.com
-executables: 
+executables:
 - notify
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - LICENSE
 - README.md
 - Rakefile
@@ -36,42 +28,35 @@ files:
 - lib/notify.rb
 - lib/notify/growlnotify.rb
 - lib/notify/kdialog.rb
-- lib/notify/lib_notify.rb
+- lib/notify/libnotify.rb
 - lib/notify/notify-send.rb
 - lib/notify/ruby-growl.rb
 - lib/notify/ruby_gntp.rb
+- lib/notify/terminal-notifier.rb
+- notify.gemspec
 - sample.rb
-has_rdoc: true
 homepage: http://github.com/jugyo/notify
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A function to notify on cross platform.
 test_files: []
-

data/lib/notify/lib_notify.rb

@@ -1,9 +0,0 @@
-begin
-  require 'libnotify'
-  module Notify
-    def self.notify(title, message, option={})
-      Libnotify.show(:summary => title, :body => message, :icon_path => option[:icon])
-    end
-  end
-rescue LoadError
-end