capistrano_multiconfig_parallel 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41637732b5b656f58b1abf8a34ee438c4a462f8d
-  data.tar.gz: 5a7ffd4a138edf79c01bb8af11817c082ffa7f34
+  metadata.gz: 663547541ff47210168ea5bf1322ebdb9fe0df58
+  data.tar.gz: 1f2710ed5c8b320293923f20448a7d0c6d52e099
 SHA512:
-  metadata.gz: cac726968d4d54a923ad181e6cb6291df404e2939d74d12910afd5eae36ba6d99ccc701e7d00fe7a2bd2ec9dd2276a63f57808c96352581fffc1d221d603ee1e
-  data.tar.gz: b20ab1b87988c254de6d0d925fa472c86e0fcaabdc4ece5f7911b5af9aed31b773e0e3bbec51acd2a6217e6f7c0a0c687ccbf1a1264fb57abdb27791f3d836dd
+  metadata.gz: 552ce1999eda34099cb20965dfb2784fbd61e476b0386a50a2bbd955593720009eafab39bf81278d094ef774ecd36ad1e2ba2e6b4d1a7423c16055068cec3a43
+  data.tar.gz: 6cbb53c3de91c94ad595a8f21556b7de039a3db07c5ae43dbfd38d6350b360c662c30ca7a2fbad8a7ed11e9ba67829126f168f020bf195594484bb70be5e19fd

data/capistrano_multiconfig_parallel.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   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.7', '>= 0.7.2'
+  s.add_runtime_dependency 'celluloid_pubsub', '~> 0.8', '>= 0.8.1'
   s.add_runtime_dependency 'celluloid-websocket-client', '~> 0.0', '>= 0.0.1'
   s.add_runtime_dependency 'composable_state_machine', '~> 1.0', '>= 1.0.2'
   s.add_runtime_dependency 'terminal-table', '~> 1.5', '>= 1.5.2'

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -49,7 +49,7 @@ module CapistranoMulticonfigParallel
 
     def set_celluloid_exception_handling
       Celluloid.logger = logger
-      Celluloid.task_class = Celluloid::TaskThread
+      Celluloid.task_class = defined?(Celluloid::TaskThread) ? Celluloid::TaskThread : Celluloid::Task::Threaded
       Celluloid.exception_handler do |ex|
         unless ex.is_a?(Interrupt)
           rescue_error(ex, 'stderr')

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -21,7 +21,8 @@ module CapistranoMulticonfigParallel
       # Get a handle on the SupervisionGroup::Member
       @mutex = Mutex.new
       # http://rubydoc.info/gems/celluloid/Celluloid/SupervisionGroup/Member
-      @workers = setup_pool_of_actor(@worker_supervisor, actor_name: :workers, type: CapistranoMulticonfigParallel::CelluloidWorker, size: 10)
+      setup_pool_of_actor(@worker_supervisor, actor_name: :workers, type: CapistranoMulticonfigParallel::CelluloidWorker, size: 10)
+      @workers = Celluloid::Actor[:workers]
       Actor.current.link @workers
       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)

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -25,6 +25,9 @@ module CapistranoMulticonfigParallel
                   :successfull_subscription, :subscription_channel, :publisher_channel, # for subscriptions and publishing events
                   :job_termination_condition, :worker_state, :invocation_chain, :filename, :worker_log, :exit_status
 
+    def initialize(*args)
+    end
+
     def work(job, manager)
       @job = job
       @job_id = job.id

data/lib/capistrano_multiconfig_parallel/classes/rake_task_hooks.rb

@@ -74,7 +74,11 @@ module CapistranoMulticonfigParallel
 
     def supervise_actor
       return unless actor.blank?
+      if CapistranoMulticonfigParallel::BaseActorHelper::ClassMethods.version_less_than_seventeen?
       CapistranoMulticonfigParallel::RakeWorker.supervise_as(rake_actor_id)
+    else
+        CapistranoMulticonfigParallel::RakeWorker.supervise(as: rake_actor_id)
+    end
     end
 
     def rake_actor_id

data/lib/capistrano_multiconfig_parallel/helpers/base_actor_helper.rb

@@ -28,7 +28,7 @@ module CapistranoMulticonfigParallel
         end
 
         def version_less_than_seventeen?
-          verify_gem_version('celluloid', '0.17', operator: '<')
+          verify_gem_version(celluloid_version, '0.17', operator: '<')
         end
       end
     end
@@ -37,14 +37,25 @@ module CapistranoMulticonfigParallel
       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]]
+
+      def setup_actor_supervision_details(class_name, options)
+        arguments = (options[:args].is_a?(Array) ? options[:args] : [options[:args]]).compact
         if version_less_than_seventeen?
-          class_name.supervise_as(options[:actor_name], options[:type], *arguments)
+          [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)
+         { as: options[:actor_name], type: options[:type], args: arguments, size: options.fetch(:size, nil) }
+        end
+      end
+
+
+      def setup_actor_supervision(class_name, options)
+        if version_less_than_seventeen?
+          class_name.supervise_as(*setup_actor_supervision_details(class_name, options))
+        else
+          setup_supervision_group do |supervisor|
+            supervisor.supervise setup_actor_supervision_details(class_name, options)
+          end
         end
       end
 
@@ -52,7 +63,9 @@ module CapistranoMulticonfigParallel
         if version_less_than_seventeen?
           Celluloid::SupervisionGroup.run!
         else
-          Celluloid::Supervision::Container.run!
+          Class.new(Celluloid::Supervision::Container) do
+            yield(self) if block_given?
+          end.run!
         end
       end
 
@@ -60,7 +73,10 @@ module CapistranoMulticonfigParallel
         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)
+          options = setup_actor_supervision_details(class_name, options)
+          setup_supervision_group do |supervisor|
+            supervisor.pool *[options[:type], options.except(:type)]
+          end
         end
       end
     end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,7 +7,7 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 1
-    MINOR = 6
+    MINOR = 7
     TINY = 0
     PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -56,20 +56,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: celluloid-websocket-client
   requirement: !ruby/object:Gem::Requirement