capistrano_evrone_recipes 0.1.11 → 0.1.12

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bb1291d5aa6007f379ce5c7aef95599db1064251
+  data.tar.gz: b5f784f23d1890e5fe8fe1dc4c3fb48ddd033051
+SHA512:
+  metadata.gz: 7112ce18ed7c4a8965a45c6c70ca5143a16138beb03c0cfc404c75f9372308a1f2d7899cefb07533fcc42543780e23d93450b7bada5f7f3c0832203c2c33c225
+  data.tar.gz: aff8ce74eebeb6648e716c79fad38b4db783d25e383cd81e89f3ef386adfb025c377517747495b2e8d349c7ff96fb0fa57677436010e0397e72143a2e7b5f659

data/lib/capistrano_evrone_recipes/capistrano.rb

@@ -2,13 +2,13 @@ require 'logger'
 require File.dirname(__FILE__) + "/util"
 
 Capistrano::Configuration.instance(:must_exist).load do
-  logger.level = Capistrano::Logger::DEBUG
+  logger.level = Capistrano::Logger::INFO
 
   default_run_options[:pty]   = true
   ssh_options[:forward_agent] = true
 
   set :bundle_cmd,                 "rbenv exec bundle"
-  set :bundle_flags,               "--deployment --quiet --binstubs --shebang ruby-local-exec"
+  set :bundle_flags,               "--deployment --quiet"
   set :rake,                       -> { "#{bundle_cmd} exec rake" }
   set :keep_releases,              7
   set :scm,                        "git"
@@ -17,19 +17,21 @@ Capistrano::Configuration.instance(:must_exist).load do
   set :copy_exclude,               [".git"]
   set :repository_cache,           -> { "#{deploy_to}/shared/#{application}.git" }
   set :normalize_asset_timestamps, false
+  set :use_sudo,                   false
 
   load "deploy"
   require 'bundler/capistrano'
 
   recipes_dir = File.dirname(File.expand_path(__FILE__))
 
+  #disabled_modules = fetch(:disabled_features, [])
+
   load "#{recipes_dir}/recipes/crontab.rb"
   load "#{recipes_dir}/recipes/runit.rb"
   load "#{recipes_dir}/recipes/deploy.rb"
   load "#{recipes_dir}/recipes/login.rb"
   load "#{recipes_dir}/recipes/migrate.rb"
   load "#{recipes_dir}/recipes/rails.rb"
-  load "#{recipes_dir}/recipes/unicorn.rb"
+  #load "#{recipes_dir}/recipes/unicorn.rb"
   load "#{recipes_dir}/recipes/assets.rb"
-  load "#{recipes_dir}/recipes/silent.rb" if ENV['CAP_SILENT_MODE']
 end

data/lib/capistrano_evrone_recipes/recipes/crontab.rb

@@ -7,14 +7,18 @@ require "whenever/capistrano/recipes"
 namespace :crontab do
   desc "Generate crontab from config/whenever.rb"
   task :generate, :roles => :crontab, :on_no_matching_servers => :continue, :except => { :no_release => true }  do
-    CapistranoEvroneRecipes::Util.ensure_changed_remote_files(self, "config/schedule.rb") do
-      find_and_execute_task("whenever:update_crontab")
+    if find_servers_for_task(current_task).any?
+      CapistranoEvroneRecipes::Util.ensure_changed_remote_files(self, "config/schedule.rb") do
+        find_and_execute_task("whenever:update_crontab")
+      end
     end
   end
 
   desc "Clear crontab"
   task :clear, :roles => :crontab, :on_no_matching_servers => :continue, :except => { :no_release => true }  do
-    find_and_execute_task("whenever:clear_crontab")
+    if find_servers_for_task(current_task).any?
+      find_and_execute_task("whenever:clear_crontab")
+    end
   end
 end
 

data/lib/capistrano_evrone_recipes/recipes/deploy.rb

@@ -3,30 +3,19 @@ namespace :deploy do
   task :symlink_configs do
     s = "cd #{shared_path}/config && "
     s << "for i in `find . -type f | sed 's/^\\.\\///'` ; do "
-    s << "echo \"> ${i}\" ;"
+    s << "echo \"create current/config/${i}\" ;"
     s << "rm -f #{release_path}/config/${i} ;"
     s << "ln -snf #{shared_path}/config/${i} #{release_path}/config/${i} ; done"
     run s
   end
 
   task :start, :on_no_matching_servers => :continue, :except => { :no_release => true } do
-    CapistranoEvroneRecipes::Util.with_roles(self, :app)    { unicorn.start }
-    CapistranoEvroneRecipes::Util.with_roles(self, :worker) { runit.start }
   end
 
   task :stop, :on_no_matching_servers => :continue, :except => { :no_release => true } do
-    CapistranoEvroneRecipes::Util.with_roles(self, :app)    { unicorn.stop }
-    CapistranoEvroneRecipes::Util.with_roles(self, :worker) { runit.stop }
-  end
-
-  task :graceful_stop, :on_no_matching_servers => :continue, :except => { :no_release => true } do
-    CapistranoEvroneRecipes::Util.with_roles(self, :app)    { unicorn.graceful_stop }
-    CapistranoEvroneRecipes::Util.with_roles(self, :worker) { runit.stop }
   end
 
   task :restart, :on_no_matching_servers => :continue, :except => {:no_release => true} do
-    CapistranoEvroneRecipes::Util.with_roles(self, :app)    { unicorn.restart }
-    CapistranoEvroneRecipes::Util.with_roles(self, :worker) { runit.restart }
   end
 end
 

data/lib/capistrano_evrone_recipes/recipes/login.rb

@@ -1,5 +1,6 @@
 desc "Login to remote host"
 task :login do
   hostname = find_servers_for_task(current_task).first
-  exec "ssh -A -l #{user} #{hostname} -t 'cd #{current_path} && ${SHELL} -l'"
+  port = hostname.port || fetch(:port, 22)
+  exec "ssh -A -p #{port} -l #{user} #{hostname} -t 'cd #{current_path} && ${SHELL} -l'"
 end

data/lib/capistrano_evrone_recipes/recipes/migrate.rb

@@ -3,8 +3,10 @@ namespace :deploy do
   task :migrate, :roles => :db, :on_no_matching_servers => :continue, :only => {:primary => true}, :except => { :no_release => true } do
     return if ENV['MIGRATE_SKIP']
 
-    CapistranoEvroneRecipes::Util.ensure_changed_remote_dirs(self, "db/migrate") do
-      run "cd #{release_path} && #{fetch :rake} RAILS_ENV=#{rails_env} db:migrate"
+    if find_servers_for_task(current_task).any?
+      CapistranoEvroneRecipes::Util.ensure_changed_remote_dirs(self, "db/migrate") do
+        run "cd #{release_path} && #{fetch :rake} RAILS_ENV=#{rails_env} db:migrate"
+      end
     end
   end
 end

data/lib/capistrano_evrone_recipes/recipes/rails.rb

@@ -4,8 +4,9 @@ namespace :rails do
   task :console, :roles => :app do
     server = find_servers_for_task(current_task).first
     if server
-      cmd = "ssh -l #{user} -A #{server} -t 'cd #{current_path} && #{fetch :bundle_cmd} exec rails console #{rails_env}'"
-      puts cmd
+      port = server.port || fetch(:port, 22)
+      cmd = "ssh -p #{port} -l #{user} -A #{server} -t 'cd #{current_path} && #{fetch :bundle_cmd} exec rails console #{rails_env}'"
+      exec cmd
     end
   end
 
@@ -14,7 +15,8 @@ namespace :rails do
   task :dbconsole, :roles => :db, :only => { :primary => true } do
     server = find_servers_for_task(current_task).first
     if server
-      exec "ssh -l #{user} -A #{server} -t 'cd #{current_path} && #{fetch :bundle_cmd} exec rails dbconsole #{rails_env}'"
+      port = server.port || fetch(:port, 22)
+      exec "ssh -p #{port} -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/runit.rb

@@ -1,59 +1,77 @@
 _cset(:runit_export_path)   { "#{latest_release}/var/services" }
 _cset(:runit_services_path) { "#{deploy_to}/services" }
 _cset(:runit_export_cmd)    { "#{fetch :bundle_cmd} exec foreman export runitu" }
-_cset(:runit_procfile)      { "#{latest_release}/Procfile" }
+_cset(:runit_procfile)      { "Procfile" }
 _cset(:foreman_concurency)  { nil }
 
 namespace :runit do
 
   desc "Restart Procfile services"
   task :restart, :roles => :worker, :on_no_matching_servers => :continue, :except => { :no_release => true } do
-    current_link = capture("readlink #{runit_services_path}/current || echo").to_s.strip
-    if current_link == runit_export_path
-      stop
-      start
-    else
-      relink
+    if find_servers_for_task(current_task).any?
+      cmd = %Q{
+        if [ -d #{runit_export_path} ] ; then
+          echo "----> Updating services" ;
+          rm -rf #{runit_services_path}/* ;
+          sync ;
+          cp -r #{runit_export_path}/* #{runit_services_path}/ ;
+          sync ;
+          rm -rf #{runit_export_path} ;
+        else
+          echo "----> Restart services" ;
+          test $(ls -1 #{runit_services_path} | wc -l) -eq 0 || sv t #{runit_services_path}/* ;
+        fi
+      }.compact
+      run cmd
     end
   end
 
-  task :relink, :roles => :worker, :on_no_matching_servers => :continue, :except => { :no_release => true } do
-    cmd = <<-EOF
-    (test -L previous && readlink previous | xargs rm -rf) ;
-    rm -f current.new &&
-    ln -s #{runit_export_path} current.new &&
-    rm -f previous &&
-    (test -L current && mv current previous) || true
-    && mv current.new current
-    EOF
-    cmd = cmd.gsub(/\n/, " ").gsub(/ +/, " ")
-    run("cd #{runit_services_path} && #{cmd}")
-  end
-
   desc "Stop services"
   task :stop, :roles => :worker, :on_no_matching_servers => :continue, :except => { :no_release => true } do
-    cmd = "for i in `ls -1 #{runit_services_path}/current`; do"
-    cmd << " sv -w 10 force-stop #{runit_services_path}/current/${i} ; done"
-    run(cmd)
+    if find_servers_for_task(current_task).any?
+      run "sv -w 10 force-stop #{runit_services_path}/*"
+    end
   end
 
   desc "Start services"
   task :start, :roles => :worker, :on_no_matching_servers => :continue, :except => { :no_release => true } do
-    cmd = "for i in `ls -1 #{runit_services_path}/current`; do"
-    cmd << " sv -v -w 10 up #{runit_services_path}/current/${i} ; done"
-    run(cmd)
+    if find_servers_for_task(current_task).any?
+      run "sv -v start #{runit_services_path}/*"
+    end
   end
 
   desc "Export Procfile"
   task :export, :roles => :worker, :on_no_matching_servers => :continue, :except => { :no_release => true } do
-    env = <<-EOF
-RAILS_ENV=#{rails_env}
-EOF
-    put(env, "#{release_path}/.env")
+    if find_servers_for_task(current_task).any?
+      CapistranoEvroneRecipes::Util.ensure_changed_remote_files(self, fetch(:runit_procfile)) do
+        env = %{ RAILS_ENV=#{rails_env} }.strip + "\n"
+        put(env, "#{latest_release}/.env")
+
+        c = fetch(:foreman_concurency) ? "-c #{fetch :foreman_concurency}" : ""
+        cmd = %{
+          cd #{latest_release} &&
+          #{runit_export_cmd} #{runit_export_path}
+            -e #{latest_release}/.env
+            -l #{shared_path}/log
+            -f #{latest_release}/#{runit_procfile}
+            --root=#{current_path}
+            -a #{application} #{c} > /dev/null &&
+            echo "----> Export #{runit_procfile}"
+        }.compact
+        run cmd
 
-    conc = fetch(:foreman_concurency) ? "-c #{fetch :foreman_concurency}" : ""
-    run "cd #{release_path} && #{runit_export_cmd} #{runit_export_path} -e #{release_path}/.env -l #{shared_path}/log -f #{runit_procfile} --root=#{release_path} -a #{application} #{conc} > /dev/null"
+        cmd = %{
+          for i in $(ls #{runit_export_path}/); do
+            sed -i 's|#{runit_export_path}|#{runit_services_path}|g' #{runit_export_path}/${i}/run ;
+          done
+        }.compact
+        run cmd
+      end
+    end
   end
 end
 
 after "deploy:finalize_update", "runit:export"
+after "deploy:start", "runit:start"
+after "deploy:stop", "runit:stop"
+after "deploy:restart", "runit:restart"

data/lib/capistrano_evrone_recipes/recipes/unicorn.rb

@@ -12,11 +12,6 @@ EOF
     run cmd
   end
 
-  desc "Fast restart unicorn"
-  task :fast_restart, :roles => :app, :on_no_matching_servers => :continue, :except => {:no_release => true} do
-    run "test -f #{fetch :unicorn_pid} ] && kill -s USR2 `cat #{fetch :unicorn_pid}`"
-  end
-
   desc "Start unicorn"
   task :start, :roles => :app, :on_no_matching_servers => :continue, :except => {:no_release => true} do
     run "cd #{current_path} && env #{fetch :unicorn_binary} -c #{fetch :unicorn_config} -E #{rails_env} -D"
@@ -26,9 +21,8 @@ EOF
   task :stop, :roles => :app, :on_no_matching_servers => :continue, :except => {:no_release => true} do
     run "test -f #{fetch :unicorn_pid} && kill `cat #{fetch :unicorn_pid}`"
   end
-
-  desc "Graceful stop unicorn"
-  task :graceful_stop, :on_no_matching_servers => :continue, :roles => :app, :except => { :no_release => true } do
-    run "test -f #{fetch :unicorn_pid} && kill -s QUIT `cat #{fetch :unicorn_pid}`"
-  end
 end
+
+after "deploy:start", "unicorn:start"
+after "deploy:stop", "unicorn:stop"
+after "deploy:restart", "unicorn:restart"

data/lib/capistrano_evrone_recipes/util.rb

@@ -2,45 +2,44 @@ module CapistranoEvroneRecipes
   class Util
     class << self
       def ensure_changed_remote_dirs(cap, path)
-        diff = if cap.previous_release
-                 -> { cap.capture("diff -r #{cap.previous_release}/#{path} #{cap.current_release}/#{path} | wc -l").to_i }
-               else
-                 -> { 1 }
-               end
-        force = ENV["FORCE"].to_i
-        if force > 0 || diff.call > 0
+        if ENV['FORCE'] || !cap.previous_release
           yield
-        else
-          cap.logger.info "skip because #{path} not changed"
-          $silent_stack_skip = true
+          return
+        end
+        cap.run changed?(cap, path, recursive: true) do |ch, st, data|
+          Capistrano::Configuration.default_io_proc.call(ch,st,data)
+          unless data.include?(" is not changed")
+            yield
+          end
         end
       end
 
       def ensure_changed_remote_files(cap, path)
-        diff = if cap.previous_release
-                 -> { cap.capture("diff -r #{cap.previous_release}/#{path} #{cap.current_release}/#{path} | wc -l").to_i }
-               else
-                 -> { 1 }
-               end
-        force = ENV["FORCE"].to_i
-        if force > 0 || diff.call > 0
+        if ENV['FORCE'] || !cap.previous_release
           yield
-        else
-          cap.logger.info "skip because #{path} not changed"
-          $silent_stack_skip = true
+          return
+        end
+        cap.run changed?(cap, path) do |ch, st, data|
+          Capistrano::Configuration.default_io_proc.call(ch,st,data)
+          unless data.include?(" is not changed")
+            yield
+          end
         end
       end
 
-
-      def with_roles(cap, role)
-        original, hosts = ENV["HOSTS"], cap.find_servers(:roles => role).map{|i| i.host }.join(",")
-        return if hosts.empty?
-        begin
-          ENV["HOSTS"] = hosts
-          yield
-        ensure
-          ENV["HOSTS"] = original
-        end
+      def changed?(cap, path, options = {})
+        r = options[:recursive] ? "-r" : ""
+        %{
+          diff #{r} #{cap.previous_release}/#{path} #{cap.latest_release}/#{path} |
+            wc -l |
+            grep -q -v 0 ;
+          ST=$? ;
+          if [ $ST -eq 0 ] ; then
+            echo '----> #{path} changed' ;
+          else
+            echo '----> #{path} is not changed' ;
+          fi
+        }.compact
       end
     end
   end

data/lib/capistrano_evrone_recipes/version.rb

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

metadata

@@ -1,96 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_evrone_recipes
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: capistrano
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.13.5
-    none: false
-  name: capistrano
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.13.5
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: colored
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: colored
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: unicorn
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: unicorn
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: foreman_export_runitu
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: foreman_export_runitu
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: whenever
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: whenever
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !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: []
@@ -118,27 +107,26 @@ files:
 - lib/capistrano_evrone_recipes/version.rb
 homepage: http://github.com/evrone/capistrano_evrone_recipes
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  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
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Capistrano recipes used in evrone company
 test_files: []
 has_rdoc: