capistrano_multiconfig_parallel 1.7.2 → 2.0.0.beta1

data/lib/capistrano_multiconfig_parallel/cli.rb

@@ -8,39 +8,23 @@ module CapistranoMulticonfigParallel
       # method used to start
       def start
         before_start
-        arguments = multi_fetch_argv(original_args)
         configuration_valid?
-        execute_start(arguments[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID])
+        run_the_application
       end
 
-      def execute_start(job_id)
-        if job_id.blank?
-          run_the_application
-        else
-          ARGV.reject! { |arg| arg_is_in_default_config?(arg) }
-          log_to_file("worker #{job_id} runs with ARGV #{ARGV.inspect}", job_id: job_id)
-          run_capistrano
-        end
-      end
-
-      def run_capistrano
-        if capistrano_version_2?
-          require 'capistrano/cli'
-          Capistrano::CLI.execute
-        else
-          require 'capistrano/all'
-          Capistrano::Application.new.run
-        end
-      end
-
-      def before_start
+      def before_start(argv = ARGV)
         check_terminal_tty
-        CapistranoMulticonfigParallel.original_args = ARGV.dup
+        CapistranoMulticonfigParallel.original_args = argv.dup
       end
 
       def run_the_application
-        execute_with_rescue('stderr') do
-          CapistranoMulticonfigParallel::Application.new.start
+        begin
+          application = CapistranoMulticonfigParallel::Application.new
+          execute_with_rescue('stderr') do
+            application.start
+          end
+        ensure
+          application.jobs_restore_application_state
         end
       end
     end

data/lib/capistrano_multiconfig_parallel/configuration/default.yml

@@ -17,7 +17,7 @@ default_config:
     type: 'boolean'
     description: >-
       Enables debugging of websocket communication between the workers
-    default: 'false'
+    default: 'true'
     required: false
 
   - name: 'websocket_server.adapter'

data/lib/capistrano_multiconfig_parallel/helpers/application_helper.rb

@@ -17,13 +17,37 @@ module CapistranoMulticonfigParallel
     delegate :logger,
     :configuration,
     :configuration_valid?,
-    :capistrano_version_2?,
-    :capistrano_version,
     :original_args,
     to: :CapistranoMulticonfigParallel
 
+
     module_function
 
+    def truncate(string, truncate_at, options = {})
+      return string.dup unless string.length > truncate_at
+
+      options[:omission] ||= '...'
+      length_with_room_for_omission = truncate_at - options[:omission].length
+      stop =        if options[:separator]
+        string.rindex(options[:separator], length_with_room_for_omission) || length_with_room_for_omission
+      else
+        length_with_room_for_omission
+      end
+
+      "#{string[0...stop]}#{options[:omission]}"
+    end
+
+    # Method that is used to parse a string as JSON , if it fails will return nil
+    # @see JSON#parse
+    # @param [string] res The string that will be parsed as JSON
+    # @return [Hash, nil] Returns Hash object if the json parse succeeds or nil otherwise
+    def parse_json(res)
+      return if res.blank?
+      JSON.parse(res)
+    rescue JSON::ParserError
+      nil
+    end
+
     def msg_for_stdin?(message)
       message['action'] == 'stdin'
     end

data/lib/capistrano_multiconfig_parallel/helpers/capistrano_helper.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
     end
 
     def env_prefix(key, version = false)
-      key != CapistranoMulticonfigParallel::ENV_KEY_JOB_ID && version == true ? '-S' : ''
+      key != CapistranoMulticonfigParallel.env_job_key_id && version == true ? '-S' : ''
     end
 
     def env_key_format(key, version = false)

data/lib/capistrano_multiconfig_parallel/helpers/configuration.rb

@@ -38,13 +38,13 @@ module CapistranoMulticonfigParallel
 
     def read_config_file
       return if CapistranoMulticonfigParallel.original_args.present? && CapistranoMulticonfigParallel.original_args.include?('--help')
-       user = Etc.getlogin
+      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)
+        @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
+        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))

data/lib/capistrano_multiconfig_parallel/helpers/gem_helper.rb

@@ -1,7 +1,7 @@
 module CapistranoMulticonfigParallel
   # helper used to determine gem versions
   module GemHelper
-  module_function
+    module_function
 
     def find_loaded_gem(name, property = nil)
       gem_spec = Gem.loaded_specs.values.find { |repo| repo.name == name }
@@ -35,5 +35,6 @@ module CapistranoMulticonfigParallel
       version = get_parsed_version(version)
       get_parsed_version(gem_version).send(options.fetch('operator', '<='), version)
     end
+
   end
 end

data/lib/capistrano_multiconfig_parallel/helpers/internal_helper.rb

@@ -1,7 +1,23 @@
 module CapistranoMulticonfigParallel
   # internal helpers for logging mostly
   module InternalHelper
-  module_function
+    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 get_current_gem_name
       searcher = if Gem::Specification.respond_to? :find
@@ -46,7 +62,7 @@ module CapistranoMulticonfigParallel
     end
 
     def default_config_keys
-      default_internal_config.map { |array| array[0].to_s }.concat([CapistranoMulticonfigParallel::ENV_KEY_JOB_ID])
+      default_internal_config.map { |array| array[0].to_s }.concat([CapistranoMulticonfigParallel.env_job_key_id, 'capistrano_version'])
     end
 
     def arg_is_in_default_config?(arg)

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -6,10 +6,11 @@ module CapistranoMulticonfigParallel
 
   # module used for generating the version
   module VERSION
-    MAJOR = 1
-    MINOR = 7
-    TINY = 2
-    PRE = nil
+
+    MAJOR = 2
+    MINOR = 0
+    TINY = 0
+    PRE = 'beta1'
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.16'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.16'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +53,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,27 +63,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.2
-- !ruby/object:Gem::Dependency
-  name: celluloid-websocket-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: composable_state_machine
   requirement: !ruby/object:Gem::Requirement
@@ -190,34 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.1
-- !ruby/object:Gem::Dependency
-  name: capistrano
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: configliere
   requirement: !ruby/object:Gem::Requirement
@@ -279,19 +239,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: capistrano_sentinel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.14
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -299,7 +265,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '10.4'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -508,6 +474,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- V1_README.md
 - bin/multi_cap
 - capistrano_multiconfig_parallel.gemspec
 - img/interactive_menu-min.png
@@ -520,18 +487,14 @@ files:
 - lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb
 - lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb
 - lib/capistrano_multiconfig_parallel/celluloid/child_process.rb
-- lib/capistrano_multiconfig_parallel/celluloid/rake_worker.rb
 - lib/capistrano_multiconfig_parallel/celluloid/state_machine.rb
 - lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb
 - lib/capistrano_multiconfig_parallel/celluloid/web_server.rb
 - lib/capistrano_multiconfig_parallel/classes/cursor.rb
 - lib/capistrano_multiconfig_parallel/classes/dependency_tracker.rb
-- lib/capistrano_multiconfig_parallel/classes/input_stream.rb
 - lib/capistrano_multiconfig_parallel/classes/interactive_menu.rb
 - lib/capistrano_multiconfig_parallel/classes/job.rb
 - lib/capistrano_multiconfig_parallel/classes/job_command.rb
-- lib/capistrano_multiconfig_parallel/classes/output_stream.rb
-- lib/capistrano_multiconfig_parallel/classes/rake_task_hooks.rb
 - lib/capistrano_multiconfig_parallel/cli.rb
 - lib/capistrano_multiconfig_parallel/configuration/default.yml
 - lib/capistrano_multiconfig_parallel/helpers/application_helper.rb
@@ -543,9 +506,6 @@ files:
 - lib/capistrano_multiconfig_parallel/helpers/internal_helper.rb
 - lib/capistrano_multiconfig_parallel/helpers/parse_helper.rb
 - lib/capistrano_multiconfig_parallel/helpers/stages_helper.rb
-- lib/capistrano_multiconfig_parallel/initializers/capistrano2.rb
-- lib/capistrano_multiconfig_parallel/initializers/rake.rb
-- lib/capistrano_multiconfig_parallel/initializers/websocket.rb
 - lib/capistrano_multiconfig_parallel/version.rb
 homepage: http://github.com/bogdanRada/capistrano_multiconfig_parallel/
 licenses:
@@ -562,12 +522,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: CapistranoMulticonfigParallel is a simple ruby implementation that allows

data/lib/capistrano_multiconfig_parallel/celluloid/rake_worker.rb

@@ -1,132 +0,0 @@
-require_relative '../helpers/base_actor_helper'
-module CapistranoMulticonfigParallel
-  # class that handles the rake task and waits for approval from the celluloid worker
-  class RakeWorker
-    include CapistranoMulticonfigParallel::BaseActorHelper
-
-    attr_reader :client, :job_id, :action, :task,
-                :task_approved, :successfull_subscription,
-                :subscription_channel, :publisher_channel, :stdin_result
-
-    def work(options = {})
-      @options = options.stringify_keys
-      default_settings
-      custom_attributes
-      initialize_subscription
-    end
-
-    def custom_attributes
-      @publisher_channel = "worker_#{@job_id}"
-      @action = @options['action'].present? ? @options['action'] : 'invoke'
-      @task = @options['task']
-    end
-
-    def publish_new_work(new_options = {})
-      work(@options.merge(new_options))
-      publish_to_worker(task_data)
-    end
-
-    def wait_execution(name = task_name, time = 0.1)
-      #    info "Before waiting #{name}"
-      Actor.current.wait_for(name, time)
-      #  info "After waiting #{name}"
-    end
-
-    def wait_for(_name, time)
-      # info "waiting for #{time} seconds on #{name}"
-      sleep time
-      # info "done waiting on #{name} "
-    end
-
-    def default_settings
-      @stdin_result = nil
-      @job_id = @options['job_id']
-      @subscription_channel = @options['actor_id']
-      @task_approved = false
-      @successfull_subscription = false
-    end
-
-    def initialize_subscription
-      return if defined?(@client) && @client.present?
-      @client = CelluloidPubsub::Client.new(actor: Actor.current, enable_debug: debug_websocket?, channel: @subscription_channel, log_file_path: websocket_config.fetch('log_file_path', nil))
-    end
-
-    def task_name
-      @task.respond_to?(:name) ? @task.name : @task
-    end
-
-    def task_data
-      {
-        action: @action,
-        task: task_name,
-        job_id: @job_id
-      }
-    end
-
-    def publish_to_worker(data)
-      @client.publish(@publisher_channel, data)
-    end
-
-    def on_message(message)
-      return unless message.present?
-      log_to_file("Rake worker #{@job_id} received after on message:", message)
-      if @client.succesfull_subscription?(message)
-        publish_subscription_successfull(message)
-      elsif message_is_about_a_task?(message)
-        task_approval(message)
-      elsif msg_for_stdin?(message)
-        stdin_approval(message)
-      else
-        show_warning "unknown message: #{message.inspect}"
-      end
-    end
-
-    def publish_subscription_successfull(message)
-      return unless @client.succesfull_subscription?(message)
-      log_to_file("Rake worker #{@job_id} received after publish_subscription_successfull:", message)
-      @successfull_subscription = true
-      publish_to_worker(task_data)
-    end
-
-    def wait_for_stdin_input
-      wait_execution until @stdin_result.present?
-      output = @stdin_result.clone
-      @stdin_result = nil
-      output
-    end
-
-    def stdin_approval(message)
-      return unless msg_for_stdin?(message)
-      if @job_id == message['job_id']
-        @stdin_result = message.fetch('result', '')
-      else
-        show_warning "unknown stdin_approval #{message.inspect}"
-      end
-    end
-
-    def task_approval(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
-        show_warning "unknown task_approval #{message.inspect} #{task_data}"
-      end
-    end
-
-    def on_close(code, reason)
-      log_to_file("websocket connection closed: #{code.inspect}, #{reason.inspect}")
-      terminate
-    end
-
-    def user_prompt_needed?(data)
-      question, default = get_question_details(data)
-      log_to_file("Rake worker #{@job_id} tries to determine question #{data.inspect} #{question.inspect} #{default.inspect}")
-      return if question.blank? || @action != 'invoke'
-      publish_to_worker(action: 'stdout',
-                        question: question,
-                        default: default.present? ? default.delete('()') : '',
-                        job_id: @job_id)
-      wait_for_stdin_input
-    end
-  end
-end

data/lib/capistrano_multiconfig_parallel/classes/input_stream.rb

@@ -1,34 +0,0 @@
-module CapistranoMulticonfigParallel
-  # class used to hook into the input stream
-  class InputStream
-    def self.hook(actor, stringio)
-      $stdin = new($stdin, actor, stringio)
-    end
-
-    def self.unhook
-      $stdin.finish if $stdin.is_a? CapistranoMulticonfigParallel::InputStream
-      $stdin = STDIN
-    end
-
-    attr_accessor :real, :actor, :stringio
-
-    def initialize(real_stdin, actor, stringio)
-      self.real = real_stdin
-      self.actor = actor
-      self.stringio = stringio
-    end
-
-    def gets(*_args)
-      @stringio.rewind
-      data = @stringio.read
-      @actor.user_prompt_needed?(data)
-    end
-
-    def finish
-    end
-
-    def method_missing(name, *args, &block)
-      @real.send name, *args, &block
-    end
-  end
-end

data/lib/capistrano_multiconfig_parallel/classes/output_stream.rb

@@ -1,33 +0,0 @@
-module CapistranoMulticonfigParallel
-  # class used to hook into the output stream
-  class OutputStream
-    def self.hook(stringio)
-      $stdout = new($stdout, stringio)
-    end
-
-    def self.unhook
-      $stdout.finish if $stdout.is_a? CapistranoMulticonfigParallel::OutputStream
-      $stdout = STDOUT
-    end
-
-    attr_accessor :real, :stringio
-
-    def initialize(real_stdout, stringio)
-      self.real = real_stdout
-      self.stringio = stringio
-    end
-
-    def write(*args)
-      @stringio.write(*args)
-      @real.write(*args)
-      @real.flush
-    end
-
-    def finish
-    end
-
-    def method_missing(name, *args, &block)
-      @real.send name, *args, &block
-    end
-  end
-end

data/lib/capistrano_multiconfig_parallel/classes/rake_task_hooks.rb

@@ -1,88 +0,0 @@
-require_relative '../celluloid/rake_worker'
-require_relative './input_stream'
-require_relative './output_stream'
-require_relative '../helpers/application_helper'
-module CapistranoMulticonfigParallel
-  # class used to handle the rake worker and sets all the hooks before and after running the worker
-  class RakeTaskHooks
-    include CapistranoMulticonfigParallel::ApplicationHelper
-    attr_accessor :job_id, :task
-    def initialize(task = nil)
-      @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(action: 'invoke')
-        actor.wait_execution until actor.task_approved
-        actor_execute_block(&block)
-      else
-        block.call
-      end
-    end
-
-    def print_question?(question)
-      if job_id.present?
-        actor.user_prompt_needed?(question)
-      else
-        yield if block_given?
-      end
-    end
-
-  private
-
-    def actor
-      Celluloid::Actor[rake_actor_id]
-    end
-
-    def output_stream
-      CapistranoMulticonfigParallel::OutputStream
-    end
-
-    def input_stream
-      CapistranoMulticonfigParallel::InputStream
-    end
-
-    def before_hooks
-      stringio = StringIO.new
-      output = output_stream.hook(stringio)
-      input = input_stream.hook(actor, stringio)
-      [input, output]
-    end
-
-    def after_hooks
-      input_stream.unhook
-      output_stream.unhook
-    end
-
-    def actor_execute_block(&block)
-      before_hooks
-      block.call
-      after_hooks
-    end
-
-    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}.merge(additionals))
-      else
-        actor.publish_new_work({task: @task}.merge(additionals))
-      end
-    end
-
-    def supervise_actor
-      return unless actor.blank?
-      if CapistranoMulticonfigParallel::BaseActorHelper::ClassMethods.version_less_than_seventeen?
-      CapistranoMulticonfigParallel::RakeWorker.supervise_as(rake_actor_id)
-    else
-        CapistranoMulticonfigParallel::RakeWorker.supervise(as: rake_actor_id)
-    end
-    end
-
-    def rake_actor_id
-      "rake_worker_#{job_id}"
-    end
-  end
-end