capistrano_multiconfig_parallel 0.31.1 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64b93504a5622842d235bd3e44e42dbe975e83ec
-  data.tar.gz: d8489a215a2cbad5b636ef1843d724e78c98e375
+  metadata.gz: 5f2058afba53f3625fe0253f9ea80bcfcd83928f
+  data.tar.gz: 6d568cea8e8d7e5501166d5e0fe3f2a8c5fd4baa
 SHA512:
-  metadata.gz: 4909493b8341c11ba695ea555255329e704dd5685f3aa9958aa68febd6a8ad50bdc2a73a185fd2cc183f90c9868908b75d56fe11ca7d49f4a7ffa91bff8f488b
-  data.tar.gz: 13f6939093552b461d94e01a90528c546ad91f8a4b6245f3cf99fb608951ab183a816dd41fa8215002d4b8e62143e4e75dce35404f4a351b22a3da8de2bff95e
+  metadata.gz: e18832aa02656f2de014326cc40c3cc7b9107c2c9e32b0c9c8edc9a542054f55d8fe9cf86f2a545006f733adcc4656af66ee76285b70d6f433ddf10748eb7861
+  data.tar.gz: c3b95a15ab8d3a962d1013918d082b6bd76ddb074d9bdf3d51d9c4dd6c8216223ecfafc937412ca0bfe575d79207d416c1843e2a5640023ce2c902b641b6914f

data/README.md

@@ -20,27 +20,25 @@ CAUTION!! PLEASE READ CAREFULLY!! Capistrano is not thread-safe. However in orde
 Requirements
 ------------
 
-1.	[Ruby 1.9.x or Ruby 2.x.x](http://www.ruby-lang.org)
-2.	[ActiveSuport >= 4.2.0](https://rubygems.org/gems/activesupport)
-3.	[celluloid-pmap >= 0.2.2](https://github.com/jwo/celluloid-pmap)
-4.	[celluloid_pubsub >= 0.1.0](https://github.com/bogdanRada/celluloid_pubsub)
-5.	[celluloid-websocket-client >= 0.0.1](https://github.com/jeremyd/celluloid-websocket-client)
-6.	[composable_state_machine >= 1.0.2](https://github.com/swoop-inc/composable_state_machine)
-7.	[terminal-table >= 1.5.2](https://github.com/tj/terminal-table)
-8.	[colorize >= 0.7](https://github.com/fazibear/colorize)
-9.	[eventmachine >= 1.0.3](https://github.com/eventmachine/eventmachine)
-10.	[right_popen >= 1.1.3](https://github.com/rightscale/right_popen)
-11.	[capistrano >= 3.0](https://github.com/capistrano/capistrano/)
-12.	[capistrano-multiconfig >= 3.0.8](https://github.com/railsware/capistrano-multiconfig)
-13.	[configliere >= 0.4](https://github.com/infochimps-platform/configliere)
-14.	[inquirer >= 0.2](https://github.com/arlimus/inquirer.rb)
-15.	[devnull >= 0.1](https://github.com/arlimus/inquirer.rb)
-16.	[rack >= 1.6](http://rack.github.io/)
+1.	[ActiveSuport >= 4.2.0](https://rubygems.org/gems/activesupport)
+2.	[celluloid-pmap >= 0.2.2](https://github.com/jwo/celluloid-pmap)
+3.	[celluloid_pubsub >= 0.1.0](https://github.com/bogdanRada/celluloid_pubsub)
+4.	[celluloid-websocket-client >= 0.0.1](https://github.com/jeremyd/celluloid-websocket-client)
+5.	[composable_state_machine >= 1.0.2](https://github.com/swoop-inc/composable_state_machine)
+6.	[terminal-table >= 1.5.2](https://github.com/tj/terminal-table)
+7.	[colorize >= 0.7](https://github.com/fazibear/colorize)
+8.	[eventmachine >= 1.0.3](https://github.com/eventmachine/eventmachine)
+9.	[right_popen >= 1.1.3](https://github.com/rightscale/right_popen)
+10.	[capistrano >= 3.0](https://github.com/capistrano/capistrano/)
+11.	[configliere >= 0.4](https://github.com/infochimps-platform/configliere)
+12.	[inquirer >= 0.2](https://github.com/arlimus/inquirer.rb)
+13.	[devnull >= 0.1](https://github.com/arlimus/inquirer.rb)
+14.	[rack >= 1.6](http://rack.github.io/)
 
 Compatibility
 -------------
 
-Rails >3.0 only. MRI 1.9.x, 2.x
+Rails >3.0 only. [MRI 1.9.x or 2.x](http://www.ruby-lang.org)
 
 Ruby 1.8 is not officially supported. We will accept further compatibilty pull-requests but no upcoming versions will be tested against it.
 

data/capistrano_multiconfig_parallel.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'eventmachine', '~> 1.0', '>= 1.0.3'
   s.add_runtime_dependency 'right_popen', '~> 1.1', '>= 1.1.3'
   s.add_runtime_dependency 'capistrano','~> 3.0','>= 3.0'
-  s.add_runtime_dependency 'capistrano-multiconfig','~> 3.0','>= 3.0.8'
   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'

data/lib/capistrano_multiconfig_parallel/all.rb

@@ -39,3 +39,4 @@ end
 
 require_relative './version'
 require_relative './base'
+require_relative './application'

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -1,12 +1,9 @@
-require 'capistrano/multiconfig/dsl'
 module CapistranoMulticonfigParallel
   # finds app dependencies, shows menu and delegates jobs to celluloid manager
   class Application
     include Celluloid
     include Celluloid::Logger
     include CapistranoMulticonfigParallel::ApplicationHelper
-    include Capistrano::DSL
-    include Capistrano::Multiconfig::DSL
 
     attr_reader :stage_apps, :top_level_tasks, :jobs, :branch_backup, :condition, :manager, :dependency_tracker, :application, :stage, :name, :args, :argv, :default_stage
 

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -72,9 +72,9 @@ module CapistranoMulticonfigParallel
 
     def setup_table_jobs(table)
       jobs = @manager.alive? ? @manager.jobs.dup : []
-      jobs.each do |_job_id, job|
+      jobs.each do |job_id, job|
         table.add_row(job.terminal_row)
-        table.add_separator
+        table.add_separator if jobs.keys.last != job_id
       end
       jobs
     end

data/lib/capistrano_multiconfig_parallel/classes/cursor.rb

@@ -27,9 +27,9 @@ module CapistranoMulticonfigParallel
       def fetch_cursor_position(table_size, position, previously_erased_screen)
         final_position = position || fetch_position
         terminal_rows = fetch_terminal_size
-        screen_erased = refetch_position?(table_size, terminal_rows, final_position)
-        if screen_erased == true
-          move_to_home! if previously_erased_screen != true
+        if previously_erased_screen == false && refetch_position?(table_size, terminal_rows, final_position)
+          screen_erased = true
+          move_to_home!
           final_position = fetch_position
           terminal_rows = fetch_terminal_size
         end

data/lib/capistrano_multiconfig_parallel/cli.rb

@@ -14,7 +14,6 @@ module CapistranoMulticonfigParallel
 
       def execute_start(arguments)
         if arguments[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
-          require_relative './application'
           run_the_application
         else
           Capistrano::Application.new.run

data/lib/capistrano_multiconfig_parallel/helpers/application_helper.rb

@@ -1,10 +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
 
     delegate :logger,
              :configuration,

data/lib/capistrano_multiconfig_parallel/helpers/stages_helper.rb

@@ -0,0 +1,37 @@
+module CapistranoMulticonfigParallel
+  # module used to fetch the stages (code taken from https://github.com/railsware/capistrano-multiconfig)
+  # TODO: find a way to remove this and still be compatible with capistrano 2.x
+  module StagesHelper
+  module_function
+
+    def stages
+      fetch_stages_paths do |paths|
+        checks_paths(paths)
+      end
+    end
+
+    def checks_paths(paths)
+      paths.reject! { |path| check_stage_path(paths, path) }
+      sorted_paths(paths)
+    end
+
+    def sorted_paths(paths)
+      paths.present? ? paths.uniq.sort : paths
+    end
+
+    def check_stage_path(paths, path)
+      paths.any? { |another| another != path && another.start_with?(path + ':') }
+    end
+
+    def stages_paths
+      stages_root = File.expand_path(File.join(detect_root, 'config/deploy'))
+      Dir["#{stages_root}/**/*.rb"].map do |file|
+        file.slice(stages_root.size + 1..-4).tr('/', ':')
+      end
+    end
+
+    def fetch_stages_paths
+      stages_paths.tap { |paths| yield paths if block_given? }
+    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 = 31
-    TINY = 1
+    MINOR = 32
+    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: 0.31.1
+  version: 0.32.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap
@@ -190,26 +190,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: capistrano-multiconfig
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.8
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -682,6 +662,7 @@ files:
 - 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/initializers/websocket.rb
 - lib/capistrano_multiconfig_parallel/version.rb