capistrano_multiconfig_parallel 0.12.3 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1134ef03c3259ddc2f47c87618a95352e1150ba7
-  data.tar.gz: febbbf3bc691468932a2f06fe6fed0ae101f059a
+  metadata.gz: da73ed1bc09e08ea7e93648b4606bdcbbbdce792
+  data.tar.gz: 79980b245e0ca22f6c59694d1bd1c8a6f8f400f5
 SHA512:
-  metadata.gz: 7cada320b380bc82737932fe73429542745a8d0dc4539355963a0fa3cf4ac64929b7abf0b93dd124438f4b77198ff46534db850065b6d21aaced499ec483b6f6
-  data.tar.gz: 052bce86fe81fe36fa5a3f7ca7349dc293fda8b12b8d8df9b5a89db7979568d7ae9f4a19a8fa525d4f54aaa035db1acfc08a98bf1d4667b580c10f1a86bfc8e6
+  metadata.gz: f85f820e562cc1947897a4a90abe1c8843109e7f4d9148ad84009ff55f82bf4e7c7527858280bcb8d644c732d2a7e56b4486f81a84ed4ef548799fdc88dfe397
+  data.tar.gz: 66dcc2e8e2ecc62ef85a663ca880e92129579c7189a8b88f6ca97d17b1979457cfc84d082a87d213eea633c673554dc6ced515c01b1f3eb710377532fba367e7

data/README.md

@@ -2,7 +2,7 @@ capistrano_multiconfig_parallel
 ==================
 
 [![Gem Version](https://badge.fury.io/rb/capistrano_multiconfig_parallel.svg)](http://badge.fury.io/rb/capistrano_multiconfig_parallel)
-[![Repo Size](https://reposs.herokuapp.com/?path=bogdanRada/capistrano_multiconfig_parallel)](https://github.com/bogdanRada/capistrano_multiconfig_parallel)
+[![Repo Size](https://ruby-gem-downloads-badge.herokuapp.com/repo_size/bogdanRada/capistrano_multiconfig_parallel)](https://github.com/bogdanRada/capistrano_multiconfig_parallel)
 [![Gem Downloads](https://ruby-gem-downloads-badge.herokuapp.com/capistrano_multiconfig_parallel?type=total&style=dynamic)](https://github.com/bogdanRada/capistrano_multiconfig_parallel)
 [![Maintenance Status](http://stillmaintained.com/bogdanRada/capistrano_multiconfig_parallel.png)](https://github.com/bogdanRada/capistrano_multiconfig_parallel)
 

data/lib/capistrano_multiconfig_parallel/all.rb

@@ -13,11 +13,11 @@ require 'right_popen'
 require 'colorize'
 require 'logger'
 require 'terminal-table'
-require 'colorize'
+
 require 'celluloid_pubsub'
 require 'capistrano/all'
 require 'fileutils'
-require 'logger'
+
 require 'pp'
 require 'devnull'
 require 'inquirer'

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -99,7 +99,7 @@ module CapistranoMulticonfigParallel
       root = Pathname.new(FileUtils.pwd)
       root = root.parent unless root.directory?
       root = root.parent until root.children.find { |f| f.file? && f.basename.to_s.downcase == 'capfile' }.present? || root.root?
-      raise "Can't detect Rails application root" if root.root?
+      raise "Can't detect Capfile in the  application root" if root.root?
       root
     end
   end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -1,5 +1,6 @@
 require_relative './celluloid_worker'
 require_relative './terminal_table'
+require_relative './web_server'
 module CapistranoMulticonfigParallel
   # rubocop:disable ClassLength
   class CelluloidManager
@@ -33,11 +34,11 @@ module CapistranoMulticonfigParallel
       @job_to_worker = {}
       @worker_to_job = {}
       @job_to_condition = {}
-
       @worker_supervisor.supervise_as(:terminal_server, CapistranoMulticonfigParallel::TerminalTable, Actor.current, @job_manager)
-      @worker_supervisor.supervise_as(:web_server, CelluloidPubsub::WebServer, self.class.websocket_config.merge(enable_debug: self.class.debug_websocket?))
+      @worker_supervisor.supervise_as(:web_server, CapistranoMulticonfigParallel::WebServer, self.class.websocket_config)
     end
 
+
     def self.debug_enabled?
       debug_enabled
     end
@@ -49,16 +50,22 @@ module CapistranoMulticonfigParallel
     def self.websocket_config
       config = CapistranoMulticonfigParallel.configuration[:websocket_server]
       config.present? && config.is_a?(Hash) ? config.stringify_keys : {}
+      config['enable_debug'] =  config.fetch('enable_debug', '').to_s == 'true'
+      config
     end
 
+
+
+
     def generate_job_id(job)
-      primary_key = @jobs.size + 1
+      primary_key = SecureRandom.random_number(500)
       job['id'] = primary_key
       @jobs[primary_key] = job
       @jobs[primary_key]
       job['id']
     end
 
+
     # call to send an actor
     # a job
     def delegate(job)
@@ -108,7 +115,7 @@ module CapistranoMulticonfigParallel
       condition = @workers_terminated.wait
       until condition.present?
         sleep(0.1) # keep current thread alive
-    end
+      end
       debug("all jobs have completed #{condition}") if self.class.debug_enabled?
       Celluloid::Actor[:terminal_server].async.notify_time_change(CapistranoMulticonfigParallel::TerminalTable::TOPIC, type: 'output') if Celluloid::Actor[:terminal_server].alive?
     end
@@ -123,7 +130,7 @@ module CapistranoMulticonfigParallel
 
     def syncronized_confirmation?
       (syncronization_required? && !@job_manager.executes_deploy_stages?) ||
-        (syncronization_required? && @job_manager.executes_deploy_stages? && !@job_manager.can_tag_staging? && @job_manager.confirmation_applies_to_all_workers?)
+      (syncronization_required? && @job_manager.executes_deploy_stages? && !@job_manager.can_tag_staging? && @job_manager.confirmation_applies_to_all_workers?)
     end
 
     def apply_confirmation_for_worker(worker)
@@ -196,10 +203,10 @@ module CapistranoMulticonfigParallel
       @jobs.pmap do |job_id, job|
         worker = get_worker_for_job(job_id)
         worker.publish_rake_event('approved' => 'yes',
-                                  'action' => 'invoke',
-                                  'job_id' => job['id'],
-                                  'task' => task
-                                 )
+        'action' => 'invoke',
+        'job_id' => job['id'],
+        'task' => task
+        )
       end
     end
 
@@ -218,7 +225,7 @@ module CapistranoMulticonfigParallel
 
     def can_tag_staging?
       @job_manager.can_tag_staging? &&
-        @jobs.find { |_job_id, job| job['env'] == 'production' }.blank?
+      @jobs.find { |_job_id, job| job['env'] == 'production' }.blank?
     end
 
     def dispatch_new_job(job)

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -20,15 +20,17 @@ module CapistranoMulticonfigParallel
 
     def notify_time_change(topic, message)
       return unless topic == CapistranoMulticonfigParallel::TerminalTable::TOPIC
-      default_headings = ['Job ID', 'App/Stage', 'Action', 'ENV Variables', 'Current Task']
+      default_headings = ['Job ID', 'Job UUID' 'App/Stage', 'Action', 'ENV Variables', 'Current Task']
       # if CapistranoMulticonfigParallel.show_task_progress
       #   default_headings << 'Total'
       #   default_headings << 'Progress'
       # end
       table = Terminal::Table.new(title: 'Deployment Status Table', headings: default_headings)
       if @manager.jobs.present? && message_valid?(message)
+        count = 0
         @manager.jobs.each do |job_id, _job|
-          add_job_to_table(table, job_id)
+          count += 1
+          add_job_to_table(table, job_id, count)
         end
       end
       show_terminal_screen(table)
@@ -100,11 +102,12 @@ module CapistranoMulticonfigParallel
       }
     end
 
-    def add_job_to_table(table, job_id)
+    def add_job_to_table(table, job_id, count)
       worker = @manager.get_worker_for_job(job_id)
       details = get_worker_details(job_id, worker)
 
-      row = [{ value: job_id.to_s },
+      row = [{ value: count.to_s },
+              { value: job_id.to_s },
              { value: details['full_stage'] },
              { value: details['action_name'] },
              { value: details['env_options'] },

data/lib/capistrano_multiconfig_parallel/celluloid/web_server.rb

@@ -0,0 +1,11 @@
+module CapistranoMulticonfigParallel
+  # rubocop:disable ClassLength
+  class WebServer  < CelluloidPubsub::WebServer
+
+    def initialize(*args)
+      super(*args)
+    rescue
+      #fails silently
+    end
+  end
+end

data/lib/capistrano_multiconfig_parallel/helpers/base_manager.rb

@@ -49,16 +49,40 @@ module CapistranoMulticonfigParallel
       run
     end
 
+
+
     def initialize_data
       @application = custom_command? ? nil : @top_level_tasks.first.split(':').reverse[1]
       @stage = custom_command? ? nil : @top_level_tasks.first.split(':').reverse[0]
       @stage = @stage.present? ? @stage : @default_stage
-      @name, @args = @cap_app.parse_task_string(@top_level_tasks.second)
+      @name, @args = parse_task_string(@top_level_tasks.second)
       @argv = @cap_app.handle_options.delete_if { |arg| arg == @stage || arg == @name || arg == @top_level_tasks.first }
       @argv = multi_fetch_argv(@argv)
       @original_argv = @argv.clone
     end
 
+
+    def parse_task_string(string) # :nodoc:
+      /^([^\[]+)(?:\[(.*)\])$/ =~ string.to_s
+
+      name           = $1
+      remaining_args = $2
+
+      return string, [] unless name
+      return name,   [] if     remaining_args.empty?
+
+      args = []
+
+      begin
+        /((?:[^\\,]|\\.)*?)\s*(?:,\s*(.*))?$/ =~ remaining_args
+
+        remaining_args = $2
+        args << $1.gsub(/\\(.)/, '\1')
+      end while remaining_args
+
+      return name, args
+    end
+
     def verify_options_custom_command(options)
       options[:action] = @argv['ACTION'].present? ? @argv['ACTION'] : 'deploy'
       options

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
     MAJOR = 0
     MINOR = 12
-    TINY = 3
+    TINY = 5
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.5
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap
@@ -624,6 +624,7 @@ files:
 - lib/capistrano_multiconfig_parallel/celluloid/rake_worker.rb
 - lib/capistrano_multiconfig_parallel/celluloid/state_machine.rb
 - lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb
+- lib/capistrano_multiconfig_parallel/celluloid/web_server.rb
 - lib/capistrano_multiconfig_parallel/cli.rb
 - lib/capistrano_multiconfig_parallel/configuration.rb
 - lib/capistrano_multiconfig_parallel/extensions/extension_helper.rb