capistrano_multiconfig_parallel 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfcc124d469e11ca56f9c100e03202921a35b7bf
-  data.tar.gz: dc5ad4198148c3f0d3218cbbd06395c0c73ef472
+  metadata.gz: 3e4e281f62d3965250a0fad971db85075dffbbaf
+  data.tar.gz: d82ae614107778723f6f46641e9fb89259f619ca
 SHA512:
-  metadata.gz: 84bae3eab933625ea86290d8733010cabe43e28527654706464cdebb0ad17c701a0ccf6bf7d34cd3626b4508efea8244d685a42eb4373848d36218084d05d178
-  data.tar.gz: a926c6383985f65332032a45b5b3701a03b8b40bb49f3669b7743dc25edbea2d9c2be21bf3d92037812b0a71744f65bbcb1175bae1e75791a7afe6b16237a52e
+  metadata.gz: a05340433f5514d4f03fe8ca127b605e4db51b9ae87d39342d8a78232c7df88ee23648b6ea62656a052f5c24d1674e493483ddfdcc2cdadaca65018b2d17bd3e
+  data.tar.gz: 1671007d8457df58e1b12ea834b9fff175c872c0704296dbddceaae0101c0fa01b5e55fde6af7e388a74306db7b0b242002a11b24805c7ebeac698cde83f963e

data/README.md

@@ -18,12 +18,17 @@ IMPORTANT! The whole reason for this gem was for using [Caphub](https://github.c
 CAUTION!! PLEASE READ CAREFULLY!! Capistrano is not thread-safe. However in order to work around this problem, each of the task is executing inside a thread that spawns a new process in order to run capistrano tasks The thread monitors the process. This works well, however if the tasks you are executing is working with files, you might get into deadlocks because multiple proceses try to access same resource. Instead of using files , please consider using StringIO instead.
 
 
-NEW Improvements started in version 2.2.0
+NEW Improvements in version 2.2.0
 -------------------------------------------------------------------------------------
 - the websocket server will automatically detect an unused port and use that, in case port is not set
 
 
-NEW Improvements started in version 2.0.0
+NEW Improvements in version 2.1.0
+-------------------------------------------------------------------------------------
+- some internal refactoring and updates for activesupport
+
+
+NEW Improvements in version 2.0.0
 -------------------------------------------------------------------------------------
 
 -	Code for handling websocket events when a task is invoked was moved to a new gem [capistrano_sentinel](https://github.com/bogdanRada/capistrano_sentinel)

data/capistrano_multiconfig_parallel.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   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_runtime_dependency 'capistrano_sentinel',  '>= 0.0', '>= 0.0.17'
+  s.add_runtime_dependency 'capistrano_sentinel',  '>= 0.0', '>= 0.0.18'
   s.add_runtime_dependency 'powerbar', '~> 1.0', '>= 1.0.17'
 
   s.add_development_dependency 'rake', '>= 10.4', '>= 10.4'

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -73,8 +73,14 @@ module CapistranoMulticonfigParallel
       raise_invalid_job_config
     end
 
-    def raise_invalid_job_config
-      puts 'Invalid execution, please call something such as `multi_cap production deploy`, where production is a stage you have defined'.red
+    def raise_invalid_job_config(path = nil)
+      if independent_deploy?(path)
+          puts 'Invalid execution, please call something such as `multi_cap app_name:production deploy`, where production is a stage you have defined and the "app_name" is a name that you defined in your multi_cap.yml file'.red
+      elsif application_supports_multi_apps?
+        puts 'Invalid execution, please call something such as `multi_cap app_name:production deploy`, where production is a stage you have defined and the "app_name" is name that you have defined in your application'.red
+      else
+        puts 'Invalid execution, please call something such as `multi_cap production deploy`, where production is a stage you have defined'.red
+      end
       exit(false)
     end
 
@@ -236,7 +242,10 @@ module CapistranoMulticonfigParallel
 
     def prepare_job(options)
       options = options.stringify_keys
-      return raise_invalid_job_config if !job_stage_valid?(options)
+      app = options.fetch('app', '')
+      path = job_path(options) rescue nil
+    #  raise [app, @stage_apps, job_stage(options) , stages(job_path(options))].inspect
+      return raise_invalid_job_config(path) if (app.present? && !@stage_apps.include?(app)) || !job_stage_valid?(options)
       app = options.fetch('app', '')
       box = options['env_options'][boxes_key]
       message = box.present? ? "BOX #{box}:" : "stage #{options['stage']}:"
@@ -253,10 +262,6 @@ module CapistranoMulticonfigParallel
       path:  job_path(options)
 
       ))
-      raise "Please make sure you have a Gemfile in the project root directory #{job.job_path}" unless job.job_gemfile.present?
-      if job.find_capfile.blank?
-        raise "Please make sure you have a Capfile in the project root directory #{job.job_path}"
-      end
 
       if configuration.check_app_bundler_dependencies.to_s.downcase == 'true' && job.job_gemfile.present?
         if !@checked_job_paths.include?(job.job_path)
@@ -283,7 +288,7 @@ module CapistranoMulticonfigParallel
     end
 
     def job_stage(options)
-      multi_apps?(job_path(options)) && options.fetch('app', nil).present? ? "#{options['app']}:#{options['stage']}" : "#{options['stage']}"
+      options['stage']
     end
 
 

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -16,9 +16,6 @@ module CapistranoMulticonfigParallel
       @options = options.stringify_keys
       @application = application
       @manager = @application.manager
-    end
-
-    def gitflow
       @gitflow ||= command.gitflow_enabled?
     end
 
@@ -125,6 +122,7 @@ module CapistranoMulticonfigParallel
 
     def setup_additional_env_variables(value)
       value["#{env_variable}"] = id
+      #value["capistrano_version"] = job_capistrano_version
     end
 
     def finished?

data/lib/capistrano_multiconfig_parallel/classes/job_command.rb

@@ -34,6 +34,8 @@ module CapistranoMulticonfigParallel
 
     def find_capfile(custom_path = job_path)
       @capfile_path ||= find_file_by_names(custom_path, 'capfile').first
+      raise "Please make sure you have a Capfile in the project root directory #{custom_path}".red if @capfile_path.blank?
+      @capfile_path
     end
 
     def capfile_name
@@ -45,11 +47,15 @@ module CapistranoMulticonfigParallel
     end
 
     def job_gemfile
-      File.join(job_path, 'Gemfile')
+      @job_gemfile ||=File.join(job_path, 'Gemfile')
+      raise "Please make sure you have a Gemfile in the project root directory #{job_path}".red unless File.exists?(@job_gemfile)
+      @job_gemfile
     end
 
     def job_gemfile_lock
-      File.join(job_path, 'Gemfile.lock')
+      @job_gemfile_lock ||= "#{job_gemfile}.lock"
+      raise "Please make sure you have a Gemfile.lock in the project root directory #{job_path}".reds unless File.exists?(@job_gemfile_lock)
+      @job_gemfile_lock
     end
 
     def job_gem_version(gem_name)
@@ -93,7 +99,7 @@ module CapistranoMulticonfigParallel
     end
 
     def job_stage
-      multi_apps?(job_path) && app.present? ? "#{app}:#{stage}" : "#{stage}"
+      app.present? && application_supports_multi_apps?(job_path) ? "#{app}:#{stage}" : "#{stage}"
     end
 
     def capistrano_action
@@ -293,7 +299,7 @@ module CapistranoMulticonfigParallel
           CMD
           f.write(cmd)
         end
-        FileUtils.copy(File.join(job_path, 'Gemfile.lock'), "#{job_gemfile_multi}.lock")
+        FileUtils.copy(job_gemfile_lock, "#{job_gemfile_multi}.lock")
       end
     end
 

data/lib/capistrano_multiconfig_parallel/cli.rb

@@ -24,7 +24,7 @@ module CapistranoMulticonfigParallel
             application.start
           end
         ensure
-          application.jobs_restore_application_state
+          application.jobs_restore_application_state if application.present?
         end
       end
     end

data/lib/capistrano_multiconfig_parallel/helpers/configuration.rb

@@ -47,6 +47,7 @@ module CapistranoMulticonfigParallel
         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.config_dir = File.dirname(config_file)
       @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)
     end

data/lib/capistrano_multiconfig_parallel/helpers/internal_helper.rb

@@ -117,9 +117,12 @@ module CapistranoMulticonfigParallel
       pathnames.present? && pathnames.is_a?(Array) ? pathnames.compact : pathnames
     end
 
+    def try_detect_file_in_dir(filename = 'multi_cap.yml', dirs = ['config'])
+      root = dirs.is_a?(Array) && dirs.present? ? Pathname.new(File.join(FileUtils.pwd, *dirs)) : pwd_parent_dir
+      try_detect_file(filename, root)
+    end
 
-    def try_detect_file(filename = 'capfile')
-      root = pwd_parent_dir
+    def try_detect_file(filename = 'capfile', root = pwd_parent_dir )
       root = root.parent until find_file_in_directory(root, filename)
       pathname_is_root?(root) ? nil : root
     end

data/lib/capistrano_multiconfig_parallel/helpers/stages_helper.rb

@@ -5,24 +5,43 @@ module CapistranoMulticonfigParallel
   module_function
 
     def stages(path = nil)
-      path.blank? && independent_deploy? ? fetch_stages_from_file : fetch_stages_app(path)
+      stages = path.present? ? fetch_stages_app(path) : []
+      if path.blank?
+        root =  detect_root rescue nil
+        if root.present?
+          stages = stages.concat(fetch_stages_app(nil))
+        end
+      end
+      stages
     end
 
     def multi_apps?(path = nil)
-      path.blank? && independent_deploy? ? true : stages(path).find { |stage| stage.include?(':') }.present?
+      independent_deploy?(path) ? true : stages(path).find { |stage| stage.include?(':') }.present?
+    end
+
+    def application_supports_multi_apps?(path = nil)
+      fetch_stages_app(path).find { |stage| stage.include?(':') }.present?
     end
 
-    def fetch_stages_from_file
+    def fetch_apps_from_file
       configuration.application_dependencies.map { |hash| hash[:app] }
     end
 
     def app_names_from_stages
-      independent_deploy? ? fetch_stages_from_file : stages.map { |stage| stage.split(':').reverse[1] }.uniq
+      independent_deploy? ? fetch_apps_from_file : stages.map { |stage| stage.split(':').reverse[1] }.uniq
+    end
+
+    def configuration_has_valid_path?(hash)
+       hash[:path].present? && File.directory?(hash[:path])
+    end
+
+    def fetch_paths_from_file
+      configuration.application_dependencies.select { |hash| configuration_has_valid_path?(hash) }.map{ |hash| hash[:path] }
     end
 
-    def independent_deploy?
-      app_with_no_path = configuration.application_dependencies.find { |hash| hash[:path].blank? }
-      configuration.config_dir.present? && app_with_no_path.blank? ? true : false
+    def independent_deploy?(path = nil)
+      app_with_path = configuration.application_dependencies.find { |hash| configuration_has_valid_path?(hash).present? }
+      configuration.config_dir.present? && app_with_path.present? && (path.nil? || (path.present? && fetch_paths_from_file.include?(path))) ? true : false
     end
 
     def fetch_stages_app(path)

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
 
     MAJOR = 2
-    MINOR = 2
+    MINOR = 3
     TINY = 0
     PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -247,7 +247,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.17
+        version: 0.0.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -257,7 +257,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.17
+        version: 0.0.18
 - !ruby/object:Gem::Dependency
   name: powerbar
   requirement: !ruby/object:Gem::Requirement