capistrano_sentinel 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a85bc5bd4389a2201db6f894977fac6ba3e68916
-  data.tar.gz: e0652f5af4dc2f02d429ac92ff1b02f7972405cd
+  metadata.gz: 7281ef91ca49872bf389712c641d09a18d4b9ef5
+  data.tar.gz: ad67df5a0f82502974869c386e95f99b77e935d1
 SHA512:
-  metadata.gz: e95267d93ce0d3994d2582215c2e3b51e6950be605eca8c0864e68a9e0a0b4fe4e57f02743aedb125747e1a1519903e8354ec4754a2e582e47d887f1464f745a
-  data.tar.gz: b35e2427ae68a052335967816f38d6dcc82fa0eceb4207fc846a6590c36f662c5f11bebdffb58e4bcd83d421f763c5291556b96d8d82425e900f9d1776935099
+  metadata.gz: 0c8fc536eb801158032d5351a38e509eebb0f2a4c6cf50d222ad513479e0e159f412ef4a987b66082ad9c38b676dfb735e203607d533aec6a54efa1e096a5e4e
+  data.tar.gz: 565e21233c9bac28bf32ef25d216b529cf019a21d1b44c057d47abd882c7d47f83873238b503cf8d88f5dae87ae2a24117b5e71a0a0e38de332e0560ede50ce7

data/lib/capistrano_sentinel/all.rb

@@ -21,10 +21,13 @@ require_relative './classes/gem_finder'
   Gem.find_files("#{CapistranoSentinel::GemFinder.get_current_gem_name}/#{folder_name}/**/*.rb").each { |path| require path }
 end
 
-if !CapistranoSentinel::GemFinder.value_blank?(ENV[CapistranoSentinel::RequestHooks::ENV_KEY_JOB_ID]) && CapistranoSentinel::GemFinder.fetch_gem_version('capistrano')
-  if CapistranoSentinel::GemFinder.capistrano_version_2?
-    require_relative './patches/capistrano2'
-  else
-    require_relative './patches/rake'
+if !CapistranoSentinel::GemFinder.value_blank?(ENV[CapistranoSentinel::RequestHooks::ENV_KEY_JOB_ID])
+
+  if CapistranoSentinel::GemFinder.fetch_gem_version('capistrano')
+    if CapistranoSentinel::GemFinder.capistrano_version_2?
+      require_relative './patches/capistrano2'
+    else
+      require_relative './patches/rake'
+    end
   end
 end

data/lib/capistrano_sentinel/classes/request_worker.rb

@@ -1,11 +1,9 @@
-require_relative '../helpers/actor'
 require_relative './websocket_client'
 require_relative '../helpers/application_helper'
 module CapistranoSentinel
   # class that handles the rake task and waits for approval from the celluloid worker
   class RequestWorker
     include CapistranoSentinel::ApplicationHelper
-    #include CapistranoSentinel::Actor
 
     attr_reader :client, :job_id, :action, :task,
     :task_approved, :stdin_result, :executor
@@ -103,10 +101,10 @@ module CapistranoSentinel
     def task_approval(message)
       return if !message_is_about_a_task?(message)
       log_to_file("RakeWorker #{@job_id} #{task_name} task_approval : #{message.inspect}")
-      if @job_id == message['job_id'] && message['task'].to_s == task_name.to_s && message['approved'] == 'yes'
+      if @job_id.to_s == message['job_id'].to_s && message['task'] && message['approved'] == 'yes'
         @task_approved = true
       else
-        show_warning "unknown task_approval #{message.inspect} #{task_data}"
+        show_warning "unknown task_approval #{message} #{task_data}"
       end
     end
 

data/lib/capistrano_sentinel/classes/websocket_client.rb

@@ -1,9 +1,7 @@
 require_relative './websocket/errors'
-require_relative '../helpers/actor'
 require_relative '../helpers/application_helper'
 module CapistranoSentinel
   class WebsocketClient
-    include CapistranoSentinel::AsyncActor
     include CapistranoSentinel::ApplicationHelper
 
     HOST = '0.0.0.0'
@@ -46,34 +44,59 @@ module CapistranoSentinel
       @channel ||= @options.fetch(:channel, nil)
       raise "#{self}: Please provide an actor in the options list!!!" if @actor.blank?
 
+
       @auto_pong   = @options.fetch(:auto_pong, true) || true
       @closed      = false
       @opened      = false
 
       @on_open    = lambda {
-        log_to_file("#{@actor.class} websocket connection opened")
+        log_to_file("native websocket client  websocket connection opened")
         subscribe(@channel) if @channel.present?
       }
 
       @on_close   = lambda { |message|
-        log_to_file("#{@actor.class} dispatching on close  #{message}")
-        @actor.on_close(message)
+        log_to_file("native websocket client received on_close  #{message.inspect}")
+        if @actor.respond_to?(:on_close)
+          if @actor.respond_to?(:async)
+            @actor.async.on_close(message)
+          else
+            @actor.on_close(message)
+          end
+        end
       }
 
       @on_ping    = lambda { |message|
-        @actor.on_ping(message) if @actor.respond_to?(:on_ping)
+        log_to_file("native websocket client received PING  #{message.inspect}")
+        if @actor.respond_to?(:on_ping)
+          if @actor.respond_to?(:async)
+            @actor.async.on_ping(message)
+          else
+            @actor.on_ping(message)
+          end
+        end
       }
 
       @on_error   = lambda { |error|
-        @actor.on_error(message) if @actor.respond_to?(:on_error)
+        log_to_file("native websocket client received ERROR  #{error.inspect} #{error.backtrace}")
+        if @actor.respond_to?(:on_error)
+          if @actor.respond_to?(:async)
+            @actor.async.on_error(error)
+          else
+            @actor.on_error(error)
+          end
+        end
       }
 
       @on_message = lambda { |message|
         message = parse_json(message)
-        log_to_file("#{@actor.class} received JSON  #{message}")
-        @actor.on_message(message)
+        log_to_file("native websocket client received JSON  #{message}")
+        if @actor.respond_to?(:async)
+          @actor.async.on_message(message)
+        else
+          @actor.on_message(message)
+        end
       }
-        connect
+      connect
     end
 
     def is_windows?

data/lib/capistrano_sentinel/version.rb

@@ -17,7 +17,7 @@ module CapistranoSentinel
     # minor release version
     MINOR = 0
     # tiny release version
-    TINY = 2
+    TINY = 3
     # prelease version ( set this only if it is a prelease)
     PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_sentinel
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket
@@ -45,7 +45,6 @@ files:
 - lib/capistrano_sentinel/classes/request_worker.rb
 - lib/capistrano_sentinel/classes/websocket/errors.rb
 - lib/capistrano_sentinel/classes/websocket_client.rb
-- lib/capistrano_sentinel/helpers/actor.rb
 - lib/capistrano_sentinel/helpers/application_helper.rb
 - lib/capistrano_sentinel/helpers/logging.rb
 - lib/capistrano_sentinel/initializers/active_support/blank.rb

data/lib/capistrano_sentinel/helpers/actor.rb

@@ -1,52 +0,0 @@
-require_relative './application_helper'
-module CapistranoSentinel
-  module AsyncActor
-    include CapistranoSentinel::ApplicationHelper
-
-    Context = Struct.new(:method, :args, :block)
-
-    Async = Struct.new(:instance, :mailbox) do
-      extend Forwardable
-      def_delegator :instance, :respond_to?
-
-      private :instance
-      private :mailbox
-
-      def initialize(instance, mailbox)
-        super(instance, mailbox)
-        run!
-      end
-
-      def method_missing(method, *args, &block)
-        mailbox << CapistranoSentinel::AsyncActor::Context.new(method, args, block)
-        nil
-      end
-    end
-
-      private
-
-      def run!
-        Thread.new do
-          loop do
-            break if mailbox.empty?
-            begin
-              mailbox.synchronize do
-                ctx = mailbox.pop
-                instance.public_send(ctx.method, *ctx.args, &ctx.block)
-              end
-            rescue => e
-              log_to_file("crashed with #{e.inspect} #{e.backtrace}")
-            end
-          end
-        end
-      end
-
-      def async_queue
-        @async_queue ||= Queue.new.extend(MonitorMixin)
-      end
-
-      def async
-        @async ||= CapistranoSentinel::AsyncActor::Async.new(self, async_queue)
-      end
-    end
-  end