notifyor 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a861fe6c36b3592bf74b9afe711ab8de22618cea
-  data.tar.gz: ecb693808505195952efaccc89b6a5f96037e2d3
+  metadata.gz: 3597469e33a2bf62c10f7203d00db28746972634
+  data.tar.gz: 46b3de74767946442236bb8f710269f8746df609
 SHA512:
-  metadata.gz: 16cf82af9309476da346619354c0c494d1716b10eecd01f260340903df8f7f178e7f3f933a0c56f601ae0359fa6b48c185594724d4e1c38c90c9ce2fbb420314
-  data.tar.gz: b9c667ad5bef798beacb48b6d403083bdb63bbd134266f2344969f9aaed79e579a0f16b636774719a0d47b2ee98786fbd0d8f12cfb8d8bbb930b30771360143b
+  metadata.gz: b686b1365d83e0e2560bfb2c177c3c794626640d6175ac4d5071da2d131347c6c3840b546d571b331646d87f7eb4f63f2c661063d371c33fd34651663f55b522
+  data.tar.gz: ce8de342bce81bea3ef428cbc7b0b335b5459a4b05327011c89d4be8f4e5286517cc9fc16e82816a31ef378f6e9ebde07eadfe65ac8e4f7f3f4d4b17d940e402

data/lib/notifyor/cli.rb

@@ -20,7 +20,7 @@ module Notifyor
         end
 
         opts.on('--ssh-host host', 'Provide the host address to your deployment/remote server') do |host|
-         ENV['ssh_host'] = host
+          ENV['ssh_host'] = host
         end
 
         opts.on('--ssh-port port', 'Provide the ssh port for the deployment/remote server') do |port|
@@ -38,6 +38,10 @@ module Notifyor
         opts.on('--redis-port redis_port', 'Provide the ssh user for the deployment/remote server') do |redis_port|
           ENV['ssh_redis_port'] = redis_port
         end
+
+        opts.on('--channel [channel]', 'Provide channel on which notifyor should listen.') do |channel|
+          ENV['channel'] = channel
+        end
       end.parse!
     end
 

data/lib/notifyor/growl/adapters/terminal_notifier.rb

@@ -5,7 +5,7 @@ module Notifyor
         extend self
 
         def create_growl(title, message)
-          %x(terminal-notifier -title '#{title}' -message '#{message}' -contentImage 'http://i.imgur.com/FrRacwt.png?1')
+          %x(terminal-notifier -title '#{title}' -message '#{message}')
         end
 
       end

data/lib/notifyor/plugin.rb

@@ -15,20 +15,23 @@ module Notifyor
 
       def configure_plugin(options = {})
         configuration = default_configuration.deep_merge(options)
-        append_callbacks(configuration)
+        publish_channels = configuration[:channels] || ['notifyor']
+        append_callbacks(configuration, publish_channels)
       end
 
-      def append_callbacks(configuration)
-        configuration[:only].each do |action|
-          case action
-            when :create
-              self.after_commit -> { ::Notifyor.configuration.redis_connection.publish "notifyor", {message: configuration[:messages][:create].call(self)}.to_json }, on: :create, if: -> { configuration[:only].include? :create }
-            when :update
-              self.after_commit -> { ::Notifyor.configuration.redis_connection.publish "notifyor", {message: configuration[:messages][:update].call(self)}.to_json }, on: :update, if: -> { configuration[:only].include? :update }
-            when :destroy
-              self.before_destroy -> { ::Notifyor.configuration.redis_connection.publish "notifyor", {message: configuration[:messages][:destroy].call(self)}.to_json }, if: -> { configuration[:only].include? :destroy }
-            else
-              #nop
+      def append_callbacks(configuration, publish_channels)
+        publish_channels.each do |channel|
+          configuration[:only].each do |action|
+            case action
+              when :create
+                self.after_commit -> { ::Notifyor.configuration.redis_connection.publish channel, configuration[:messages][:create].call(self) }, on: :create, if: -> { configuration[:only].include? :create }
+              when :update
+                self.after_commit -> { ::Notifyor.configuration.redis_connection.publish channel, configuration[:messages][:update].call(self) }, on: :update, if: -> { configuration[:only].include? :update }
+              when :destroy
+                self.before_destroy -> { ::Notifyor.configuration.redis_connection.publish channel, configuration[:messages][:destroy].call(self) }, if: -> { configuration[:only].include? :destroy }
+              else
+                #nop
+            end
           end
         end
       end
@@ -37,9 +40,9 @@ module Notifyor
         {
             only: [:create, :destroy, :update],
             messages: {
-                create: -> (model) { I18n.t('notifyor.model.create', model: model.class.model_name.human) },
-                update: -> (model) { I18n.t('notifyor.model.update', model: model.class.model_name.human) },
-                destroy: -> (model) { I18n.t('notifyor.model.destroy', model: model.class.model_name.human) }
+                create: -> (model) { I18n.t('notifyor.model.create') },
+                update: -> (model) { I18n.t('notifyor.model.update') },
+                destroy: -> (model) { I18n.t('notifyor.model.destroy') }
             }
         }
       end

data/lib/notifyor/remote/connection.rb

@@ -8,11 +8,12 @@ module Notifyor
     class Connection
 
       def initialize
-        @ssh_host = ENV['ssh_host']
-        @ssh_port = ENV['ssh_port']
+        @ssh_host = ENV['ssh_host'] || 'localhost'
+        @ssh_port = ENV['ssh_port'] || '22'
         @ssh_user = ENV['ssh_user']
-        @tunnel_port = ENV['ssh_tunnel_port']
-        @redis_port = ENV['ssh_redis_port']
+        @tunnel_port = ENV['ssh_tunnel_port'] || '2000'
+        @redis_port = ENV['ssh_redis_port'] || '6379'
+        @redis_channel = ENV['channel'] || 'notifyor'
         @ssh_gateway = nil
         @redis_tunnel_connection = nil
       end
@@ -30,10 +31,10 @@ module Notifyor
       end
 
       def subscribe_to_redis
-        @redis_tunnel_connection.subscribe('notifyor') do |on|
+        @redis_tunnel_connection.subscribe(@redis_channel) do |on|
           on.message do |channel, msg|
-            data = ::JSON.parse(msg)
-            growl_message(data['message'])
+            STDERR.write "INFO - Message received on channel: #{channel} \n"
+            growl_message(msg)
           end
         end
       end

data/lib/notifyor/version.rb

@@ -1,3 +1,3 @@
 module Notifyor
-  VERSION = "0.6.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notifyor
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Erwin Schens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis