capobvious 0.2.3 → 0.2.4

data/lib/capistrano/ext/capobvious.rb

@@ -18,6 +18,8 @@ Capistrano::Configuration.instance.load do
 
 
   set :unicorn_init, "unicorn_#{application}"
+  set :unicorn_conf, "#{current_path}/config/unicorn.rb"
+  set :unicorn_pid, "#{shared_path}/pids/unicorn.pid"
 
   psql = "psql -h localhost"
   psql_postgres = "#{psql} -U postgres"
@@ -55,7 +57,7 @@ Capistrano::Configuration.instance.load do
   set :timestamp, Time.new.to_i.to_s
   set :db_archive_ext, "tar.bz2"
   set :arch_extract, "tar -xvjf"
-  set :arch_create, "tar -cjf"
+  set :arch_create, "tar -cvjf"
 
   set :db_file_name, "#{database}-#{timestamp}.sql"
   set :sys_file_name, "#{application}-system-#{timestamp}.#{db_archive_ext}"
@@ -220,11 +222,11 @@ Capistrano::Configuration.instance.load do
     task :sys do
       backup.sys
       system "rm -rfv public/system/"
-      system "#{arch_extract} #{local_folder_path}/#{sys_file_name} -opublic"
-    end
-    task :db do
-      db.pg_import
+      system "cd public && #{arch_extract} ../#{local_folder_path}/#{sys_file_name}"
     end
+#   task :db do
+#     db.pg_import
+#   end
   end
 
   #def prompt_with_default(var, default)
@@ -462,6 +464,62 @@ Capistrano::Configuration.instance.load do
   end
 
 
+  def which(name)
+    run "which #{name}"
+  end
+
+
+  namespace :runit do
+    desc "init"
+    task :init, :roles => :web do
+      join_ruby = rvm_ruby_string[/\d.\d.\d/].delete('.')
+      local_runit_path = "#{shared_path}/runit_temp"
+      runit = "/etc/sv/#{application}"
+      runit_path = "/etc/service/#{application}"
+      wrapper = "#{join_ruby}_unicorn"
+      logger.important('Creating unicorn wrapper', 'runit')
+      run "rvm wrapper #{rvm_ruby_string} #{join_ruby} unicorn"
+
+      run = <<EOF
+#!/bin/sh
+exec 2>&1
+export USER=#{user}
+export HOME=/home/$USER
+export RAILS_ENV=#{rails_env}
+UNICORN="/home/#{user}/.rvm/bin/#{wrapper}"
+UNICORN_CONF=#{unicorn_conf}
+cd #{current_path}
+exec chpst -u $USER:$USER $UNICORN -c $UNICORN_CONF
+EOF
+log_run = <<EOF
+#!/bin/bash
+LOG_FOLDER=/var/log/#{application}
+mkdir -p $LOG_FOLDER
+exec svlogd -tt $LOG_FOLDER
+EOF
+
+logger.important('Creating local runit path', 'runit')
+run "mkdir -p #{local_runit_path}/log"
+logger.important('Creating run script', 'runit')
+put run, "#{local_runit_path}/run"
+run "chmod +x #{local_runit_path}/run"
+logger.important('Creating log script', 'runit')
+put log_run, "#{local_runit_path}/log/run"
+run "chmod +x #{local_runit_path}/log/run"
+
+run "#{sudo} mv #{local_runit_path} #{runit} && #{sudo} ln -s #{runit} #{runit_path}"
+sudo chown -R root:root /etc/sv/three-elements/
+
+#logger.important('Creating symlink', 'runit')
+#symlink = "#{sudo} ln -s #{local_runit_path} #{runit_path}"
+#run symlink
+
+#puts "$ cat #{runit_path}/run"
+#puts run
+    end
+  end
+
+
 
   # Check if remote file exists
         #
@@ -475,8 +533,6 @@ Capistrano::Configuration.instance.load do
     capture("ps -p $(cat #{pid_file}) ; true").strip.split("\n").size == 2
   end
 
-  set :unicorn_conf, "#{current_path}/config/unicorn.rb"
-  set :unicorn_pid, "#{shared_path}/pids/unicorn.pid"
   namespace :unicorn do
     desc "start unicorn"
     task :start do

data/lib/capobvious/version.rb

@@ -1,3 +1,3 @@
 module Capobvious
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capobvious
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: capobvious
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Cap recipes