capistrano_sentinel 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cc01aa8dc3ee91a8dc14215e8feef1287da0c87
-  data.tar.gz: 51d882889f47d5996e5be5c8c1581bd902f08037
+  metadata.gz: 8b6b182133b14542484ea0826866219fe15b3f4b
+  data.tar.gz: e8a7a2543dbf262fc31a313793e601dc190ec95e
 SHA512:
-  metadata.gz: e1ec7fe7b1dcc97bdf12447464e3f211d0870da529a5d65fef1dcc0c26f0481fbdadad75328930f40f9e22db9f55f7904a71cf1bf59ddc95fb4dcab5de2c1db5
-  data.tar.gz: c853ec02a1571d484ab18098e6dfafad1ab29c0723b5a8dbeba7644d624c03efdf081bcaaad13a2b552fcc42ed5307f5cdc3df26f26fe1a8454209f61b630a58
+  metadata.gz: 790ea96121af5f8ddda552c560b762da0774239a234da419b3bd2a1a937d729e68e6d3265fb803d429e28ed436d404ae49c501a402cb06c93903717208bf345a
+  data.tar.gz: 3a5041ea520987f0d7fcdfaaa55c08f5d598b33bba2bcc23e98df9c0b6b1bd4491cb8448a043496e9623741c5be08bd13137f310c8f82e2f365cb5e63559e72f

data/README.md

@@ -3,6 +3,9 @@ capistrano_sentinel
 
 [![Gem Version](https://badge.fury.io/rb/capistrano_sentinel.svg)](http://badge.fury.io/rb/capistrano_sentinel) [![Gem Downloads](https://ruby-gem-downloads-badge.herokuapp.com/capistrano_sentinel?type=total&style=dynamic)](https://github.com/bogdanRada/capistrano_sentinel) [![Analytics](https://ga-beacon.appspot.com/UA-72570203-1/bogdanRada/capistrano_sentinel)](https://github.com/bogdanRada/capistrano_sentinel)
 
+**IMPORTANT!!!**  The whole reason for this gem was for using [capistrano_multiconfig_parallel](https://github.com/bogdanRada/capistrano_multiconfig_parallel) that allows you to run tasks in parallel for multiple aplications. This gem is practically the producer that produces the websocket events when a capistrano task is running and the other gem is the consumer that consumes the messages and acts depending on configuration and displays the progress on screen
+
+
 Overview
 --------
 

data/lib/capistrano_sentinel/classes/configuration.rb

@@ -1,6 +1,18 @@
 module CapistranoSentinel
   class Configuration
-    SETTINGS = [:host, :port, :path, :secure, :auto_pong, :read_buffer_size,:reconnect, :retry_time, :wait_execution, :hook_stdin_and_stdout]
+
+    SETTINGS = [
+      :secure,
+      :host,
+      :port,
+      :path,
+      :auto_pong,
+      :read_buffer_size,
+      :reconnect,
+      :retry_time,
+      :wait_execution,
+      :hook_stdin_and_stdout
+    ]
 
     SETTINGS.each do |setting|
       attr_reader setting
@@ -20,14 +32,5 @@ module CapistranoSentinel
       @hook_stdin_and_stdout = true
     end
 
-    def update(settings_hash)
-      settings_hash.each do |setting, value|
-        unless SETTINGS.include? setting.to_sym
-          raise ArgumentError, "invalid setting: #{setting}"
-        end
-
-        self.public_send "#{setting}=", value
-      end
-    end
   end
 end

data/lib/capistrano_sentinel/classes/request_hooks.rb

@@ -10,7 +10,18 @@ module CapistranoSentinel
     end
 
     def self.socket_client
-      @@socket_client ||= CapistranoSentinel::WebsocketClient.new(actor: nil, enable_debug: ENV.fetch('debug_websocket', false), channel: "#{CapistranoSentinel::RequestHooks::SUBSCRIPTION_PREFIX}#{job_id}", log_file_path: ENV.fetch('websocket_log_file_path', nil))
+      @@socket_client ||= CapistranoSentinel::WebsocketClient.new(
+      actor:            nil,
+      channel:          "#{CapistranoSentinel::RequestHooks::SUBSCRIPTION_PREFIX}#{job_id}",
+      auto_pong:        ENV.fetch('WS_AUTO_PONG', nil),
+      read_buffer_size: ENV.fetch('WS_READ_BUFFER_SIZE', nil),
+      reconnect:        ENV.fetch("WS_RECONNECT", nil),
+      retry_time:       ENV.fetch("WS_RETRY_TIME", nil),
+      secure:           ENV.fetch("WS_SECURE", nil),
+      host:             ENV.fetch("WS_HOST", nil),
+      port:             ENV.fetch("WS_PORT", nil),
+      path:             ENV.fetch("WS_PATH", nil)
+      )
     end
 
     ENV_KEY_JOB_ID = 'multi_cap_job_id'
@@ -29,7 +40,9 @@ module CapistranoSentinel
         subscribed_already = defined?(@@socket_client)
         actor_start_working(action: 'invoke', subscribed: subscribed_already)
         if CapistranoSentinel.config.wait_execution
-          actor.wait_execution until actor.task_approved
+          actor.wait_execution_of_task until actor.task_approved
+        elsif subscribed_already.blank?
+          actor.wait_execution_of_task until actor.successfull_subscription
         end
         actor_execute_block(&block)
       else

data/lib/capistrano_sentinel/classes/request_worker.rb

@@ -6,17 +6,17 @@ module CapistranoSentinel
     include CapistranoSentinel::ApplicationHelper
 
     attr_reader :client, :job_id, :action, :task,
-    :task_approved, :stdin_result, :executor
+    :task_approved, :stdin_result, :executor, :successfull_subscription
 
 
     def work(options = {})
       @options = options.stringify_keys
       default_settings
       socket_client.actor = self
-      publish_to_worker(task_data) if CapistranoSentinel.config.wait_execution && options['subscribed'].present?
+      publish_to_worker(task_data) if options['subscribed'].present?
     end
 
-    def wait_execution(name = task_name, time = 0.1)
+    def wait_execution_of_task(name = task_name, time = 0.1)
       #    info "Before waiting #{name}"
       wait_for(name, time)
       #  info "After waiting #{name}"
@@ -38,6 +38,7 @@ module CapistranoSentinel
       @task_approved = false
       @action = @options['action'].present? ? @options['action'] : 'invoke'
       @task = @options['task']
+      @successfull_subscription = false
     end
 
     def task_name
@@ -80,12 +81,12 @@ module CapistranoSentinel
     def publish_subscription_successfull(message)
       return unless message['client_action'] == 'successful_subscription'
       log_to_file("Rake worker #{@job_id} received after publish_subscription_successfull: #{message}")
-      @successfull_subscription = true
       publish_to_worker(task_data)
+      @successfull_subscription = true
     end
 
     def wait_for_stdin_input
-      wait_execution until @stdin_result.present?
+      wait_execution_of_task until @stdin_result.present?
       output = @stdin_result.clone
       @stdin_result = nil
       output

data/lib/capistrano_sentinel/classes/websocket_client.rb

@@ -84,6 +84,7 @@ module CapistranoSentinel
         message = parse_json(message)
         log_to_file("#{@actor.class} websocket client received JSON  #{message}")
         if @actor.present? && @actor.respond_to?(:async)
+          log_to_file("#{@actor.class} works async on message #{message.inspect}")
           @actor.async.on_message(message)
         else
           @actor.on_message(message)
@@ -104,7 +105,7 @@ module CapistranoSentinel
     #
     # @api public
     def subscribe(channel, data = {})
-      log_to_file("#{self.class} tries to subscribe to channel  #{channel}")
+      log_to_file("#{self.class} tries to subscribe to channel  #{channel} with #{data.inspect}")
       send_action('subscribe', channel, data)
     end
 
@@ -188,7 +189,6 @@ module CapistranoSentinel
     #+type+:: :text or :binary, defaults to :text
     def send_data(data, type = :text)
       pid = Thread.new do
-        log_to_file("#{@actor.class} calls send: #{data}")
         do_send(data, type)
       end
     end

data/lib/capistrano_sentinel/version.rb

@@ -17,7 +17,7 @@ module CapistranoSentinel
     # minor release version
     MINOR = 0
     # tiny release version
-    TINY = 15
+    TINY = 16
     # 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.15
+  version: 0.0.16
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket