capistrano-chef-eye 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68549f077bb1e42d52eca2bb1fbc27343b49c06a
-  data.tar.gz: c45bbabf6fb49e8eb155268e0d2c30a22573070c
+  metadata.gz: 014e572035814ade2030fb3620f466ae88416a49
+  data.tar.gz: 73a6052217b448561819d05983c07787a2348f83
 SHA512:
-  metadata.gz: f5716f67d78fd228577f0ebcd9a931aebb26356900b12f41bcb03497a55eccaad94842963c9f8747c8f31ec22e54b69e1c89c77e355f7b266d62ed333e73a1cf
-  data.tar.gz: e5f7c4f6640d5c86549fe1041099f8ee48009934dc01ee04041826f5d5db94f960f848b1b0061416dd5f6f9e020b30efb63d2b5b421286d2848a57bef5875c92
+  metadata.gz: d8b54a0aabed6224d591ef6c937fb16d06105ae978b38811d57da9c37f0223f90a9f8d040f4d96d99ba8cd622db3c057ef9b16087b764db8e36e3251d11b12b2
+  data.tar.gz: 2a5f347ac1aa2f4c19147483677207bf85f30449bd7ff236ac10fd8952848a60ee1bd8a02472381645049267e60af28749283c89336879468d569551d236a589

data/lib/capistrano/chef_eye/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module ChefEye
-    VERSION = '0.2.3'
+    VERSION = '0.2.4'
   end
 end

data/lib/capistrano/tasks/chef_eye.cap

@@ -1,6 +1,7 @@
+EYE_SEQUENCE_COMMANDS=%w(restart force_restart info)
 namespace :eye do
   desc 'Show help'
-  commands = [:start, :restart, :stop, :history, :info, :trace]
+  commands = [:force_restart, :start, :restart, :stop, :history, :info, :trace]
 
   task :hook do
     processes = fetch(:eye_processes)
@@ -24,16 +25,12 @@ namespace :eye do
           eye_execute(command, process)
         end
       end
-
-      Rake::Task.define_task("eye:#{process}:force_restart") do
-        eye_execute(:stop, process)
-        eye_execute(:start, process)
-      end
     end
   end
 
   desc 'Show available process list and commands'
   task :processes do
+    puts "\n"
     fetch(:eye_processes).each do |process|
       puts "#{process}".bold.yellow
       commands.each do |command|
@@ -58,11 +55,10 @@ namespace :eye do
     eye_execute(:trace, ENV['GREP'])
   end
 
-  desc 'Force restart services (stop/start)'
-  task :force_restart do
-    Rake::Task['eye:stop'].invoke
-    Rake::Task['eye:start'].invoke
-  end
+  # desc 'Force restart services (stop/start)'
+  # task :force_restart do
+  #   invoke('eye:force_restart')
+  # end
 
   desc 'Check configuration'
   task :check do
@@ -93,6 +89,7 @@ namespace :load do
     set :eye_servers, -> { release_roles(fetch(:eye_roles)) }
     set :eye_processes, nil
     set :eye_user, -> { 'auto' }
+    set :eye_restart_timeout, 10
     set :eye_file, -> {
       if fetch(:eye_strategy).to_s == 'local'
         'Eyefile'
@@ -120,21 +117,35 @@ end
 
 def eye_execute(command, mask='')
   res = []
+  commands = []
+
   rvm_path = fetch(:rvm_path)
   eye_bin = fetch(:eye_bin)
   eye_bin = "#{rvm_path}/bin/rvm system do #{eye_bin}" if rvm_path
-  cmd = "#{eye_bin} #{command} #{mask}".strip
 
-  on fetch(:eye_servers) do
+  if command.to_s == 'force_restart'
+    timeout = fetch(:eye_restart_timeout)
+    commands << 'stop'
+    commands << 'start'
+  else
+    timeout = 2
+    commands << command
+  end
+  strategy = EYE_SEQUENCE_COMMANDS.include?(command.to_s) ? :sequence : :parallel
+
+  on fetch(:eye_servers), in: strategy, wait: timeout do
     begin
       within fetch(:eye_home) do
-        cmd.gsub!('{eye_user}', capture('whoami'))
-        result = capture(*cmd.split(' '))
-        res << result
-        # puts result unless fetch(:format) == :pretty
+        whoami = capture('whoami')
+        commands.each do |cmd|
+          cmd = "#{eye_bin} #{cmd} #{mask}".strip
+          cmd.gsub!('{eye_user}', whoami)
+          result = capture(*cmd.split(' '))
+          res << result
+        end
       end
     rescue Exception => e
-      # puts e.message
+      puts e.message
     end
   end
   res

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-chef-eye
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Nikolay Murga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Chef Eye plugin companion for Capistrano.
@@ -45,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -81,17 +81,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Chef Eye plugin companion for Capistrano.