uniform_notifier 1.0.1 → 1.0.2

data/.gitignore

@@ -2,3 +2,4 @@ pkg/*
 *.gem
 .bundle
 .rvmrc
+bin/

data/Gemfile.lock

@@ -1,28 +1,30 @@
 PATH
   remote: .
   specs:
-    uniform_notifier (1.0.1)
+    uniform_notifier (1.0.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.0)
-    rspec-expectations (2.3.0)
+    diff-lcs (1.1.3)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec-mocks (2.8.0)
     ruby-growl (3.0)
+    ruby_gntp (0.3.4)
     xmpp4r (0.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  rspec (= 2.3.0)
+  rspec
   ruby-growl (= 3.0)
+  ruby_gntp (= 0.3.4)
   uniform_notifier!
   xmpp4r (= 0.5)

data/README.md

@@ -10,16 +10,23 @@ Install
 
     gem install uniform_notifier
 
-  if you want to notify by growl or xmpp, you should install them first
+if you want to notify by growl < v1.3, you should install ruby-growl first
 
     gem install ruby-growl
+
+if you want to notify by growl v1.3+, you should install ruby_gntp first
+
+    gem install ruby_gntp
+
+if you want to notify by xmpp, you should install xmpp4r first
+
     gem install xmpp4r
 
 ### add it into Gemfile (Bundler)
 
     gem "uniform_notifier"
 
-  you should add ruby-growl and xmpp4r gem if you want.
+  you should add ruby-growl, ruby_gntp, or xmpp4r gem if you want.
 
 Usage
 -----
@@ -76,7 +83,8 @@ Growl Support
 
 To get Growl support up-and-running, follow the steps below:
 
-* Install the ruby-growl gem: <code>gem install ruby-growl</code>
+* For Growl < v1.3, install the ruby-growl gem: <code>gem install ruby-growl</code>
+* For Growl v1.3+, install the ruby_gntp gem: <code>gem install ruby_gntp</code>
 * Open the Growl preference pane in Systems Preferences
 * Click the "Network" tab
 * Make sure both "Listen for incoming notifications" and "Allow remote application registration" are checked. *Note*: If you set a password, you will need to set <code>UniformNotifier.growl_password = { :password => 'growl password' }</code> in the config file.

data/lib/uniform_notifier/growl.rb

@@ -12,28 +12,53 @@ module UniformNotifier
     end
 
     def self.setup_connection( growl )
+      setup_connection_growl(growl)
+    rescue LoadError
+      begin
+        setup_connection_gntp(growl)
+      rescue LoadError
+        @growl = nil
+        raise NotificationError.new( 'You must install the ruby-growl or the ruby_gntp gem to use Growl notification: `gem install ruby-growl` or `gem install ruby_gntp`' )
+      end
+    end
+
+    def self.setup_connection_growl( growl )
       return unless growl
       require 'ruby-growl'
       @password = growl.instance_of?(Hash) ? growl[:password] : nil
-      @growl = connect
+      @growl = ::Growl.new('localhost',
+                           'uniform_notifier',
+                           [ 'uniform_notifier' ],
+                           nil,
+                           @password)
 
       notify 'Uniform Notifier Growl has been turned on'
-    rescue LoadError
-      @growl = nil
-      raise NotificationError.new( 'You must install the ruby-growl gem to use Growl notification: `gem install ruby-growl`' )
     end
 
-    private
-      def self.connect
-        ::Growl.new 'localhost',
-                    'uniform_notifier',
-                    [ 'uniform_notifier' ],
-                    nil,
-                    @password
-      end
+    def self.setup_connection_gntp( growl )
+      return unless growl
+      require 'ruby_gntp'
+      @password = growl.instance_of?(Hash) ? growl[:password] : nil
+      @growl = GNTP.new('uniform_notifier', 'localhost', @password, 23053)
+      @growl.register({:notifications => [{
+                                            :name     => 'uniform_notifier',
+                                            :enabled  => true,
+                                          }]})
+
+      notify 'Uniform Notifier Growl has been turned on (using GNTP)'
+    end
 
+    private
       def self.notify( message )
-        @growl.notify( 'uniform_notifier', 'Uniform Notifier', message )
+        if defined?(::Growl) && @growl.is_a?(::Growl)
+          @growl.notify( 'uniform_notifier', 'Uniform Notifier', message )
+        elsif defined?(::GNTP) && @growl.is_a?(::GNTP)
+          @growl.notify({
+                          :name  => 'uniform_notifier',
+                          :title => 'Uniform Notifier',
+                          :text  => message
+                        })
+        end
       end
+    end
   end
-end

data/lib/uniform_notifier/version.rb

@@ -1,3 +1,3 @@
 module UniformNotifier
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/uniform_notifier/xmpp.rb

@@ -18,12 +18,14 @@ module UniformNotifier
 
       require 'xmpp4r'
 
+      @xmpp = xmpp_information
       @receiver = xmpp_information[:receiver]
       @password = xmpp_information[:password]
       @account  = xmpp_information[:account]
       @show_online_status = xmpp_information[:show_online_status]
+      @stay_connected = xmpp_information[:stay_connected].nil? ? true : xmpp_information[:stay_connected]
 
-      connect
+      connect if @stay_connected
     rescue LoadError
       @xmpp = nil
       raise NotificationError.new( 'You must install the xmpp4r gem to use XMPP notification: `gem install xmpp4r`' )
@@ -39,6 +41,7 @@ module UniformNotifier
       end
 
       def self.notify( message )
+        connect unless @stay_connected
         message = Jabber::Message.new( @receiver, message ).
                                   set_type( :normal ).
                                   set_subject( 'Uniform Notifier' )

data/spec/uniform_notifier/growl_spec.rb

@@ -7,7 +7,7 @@ describe UniformNotifier::Growl do
   end
 
   it "should notify growl without password" do
-    growl = double('growl')
+    growl = double('growl', :is_a? => true)
     Growl.should_receive(:new).with('localhost', 'uniform_notifier', ['uniform_notifier'], nil, nil).and_return(growl)
     growl.should_receive(:notify).with('uniform_notifier', 'Uniform Notifier', 'Uniform Notifier Growl has been turned on').ordered
     growl.should_receive(:notify).with('uniform_notifier', 'Uniform Notifier', 'notify growl without password').ordered
@@ -17,7 +17,7 @@ describe UniformNotifier::Growl do
   end
 
   it "should notify growl with password" do
-    growl = double('growl')
+    growl = double('growl', :is_a? => true)
     Growl.should_receive(:new).with('localhost', 'uniform_notifier', ['uniform_notifier'], nil, '123456').and_return(growl)
     growl.should_receive(:notify).with('uniform_notifier', 'Uniform Notifier', 'Uniform Notifier Growl has been turned on').ordered
     growl.should_receive(:notify).with('uniform_notifier', 'Uniform Notifier', 'notify growl with password').ordered

data/uniform_notifier.gemspec

@@ -15,8 +15,9 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "uniform_notifier"
 
   s.add_development_dependency "ruby-growl", "3.0"
+  s.add_development_dependency "ruby_gntp", "0.3.4"
   s.add_development_dependency "xmpp4r", "0.5"
-  s.add_development_dependency "rspec", "2.3.0"
+  s.add_development_dependency "rspec"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,79 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: uniform_notifier
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
+version: !ruby/object:Gem::Version
+  version: 1.0.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-15 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ruby-growl
+  requirement: &70109712498760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70109712498760
+- !ruby/object:Gem::Dependency
+  name: ruby_gntp
+  requirement: &70109712496600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.3.4
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: xmpp4r
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70109712496600
+- !ruby/object:Gem::Dependency
+  name: xmpp4r
+  requirement: &70109712495040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 5
-        version: "0.5"
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70109712495040
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70109712493660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
-        version: 2.3.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: uniform notifier for rails logger, customized logger, javascript alert, javascript console, growl and xmpp
-email: 
+  prerelease: false
+  version_requirements: *70109712493660
+description: uniform notifier for rails logger, customized logger, javascript alert,
+  javascript console, growl and xmpp
+email:
 - flyerhzm@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -97,41 +86,32 @@ files:
 - spec/uniform_notifier/rails_logger_spec.rb
 - spec/uniform_notifier/xmpp_spec.rb
 - uniform_notifier.gemspec
-has_rdoc: true
 homepage: http://rubygems.org/gems/uniform_notifier
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: uniform_notifier
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: uniform notifier for rails logger, customized logger, javascript alert, javascript console, growl and xmpp
-test_files: 
+summary: uniform notifier for rails logger, customized logger, javascript alert, javascript
+  console, growl and xmpp
+test_files:
 - spec/spec_helper.rb
 - spec/uniform_notifier/customized_logger_spec.rb
 - spec/uniform_notifier/growl_spec.rb