capistrano_multiconfig_parallel 1.1.9 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d81f344d7242ec416e171393c6bdc5cee38b75ce
-  data.tar.gz: 2daf07ef4b0f0141de876309c765695ab4c067f9
+  metadata.gz: 1e4d9a28f5d3cdeb1e98c18c651ec36cd83c6cec
+  data.tar.gz: b311f2acada696e6e029fdeebbded2fd868c228d
 SHA512:
-  metadata.gz: 253acf6fc8f334b79e4aa1fe5c20a5fc9132b31babc0ddd4ae5b79938d39cffae4c97cca3dc44891cc99e9f96b814c3e6da015c7152b9bcbd834c884e119b7ce
-  data.tar.gz: 7330d539c6db97a9c0e417b2177261e6a9900c3a4476f17ad12b7224e935a03978087b940c1cb5e1719f056e155e470668df96dc08bfadd203065c715b38812f
+  metadata.gz: 4c0e34c2a8e00ad86845bb2d8d2b51ab412766b9632e193467d906c1fb8bfb6da06072d6304fccf9d24d2e05b1aabf81d27ba6ac9f6129285dc6add29a28a31f
+  data.tar.gz: 66b76ce6cf78619cf93a58ff9ef237f1c6f2347ba949566dba1b63ff1cac72318ee91d8e791acc7c34e7332ca6a287d00b28c8f05cdbebf288f8ec683af5e7a1

data/README.md

@@ -17,6 +17,11 @@ IMPORTANT! The whole reason for this gem was for using [Caphub](https://github.c
 
 CAUTION!! PLEASE READ CAREFULLY!! Capistrano is not thread-safe. However in order to work around this problem, each of the task is executing inside a thread that spawns a new process in order to run capistrano tasks The thread monitors the process. This works well, however if the tasks you are executing is working with files, you might get into deadlocks because multiple proceses try to access same resource. Instead of using files , please consider using StringIO instead.
 
+NEW Improvements in version 1.2.0
+---------------------------------
+
+-	support for Celluloid 0.17 was added
+
 NEW Improvements in version 1.1.0
 ---------------------------------
 

data/capistrano_multiconfig_parallel.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
 
+  s.add_runtime_dependency 'celluloid', '>= 0.16', '>= 0.16.0'
   s.add_runtime_dependency 'celluloid-pmap', '~> 0.2', '>= 0.2.2'
   s.add_runtime_dependency 'celluloid_pubsub', '~> 0.6', '>= 0.6.1'
   s.add_runtime_dependency 'celluloid-websocket-client', '~> 0.0', '>= 0.0.1'

data/lib/capistrano_multiconfig_parallel/all.rb

@@ -7,15 +7,15 @@ require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/concern'
 
-require 'celluloid/autostart'
+require_relative './helpers/base_actor_helper'
 require 'celluloid/pmap'
+require 'celluloid_pubsub'
 
 require 'composable_state_machine'
 require 'eventmachine'
 require 'right_popen'
 require 'colorize'
 require 'terminal-table'
-require 'celluloid_pubsub'
 require 'configliere'
 require 'devnull'
 require 'inquirer'

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -1,14 +1,13 @@
+require_relative './helpers/base_actor_helper'
 module CapistranoMulticonfigParallel
   # finds app dependencies, shows menu and delegates jobs to celluloid manager
   class Application
-    include Celluloid
-    include Celluloid::Logger
-    include CapistranoMulticonfigParallel::ApplicationHelper
+    include CapistranoMulticonfigParallel::BaseActorHelper
 
     attr_reader :stage_apps, :top_level_tasks, :jobs, :condition, :manager, :dependency_tracker, :application, :stage, :name, :args, :argv, :default_stage
 
     def initialize
-      Celluloid.boot
+      Celluloid.boot unless Celluloid.running?
       CapistranoMulticonfigParallel.enable_logging
       @stage_apps = multi_apps? ? app_names_from_stages : []
       collect_command_line_tasks(CapistranoMulticonfigParallel.original_args)

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -1,15 +1,11 @@
 require_relative './celluloid_worker'
 require_relative './terminal_table'
 require_relative './web_server'
-require_relative '../helpers/application_helper'
+require_relative '../helpers/base_actor_helper'
 module CapistranoMulticonfigParallel
   # manager class that handles workers
   class CelluloidManager
-    include Celluloid
-    include Celluloid::Notifications
-    include Celluloid::Logger
-    include CapistranoMulticonfigParallel::ApplicationHelper
-
+    include CapistranoMulticonfigParallel::BaseActorHelper
     attr_accessor :jobs, :job_to_worker, :worker_to_job, :job_to_condition, :mutex, :registration_complete, :workers_terminated, :stderr_buffer
 
     attr_reader :worker_supervisor, :workers
@@ -20,16 +16,16 @@ module CapistranoMulticonfigParallel
       @registration_complete = false
       return if configuration.multi_secvential.to_s.downcase == 'true'
       # start SupervisionGroup
-      @worker_supervisor = Celluloid::SupervisionGroup.run!
+      @worker_supervisor = setup_supervision_group
 
       # Get a handle on the SupervisionGroup::Member
       @mutex = Mutex.new
       # http://rubydoc.info/gems/celluloid/Celluloid/SupervisionGroup/Member
-      @workers = @worker_supervisor.pool(CapistranoMulticonfigParallel::CelluloidWorker, as: :workers, size: 10)
+      @workers = setup_pool_of_actor(@worker_supervisor, actor_name: :workers, type: CapistranoMulticonfigParallel::CelluloidWorker, size: 10)
       Actor.current.link @workers
-      @worker_supervisor.supervise_as(:terminal_server, CapistranoMulticonfigParallel::TerminalTable, Actor.current, @job_manager, configuration.fetch(:terminal, {}))
-      @worker_supervisor.supervise_as(:web_server, CapistranoMulticonfigParallel::WebServer, [websocket_config])
-
+      setup_actor_supervision(@worker_supervisor, actor_name: :terminal_server, type: CapistranoMulticonfigParallel::TerminalTable, args: [Actor.current, @job_manager, configuration.fetch(:terminal, {})])
+      setup_actor_supervision(@worker_supervisor, actor_name: :web_server, type: CapistranoMulticonfigParallel::WebServer, args: websocket_config)
+      
       # Get a handle on the PoolManager
       # http://rubydoc.info/gems/celluloid/Celluloid/PoolManager
       # @workers = workers_pool.actor

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -1,6 +1,6 @@
 require_relative './child_process'
 require_relative './state_machine'
-require_relative '../helpers/application_helper'
+require_relative '../helpers/base_actor_helper'
 module CapistranoMulticonfigParallel
   # worker that will spawn a child process in order to execute a capistrano job and monitor that process
   #
@@ -17,10 +17,7 @@ module CapistranoMulticonfigParallel
   #   @return [CapistranoMulticonfigParallel::CelluloidManager] the instance of the manager that delegated the job to this worker
   #
   class CelluloidWorker
-    include Celluloid
-    include Celluloid::Notifications
-    include Celluloid::Logger
-    include CapistranoMulticonfigParallel::ApplicationHelper
+    include CapistranoMulticonfigParallel::BaseActorHelper
     class TaskFailed < StandardError; end
 
     attr_accessor :job, :manager, :job_id, :app_name, :env_name, :action_name, :env_options, :machine, :client, :task_argv,

data/lib/capistrano_multiconfig_parallel/celluloid/child_process.rb

@@ -1,11 +1,8 @@
-require_relative '../helpers/application_helper'
-require_relative '../helpers/core_helper'
+require_relative '../helpers/base_actor_helper'
 module CapistranoMulticonfigParallel
   # class that is used to execute the capistrano tasks and it is invoked by the celluloid worker
   class ChildProcess
-    include Celluloid
-    include Celluloid::Logger
-    include CapistranoMulticonfigParallel::ApplicationHelper
+    include CapistranoMulticonfigParallel::BaseActorHelper
 
     attr_accessor :options, :job, :actor, :job_id, :exit_status, :pid, :process
 

data/lib/capistrano_multiconfig_parallel/celluloid/rake_worker.rb

@@ -1,10 +1,8 @@
-require_relative '../helpers/application_helper'
+require_relative '../helpers/base_actor_helper'
 module CapistranoMulticonfigParallel
   # class that handles the rake task and waits for approval from the celluloid worker
   class RakeWorker
-    include Celluloid
-    include Celluloid::Logger
-    include CapistranoMulticonfigParallel::ApplicationHelper
+    include CapistranoMulticonfigParallel::BaseActorHelper
 
     attr_reader :client, :job_id, :action, :task,
                 :task_approved, :successfull_subscription,

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -1,12 +1,9 @@
 
-require_relative '../helpers/application_helper'
+require_relative '../helpers/base_actor_helper'
 module CapistranoMulticonfigParallel
   # class used to display the progress of each worker on terminal screen using a table
   class TerminalTable
-    include Celluloid
-    include Celluloid::Notifications
-    include Celluloid::Logger
-    include CapistranoMulticonfigParallel::ApplicationHelper
+  include CapistranoMulticonfigParallel::BaseActorHelper
 
     attr_reader :options, :errors, :manager, :position, :job_manager, :terminal_rows, :screen_erased
 

data/lib/capistrano_multiconfig_parallel/helpers/base_actor_helper.rb

@@ -0,0 +1,84 @@
+require_relative '../helpers/application_helper'
+module CapistranoMulticonfigParallel
+  # base actor used for compatibility between celluloid versions
+  module BaseActorHelper
+
+    module ClassMethods
+      class << self
+        include CapistranoMulticonfigParallel::ApplicationHelper
+        attr_reader :config
+
+
+        def config
+          {
+            'logger_class' => celluloid_logger_class
+          }
+        end
+
+        def celluloid_logger_class
+          if version_less_than_seventeen?
+            Celluloid::Logger
+          else
+            Celluloid::Internals::Logger
+          end
+        end
+
+        def celluloid_version
+          find_loaded_gem_property('celluloid', 'version')
+        end
+
+        def version_less_than_seventeen?
+          verify_gem_version('celluloid', '0.17', operator: '<')
+        end
+      end
+    end
+
+    module InstanceMethods
+      delegate :version_less_than_seventeen?,
+      to: :'CapistranoMulticonfigParallel::BaseActorHelper::ClassMethods'
+
+      def setup_actor_supervision(class_name, options)
+        arguments = options[:args].is_a?(Array) ? options[:args] : [options[:args]]
+        if version_less_than_seventeen?
+          class_name.supervise_as(options[:actor_name], options[:type], *arguments)
+        else
+          #supervises_opts = options[:supervises].present? ? { supervises: options[:supervises] } : {}
+          default_opts = options[:actor_name].present? ? { as: options[:actor_name], type: options[:type], args: arguments, size: options.fetch(:size, nil) } : {}
+          class_name.supervise(default_opts)
+        end
+      end
+
+      def setup_supervision_group
+        if version_less_than_seventeen?
+          Celluloid::SupervisionGroup.run!
+        else
+          Celluloid::Supervision::Container.run!
+        end
+      end
+
+      def setup_pool_of_actor(class_name, options)
+        if version_less_than_seventeen?
+          class_name.pool(options[:type], as: options[:actor_name], size:  options.fetch(:size, 10))
+        else
+          setup_actor_supervision(class_name, options)
+        end
+      end
+    end
+
+
+    def self.included(base)
+      base.include Celluloid
+      base.include Celluloid::Notifications
+      base.include CapistranoMulticonfigParallel::ApplicationHelper
+      base.include CapistranoMulticonfigParallel::BaseActorHelper::ClassMethods.config['logger_class']
+      base.include CapistranoMulticonfigParallel::BaseActorHelper::InstanceMethods
+    end
+
+  end
+end
+
+if CapistranoMulticonfigParallel::BaseActorHelper::ClassMethods.version_less_than_seventeen?
+  require 'celluloid/autostart'
+else
+  require 'celluloid/current'
+end

data/lib/capistrano_multiconfig_parallel/helpers/gem_helper.rb

@@ -20,10 +20,16 @@ module CapistranoMulticonfigParallel
     def get_parsed_version(version)
       return 0 if version.blank?
       version = version.to_s.split('.')
-      version.pop until version.size == 2
+      version = format_gem_version(version)
       version.join('.').to_f
     end
 
+    def format_gem_version(version)
+      return version if version.size <= 2
+      version.pop until version.size == 2
+      version
+    end
+
     def verify_gem_version(gem_version, version, options = {})
       options.stringify_keys!
       version = get_parsed_version(version)

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 1
-    MINOR = 1
-    TINY = 9
+    MINOR = 2
+    TINY = 0
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors:
 - bogdanRada
@@ -10,6 +10,26 @@ bindir: bin
 cert_chain: []
 date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: celluloid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap
   requirement: !ruby/object:Gem::Requirement
@@ -527,6 +547,7 @@ files:
 - lib/capistrano_multiconfig_parallel/cli.rb
 - lib/capistrano_multiconfig_parallel/configuration/default.yml
 - lib/capistrano_multiconfig_parallel/helpers/application_helper.rb
+- lib/capistrano_multiconfig_parallel/helpers/base_actor_helper.rb
 - lib/capistrano_multiconfig_parallel/helpers/capistrano_helper.rb
 - lib/capistrano_multiconfig_parallel/helpers/configuration.rb
 - lib/capistrano_multiconfig_parallel/helpers/core_helper.rb