capistrano_multiconfig_parallel 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a2624e7780cba952e2cab12a77757f73a2d902f
-  data.tar.gz: c37dfc724d1298716cc62cebcf95bd758082a321
+  metadata.gz: 91eff916dbb3076e8afd788b6b853dedf839a523
+  data.tar.gz: 7056e86b82f6d3021c3e8778e86d5c33cd9a7543
 SHA512:
-  metadata.gz: 9549c24533b7558dc8f37e74fb183938d518b86503492ca07298849e844a9b800c1ed0d56e7ea60da2d260d01c622174ce601f527de1b76f54a2ba91e7c4028d
-  data.tar.gz: a8aadcd64a80ba1392d171310c6802a2c3eacce6abe8086ce38a0e1b616732f2d5eb5443b2f2feedb17b5df756f2dd0ecce72d72f1c876ebf3d099da5cdc04a5
+  metadata.gz: 99d5dad8951a1f901a94f49e6f4ac7c6781555e218ccfe4f5f152b71160fa37d7824ab649e56b0d47abfc9588fc264ee5d460186e0571109e77ea8e22fa4a945
+  data.tar.gz: f93cc40a17d86fa045e624f06f4fb8716632867cf7df0761c52d313eaed40dae304249c4e989ccf4fda7da29045516a5a1c2ae8aa25803cb1bb00bacbd5991be

data/lib/capistrano_multiconfig_parallel/all.rb

@@ -22,6 +22,7 @@ require 'inquirer'
 require 'rack'
 require 'rake'
 
+require 'etc'
 require 'logger'
 require 'fileutils'
 require 'pp'

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -29,14 +29,14 @@ module CapistranoMulticonfigParallel
       set_celluloid_exception_handling
     end
 
-    def original_args_hash
-      multi_fetch_argv((original_args || ARGV).dup)
-    end
-
     def job_id
       original_args_hash.fetch(CapistranoMulticonfigParallel::ENV_KEY_JOB_ID, nil)
     end
 
+    def original_args_hash
+      multi_fetch_argv((original_args || ARGV).dup)
+    end
+
     def capistrano_version
       find_loaded_gem_property('capistrano', 'version')
     end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -121,14 +121,6 @@ module CapistranoMulticonfigParallel
       end
     end
 
-    def message_is_for_stdout?(message)
-      message.present? && message.is_a?(Hash) && message['action'].present? && message['job_id'].present? && message['action'] == 'stdout'
-    end
-
-    def message_is_about_a_task?(message)
-      message.present? && message.is_a?(Hash) && message['action'].present? && message['job_id'].present? && message['task'].present?
-    end
-
     def executed_task?(task)
       rake_tasks.present? && rake_tasks.index(task.to_s).present?
     end
@@ -163,7 +155,7 @@ module CapistranoMulticonfigParallel
 
     def finish_worker(exit_status)
       log_to_file("worker #{job_id} tries to terminate with exit_status #{exit_status}")
-      @manager.mark_completed_remaining_tasks(@job)
+      @manager.mark_completed_remaining_tasks(@job) if Actor.current.alive?
       update_machine_state('FINISHED') if exit_status == 0
       @manager.workers_terminated.signal('completed') if @manager.present? && @manager.alive? && @manager.all_workers_finished?
     end

data/lib/capistrano_multiconfig_parallel/celluloid/rake_worker.rb

@@ -17,7 +17,7 @@ module CapistranoMulticonfigParallel
 
     def custom_attributes
       @publisher_channel = "worker_#{@job_id}"
-      @action = 'invoke'
+      @action = @options['action'].present? ? @options['action'] : 'invoke'
       @task = @options['task']
     end
 
@@ -72,7 +72,7 @@ module CapistranoMulticonfigParallel
       log_to_file("Rake worker #{@job_id} received after on message:", message)
       if @client.succesfull_subscription?(message)
         publish_subscription_successfull(message)
-      elsif msg_for_task?(message)
+      elsif message_is_about_a_task?(message)
         task_approval(message)
       elsif msg_for_stdin?(message)
         stdin_approval(message)
@@ -105,7 +105,7 @@ module CapistranoMulticonfigParallel
     end
 
     def task_approval(message)
-      return unless msg_for_task?(message)
+      return unless message_is_about_a_task?(message)
       if @job_id == message['job_id'] && message['task'].to_s == task_name.to_s && message['approved'] == 'yes'
         @task_approved = true
       else

data/lib/capistrano_multiconfig_parallel/celluloid/state_machine.rb

@@ -45,6 +45,7 @@ module CapistranoMulticonfigParallel
   private
 
     def actor_notify_state_change(current_state, event, new_state)
+      return unless @actor.alive?
       @actor.send_msg(CapistranoMulticonfigParallel::TerminalTable.topic, type: 'event', new_state: new_state, message: "Going from #{current_state} to #{new_state}  due to a #{event} event")
     end
   end

data/lib/capistrano_multiconfig_parallel/classes/cursor.rb

@@ -61,7 +61,7 @@ module CapistranoMulticonfigParallel
       end
 
       def dynamic_size_tput
-        lines `tput lines 2>/dev/null`
+        lines = `tput lines 2>/dev/null`
         cols = `tput cols 2>/dev/null`
         lines.present? && cols.present? ? "#{lines} #{cols}" : nil
       end

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -12,7 +12,7 @@ module CapistranoMulticonfigParallel
              :capistrano_action,
              :execute_standard_deploy,
              :setup_command_line,
-             :gitflow,
+             :gem_specs,
              to: :command
 
     delegate :stderr_buffer,
@@ -22,6 +22,7 @@ module CapistranoMulticonfigParallel
       @options = options.stringify_keys
       @application = application
       @manager = @application.manager
+      @gitflow ||= command.gitflow_enabled?
     end
 
     def save_stderr_error(data)

data/lib/capistrano_multiconfig_parallel/classes/job_command.rb

@@ -7,19 +7,44 @@ module CapistranoMulticonfigParallel
     include CapistranoMulticonfigParallel::ApplicationHelper
 
     attr_reader :job, :job_capistrano_version, :legacy_capistrano
-    delegate :app, :stage, :action, :task_arguments, :env_options, :path, to: :job
+    delegate :id, :app, :stage, :action, :task_arguments, :env_options, :path, to: :job
 
     def initialize(job)
       @job = job
       @legacy_capistrano = legacy_capistrano? ? true : false
     end
 
+    def lockfile_parser
+      if File.exists?(job_gemfile_lock)
+        @lockfile_parser ||= Bundler::LockfileParser.new(Bundler.read_file("#{job_gemfile_lock}"))
+      else
+        raise RuntimeError, "please install the gems separately for this application #{job_path} and re-try again!"
+      end
+    end
+
+    def gem_specs
+      @specs = lockfile_parser.specs
+    end
+
+    def job_gemfile
+      File.join(job_path, 'Gemfile')
+    end
+
+    def job_gemfile_lock
+      File.join(job_path, 'Gemfile.lock')
+    end
+
+    def job_gem_version(gem_name)
+      gem_spec = gem_specs.find {|spec| spec.name == gem_name}
+      gem_spec.present? ? gem_spec.version.to_s : nil
+    end
+
     def filtered_env_keys
       %w(STAGES ACTION)
     end
 
     def bundle_gemfile_env
-      "BUNDLE_GEMFILE=#{job_path}/Gemfile"
+      "BUNDLE_GEMFILE=#{job_gemfile}"
     end
 
     def gitflow
@@ -27,6 +52,11 @@ module CapistranoMulticonfigParallel
       @gitflow ||= gitflow.include?('Could not find') ? false : true
     end
 
+    def gitflow_enabled?
+     gitflow_version = job_gem_version("capistrano-gitflow")
+      gitflow_version.present? ? true : false
+    end
+
     def job_stage
       multi_apps?(job_path) && app.present? ? "#{app}:#{stage}" : "#{stage}"
     end
@@ -60,8 +90,7 @@ module CapistranoMulticonfigParallel
     end
 
     def job_capistrano_version
-      @job_capistrano_version ||= `#{command_prefix} && #{bundle_gemfile_env} bundle show capistrano | grep  -Po  'capistrano-([0-9.]+)' | grep  -Po  '([0-9.]+)'`
-      @job_capistrano_version = strip_characters_from_string(@job_capistrano_version)
+      @job_capistrano_version ||= job_gem_version("capistrano")
     end
 
     def legacy_capistrano?

data/lib/capistrano_multiconfig_parallel/classes/rake_task_hooks.rb

@@ -8,13 +8,13 @@ module CapistranoMulticonfigParallel
     include CapistranoMulticonfigParallel::ApplicationHelper
     attr_accessor :job_id, :task
     def initialize(task = nil)
-      @job_id = CapistranoMulticonfigParallel.job_id
+      @job_id  = CapistranoMulticonfigParallel.job_id
       @task = task.respond_to?(:fully_qualified_name) ? task.fully_qualified_name : task
     end
 
     def automatic_hooks(&block)
       if configuration.multi_secvential.to_s.downcase == 'false' && job_id.present? && @task.present?
-        actor_start_working
+        actor_start_working(action: 'invoke')
         actor.wait_execution until actor.task_approved
         actor_execute_block(&block)
       else
@@ -26,7 +26,7 @@ module CapistranoMulticonfigParallel
       if job_id.present?
         actor.user_prompt_needed?(question)
       else
-        yield if block.given?
+        yield if block_given?
       end
     end
 
@@ -62,12 +62,13 @@ module CapistranoMulticonfigParallel
       after_hooks
     end
 
-    def actor_start_working
+    def actor_start_working(additionals = {})
+       additionals = additionals.present? ? additionals : {}
       if actor.blank?
         supervise_actor
-        actor.work(actor_id: rake_actor_id, job_id: job_id, task: @task)
+        actor.work({actor_id: rake_actor_id, job_id: job_id, task: @task}.merge(additionals))
       else
-        actor.publish_new_work(task: @task)
+        actor.publish_new_work({task: @task}.merge(additionals))
       end
     end
 

data/lib/capistrano_multiconfig_parallel/helpers/application_helper.rb

@@ -15,21 +15,29 @@ module CapistranoMulticonfigParallel
     include CapistranoMulticonfigParallel::CapistranoHelper
 
     delegate :logger,
-             :configuration,
-             :configuration_valid?,
-             :capistrano_version_2?,
-             :capistrano_version,
-             :original_args,
-             to: :CapistranoMulticonfigParallel
+    :configuration,
+    :configuration_valid?,
+    :capistrano_version_2?,
+    :capistrano_version,
+    :original_args,
+    to: :CapistranoMulticonfigParallel
 
-  module_function
+    module_function
 
     def msg_for_stdin?(message)
       message['action'] == 'stdin'
     end
 
-    def msg_for_task?(message)
-      message['task'].present?
+    def message_is_for_stdout?(message)
+      message.present? && message.is_a?(Hash) && message['action'].present? && message['job_id'].present? && message['action'] == 'stdout'
+    end
+
+    def message_is_about_a_task?(message)
+      message.present? && message.is_a?(Hash) && message['action'].present? && message['job_id'].present? && message['task'].present? && message['action'] == 'invoke'
+    end
+
+    def message_from_bundler?(message)
+      message.present? && message.is_a?(Hash) && message['action'].present? && message['job_id'].present? && message['task'].present? && message['action'] == 'bundle_install'
     end
 
     def get_question_details(data)

data/lib/capistrano_multiconfig_parallel/helpers/capistrano_helper.rb

@@ -3,19 +3,19 @@ module CapistranoMulticonfigParallel
   module CapistranoHelper
   module_function
 
-    def filtered_env_keys_format(keys, version = capistrano_version_2?)
+    def filtered_env_keys_format(keys, version = false)
       keys.map { |key| env_key_format(key, version) }
     end
 
-    def env_prefix(key, version = capistrano_version_2?)
+    def env_prefix(key, version = false)
       key != CapistranoMulticonfigParallel::ENV_KEY_JOB_ID && version == true ? '-S' : ''
     end
 
-    def env_key_format(key, version = capistrano_version_2?)
+    def env_key_format(key, version = false)
       version == true ? key.downcase : key
     end
 
-    def trace_flag(version = capistrano_version_2?)
+    def trace_flag(version = false)
       version == true ? '--verbose' : '--trace'
     end
 

data/lib/capistrano_multiconfig_parallel/helpers/configuration.rb

@@ -38,8 +38,14 @@ module CapistranoMulticonfigParallel
 
     def read_config_file
       return if CapistranoMulticonfigParallel.original_args.present? && CapistranoMulticonfigParallel.original_args.include?('--help')
-      @fetched_config.config_dir = @fetched_config.config_dir.present? ? File.expand_path(@fetched_config.config_dir) : try_detect_file('multi_cap.yml')
-      config_file_path = @fetched_config.config_dir.present? ? File.join(@fetched_config.config_dir, 'multi_cap.yml') : nil
+       user = Etc.getlogin
+      config_file_path = File.join(Dir.home(user), "multi_cap.yml")
+      if File.exists?(config_file_path)
+         @fetched_config.config_dir  = File.dirname(config_file_path)
+      else
+        @fetched_config.config_dir = @fetched_config.config_dir.present? ? File.expand_path(@fetched_config.config_dir) : try_detect_file('multi_cap.yml')
+         config_file_path = @fetched_config.config_dir.present? ? File.join(@fetched_config.config_dir, 'multi_cap.yml') : nil
+      end
       config_file = File.expand_path(config_file_path || File.join(detect_root.to_s, 'config', 'multi_cap.yml'))
       @fetched_config.log_dir = config_file_path.present? ? File.dirname(config_file) : File.dirname(File.dirname(config_file))
       @fetched_config.read config_file if File.file?(config_file)

data/lib/capistrano_multiconfig_parallel/helpers/internal_helper.rb

@@ -3,13 +3,29 @@ module CapistranoMulticonfigParallel
   module InternalHelper
   module_function
 
+  def get_current_gem_name
+      searcher = if Gem::Specification.respond_to? :find
+        # ruby 2.0
+        Gem::Specification
+      elsif Gem.respond_to? :searcher
+        # ruby 1.8/1.9
+        Gem.searcher.init_gemspecs
+      end
+      spec = unless searcher.nil?
+        searcher.find do |spec|
+          File.fnmatch(File.join(spec.full_gem_path,'*'), __FILE__)
+        end
+      end
+      spec.name if spec.present?
+    end
+
     def multi_level_prop(config, prop)
       prop.split('.').each { |new_prop| config = config[new_prop] }
       config
     end
 
     def internal_config_directory
-      File.join(root.to_s, 'capistrano_multiconfig_parallel', 'configuration')
+     File.join(root.to_s, get_current_gem_name, 'configuration')
     end
 
     def internal_config_file

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 1
-    MINOR = 3
-    TINY = 1
+    MINOR = 4
+    TINY = 0
     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: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid