capistrano_multiconfig_parallel 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90467fb1e95571ff800390c44e68f08d7d4b9b2f
-  data.tar.gz: a9fa1498b21325d91a363c0b15c92e9b33ad3aac
+  metadata.gz: 636e8807495e7cc5082a737fddaf6de9eb132d50
+  data.tar.gz: 77409e0a2196ce97e32fc12f9d9feffd54972bda
 SHA512:
-  metadata.gz: 735c86753f6a6af76c9c339e5b5c14e8b655eb92216daafeba8034930e87d7ece4b9bcbb38f7ddc168ab6dc44d6ee0cb014fdda9551759edc9fbdde26f506d86
-  data.tar.gz: 7bfd74cfa40521cb0a8bf8508624e54d9fa2f0a005f9a36470492e7f2f49f9e25f1e9f91215dc3d52008b79c480e9892576641999a14a2c921c39e76a03401c6
+  metadata.gz: 524ffa981d6cfc38698300d0334ec049a384002ed9b0b31eed239ca4d02047fce155a3211e53a720d533e2b911aa320fea0e789d934dd7728fb1c239c54d2f4c
+  data.tar.gz: d8b40b726fb03873c14d720604bbd99ee74e676d177b1778ab2cfa791d1645b86f473abd701d124f56779414ededec03c5dce0da0af7c81cb9cd61485752920f

data/.reek

@@ -0,0 +1,3 @@
+---
+Attribute:
+  enabled: false

data/Gemfile.lock

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

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -4,7 +4,6 @@ module CapistranoMulticonfigParallel
   class Application
     include Celluloid
     include Celluloid::Logger
-    include CapistranoMulticonfigParallel::StagesHelper
     include CapistranoMulticonfigParallel::ApplicationHelper
 
     attr_reader :stages, :stage_apps, :top_level_tasks, :jobs, :branch_backup, :condition, :manager, :dependency_tracker, :application, :stage, :name, :args, :argv, :default_stage
@@ -106,13 +105,11 @@ module CapistranoMulticonfigParallel
       backup_the_branch if multi_apps?
       deploy_multiple_apps(apps, options)
       deploy_app(options) if !custom_command? || !multi_apps?
-    rescue => e
-      log_error(e)
     end
 
     def process_jobs
       return unless @jobs.present?
-      FileUtils.rm Dir["#{CapistranoMulticonfigParallel.log_directory}/worker_*.log"]
+      FileUtils.rm Dir["#{log_directory}/worker_*.log"]
       if app_configuration.multi_secvential.to_s.downcase == 'true'
         @jobs.each { |job| CapistranoMulticonfigParallel::StandardDeploy.new(job) }
       else

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -11,38 +11,22 @@ module CapistranoMulticonfigParallel
 
     def enable_logging
       enable_file_logging
-      Celluloid.logger = logger
-      Celluloid.task_class = Celluloid::TaskThread
-    end
-
-    def detect_root
-      if find_env_multi_cap_root
-        Pathname.new(find_env_multi_cap_root)
-      elsif defined?(::Rails)
-        ::Rails.root
-      else
-        try_detect_capfile
-      end
-    end
-
-    def config_file
-      File.join(detect_root.to_s, 'config', 'multi_cap.yml')
-    end
-
-    def log_directory
-      File.join(detect_root.to_s, 'log')
+      set_celluloid_exception_handling
     end
 
-    def main_log_file
-      File.join(log_directory, 'multi_cap.log')
-    end
+  private
 
-    def custom_commands
-      ['deploy_multi_stages']
+    def set_celluloid_exception_handling
+      Celluloid.logger = logger
+      Celluloid.task_class = Celluloid::TaskThread
+      Celluloid.exception_handler do |ex|
+        unless ex.is_a?(Interrupt)
+          puts format_error(ex)
+          log_error(ex)
+        end
+      end
     end
 
-  private
-
     def enable_file_logging
       if configuration.multi_debug.to_s.downcase == 'true'
         enable_main_log_file
@@ -51,12 +35,5 @@ module CapistranoMulticonfigParallel
         self.logger ||= ::Logger.new(DevNull.new)
       end
     end
-
-    def enable_main_log_file
-      FileUtils.mkdir_p(log_directory) unless File.directory?(log_directory)
-      FileUtils.touch(main_log_file) unless File.file?(main_log_file)
-      log_file = File.open(main_log_file, 'w')
-      log_file.sync = true
-    end
   end
 end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -37,8 +37,6 @@ module CapistranoMulticonfigParallel
       @worker_supervisor.supervise_as(:web_server, CapistranoMulticonfigParallel::WebServer, websocket_config)
     end
 
-  
-
     def generate_job_id(job)
       @jobs[job['id']] = job
       job['id']
@@ -168,12 +166,13 @@ module CapistranoMulticonfigParallel
       until apps_symlink_confirmation.present?
         sleep(0.1) # keep current thread alive
       end
+      apps_symlink_confirmation
     end
 
     def confirm_task_approval(result, task, worker = nil)
       return unless result.present?
-      print_confirm_task_approvall(result, task, worker = nil)
-      return if fetch(:apps_symlink_confirmation).blank? || fetch(:apps_symlink_confirmation).downcase != 'y'
+      result = print_confirm_task_approvall(result, task, worker = nil)
+      return if result.blank? || result.downcase != 'y'
       @jobs.pmap do |job_id, job|
         worker = get_worker_for_job(job_id)
         worker.publish_rake_event('approved' => 'yes',
@@ -194,8 +193,8 @@ module CapistranoMulticonfigParallel
         end
       else
         return nil
-      end
     end
+      end
 
     def can_tag_staging?
       @job_manager.can_tag_staging? &&

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -78,7 +78,7 @@ module CapistranoMulticonfigParallel
     end
 
     def cd_working_directory
-      "cd #{CapistranoMulticonfigParallel.detect_root}"
+      "cd #{detect_root}"
     end
 
     # def generate_command_new
@@ -169,7 +169,7 @@ module CapistranoMulticonfigParallel
       log_to_file("worker #{@job_id} triest to transition from #{@machine.state} to  #{name}")
       @machine.transitions.on(name.to_s, @machine.state => name.to_s)
       @machine.go_to_transition(name.to_s)
-      raise(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed, "task #{@action} failed ") if name == 'deploy:failed' # force worker to rollback
+      abort(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed, "task #{@action} failed ") if name == 'deploy:failed' # force worker to rollback
     end
 
     def setup_command_line(*options)
@@ -235,7 +235,7 @@ module CapistranoMulticonfigParallel
     def notify_finished(exit_status)
       if exit_status.exitstatus != 0
         log_to_file("worker #{job_id} tries to terminate")
-        raise(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed, "task  failed with exit status #{exit_status.inspect} ") # force worker to rollback
+        abort(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed, "task  failed with exit status #{exit_status.inspect} ") # force worker to rollback
       else
         update_machine_state('FINISHED')
         log_to_file("worker #{job_id} notifies manager has finished")

data/lib/capistrano_multiconfig_parallel/celluloid/state_machine.rb

@@ -2,35 +2,33 @@ module CapistranoMulticonfigParallel
   # class that handles the states of the celluloid worker executing the child process in a fork process
   class StateMachine
     include ComposableStateMachine::CallbackRunner
-    attr_accessor :state, :model, :machine, :job, :initial_state, :transitions, :output
+    attr_accessor :job, :actor, :initial_state, :state, :output
 
     def initialize(job, actor)
       @job = job
       @actor = actor
       @initial_state = :unstarted
-      @model = generate_model
-      build_machine
+      machine
     end
 
     def go_to_transition(action)
-      @machine.trigger(action.to_s)
+      machine.trigger(action.to_s)
     end
 
-  private
-
-    def build_machine
-      @machine = ComposableStateMachine::MachineWithExternalState.new(
-        @model, method(:state), method(:state=), state: initial_state.to_s, callback_runner: self)
+    def machine
+      @machine ||= ComposableStateMachine::MachineWithExternalState.new(
+        model, method(:state), method(:state=), state: @initial_state.to_s, callback_runner: self)
+      @machine
     end
 
-    def generate_transitions
-      @transitions = ComposableStateMachine::Transitions.new
+    def transitions
+      @transitions ||= ComposableStateMachine::Transitions.new
       @transitions
     end
 
-    def generate_model
+    def model
       ComposableStateMachine.model(
-        transitions: generate_transitions,
+        transitions: transitions,
         behaviors: {
           enter: {
             any: proc do |current_state, event, new_state|
@@ -42,6 +40,8 @@ module CapistranoMulticonfigParallel
       )
     end
 
+  private
+
     def actor_notify_state_change(current_state, event, new_state)
       @actor.send_msg(CapistranoMulticonfigParallel::TerminalTable.topic, type: 'event', message: "Going from #{current_state} to #{new_state}  due to a #{event} event")
     end

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -24,10 +24,8 @@ module CapistranoMulticonfigParallel
     def notify_time_change(topic, message)
       return unless topic == CapistranoMulticonfigParallel::TerminalTable.topic
       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
@@ -116,7 +114,7 @@ module CapistranoMulticonfigParallel
              { value: details['env_options'] },
              { value: "#{details['state']}" }
             ]
-      # if CapistranoMulticonfigParallel.show_task_progress
+
       #   if  worker.alive?
       #     row << { value: worker.rake_tasks.size }
       #     row << { value: worker_progress(details, worker) }
@@ -124,7 +122,6 @@ module CapistranoMulticonfigParallel
       #     row << { value: 0 }
       #     row << { value:  worker_state(worker) }
       #   end
-      # end
       table.add_row(row)
       table.add_separator if @manager.jobs.keys.last.to_i != job_id.to_i
     end

data/lib/capistrano_multiconfig_parallel/classes/rake_hook_actor.rb

@@ -14,7 +14,6 @@ module CapistranoMulticonfigParallel
       if job_id.present?
         actor_start_working
         actor.wait_execution until actor.task_approved
-        return unless actor.task_approved
         actor_execute_block(&block)
       else
         block.call
@@ -31,15 +30,23 @@ module CapistranoMulticonfigParallel
       CapistranoMulticonfigParallel::InputStream
     end
 
-    def actor_execute_block(&block)
+    def before_hooks
       stringio = StringIO.new
       output_stream.hook(stringio)
       input_stream.hook(actor, stringio)
-      block.call
+    end
+
+    def after_hooks
       input_stream.unhook
       output_stream.unhook
     end
 
+    def actor_execute_block(&block)
+      before_hooks
+      block.call
+      after_hooks
+    end
+
     def actor_start_working
       if actor.blank?
         supervise_actor

data/lib/capistrano_multiconfig_parallel/cli.rb

@@ -8,23 +8,15 @@ module CapistranoMulticonfigParallel
 
       # method used to start
       def start
-        verify_validation
-        start_work
-      rescue Interrupt
-        rescue_interrupt
-      rescue => error
-        rescue_error(error)
-      end
-
-      def rescue_interrupt
-        `stty icanon echo`
-        $stderr.puts 'Command cancelled.'
-      end
-
-      def rescue_error(error)
-        $stderr.puts error
-        $stderr.puts error.backtrace if error.respond_to?(:backtrace)
-        exit(1)
+        execute_with_rescue('stderr') do
+          verify_validation
+          job_manager = CapistranoMulticonfigParallel::Application.new
+          if job_manager.argv[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
+            job_manager.start
+          else
+            Capistrano::Application.new.run
+          end
+        end
       end
 
       def verify_validation
@@ -32,15 +24,6 @@ module CapistranoMulticonfigParallel
         CapistranoMulticonfigParallel.original_args = ARGV.dup
         CapistranoMulticonfigParallel.configuration_valid?
       end
-
-      def start_work
-        job_manager = CapistranoMulticonfigParallel::Application.new
-        if job_manager.argv[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
-          job_manager.start
-        else
-          Capistrano::Application.new.run
-        end
-      end
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/helpers/application_helper.rb

@@ -1,8 +1,12 @@
 require_relative './core_helper'
+require_relative './internal_helper'
+require_relative './stages_helper'
 module CapistranoMulticonfigParallel
   # class that holds the options that are configurable for this gem
   module ApplicationHelper
+    include CapistranoMulticonfigParallel::InternalHelper
     include CapistranoMulticonfigParallel::CoreHelper
+    include CapistranoMulticonfigParallel::StagesHelper
 
   module_function
 

data/lib/capistrano_multiconfig_parallel/helpers/core_helper.rb

@@ -3,39 +3,10 @@ module CapistranoMulticonfigParallel
   module CoreHelper
   module_function
 
-    def internal_config_directory
-      File.join(root.to_s, 'capistrano_multiconfig_parallel', 'configuration')
-    end
-
-    def internal_config_file
-      File.join(internal_config_directory, 'default.yml')
-    end
-
-    def default_internal_config
-      @default_config ||= YAML.load_file(internal_config_file)['default_config']
-      @default_config
-    end
-
-    def find_env_multi_cap_root
-      ENV['MULTI_CAP_ROOT']
-    end
-
-    def root
-      File.expand_path(File.dirname(File.dirname(__dir__)))
-    end
-
     def find_config_type(type)
       ['boolean'].include?(type.to_s) ? type.to_s.delete(':').to_sym : type.to_s.constantize
     end
 
-    def try_detect_capfile
-      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?
-      fail "Can't detect Capfile in the  application root".red if root.root?
-      root
-    end
-
     def app_debug_enabled?
       app_configuration.multi_debug.to_s.downcase == 'true'
     end
@@ -48,10 +19,6 @@ module CapistranoMulticonfigParallel
       CapistranoMulticonfigParallel.configuration
     end
 
-    def custom_commands
-      CapistranoMulticonfigParallel.custom_commands
-    end
-
     def app_logger
       CapistranoMulticonfigParallel.logger
     end
@@ -66,22 +33,30 @@ module CapistranoMulticonfigParallel
     end
 
     def ask_confirm(message, default)
+      force_confirmation do
+        Ask.input message, default: default
+      end
+    rescue
+      return nil
+    end
+
+    def force_confirmation(&block)
       `stty -raw echo`
       check_terminal_tty
-      result = Ask.input message, default: default
+      result = block.call
       $stdout.flush
       `stty -raw echo`
-      return result
-    rescue
-      return nil
+      result
+    end
+
+    def log_error(error)
+      log_to_file(format_error(error))
     end
 
-    def log_error(message)
-      log_to_file(
-        class_name: message.class,
-        message: message.respond_to?(:message) ? message.message : message.inspect,
-        backtrace: message.respond_to?(:backtrace) ? message.backtrace.join("\n\n") : ''
-      )
+    def format_error(error)
+      JSON.pretty_generate(class_name: error.class,
+                           message: error.respond_to?(:message) ? error.message : error.inspect,
+                           backtrace: error.respond_to?(:backtrace) ? error.backtrace.join("\n\n") : '')
     end
 
     def log_to_file(message, job_id = nil)
@@ -91,8 +66,8 @@ module CapistranoMulticonfigParallel
 
     def find_worker_log(job_id)
       return if job_id.blank?
-      FileUtils.mkdir_p(CapistranoMulticonfigParallel.log_directory) unless File.directory?(CapistranoMulticonfigParallel.log_directory)
-      filename = File.join(CapistranoMulticonfigParallel.log_directory, "worker_#{job_id}.log")
+      FileUtils.mkdir_p(log_directory) unless File.directory?(log_directory)
+      filename = File.join(log_directory, "worker_#{job_id}.log")
       worker_log = ::Logger.new(filename)
       worker_log.level = ::Logger::Severity::DEBUG
       worker_log.formatter = proc do |severity, datetime, progname, msg|
@@ -103,15 +78,33 @@ module CapistranoMulticonfigParallel
     end
 
     def debug_websocket?
-      websocket_config['enable_debug'].to_s == 'true'
+      websocket_server_config['enable_debug'].to_s == 'true'
+    end
+
+    def websocket_server_config
+      app_configuration.fetch(:websocket_server, {}).stringify_keys
     end
 
     def websocket_config
-      config = app_configuration[:websocket_server]
-      config.present? && config.is_a?(Hash) ? config.stringify_keys : {}
-      config['enable_debug'] = config.fetch('enable_debug', '').to_s == 'true'
-      config
+      websocket_server_config.merge('enable_debug' =>  debug_websocket?)
+    end
+
+    def execute_with_rescue(output = nil)
+      yield if block_given?
+    rescue Interrupt
+      rescue_interrupt
+    rescue => error
+      rescue_error(error, output)
     end
 
+    def rescue_error(error, output = nil)
+      output.blank? ? log_error(error) : puts(format_error(error))
+      exit(1)
+    end
+
+    def rescue_interrupt
+      `stty icanon echo`
+      puts "\n Command was cancelled due to an Interrupt error."
+    end
   end
 end

data/lib/capistrano_multiconfig_parallel/helpers/internal_helper.rb

@@ -0,0 +1,68 @@
+module CapistranoMulticonfigParallel
+  # internal helpers for logging mostly
+  module InternalHelper
+  module_function
+
+    def internal_config_directory
+      File.join(root.to_s, 'capistrano_multiconfig_parallel', 'configuration')
+    end
+
+    def internal_config_file
+      File.join(internal_config_directory, 'default.yml')
+    end
+
+    def default_internal_config
+      @default_config ||= YAML.load_file(internal_config_file)['default_config']
+      @default_config
+    end
+
+    def find_env_multi_cap_root
+      ENV['MULTI_CAP_ROOT']
+    end
+
+    def root
+      File.expand_path(File.dirname(File.dirname(__dir__)))
+    end
+
+    def try_detect_capfile
+      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?
+      fail "Can't detect Capfile in the  application root".red if root.root?
+      root
+    end
+
+    def detect_root
+      if find_env_multi_cap_root
+        Pathname.new(find_env_multi_cap_root)
+      elsif defined?(::Rails)
+        ::Rails.root
+      else
+        try_detect_capfile
+      end
+    end
+
+    def config_file
+      File.join(detect_root.to_s, 'config', 'multi_cap.yml')
+    end
+
+    def log_directory
+      File.join(detect_root.to_s, 'log')
+    end
+
+    def main_log_file
+      File.join(log_directory, 'multi_cap.log')
+    end
+
+    def custom_commands
+      ['deploy_multi_stages']
+    end
+
+    def enable_main_log_file
+      FileUtils.mkdir_p(log_directory) unless File.directory?(log_directory)
+      FileUtils.touch(main_log_file) unless File.file?(main_log_file)
+      log_file = File.open(main_log_file, 'w')
+      log_file.sync = true
+    end
+  end
+end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
     MAJOR = 0
     MINOR = 18
-    TINY = 1
+    TINY = 2
     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.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap
@@ -602,6 +602,7 @@ files:
 - ".codeclimate.yml"
 - ".coveralls.yml"
 - ".gitignore"
+- ".reek"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -639,6 +640,7 @@ files:
 - lib/capistrano_multiconfig_parallel/helpers/application_helper.rb
 - lib/capistrano_multiconfig_parallel/helpers/configuration.rb
 - lib/capistrano_multiconfig_parallel/helpers/core_helper.rb
+- lib/capistrano_multiconfig_parallel/helpers/internal_helper.rb
 - lib/capistrano_multiconfig_parallel/helpers/stages_helper.rb
 - lib/capistrano_multiconfig_parallel/initializers/rake.rb
 - lib/capistrano_multiconfig_parallel/version.rb