capistrano_multiconfig_parallel 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 576d2d4c017df766b649b56f90a3410f58beaf9a
-  data.tar.gz: e4952851b1bab357329ece299ee8de1346256956
+  metadata.gz: 0362dba10934410958b8d42d03252ee5b8126c22
+  data.tar.gz: e407a9d74a97ea09c2a80e5222334204dc106b86
 SHA512:
-  metadata.gz: fe9d160ac7cf3658b94f70627b6a0a498097074185ebe1465de2baa638c278a80ba5d5cae140876d6ae02dc3b4e5e588b0070467ee680ef8e74d5cd7a561bc11
-  data.tar.gz: baa62229473d2fda8046a4aed016834327b9c659d088f98c876a5bdd91c7553b737a50b488b09893f844fe5d5823dbcd61620392035afd215a24035093ee54b5
+  metadata.gz: 87a31611fb4dc5f10e115e7acb8bd1d580c9afbedb62c0c908d3a2b6be55cedbf3e936a6cffa44ecf5f4925c3a7f903b8536ff0ec3d6765c1cfd131a870d988b
+  data.tar.gz: fea6af3d812cf4ebdbfefee6084d50a640d3dc9d45a713a689e46d8f25bef422c50961c68b12ed4680a6c46ec5445cee67efac1cab15ecdcdb72bc961bb5e94c

data/README.md

@@ -75,7 +75,7 @@ Add the following to your Gemfile:
 ```
 
 
-Add the following to your Capfile:
+Add the following to your Capfile after requiring **capistrano** and **capistrano-multiconfig**
   
 ```ruby
   require 'capistrano_multiconfig_parallel'

data/capistrano_multiconfig_parallel.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'activesupport',  '~> 4.0','>= 4.0'
   s.add_runtime_dependency 'configliere', '~> 0.4', '>=0.4'
   s.add_runtime_dependency 'inquirer', '~> 0.2', '>= 0.2'
+   s.add_runtime_dependency 'devnull','~> 0.1', '>= 0.1'
     
   s.add_development_dependency 'rspec-rails', '~> 2.0', '>= 2.0'
   s.add_development_dependency 'guard', '~> 2.6', '>= 2.6.1'

data/lib/capistrano_multiconfig_parallel.rb

@@ -1 +1 @@
-require 'capistrano_multiconfig_parallel/base'
+require 'capistrano_multiconfig_parallel/all'

data/lib/capistrano_multiconfig_parallel/all.rb

@@ -20,6 +20,8 @@ require 'capistrano/all'
 require 'fileutils'
 require 'logger'
 require 'pp'
+require 'devnull'
+require 'inquirer'
 # fix error with not files that can not be found
 Gem.find_files('composable_state_machine/**/*.rb').each { |path| require path }
 
@@ -27,5 +29,7 @@ Gem.find_files('capistrano_multiconfig_parallel/initializers/**/*.rb').each { |p
 Gem.find_files('capistrano_multiconfig_parallel/helpers/**/*.rb').each { |path| require path }
 Gem.find_files('capistrano_multiconfig_parallel/celluloid/**/*.rb').each { |path| require path }
 
+require_relative './version'
+require_relative './configuration'
 require_relative './base'
-require_relative 'application'
+require_relative './application'

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -1,3 +1,4 @@
+Gem.find_files('capistrano_multiconfig_parallel/extensions/**/*.rb').each { |path| require path }
 module CapistranoMulticonfigParallel
   # class used as a wrapper around capistrano
   class Application < Capistrano::Application

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -1,9 +1,3 @@
-require 'rubygems'
-require 'bundler'
-require 'bundler/setup'
-require 'inquirer'
-require_relative './version'
-require_relative './configuration'
 # base module that has the statis methods that this gem is using
 module CapistranoMulticonfigParallel
   include CapistranoMulticonfigParallel::Configuration
@@ -11,7 +5,8 @@ module CapistranoMulticonfigParallel
   ENV_KEY_JOB_ID = 'multi_cap_job_id'
   MULTI_KEY = 'multi'
   SINGLE_KEY = 'single'
-
+ GITFLOW_TAG_STAGING_TASK = "gitflow:tag_staging"
+ 
   CUSTOM_COMMANDS = {
     CapistranoMulticonfigParallel::MULTI_KEY => {
       stages: 'deploy_multi_stages'
@@ -29,7 +24,11 @@ module CapistranoMulticonfigParallel
     end
 
     def ask_confirm(message, default)
+      begin
       Ask.input message, default: default
+      rescue
+        return nil
+      end
     end
 
     def log_directory
@@ -46,14 +45,19 @@ module CapistranoMulticonfigParallel
 
     def enable_logging
       CapistranoMulticonfigParallel.configuration_valid?
-      return unless CapistranoMulticonfigParallel::CelluloidManager.debug_enabled
       FileUtils.mkdir_p(log_directory) unless File.directory?(log_directory)
-      FileUtils.touch(main_log_file) unless File.file?(main_log_file)
-      if ENV[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
-        log_file = File.open(main_log_file, 'w')
-        log_file.sync = true
+      if  CapistranoMulticonfigParallel::CelluloidManager.debug_enabled.to_s.downcase == 'true'
+        FileUtils.touch(main_log_file) unless File.file?(main_log_file)
+        if ENV[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
+          log_file = File.open(main_log_file, 'w')
+          log_file.sync = true
+        end
+        self.logger = ::Logger.new(main_log_file)
+      else
+        self.logger =  ::Logger.new(DevNull.new)
       end
-      self.logger = ::Logger.new(main_log_file)
+      Celluloid.logger = CapistranoMulticonfigParallel.logger
+      Celluloid.task_class = Celluloid::TaskThread
     end
 
     def log_message(message)

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -63,7 +63,7 @@ module CapistranoMulticonfigParallel
     # a job
     def delegate(job)
       job = job.stringify_keys
-      job['id'] = generate_job_id(job) if job['worker_action'] != 'worker_died'
+      job['id'] = generate_job_id(job) unless job_failed?(job)
       @jobs[job['id']] = job
       job['env_options'][CapistranoMulticonfigParallel::ENV_KEY_JOB_ID] = job['id']
       # debug(@jobs)
@@ -198,6 +198,18 @@ module CapistranoMulticonfigParallel
       end
     end
 
+    def can_tag_staging?
+     @job_manager.is_able_to_tag_staging?  &&
+       @jobs.detect{|job_id, job| job['env'] == 'production'}.blank? 
+    end
+    
+    def dispatch_new_job(job)
+      original_env = job['env_options']
+      env_opts = @job_manager.get_app_additional_env_options(job['app_name'], job['stage'])
+      job['env_options'] =  original_env.merge(env_opts)
+      async.delegate(job)
+    end
+    
     def process_job(job)
       env_options = {}
       job['env_options'].each do |key, value|
@@ -228,14 +240,18 @@ module CapistranoMulticonfigParallel
       end
       status
     end
+    
+    def job_failed?(job)
+      job['worker_action'].present? && job['worker_action'] == 'worker_died'
+    end
 
     def worker_died(worker, reason)
       debug("worker with mailbox #{worker.mailbox.inspect} died  for reason:  #{reason}") if self.class.debug_enabled?
       job = @worker_to_job[worker.mailbox.address]
       @worker_to_job.delete(worker.mailbox.address)
       debug "restarting #{job} on new worker" if self.class.debug_enabled?
-      return if job.blank? || job['worker_action'] == 'worker_died'
-      return unless job['worker_action'] == 'deploy'
+      return if job.blank? || job_failed?(job)
+      return unless job['action_name'] == 'deploy'
       job = job.merge(:action => 'deploy:rollback', 'worker_action' => 'worker_died')
       delegate(job)
     end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -88,10 +88,37 @@ module CapistranoMulticonfigParallel
     def rake_tasks
       @rake_tasks ||= []
     end
-
+      
+    def last_staging_tag
+      last_tag_matching('staging-*')
+    end
+    
+    def last_tag_matching(pattern)
+        # search for most recent (chronologically) tag matching the passed pattern, then get the name of that tag.
+        last_tag = `#{cd_working_directory} && git describe --exact-match  --tags --match='#{pattern}' $(git log --tags='#{pattern}*' -n1 --pretty='%h')`.chomp
+        debug("LAST TAG is #{last_tag}") if debug_enabled?
+        last_tag == '' ? nil : last_tag
+    end
+    
+    def staging_was_tagged?
+      begin
+        current_sha = `#{cd_working_directory} && git log --pretty=format:%H HEAD -1`
+        debug("curent SHA is #{current_sha}") if debug_enabled?
+        last_staging_tag_sha = last_staging_tag ?   `#{cd_working_directory} && git log --pretty=format:%H #{last_staging_tag} -1` : nil
+        debug("LAST TAGGING SHA  is #{last_staging_tag_sha}") if debug_enabled?
+        last_staging_tag_sha == current_sha
+      rescue
+        return false
+      end
+    end
+    
+    def cd_working_directory
+      "cd #{CapistranoMulticonfigParallel.detect_root.to_s}"
+    end
+    
     def generate_command
       <<-CMD
-            bundle exec ruby -e "require 'bundler' ;   Bundler.with_clean_env { %x[cd #{CapistranoMulticonfigParallel.detect_root.to_s} && bundle install && RAILS_ENV=#{@env_name} bundle exec multi_cap #{@task_argv.join(' ')} ] } "
+           #{cd_working_directory} && RAILS_ENV=#{@env_name} bundle exec multi_cap #{@task_argv.join(' ')}
       CMD
     end
     
@@ -121,6 +148,9 @@ module CapistranoMulticonfigParallel
 
     def handle_subscription(message)
       if message_is_about_a_task?(message)
+        if @env_name == 'staging' && @manager.can_tag_staging? && staging_was_tagged? && has_executed_task?(CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK)
+         @manager.dispatch_new_job(@job.merge('env' =>  'production'))
+       end
         save_tasks_to_be_executed(message)
         update_machine_state(message['task']) # if message['action'] == 'invoke'
         debug("worker #{@job_id} state is #{@machine.state}") if debug_enabled?
@@ -133,6 +163,10 @@ module CapistranoMulticonfigParallel
     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 has_executed_task?(task)
+      @rake_tasks.present? && @rake_tasks[task].present?
+    end
 
     def task_approval(message)
       if @manager.apply_confirmations? && CapistranoMulticonfigParallel.configuration.task_confirmations.include?(message['task']) && message['action'] == 'invoke'
@@ -193,14 +227,14 @@ module CapistranoMulticonfigParallel
     end
    
     def crashed?
-      @action_name == 'deploy:rollback' || @action_name == 'deploy:failed'
+      @action_name == 'deploy:rollback' || @action_name == 'deploy:failed'  || @manager.job_failed?(@job)
     end
 
     def finish_worker
       @manager.mark_completed_remaining_tasks(Actor.current)
       @worker_state = 'finished'
       @manager.job_to_worker.each do|_job_id, worker|
-        debug("worker #{worker.job_id}has state #{worker.worker_state}") if worker.alive? && ebug_enabled?
+        debug("worker #{worker.job_id}has state #{worker.worker_state}") if worker.alive? && debug_enabled?
       end
     end
 

data/lib/capistrano_multiconfig_parallel/celluloid/child_process.rb

@@ -26,9 +26,9 @@ module CapistranoMulticonfigParallel
     end
 
     def set_worker_log
-      FileUtils.mkdir_p(CapistranoMulticonfigParallel.log_directory)
+      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 @options[:dry_run] || @actor.executed_dry_run != true
+      FileUtils.rm_rf(@filename) if File.file?(@filename) && !@actor.crashed? &&  (@options[:dry_run] || @actor.executed_dry_run != true)
       @worker_log = ::Logger.new(@filename)
       @worker_log.level = ::Logger::Severity::DEBUG
       @worker_log.formatter = proc do |severity, datetime, progname, msg|

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -57,7 +57,7 @@ module CapistranoMulticonfigParallel
       worker = @manager.get_worker_for_job(job_id)
       if worker.alive?
         state = worker.machine.state.to_s
-        state = worker_crashed?(worker) ? state.red : state.green
+        state = worker.crashed? ? state.red : state.green
       else
         state = "dead".upcase.red
       end
@@ -98,26 +98,6 @@ module CapistranoMulticonfigParallel
       system('cls') || system('clear') || puts("\e[H\e[2J")
     end
 
-    def worker_crashed?(worker)
-      worker.crashed?
-    end
-    # rubocop:disable Lint/Eval
-    def capture(stream)
-      stream = stream.to_s
-      captured_stream = Tempfile.new(stream)
-      stream_io = eval("$#{stream}")
-      origin_stream = stream_io.dup
-      stream_io.reopen(captured_stream)
-
-      yield
-
-      stream_io.rewind
-      return captured_stream.read
-    ensure
-      captured_stream.close
-      captured_stream.unlink
-      stream_io.reopen(origin_stream)
-    end
 
     def worker_progress(worker)
       tasks = worker.rake_tasks
@@ -125,14 +105,14 @@ module CapistranoMulticonfigParallel
       total_tasks = tasks.size
       task_index = tasks.index(current_task)
       progress = Formatador::ProgressBar.new(total_tasks, color: 'green', start: task_index.to_i)
-      result = capture(:stdout) do
+      result = CapistranoMulticonfigParallel::Helper.capture(:stdout) do
         progress.increment
       end
       result = result.gsub("\r\n", '')
       result = result.gsub("\n", '')
       result = result.gsub('|', '#')
       result = result.gsub(/\s+/, ' ')
-      if worker_crashed?(worker)
+      if worker.crashed?
         return result.red
       else
         return result.green

data/lib/capistrano_multiconfig_parallel/cli.rb

@@ -1,5 +1,4 @@
 require_relative './all'
-
 module CapistranoMulticonfigParallel
   # this is the class that will be invoked from terminal , and willl use the invoke task as the primary function.
   class CLI

data/lib/capistrano_multiconfig_parallel/configuration.rb

@@ -1,4 +1,3 @@
-require_relative './initializers/conf'
 module CapistranoMulticonfigParallel
   # class that holds the options that are configurable for this gem
   module Configuration

data/lib/capistrano_multiconfig_parallel/helpers/base_manager.rb

@@ -5,7 +5,7 @@ module CapistranoMulticonfigParallel
   class BaseManager
     include Celluloid
     include Celluloid::Logger
-
+  
     attr_accessor :condition, :manager, :deps, :application, :stage, :name, :args, :argv, :jobs, :job_registered_condition, :default_stage
 
     def initialize(cap_app, top_level_tasks, stages)
@@ -58,10 +58,6 @@ module CapistranoMulticonfigParallel
     def check_before_starting
       @condition = Celluloid::Condition.new
       @manager = CapistranoMulticonfigParallel::CelluloidManager.new(Actor.current)
-      if CapistranoMulticonfigParallel::CelluloidManager.debug_enabled == true
-        Celluloid.logger = CapistranoMulticonfigParallel.logger
-        Celluloid.task_class = Celluloid::TaskThread
-      end
     end
     
     def collect_jobs(options = {}, &block)
@@ -79,22 +75,50 @@ module CapistranoMulticonfigParallel
         run_async_jobs
       end
     end
+    
+    def tag_staging_exists? # check exists task from capistrano-gitflow
+      begin
+        Rake::Task[CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK].present?
+      rescue
+        return false
+      end
+    end
 
     def fetch_multi_stages
       stages = @argv['STAGES'].blank? ? '' : @argv['STAGES']
       stages = parse_inputted_value(value: stages).split(',').compact if stages.present?
-      stages
+      stages.present? ? stages :  [@default_stage]
     end
 
+    def wants_deploy_production?
+     (!custom_command? &&  @stage == 'production') || (custom_command? && fetch_multi_stages.include?("production"))
+    end
+    
+     def is_able_to_tag_staging?
+        using_git? &&  wants_deploy_production? && tag_staging_exists? 
+    end
+    
+     def check_multi_stages(stages)
+         is_able_to_tag_staging? ?  stages.reject{|u| u == 'production'} : stages
+     end
+    
     def deploy_app(options = {})
       options = options.stringify_keys
       app = options['app'].is_a?(Hash) ? options['app'] : { 'app' => options['app'] }
       branch = @branch_backup.present? ? @branch_backup : @argv['BRANCH'].to_s
-      call_task_deploy_app({
-          branch: branch,
-          app: app,
-          action: options['action']
-        }.reverse_merge(options))
+        call_task_deploy_app({
+            branch: branch,
+            app: app,
+            action: options['action']
+          }.reverse_merge(options))
+    end
+    
+    def get_app_additional_env_options(app, app_message)
+      app_name = (app.is_a?(Hash) && app[:app].present?) ? app[:app].camelcase : app
+      app_name = app_name.present? ? app_name : 'current application'
+      message = "Please write additional ENV options for #{app_name} for #{app_message}"
+      set :app_additional_env_options, CapistranoMulticonfigParallel.ask_confirm(message, nil)
+      fetch_app_additional_env_options
     end
 
     private
@@ -178,15 +202,13 @@ module CapistranoMulticonfigParallel
         return ''
       end
     end
-
-    def get_app_additional_env_options(app, app_message)
-      app_name = (app.is_a?(Hash) && app[:app].present?) ? app[:app].camelcase : app
-      app_name = app_name.present? ? app_name : 'current application'
-      message = "Please write additional ENV options for #{app_name} for #{app_message}"
-      set :app_additional_env_options, CapistranoMulticonfigParallel.ask_confirm(message, nil)
-      fetch_app_additional_env_options
+     
+    def using_git?
+    fetch(:scm, :git).to_sym == :git
     end
 
+  
+
     def fetch_app_additional_env_options
       options = {}
       return options if fetch(:app_additional_env_options).blank?

data/lib/capistrano_multiconfig_parallel/helpers/multi_app_manager.rb

@@ -49,6 +49,7 @@ module CapistranoMulticonfigParallel
     def multi_stage_deploy(options)
       stages = fetch_multi_stages
       return if stages.blank?
+      stages = check_multi_stages(stages)
       multi_collect_and_run_jobs(options) do |apps, new_options|
         apps.each do |app|
           stages.each do |stage|

data/lib/capistrano_multiconfig_parallel/helpers/single_app_manager.rb

@@ -29,6 +29,7 @@ module CapistranoMulticonfigParallel
       return unless custom_command?
       stages = fetch_multi_stages
       return if stages.blank?
+      stages = check_multi_stages(stages)
       collect_jobs(options) do |new_options|
         stages.each do |stage|
           deploy_app(new_options.merge('stage' => stage, 'action' => 'deploy'))

data/lib/capistrano_multiconfig_parallel/initializers/helper.rb

@@ -0,0 +1,23 @@
+module CapistranoMulticonfigParallel
+  # class used to find application dependencies
+  class Helper
+    # rubocop:disable Lint/Eval
+    def self.capture(stream)
+      stream = stream.to_s
+      captured_stream = Tempfile.new(stream)
+      stream_io = eval("$#{stream}")
+      origin_stream = stream_io.dup
+      stream_io.reopen(captured_stream)
+
+      yield
+
+      stream_io.rewind
+      return captured_stream.read
+    ensure
+      captured_stream.close
+      captured_stream.unlink
+      stream_io.reopen(origin_stream)
+    end
+  end
+
+end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 0
-    MINOR = 5
-    TINY = 0
+    MINOR = 6
+    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.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - bogdanRada
@@ -270,6 +270,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: devnull
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -626,13 +646,14 @@ files:
 - lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb
 - lib/capistrano_multiconfig_parallel/cli.rb
 - lib/capistrano_multiconfig_parallel/configuration.rb
+- lib/capistrano_multiconfig_parallel/extensions/rake.rb
 - lib/capistrano_multiconfig_parallel/helpers/base_manager.rb
 - lib/capistrano_multiconfig_parallel/helpers/multi_app_manager.rb
 - lib/capistrano_multiconfig_parallel/helpers/single_app_manager.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/initializers/rake.rb
+- lib/capistrano_multiconfig_parallel/initializers/helper.rb
 - lib/capistrano_multiconfig_parallel/multi_app_helpers/dependency_tracker.rb
 - lib/capistrano_multiconfig_parallel/multi_app_helpers/interactive_menu.rb
 - lib/capistrano_multiconfig_parallel/version.rb