notifyor 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18ab8b7e2791a9d95c00dc7a739d23b2022135e7
-  data.tar.gz: f283a8c0f16dd22e39288fc49a54348a11b178f5
+  metadata.gz: c0b21b40fea27da456c9d5861f5186571379f7ef
+  data.tar.gz: 3e2eaa99002718566ad4b315c5f0455801eb0158
 SHA512:
-  metadata.gz: 9fef1442cd600794cd96ba16a85e1af9ff7a8b4d4bf1e4ad43d5237a556221d7a6b15cab33aa38b3a9218c9483caf9fc1ab086c45c28d4030786bbcb24e8beb5
-  data.tar.gz: 25f2afe9f262a6311472fbf419e303340cd6c82522307ca3a1583a2c239d04274f50e0837734feff4d1cd2fc8d4115eb5007b38db50561f463e6b9db7a67c1bc
+  metadata.gz: 2aab52e0d9708cd1abb8cc591212ee57cb172271586a7ded0370491b99b04b10b0f1c1167f5019224ec6cf10557603e33f2a4b788a58b0b4209a0bfef36b5022
+  data.tar.gz: 39f3a39d4ee3d0d94d7b8bfca06deb21fe5ae6fe5edd5accdf6c80c7a911bff6e45d682cf3e2faa6fdc0adccdc7b572ce685c7cc4470aa01f0d9c764ca87f3f0

data/lib/notifyor/cli.rb

@@ -20,7 +20,19 @@ module Notifyor
         end
 
         opts.on('--ssh-host host', 'Provide the host address to your deployment/remote server') do |host|
-          ENV['ssh_host'] = host
+          ::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
+
+        opts.on('--ssh-user user', 'Provide the ssh user for the deployment/remote server') do |user|
+          ::Notifyor.configuration.ssh_user = user
         end
       end.parse!
     end
@@ -28,7 +40,7 @@ module Notifyor
     def check_notifications
       loop do
         ::Notifyor.configuration.notifyor_models.each do |model|
-          connection = Notifyor::Remote::Connection.new(::Notifyor.configuration.ssh_host)
+          connection = Notifyor::Remote::Connection.new
           connection.growl_message(model.tableize)
         end
         sleep 5

data/lib/notifyor/configuration.rb

@@ -5,12 +5,15 @@ module Notifyor
     attr_accessor :redis_connection
     attr_accessor :notifyor_models
     attr_accessor :ssh_host
+    attr_accessor :ssh_user
+    attr_accessor :ssh_password
+    attr_accessor :ssh_port
 
     def initialize
       @redis_connection = ::Redis.new
       Redis::Objects.redis = ::ConnectionPool.new(size: 5, timeout: 5) { @redis_connection }
       @notifyor_models = Set.new
-      @ssh_host = 'localhost'
+      @ssh_port = 22
     end
   end
 end

data/lib/notifyor/errors/ssh_error.rb

@@ -0,0 +1,6 @@
+module Notifyor
+  module Errors
+    class SSHError < StandardError
+    end
+  end
+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}' -contentImage 'http://i.imgur.com/FrRacwt.png?1')
         end
 
       end

data/lib/notifyor/plugin.rb

@@ -19,7 +19,7 @@ module Notifyor
       end
 
       def append_callbacks
-        self.send(:before_save, -> { self.class.events << I18n.t('notifyor.model.create', model: self.model_name.human) })
+        self.send(:before_create, -> { self.class.events << I18n.t('notifyor.model.create', model: self.model_name.human) })
         self.send(:before_destroy, -> { self.class.events << I18n.t('notifyor.model.delete', model: self.model_name.human) })
       end
 

data/lib/notifyor/remote/connection.rb

@@ -1,17 +1,33 @@
 require 'redis-objects'
+require 'notifyor'
 require 'notifyor/growl'
 require 'notifyor/util/formatter'
+require 'notifyor/errors/ssh_error'
 module Notifyor
   module Remote
     class Connection
-      attr_accessor :ssh_host
 
-      def initialize(ssh_host)
-        @ssh_host = ssh_host
+      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
+      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."
+        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}"
       end
 
       def retrieve_value(model_name)
-        %x(ssh #{@ssh_host} 'redis-cli LPOP notifyor:#{model_name}')
+        %x(#{build_ssh_cmd} '#{build_redis_cmd(model_name)}')
       end
 
       def growl_message(model_name)

data/lib/notifyor/version.rb

@@ -1,3 +1,3 @@
 module Notifyor
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/test_app/config/initializers/notifyor.rb

@@ -1,3 +1,4 @@
 Notifyor.configure do |config|
   config.ssh_host = 'rossbruch'
+  config.ssh_port = 10110
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifyor
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Erwin Schens
@@ -110,6 +110,7 @@ files:
 - lib/notifyor.rb
 - lib/notifyor/cli.rb
 - lib/notifyor/configuration.rb
+- lib/notifyor/errors/ssh_error.rb
 - lib/notifyor/growl.rb
 - lib/notifyor/growl/adapters/terminal_notifier.rb
 - lib/notifyor/plugin.rb