capistrano_evrone_recipes 0.1.5 → 0.1.6

data/lib/capistrano_evrone_recipes/capistrano.rb

@@ -7,14 +7,16 @@ Capistrano::Configuration.instance(:must_exist).load do
   default_run_options[:pty]   = true
   ssh_options[:forward_agent] = true
 
-  set :bundle_cmd,       "rbenv exec bundle"
-  set :rake,             -> { "#{bundle_cmd} exec rake" }
-  set :keep_releases,    7
-  set :scm,              "git"
-  set :user,             "deploy"
-  set :deploy_via,       :unshared_remote_cache
-  set :copy_exclude,     [".git"]
-  set :repository_cache, -> { "#{deploy_to}/shared/#{application}.git" }
+  set :bundle_cmd,                 "rbenv exec bundle"
+  set :bundle_flags,               "--deployment --quiet --binstubs --shebang ruby-local-exec"
+  set :rake,                       -> { "#{bundle_cmd} exec rake" }
+  set :keep_releases,              7
+  set :scm,                        "git"
+  set :user,                       "deploy"
+  set :deploy_via,                 :unshared_remote_cache
+  set :copy_exclude,               [".git"]
+  set :repository_cache,           -> { "#{deploy_to}/shared/#{application}.git" }
+  set :normalize_asset_timestamps, false
 
   load "deploy"
   require 'bundler/capistrano'
@@ -22,7 +24,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   recipes_dir = File.dirname(File.expand_path(__FILE__))
 
   load "#{recipes_dir}/recipes/crontab.rb"
-  load "#{recipes_dir}/recipes/foreman.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"

data/lib/capistrano_evrone_recipes/recipes/deploy.rb

@@ -10,23 +10,23 @@ namespace :deploy do
   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) { foreman.start }
+    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) { foreman.stop }
+    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) { foreman.stop }
+    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) { foreman.restart }
+    CapistranoEvroneRecipes::Util.with_roles(self, :app)    { unicorn.restart }
+    CapistranoEvroneRecipes::Util.with_roles(self, :worker) { runit.restart }
   end
 end
 

data/lib/capistrano_evrone_recipes/recipes/runit.rb

@@ -0,0 +1,59 @@
+_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(: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").to_s.strip
+    if current_link == runit_export_path
+      stop
+      start
+    else
+      relink
+    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)
+  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)
+  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")
+
+    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"
+  end
+end
+
+after "deploy:finalize_update", "runit:export"

data/lib/capistrano_evrone_recipes/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_evrone_recipes
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -107,10 +107,10 @@ files:
 - lib/capistrano_evrone_recipes/recipes/assets.rb
 - lib/capistrano_evrone_recipes/recipes/crontab.rb
 - lib/capistrano_evrone_recipes/recipes/deploy.rb
-- lib/capistrano_evrone_recipes/recipes/foreman.rb
 - lib/capistrano_evrone_recipes/recipes/login.rb
 - lib/capistrano_evrone_recipes/recipes/migrate.rb
 - lib/capistrano_evrone_recipes/recipes/rails.rb
+- lib/capistrano_evrone_recipes/recipes/runit.rb
 - lib/capistrano_evrone_recipes/recipes/silent.rb
 - lib/capistrano_evrone_recipes/recipes/sphinx.rb
 - lib/capistrano_evrone_recipes/recipes/unicorn.rb

data/lib/capistrano_evrone_recipes/recipes/foreman.rb

@@ -1,48 +0,0 @@
-_cset(:foreman_services_path) { "#{deploy_to}/services/#{release_name}" }
-_cset(:foreman_cmd)           { "#{fetch :bundle_cmd} exec foreman export runitu" }
-_cset(:foreman_procfile)      { "#{release_path}/Procfile" }
-_cset(:foreman_concurency)    { nil }
-
-namespace :foreman do
-
-  desc "Restart Procfile services"
-  task :restart, :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 #{fetch :foreman_services_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 #{deploy_to}/services && #{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 #{deploy_to}/services/current`; do"
-    cmd << " sv -w 10 down #{deploy_to}/services/current/${i} ; done"
-    run(cmd)
-  end
-
-  desc "Start services"
-  task :start, :roles => :worker, :on_no_matching_servers => :continue, :except => { :no_release => true } do
-    cmd = "for i in `ls -1 #{deploy_to}/services/current`; do"
-    cmd << " sv -v -w 10 up #{deploy_to}/services/current/${i} ; done"
-    run(cmd)
-  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")
-
-    conc = fetch(:foreman_concurency) ? "-c #{fetch :foreman_concurency}" : ""
-    run "cd #{release_path} && #{fetch :foreman_cmd} #{fetch :foreman_services_path} -e #{release_path}/.env -l #{shared_path}/log -f #{fetch :foreman_procfile} --root=#{release_path} -a #{application} #{conc} > /dev/null"
-  end
-end
-
-after "deploy:finalize_update", "foreman:export"