capistrano_multiconfig_parallel 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ce2dc9cdc3056f52c0f0f06facbc8208eb341a8
-  data.tar.gz: f014527c0c1545dd27d0561bb2188df5816a6eaf
+  metadata.gz: d46ff24b24d18247e1ea920d37ce383734ffa3bc
+  data.tar.gz: bf1581316694c05421159ab06874ec929a6dd122
 SHA512:
-  metadata.gz: 3749cf237d9070a98da9ddf7b7b939b23d440b7edb318fd1dd26c227d3c47b04fd7738c9e5251e459cb7ac73fed714783cf1ea7e66a07309684cc0ff6f8667a0
-  data.tar.gz: 67b528fcfcecf9a5ac5a87f85a22e9cd4467a0ce47ed421f1587ea3167e0882784e035c05c0a71998d0de1f14658a7995459bd46dc4ee4f729cf07076bbc6093
+  metadata.gz: 1e4abbd36a6096db020e255cb31548f39f8a8ce542f875cc04ca02bc1c530ebafe38df72738b2563832814cf1dcd4d4249582377ba695d2a14b050b4c2141266
+  data.tar.gz: bc9d444a27c396acb3080f4251649b0a934c5530aad42df6ec097342c9542015293556e8b61028231c0b926bdfe8a4f28ce6eca7d74e4bc13f89199599f56756

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano_multiconfig_parallel (0.15.5)
+    capistrano_multiconfig_parallel (0.16.0)
       activesupport (~> 4.0, >= 4.0)
       capistrano (~> 3.0, >= 3.0)
       celluloid-pmap (~> 0.2, >= 0.2.2)

data/lib/capistrano_multiconfig_parallel/all.rb

@@ -35,18 +35,3 @@ require_relative './version'
 require_relative './configuration'
 require_relative './base'
 require_relative './application'
-
-# Signal.trap("TERM") do
-#   puts'aa'
-# CapistranoMulticonfigParallel::Application.terminate
-# end
-#
-# Signal.trap('USR1') do
-#   puts'aaaa3'
-#   CapistranoMulticonfigParallel::Application.terminate
-# end
-#
-# Signal.trap('USR2') do
-#   puts'aaaa3'
-#   CapistranoMulticonfigParallel::Application.terminate
-# end

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -8,11 +8,11 @@ module CapistranoMulticonfigParallel
     attr_accessor :stages,:stage_apps, :top_level_tasks, :jobs, :branch_backup, :condition, :manager, :dependency_tracker, :application, :stage, :name, :args, :argv, :default_stage
 
     def initialize
+      Celluloid.boot
       @stages = fetch_stages
       @stage_apps =  multi_apps? ? @stages.map { |stage| stage.split(':').reverse[1] }.uniq : []
       collect_command_line_tasks(CapistranoMulticonfigParallel.original_args)
       @jobs = []
-      CapistranoMulticonfigParallel.configuration_valid?(@stages)
     end
 
 
@@ -78,9 +78,6 @@ module CapistranoMulticonfigParallel
       @argv['BRANCH'] = nil
     end
 
-    def can_start?
-      @top_level_tasks.size >= 1 && (@stages.include?(@top_level_tasks.first) || custom_command?) && @argv[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
-    end
 
     def custom_command?
       if multi_apps?

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -10,7 +10,7 @@ module CapistranoMulticonfigParallel
 
     cattr_accessor :debug_enabled
 
-    attr_accessor :jobs, :job_to_worker, :worker_to_job, :actor_system, :job_to_condition, :mutex, :registration_complete, :workers_terminated
+    attr_accessor :jobs, :job_to_worker, :worker_to_job, :job_to_condition, :mutex, :registration_complete, :workers_terminated
 
     attr_reader :worker_supervisor, :workers
     trap_exit :worker_died
@@ -21,7 +21,6 @@ module CapistranoMulticonfigParallel
       @job_manager = job_manager
       @registration_complete = false
       # Get a handle on the SupervisionGroup::Member
-      @actor_system = Celluloid.boot
       @mutex = Mutex.new
       # http://rubydoc.info/gems/celluloid/Celluloid/SupervisionGroup/Member
       @workers = @worker_supervisor.pool(CapistranoMulticonfigParallel::CelluloidWorker, as: :workers, size: 10)

data/lib/capistrano_multiconfig_parallel/cli.rb

@@ -7,8 +7,9 @@ module CapistranoMulticonfigParallel
     def self.start
       CapistranoMulticonfigParallel.check_terminal_tty
       CapistranoMulticonfigParallel.original_args = ARGV.dup
+      CapistranoMulticonfigParallel.configuration_valid?
       job_manager = CapistranoMulticonfigParallel::Application.new
-      if job_manager.can_start?
+      if job_manager.argv[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
         job_manager.start
       else
         Capistrano::Application.new.run

data/lib/capistrano_multiconfig_parallel/configuration.rb

@@ -7,23 +7,30 @@ module CapistranoMulticonfigParallel
       attr_accessor :configuration
 
       def configuration
-        @config ||= Configliere::Param.new
+        @config ||= fetch_configuration
+        @config
+      end
+
+
+      def fetch_configuration
+        @fetched_config = Configliere::Param.new
         command_line_params.each do |param|
           param_type = change_config_type(param['type'].to_s)
-          @config.define param['name'], type: param_type, description: param['description'], default: param['default']
+          @fetched_config.define param['name'], type: param_type, description: param['description'], default: param['default']
         end
 
         ARGV.clear
 
         CapistranoMulticonfigParallel.original_args.each { |a| ARGV << a }
-        @config.read config_file if File.file?(config_file)
-        @config.use :commandline
+        @fetched_config.read config_file if File.file?(config_file)
+        @fetched_config.use :commandline
 
-        @config.use :config_block
-        @config.finally do |c|
+        @fetched_config.use :config_block
+        @fetched_config.finally do |c|
           check_configuration(c)
         end
-        @config.resolve!
+        @fetched_config.process_argv!
+        @fetched_config.resolve!
       end
 
       def config_file
@@ -71,7 +78,7 @@ module CapistranoMulticonfigParallel
         raise ArgumentError, "the property `#{prop}` must be boolean" unless %w(true false).include?(c[prop].to_s.downcase)
       end
 
-      def configuration_valid?(stages)
+      def configuration_valid?
         configuration
       end
 

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
     MAJOR = 0
     MINOR = 16
-    TINY = 0
+    TINY = 1
     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: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - bogdanRada
@@ -637,7 +637,6 @@ files:
 - lib/capistrano_multiconfig_parallel/helpers/output_stream.rb
 - lib/capistrano_multiconfig_parallel/helpers/rake_hook_actor.rb
 - lib/capistrano_multiconfig_parallel/helpers/standard_deploy.rb
-- lib/capistrano_multiconfig_parallel/initializers/conf.rb
 - lib/capistrano_multiconfig_parallel/initializers/default.yml
 - lib/capistrano_multiconfig_parallel/version.rb
 homepage: http://github.com/bogdanRada/capistrano_multiconfig_parallel/

data/lib/capistrano_multiconfig_parallel/initializers/conf.rb

@@ -1,12 +0,0 @@
-require 'configliere/commandline'
-Configliere::Commandline.class_eval do
-  def resolve!(print_help_and_exit = true)
-    process_argv!
-    if print_help_and_exit && self[:help]
-      dump_help
-    #  exit(2)
-    end
-    super()
-    self
-  end
-end