capistrano_multiconfig_parallel 0.15.3 → 0.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6ef58b7705f7108cbf9c27d87770adc5f34996a
-  data.tar.gz: 063a8f3085ffb19f7e0b685eca4abc24b5888fa1
+  metadata.gz: b6cd09cc8132c08c2d8ae96463ddebaf9262f296
+  data.tar.gz: 8b2521b82d898dd019ed65db627b9c4e068b5181
 SHA512:
-  metadata.gz: 5962c3b2ef441dc9eec088288af0e60aa7bb967c1a59763d4d0946a0829c167b9d8678e614b022e2ed121eff508d633bf023486048e34c01d7feb1e9bf277ce8
-  data.tar.gz: 6fc5b41b03e0fbd22745e3f4585daa147f3fe07f9f734aeaabb4c2590c3d570bd5b9aee711dc50c2ead2a3d84a20cf30a3c21844b8c239de7c3285e51cdb79a0
+  metadata.gz: 8b99f2a7c3dc0fbf602b816d8d59c37800ee19ed9c153209afc05887c88ac13d3cfb0d61fec4ad9cfbda34898b05bd53911923e1e9fee92a5cb0f5f33b8a2285
+  data.tar.gz: bc29a225e6eef5b902d66e030e342b3be7486c5a988dcc62354870f5d69b717c0c74c0e05a8a866b8c56052dded9ae3374498b2fc211dec5edd114fbf4daa0b8

data/Rakefile

@@ -45,12 +45,12 @@ task default: [:all]
 desc 'Test the plugin under all supported Rails versions.'
 task :all do |_t|
   if ENV['TRAVIS']
-    exec(' bundle exec phare &&  bundle exec rake  spec && bundle exec rake coveralls:push')
+    exec(' bundle exec rubocop . &&  bundle exec reek .  &&  bundle exec rake  spec && bundle exec rake coveralls:push')
   else
-    exec('bundle exec rubocop -a . && bundle exec phare && bundle exec rake spec')
+    exec('bundle exec rubocop -a . && bundle exec rubocop . && bundle exec reek . && bundle exec rake spec')
   end
 end
 
 task :docs do
-  exec(' bundle exec rubocop -a .  && bundle exec phare  && bundle exec inch --pedantic && bundle exec yard')
+  exec('bundle exec rubocop -a . && bundle exec rubocop . && bundle exec reek . && bundle exec inch --pedantic && bundle exec yard')
 end

data/capistrano_multiconfig_parallel.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rvm-tester', '~> 1.1', '>= 1.1'
 
   s.add_development_dependency 'rubocop', '~> 0.33', '>= 0.33'
-  s.add_development_dependency 'phare', '~> 0.7', '>= 0.7'
+  s.add_development_dependency 'reek', '~> 3.7', '>= 3.7'
   s.add_development_dependency 'yard', '~> 0.8', '>= 0.8.7'
   s.add_development_dependency 'yard-rspec', '~> 0.1', '>= 0.1'
   s.add_development_dependency 'redcarpet', '~> 3.3', '>= 3.3'

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -76,9 +76,9 @@ module CapistranoMulticonfigParallel
       err_backtrace = message.respond_to?(:backtrace) ? message.backtrace.join("\n\n") : ''
       if err_backtrace.present?
         logger.debug(
-        class_name: message.class,
-        message: error_message,
-        backtrace: err_backtrace
+          class_name: message.class,
+          message: error_message,
+          backtrace: err_backtrace
         )
       else
         logger.debug(message)

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -22,15 +22,14 @@ module CapistranoMulticonfigParallel
     include Celluloid::Logger
     class TaskFailed < StandardError; end
 
-    attr_accessor :job, :manager, :job_id, :app_name, :env_name, :action_name, :env_options, :machine, :client, :task_argv, :execute_deploy, :executed_dry_run,
+    attr_accessor :job, :manager, :job_id, :app_name, :env_name, :action_name, :env_options, :machine, :client, :task_argv,
                   :rake_tasks, :current_task_number, # tracking tasks
                   :successfull_subscription, :subscription_channel, :publisher_channel, # for subscriptions and publishing events
-                  :job_termination_condition, :worker_state, :executing_dry_run, :job_argv, :dry_run_tasks
+                  :job_termination_condition, :worker_state, :invocation_chain
 
     def work(job, manager)
       @job = job
       @worker_state = 'started'
-      @executing_dry_run = nil
       @manager = manager
       @job_confirmation_conditions = []
       process_job(job) if job.present?
@@ -76,8 +75,8 @@ module CapistranoMulticonfigParallel
       @rake_tasks ||= []
     end
 
-    def dry_run_tasks
-      @dry_run_tasks ||= []
+    def invocation_chain
+      @invocation_chain ||= []
     end
 
     def cd_working_directory
@@ -91,7 +90,6 @@ module CapistranoMulticonfigParallel
     end
 
     def execute_deploy
-      @execute_deploy = true
       debug("invocation chain #{@job_id} is : #{@rake_tasks.inspect}") if debug_enabled?
       check_child_proces
       setup_task_arguments
@@ -115,13 +113,11 @@ module CapistranoMulticonfigParallel
     end
 
     def check_gitflow
-      return if dry_running? || @env_name != 'staging' || !@manager.can_tag_staging? || !executed_task?(CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK)
+      return if @env_name != 'staging' || !@manager.can_tag_staging? || !executed_task?(CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK)
       @manager.dispatch_new_job(@job.merge('env' => 'production'))
     end
 
     def handle_subscription(message)
-      @executing_dry_run = message['action'] == 'count' ? true : false
-      @manager.jobs[@job_id]['job_argv'] = @job_argv
       if message_is_about_a_task?(message)
         check_gitflow
         save_tasks_to_be_executed(message)
@@ -162,7 +158,7 @@ module CapistranoMulticonfigParallel
     def save_tasks_to_be_executed(message)
       debug("worler #{@job_id} current invocation chain : #{rake_tasks.inspect}") if debug_enabled?
       rake_tasks << message['task'] if rake_tasks.last != message['task']
-      dry_run_tasks << message['task'] if dry_running? && dry_run_tasks.last != message['task']
+      invocation_chain << message['task'] if invocation_chain.last != message['task']
     end
 
     def update_machine_state(name)
@@ -180,14 +176,6 @@ module CapistranoMulticonfigParallel
       @task_argv
     end
 
-    def dry_run_command
-      '--dry-run'
-    end
-
-    def dry_running?
-      @task_argv.include?(dry_run_command) == true
-    end
-
     def worker_stage
       @app_name.present? ? "#{@app_name}:#{@env_name}" : "#{@env_name}"
     end
@@ -206,7 +194,7 @@ module CapistranoMulticonfigParallel
       args.each do |arg|
         array_options << arg
       end
-      @job_argv = array_options.clone
+      @manager.jobs[@job_id]['job_argv'] = array_options.clone
       array_options.unshift("#{worker_action}")
       array_options.unshift("#{worker_stage}")
       setup_command_line(*array_options)

data/lib/capistrano_multiconfig_parallel/celluloid/child_process.rb

@@ -32,7 +32,7 @@ module CapistranoMulticonfigParallel
     def set_worker_log
       FileUtils.mkdir_p(CapistranoMulticonfigParallel.log_directory) unless File.directory?(CapistranoMulticonfigParallel.log_directory)
       @filename = File.join(CapistranoMulticonfigParallel.log_directory, "worker_#{@actor.job_id}.log")
-      FileUtils.rm_rf(@filename) if File.file?(@filename) && !@actor.crashed? && (@options[:dry_run] || @actor.executed_dry_run != true)
+      FileUtils.rm_rf(@filename) if File.file?(@filename) && !@actor.crashed?
       @worker_log = ::Logger.new(@filename)
       @worker_log.level = ::Logger::Severity::DEBUG
       @worker_log.formatter = proc do |severity, datetime, progname, msg|
@@ -47,14 +47,9 @@ module CapistranoMulticonfigParallel
     end
 
     def check_exit_status
-      return unless @exit_status.present?
-      if @exit_status.exitstatus == 0 && @options[:dry_run]
-        debug("worker #{@actor.job_id} starts execute deploy") if @debug_enabled
-        @actor.async.execute_deploy
-      elsif !@actor.worker_finshed?
-        debug("worker #{@actor.job_id} startsnotify finished") if @debug_enabled
-        @actor.notify_finished(@exit_status)
-      end
+      return if @exit_status.blank? || !@actor.worker_finshed?
+      debug("worker #{@actor.job_id} startsnotify finished") if @debug_enabled
+      @actor.notify_finished(@exit_status)
     end
 
     def start_async_deploy(cmd, options)

data/lib/capistrano_multiconfig_parallel/celluloid/rake_worker.rb

@@ -73,14 +73,15 @@ module CapistranoMulticonfigParallel
     end
 
     def on_message(message)
+      return unless message.present?
       debug("Rake worker #{@job_id} received after parse #{message}") # if debug_enabled?
       if @client.succesfull_subscription?(message)
         debug("Rake worker #{@job_id} received  parse #{message}") if debug_enabled?
         @successfull_subscription = true
         publish_to_worker(task_data)
-      elsif message.present? && message['task'].present?
+      elsif message['task'].present?
         task_approval(message)
-      elsif message.present? && message['action'].present? && message['action'] == 'stdin'
+      elsif message['action'].present? && message['action'] == 'stdin'
         stdin_approval(message)
       else
         warn "unknown action: #{message.inspect}" if debug_enabled?

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -132,19 +132,18 @@ module CapistranoMulticonfigParallel
       system('cls') || system('clear') || puts("\e[H\e[2J")
     end
 
-    def worker_dry_running?(worker)
-      worker.alive? && worker.dry_running?
-    end
-
     def worker_progress(_details, worker)
       return worker_state(worker) unless worker.alive?
-      return if worker.executing_dry_run.nil?
-      tasks = worker.alive? ? worker.dry_run_tasks : []
+      tasks = worker.alive? ? worker.invocation_chain : []
       current_task = worker.alive? ? worker.machine.state.to_s : ''
-      total_tasks = worker_dry_running?(worker) ? nil : tasks.size
-      task_index = worker_dry_running?(worker) ? 0 : tasks.index(current_task.to_s).to_i + 1
+      show_worker_percent(worker, tasks, current_task)
+    end
+
+    def show_worker_percent(worker, tasks, current_task)
+      total_tasks = worker.alive? ? tasks.size : nil
+      task_index = worker.alive? ? tasks.index(current_task.to_s).to_i + 1 : 0
       percent = percent_of(task_index, total_tasks)
-      result  = worker_dry_running?(worker) ? 'Please wait.. building the progress bars' : "Progress [#{format('%.2f', percent)}%]  (executed #{task_index} of #{total_tasks})"
+      result  = "Progress [#{format('%.2f', percent)}%]  (executed #{task_index} of #{total_tasks})"
       if worker.alive?
         worker.crashed? ? result.red : result.green
       else

data/lib/capistrano_multiconfig_parallel/configuration.rb

@@ -65,18 +65,21 @@ module CapistranoMulticonfigParallel
         raise ArgumentError, 'the array must contain only task names' if value.find { |row| !row.is_a?(String) }
       end
 
-      def verify_application_dependencies(value)
+      def verify_application_dependencies(c, prop, props)
+        value = c[prop.to_sym]
+        return unless value.is_a?(Array)
         value.reject { |val| val.blank? || !val.is_a?(Hash) }
-        wrong = value.find do|hash|
-          !Set[:app, :priority, :dependencies].subset?(hash.keys.to_set) ||
-          hash[:app].blank? ||
-          hash[:priority].blank?
-          !hash[:priority].is_a?(Numeric) ||
-          !hash[:dependencies].is_a?(Array)
-        end
+        wrong = check_array_of_hash(value, props.map(&:to_sym))
         raise ArgumentError, "invalid configuration for #{wrong.inspect}" if wrong.present?
       end
 
+      def check_array_of_hash(value, props)
+        value.find do|hash|
+          !Set.new(props).subset?(hash.keys.to_set) ||
+            hash.values.find(&:blank?).present?
+        end
+      end
+
       def verify_app_dependencies(stages)
         applications = stages.map { |stage| stage.split(':').reverse[1] }
         wrong = configuration.application_dependencies.find do |hash|
@@ -94,14 +97,22 @@ module CapistranoMulticonfigParallel
         verify_app_dependencies(stages) if configuration.application_dependencies.present?
       end
 
-      def check_configuration(c)
-        %w(multi_debug multi_secvential websocket_server.enable_debug).each do |prop|
+      def check_boolean_props(c, props)
+        props.each do |prop|
           c.send("#{prop}=", c[prop.to_sym]) if check_boolean(c, prop.to_sym)
         end
-        %w(task_confirmations development_stages apply_stage_confirmation).each do |prop|
+      end
+
+      def check_array_props(c, props)
+        props.each do |prop|
           c.send("#{prop}=", c[prop.to_sym]) if c[prop.to_sym].is_a?(Array) && verify_array_of_strings(c[prop.to_sym])
         end
-        c.application_dependencies = c[:application_dependencies] if c[:application_dependencies].is_a?(Array) && verify_application_dependencies(c[:application_dependencies])
+      end
+
+      def check_configuration(c)
+        check_boolean_props(c, %w(multi_debug multi_secvential websocket_server.enable_debug))
+        check_array_props(c, %w(task_confirmations development_stages apply_stage_confirmation))
+        verify_application_dependencies(c, 'application_dependencies', %w(app priority dependencies))
         CapistranoMulticonfigParallel::CelluloidManager.debug_enabled = true if c[:multi_debug].to_s.downcase == 'true'
       end
     end

data/lib/capistrano_multiconfig_parallel/helper.rb

@@ -1,8 +1,8 @@
 # module used for feching gem information
 module Helper
-  # function that makes the methods incapsulated as utility functions
+# function that makes the methods incapsulated as utility functions
 
-  module_function
+module_function
 
   def find_loaded_gem_property(gem_name, property)
     gem_spec = Gem.loaded_specs.values.find { |repo| repo.name == gem_name }
@@ -15,7 +15,7 @@ module Helper
   end
 
   def get_parsed_version(version, options)
-    parsing_options = {optional_fields: [:tiny]}.merge(options.fetch("unparse", {}))
+    parsing_options = { optional_fields: [:tiny] }.merge(options.fetch('unparse', {}))
     Versionomy.parse(version).unparse(parsing_options)
   rescue Versionomy::Errors::ParseError
     nil
@@ -27,5 +27,4 @@ module Helper
     gem_version = fetch_gem_version(gem_name, options)
     gem_version.blank? ? false : gem_version.send(options.fetch('operator', '<='), version)
   end
-
 end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
     MAJOR = 0
     MINOR = 15
-    TINY = 3
+    TINY = 4
     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.15.3
+  version: 0.15.4
 platform: ruby
 authors:
 - bogdanRada
@@ -451,25 +451,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.33'
 - !ruby/object:Gem::Dependency
-  name: phare
+  name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '3.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '3.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement