capistrano_evrone_recipes 0.1.10 → 0.1.11

data/lib/capistrano_evrone_recipes/recipes/rails.rb

@@ -4,7 +4,8 @@ namespace :rails do
   task :console, :roles => :app do
     server = find_servers_for_task(current_task).first
     if server
-      exec "ssh -A #{server} -t 'cd #{current_path} && #{fetch :bundle_cmd} exec script/rails console #{rails_env}'"
+      cmd = "ssh -l #{user} -A #{server} -t 'cd #{current_path} && #{fetch :bundle_cmd} exec rails console #{rails_env}'"
+      puts cmd
     end
   end
 
@@ -13,7 +14,7 @@ namespace :rails do
   task :dbconsole, :roles => :db, :only => { :primary => true } do
     server = find_servers_for_task(current_task).first
     if server
-      exec "ssh -A #{server} -t 'cd #{current_path} && #{fetch :bundle_cmd} exec script/rails dbconsole #{rails_env}'"
+      exec "ssh -l #{user} -A #{server} -t 'cd #{current_path} && #{fetch :bundle_cmd} exec rails dbconsole #{rails_env}'"
     end
   end
 end

data/lib/capistrano_evrone_recipes/recipes/unicorn.rb

@@ -5,18 +5,11 @@ _cset(:unicorn_pid)    { "#{fetch :current_path}/tmp/pids/unicorn.pid" }
 namespace :unicorn do
   desc "Restart unicorn"
   task :restart, :roles => :app, :on_no_matching_servers => :continue, :except => {:no_release => true} do
+    upid = fetch :unicorn_pid
     cmd = <<-EOF
-if [ -f #{fetch :unicorn_pid} ];
-then
-  kill -s USR2 `cat #{fetch :unicorn_pid}` &&
-  TIMES=1 &&
-  echo 'Please wait unicorn restart...' &&
-  sleep 1 &&
-  (while [ -e #{fetch :unicorn_pid}.oldbin ] ; do sleep 2; TIMES=$TIMES+2; done) &&
-  echo "Unicorn restart time: $TIMES sec" ;
-fi
+if [ -f #{upid} ] ; then kill -s USR2 `cat #{upid}` ;fi && a=1;d=2; echo 'Please wait unicorn restart...'; sleep 1 && while [ -e #{upid}.oldbin ] ; do sleep 2; a=$(expr $a + $d);  done; echo "Unicorn restart time: $a sec"
 EOF
-    run cmd.gsub(/\n/, " ").gsub(/ +/, " ")
+    run cmd
   end
 
   desc "Fast restart unicorn"

data/lib/capistrano_evrone_recipes/version.rb

@@ -3,7 +3,7 @@ module CapistranoEvroneRecipes
 
     MAJOR = 0
     MINOR = 1
-    PATCH = 10
+    PATCH = 11
 
     def self.to_s
       "#{MAJOR}.#{MINOR}.#{PATCH}"

metadata

@@ -1,96 +1,96 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_evrone_recipes
 version: !ruby/object:Gem::Version
-  version: 0.1.10
   prerelease: 
+  version: 0.1.11
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: capistrano
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.5
+    none: false
+  name: capistrano
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.5
-- !ruby/object:Gem::Dependency
-  name: colored
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: colored
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: unicorn
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: unicorn
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: foreman_export_runitu
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: foreman_export_runitu
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: whenever
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: whenever
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: Capistrano recipes used in evrone company
 email: dima.exe@gmail.com
 executables: []
@@ -123,17 +123,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23