notifyor 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d502004be90a818b8dc72451657eed6345835b4d
-  data.tar.gz: aba81061f68c9a5d400ea64171eb5f4e4cf21008
+  metadata.gz: 5a06c37ee1d957d65e8d85fc3f2a7fe548a17fc8
+  data.tar.gz: a23b2405dc4b7a2ff8f498aa567aa8f749c5d34a
 SHA512:
-  metadata.gz: 32c5233533ea70d62ddc3b10a5718f04f1a98e6f4f8385a534a3ca40df9376a53639eeda7992bb79b3ff530459c832c651276abba1e8b94794155fd1ed7f0e72
-  data.tar.gz: 7c9a06aa49e1c29d2eccf7a063c5c5073c1829100fe4e81b42f9faa0f4cf82912292ac4dfb38552901da72ed14468a1e45360c6c4996bd2978ee324a098b6d3e
+  metadata.gz: 281d8842cc4fbefca6577f019b095f9e6bf2f72990bf9d1e62de88e4069e645417b4852f09c88394543fb2227f138f288cee27a44598c69903453c907d0844ac
+  data.tar.gz: 0d11f8684dc3b83c4237eb79fb31c1fef8c5bece12b7ea3515088ed259f006f2755a59abbf57884b538a5afcf3fe274869ab1b076b68a4e4f70efb916d8d6d88

data/lib/notifyor/cli.rb

@@ -23,10 +23,6 @@ module Notifyor
           ::Notifyor.configuration.ssh_host = host
         end
 
-        opts.on('--ssh-password password', 'Provide the ssh password for the deployment/remote server') do |password|
-          ::Notifyor.configuration.ssh_password = password
-        end
-
         opts.on('--ssh-port port', 'Provide the ssh port for the deployment/remote server') do |port|
           ::Notifyor.configuration.ssh_port = port
         end
@@ -34,16 +30,25 @@ module Notifyor
         opts.on('--ssh-user user', 'Provide the ssh user for the deployment/remote server') do |user|
           ::Notifyor.configuration.ssh_user = user
         end
+
+        opts.on('--tunnel-port tunnel_port', 'Provide the ssh user for the deployment/remote server') do |tunnel_port|
+          ::Notifyor.configuration.tunnel_port = tunnel_port
+        end
+
+        opts.on('--redis-port redis_port', 'Provide the ssh user for the deployment/remote server') do |redis_port|
+          ::Notifyor.configuration.redis_port = redis_port
+        end
       end.parse!
     end
 
     def check_notifications
-      loop do
-        ::Notifyor.configuration.notifyor_models.each do |model|
-          connection = Notifyor::Remote::Connection.new
-          connection.growl_message(model.tableize)
-        end
-        sleep 5
+      connection = Notifyor::Remote::Connection.new
+      begin
+        connection.build_tunnel
+        connection.build_redis_tunnel_connection
+        connection.subscribe_to_redis
+      rescue => e
+        STDOUT.write "Could not establish SSH tunnel. Reason: #{e.message}"
       end
     end
 

data/lib/notifyor/configuration.rb

@@ -1,20 +1,20 @@
-require 'redis-objects'
+require 'redis'
 require 'connection_pool'
 module Notifyor
   class Configuration
     attr_accessor :redis_connection
-    attr_accessor :notifyor_models
     attr_accessor :ssh_host
     attr_accessor :ssh_user
-    attr_accessor :ssh_password
     attr_accessor :ssh_port
+    attr_accessor :tunnel_port
+    attr_accessor :redis_port
 
     def initialize
       @redis_connection = ::Redis.new
-      Redis::Objects.redis = ::ConnectionPool.new(size: 5, timeout: 5) { @redis_connection }
-      @notifyor_models = Set.new
-      @ssh_port = 22
+      @ssh_port = '22'
       @ssh_host = 'localhost'
+      @tunnel_port ='2000'
+      @redis_port = '6379'
     end
   end
 end

data/lib/notifyor/plugin.rb

@@ -1,4 +1,5 @@
 require 'active_support'
+require 'redis'
 
 module Notifyor
   module Plugin
@@ -8,14 +9,8 @@ module Notifyor
     end
 
     module ClassMethods
-      attr_accessor :notifyor_events
-      attr_accessor :notifyor_models
-
       def notifyor(options = {})
         configure_plugin(options)
-        self.extend ::Redis::Objects
-        ::Notifyor.configuration.notifyor_models.add(self.name)
-        self.notifyor_events = ::Redis::List.new("notifyor:#{self.name.tableize}")
       end
 
       def configure_plugin(options = {})
@@ -27,11 +22,11 @@ module Notifyor
         configuration[:only].each do |action|
           case action
             when :create
-              self.after_commit -> { self.class.notifyor_events << configuration[:messages][:create].call(self) }, on: :create, if: -> { configuration[:only].include? :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 -> {self.class.notifyor_events << configuration[:messages][:update].call(self) }, on: :update, if: -> { configuration[:only].include? :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 -> {self.class.notifyor_events << configuration[:messages][:destroy].call(self)}, if: -> { configuration[:only].include? :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
           end

data/lib/notifyor/remote/connection.rb

@@ -3,40 +3,44 @@ require 'notifyor'
 require 'notifyor/growl'
 require 'notifyor/util/formatter'
 require 'notifyor/errors/ssh_error'
+require 'net/ssh/gateway'
 module Notifyor
   module Remote
     class Connection
 
       def initialize
         @ssh_host = ::Notifyor.configuration.ssh_host
-        @ssh_password = ::Notifyor.configuration.ssh_password
         @ssh_port = ::Notifyor.configuration.ssh_port
         @ssh_user = ::Notifyor.configuration.ssh_user
+        @tunnel_port = ::Notifyor.configuration.tunnel_port
+        @redis_port = ::Notifyor.configuration.redis_port
+        @ssh_gateway = nil
+        @redis_tunnel_connection = nil
       end
 
-      def build_ssh_cmd
-        if @ssh_host.blank?
-          raise ::Notifyor::Errors::SSHError, "no ssh host provided. Provide a host with the --ssh-host option or set it in your configuration."
+      def build_tunnel
+        unless ['127.0.0.1', 'localhost'].include? @ssh_host
+          @ssh_gateway = Net::SSH::Gateway.new(@ssh_host, @ssh_user, port: @ssh_port)
+          @ssh_gateway.open('127.0.0.1', @redis_port, @tunnel_port)
         end
-        ssh_cmd = @ssh_user.present? ? "ssh #{@ssh_user}:#{@ssh_password}@#{@ssh_host}" : "ssh #{@ssh_host}"
-        ssh_cmd + " -p#{@ssh_port ? @ssh_port : 22}"
       end
 
-      def build_redis_cmd(model_name)
-        "redis-cli LPOP notifyor:#{model_name}"
+      def build_redis_tunnel_connection
+        redis_port = (['127.0.0.1', 'localhost'].include? @ssh_host) ? @redis_port : @tunnel_port
+        @redis_tunnel_connection = Redis.new(port: redis_port)
       end
 
-      def retrieve_value(model_name)
-        if ['127.0.0.1', 'localhost'].include? @ssh_host
-          %x(#{build_redis_cmd(model_name)})
-        else
-          %x(#{build_ssh_cmd} '#{build_redis_cmd(model_name)}')
+      def subscribe_to_redis
+        @redis_tunnel_connection.subscribe('notifyor') do |on|
+          on.message do |channel, msg|
+            data = JSON.parse(msg)
+            growl_message(data['message'])
+          end
         end
       end
 
-      def growl_message(model_name)
-        value = retrieve_value(model_name)
-        ::Notifyor::Growl.create_growl("Notifyor", value) unless Notifyor::Util::Formatter.squish!(value).empty?
+      def growl_message(message)
+        ::Notifyor::Growl.create_growl("Notifyor", message) unless Notifyor::Util::Formatter.squish!(message).empty?
       end
     end
   end

data/lib/notifyor/version.rb

@@ -1,3 +1,3 @@
 module Notifyor
-  VERSION = "0.4.3"
+  VERSION = "0.5.0"
 end

data/spec/test_app/log/development.log

@@ -193,3 +193,9 @@ Migrating to CreateUsers (20160404044940)
    (0.3ms)  begin transaction
   SQL (1.6ms)  UPDATE "users" SET "first_name" = ?, "updated_at" = ? WHERE "users"."id" = ?  [["first_name", "erwin"], ["updated_at", "2016-04-05 19:15:08.874646"], ["id", 5]]
    (2.3ms)  commit transaction
+   (0.3ms)  begin transaction
+  SQL (1.9ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-06 08:51:10.426367"], ["updated_at", "2016-04-06 08:51:10.426367"]]
+   (6.1ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (1.1ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-06 08:54:59.353124"], ["updated_at", "2016-04-06 08:54:59.353124"]]
+   (39.3ms)  commit transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifyor
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Erwin Schens
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh-gateway
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement