capobvious 0.0.7 → 0.0.8

data/lib/capistrano/ext/capobvious.rb

@@ -2,216 +2,252 @@ $:.unshift(File.expand_path('./lib', ENV['rvm_path']))
 require "rvm/capistrano"
 
 Capistrano::Configuration.instance.load do
-rvmrc = "rvm use #{rvm_ruby_string}"
-set :rvm_type, :user
-
-default_run_options[:pty] = true
-ssh_options[:forward_agent] = true
-
-set :rails_env, "production" unless exists?(:rails_env)
-set :branch, "master" unless exists?(:branch)
-set :dbconf, "database.yml" unless exists?(:dbconf)
-set :deploy_to, "/home/#{user}/www/#{application}" unless exists?(:deploy_to)
-set :deploy_via, :remote_cache unless exists?(:deploy_via)
-set :keep_releases, 5 unless exists?(:keep_releases)
-set :use_sudo, false unless exists?(:use_sudo)
-set :scm, :git unless exists?(:scm)
-
-if `uname -a`.include?("Darwin")
-run_local_psql = "psql -h localhost -U postgres"
-else
-run_local_psql = "#{sudo} -u postgres psql"
-end
+  rvmrc = "rvm use #{rvm_ruby_string}"
+  set :rvm_type, :user
+
+  default_run_options[:pty] = true
+  ssh_options[:forward_agent] = true
+
+  set :rails_env, "production" unless exists?(:rails_env)
+  set :branch, "master" unless exists?(:branch)
+  set :dbconf, "database.yml" unless exists?(:dbconf)
+  set :deploy_to, "/home/#{user}/www/#{application}" unless exists?(:deploy_to)
+  set :deploy_via, :remote_cache unless exists?(:deploy_via)
+  set :keep_releases, 5 unless exists?(:keep_releases)
+  set :use_sudo, false unless exists?(:use_sudo)
+  set :scm, :git unless exists?(:scm)
+
+  if `uname -a`.include?("Darwin")
+    run_local_psql = "psql -h localhost -U postgres"
+  else
+    run_local_psql = "#{sudo} -u postgres psql"
+  end
 
-config = YAML::load(File.open("config/#{dbconf}"))
-adapter = config[rails_env]["adapter"]
-database = config[rails_env]["database"]
-db_username = config[rails_env]["username"]
-db_password = config[rails_env]["password"]
+  config = YAML::load(File.open("config/#{dbconf}"))
+  adapter = config[rails_env]["adapter"]
+  database = config[rails_env]["database"]
+  db_username = config[rails_env]["username"]
+  db_password = config[rails_env]["password"]
 
 
-local_rails_env = 'development'
-config = YAML::load(File.open("config/database.yml"))
-local_adapter = config[local_rails_env]["adapter"]
-local_database = config[local_rails_env]["database"]
-local_db_username = config[local_rails_env]["username"]
-local_db_password = config[local_rails_env]["password"]
+  local_rails_env = 'development'
+  config = YAML::load(File.open("config/database.yml"))
+  local_adapter = config[local_rails_env]["adapter"]
+  local_database = config[local_rails_env]["database"]
+  local_db_username = config[local_rails_env]["username"]
+  local_db_password = config[local_rails_env]["password"]
 
 
 
-set :local_folder_path, "tmp/backup"
-set :timestamp, Time.new.to_i.to_s
-set :db_file_name, "#{database}-#{timestamp}.sql"
-set :sys_file_name, "#{application}-system-#{timestamp}.7z"
-set :db_archive_ext, "7z"
+  set :local_folder_path, "tmp/backup"
+  set :timestamp, Time.new.to_i.to_s
+  set :db_file_name, "#{database}-#{timestamp}.sql"
+  set :sys_file_name, "#{application}-system-#{timestamp}.7z"
+  set :db_archive_ext, "7z"
 
 
-#after "deploy:symlink", "auto:run"
-before "deploy:restart", "auto:run"
-#after "deploy:setup", "db:create", "nginx:conf", "install:p7zip"
+  #after "deploy:symlink", "auto:run"
+  before "deploy:restart", "auto:run"
+  #after "deploy:setup", "db:create", "nginx:conf", "install:p7zip"
 
 
-namespace :auto do
-  task :run do
-    if exists?(:assets) && fetch(:assets) == true
-      assets.precompile
+  namespace :auto do
+    task :run do
+      if exists?(:assets) && fetch(:assets) == true
+        assets.precompile
+      end
+      create.files
+      if exists?(:sphinx) && fetch(:sphinx) == true
+        sphinx.symlink
+      end
+      bundle.install
+      if exists?(:auto_migrate) && fetch(:auto_migrate) == true
+        db.migrate
+      end
     end
-    create.files
-    if exists?(:sphinx) && fetch(:sphinx) == true
-      sphinx.symlink
+    task :prepare do
+      db.create
+      nginx.conf
+      install.p7zip
     end
-    bundle.install
-    if exists?(:auto_migrate) && fetch(:auto_migrate) == true
-      db.migrate
-    end
-  end
-  task :prepare do
-    db.create
-    nginx.conf
-    install.p7zip
   end
-end
-namespace :create do
-  task :files do
-    create.rvmrc
-    if fetch(:dbconf) != 'database.yml'
-      create.database_yml
+  namespace :create do
+    task :files do
+      create.rvmrc
+      if fetch(:dbconf) != 'database.yml'
+        create.database_yml
+      end
+    end
+    task :database_yml do
+      run "ln -sfv #{current_path}/config/#{dbconf} #{current_path}/config/database.yml"
+    end
+    desc "Create .rvmrc & files"
+    task :rvmrc do
+      put rvmrc, "#{current_path}/.rvmrc"
     end
   end
-  task :database_yml do
-    run "ln -sfv #{current_path}/config/#{dbconf} #{current_path}/config/database.yml"
-  end
-  desc "Create .rvmrc & files"
-  task :rvmrc do
-    put rvmrc, "#{current_path}/.rvmrc"
-  end
-end
 
 
-namespace :db do
-  task :create do
-    if adapter == "postgresql"
-    run "echo \"create user #{db_username} with password '#{db_password}';\" | #{sudo} -u postgres psql"
-    run "echo \"create database #{database} owner #{db_username};\" | #{sudo} -u postgres psql"
-    else
-      puts "Cannot create, adapter #{adapter} is not implemented yet"
+  namespace :db do
+    task :create do
+      if adapter == "postgresql"
+        run "echo \"create user #{db_username} with password '#{db_password}';\" | #{sudo} -u postgres psql"
+        run "echo \"create database #{database} owner #{db_username};\" | #{sudo} -u postgres psql"
+      else
+        puts "Cannot create, adapter #{adapter} is not implemented yet"
+      end
+    end
+    task :seed do
+      run "cd #{current_path} && bundle exec rake RAILS_ENV=#{rails_env} db:seed"
+    end
+    task :reset do
+      run "cd #{current_path} && bundle exec rake RAILS_ENV=#{rails_env} db:reset"
+    end
+    task :migrate do
+      run "cd #{current_path} && bundle exec rake RAILS_ENV=#{rails_env} db:migrate"
+    end
+    task :import do
+      file_name = "#{db_file_name}.#{db_archive_ext}"
+      file_path = "#{local_folder_path}/#{file_name}"
+      system "cd #{local_folder_path} && 7z x #{file_name}"
+      system "echo \"drop database #{local_database}\" | #{run_local_psql}"
+      system "echo \"create database #{local_database} owner #{local_db_username};\" | #{run_local_psql}"
+      #    system "#{run_local_psql} #{local_database} < #{local_folder_path}/#{db_file_name}"
+      puts "ENTER your development password: #{local_db_password}"
+      system "#{run_local_psql} -U#{local_db_username} #{local_database} < #{local_folder_path}/#{db_file_name}"
+      system "rm #{local_folder_path}/#{db_file_name}"
+    end
+    task :pg_import do
+      backup.db
+      db.import
     end
   end
-  task :seed do
-    run "cd #{current_path} && bundle exec rake RAILS_ENV=#{rails_env} db:seed"
-  end
-  task :reset do
-    run "cd #{current_path} && bundle exec rake RAILS_ENV=#{rails_env} db:reset"
-  end
-  task :migrate do
-    run "cd #{current_path} && bundle exec rake RAILS_ENV=#{rails_env} db:migrate"
-  end
-  task :import do
-    file_name = "#{db_file_name}.#{db_archive_ext}"
-    file_path = "#{local_folder_path}/#{file_name}"
-    system "cd #{local_folder_path} && 7z x #{file_name}" 
-    system "echo \"drop database #{local_database}\" | #{run_local_psql}"
-    system "echo \"create database #{local_database} owner #{local_db_username};\" | #{run_local_psql}"
-#    system "#{run_local_psql} #{local_database} < #{local_folder_path}/#{db_file_name}"
-    puts "ENTER your development password: #{local_db_password}"
-    system "#{run_local_psql} -U#{local_db_username} #{local_database} < #{local_folder_path}/#{db_file_name}"
-    system "rm #{local_folder_path}/#{db_file_name}"
-  end
-  task :pg_import do
-    backup.db
-    db.import
-  end
-end
 
-namespace :import do
-  task :sys do
-    backup.sys
-    system "rm -rfv public/system/"
-    system "7z x #{local_folder_path}/#{sys_file_name} -opublic"
-  end
-  task :db do
-    db.pg_import
+  namespace :import do
+    task :sys do
+      backup.sys
+      system "rm -rfv public/system/"
+      system "7z x #{local_folder_path}/#{sys_file_name} -opublic"
+    end
+    task :db do
+      db.pg_import
+    end
   end
-end
 
-# PRIKHA-TASK
-desc "Run custom task usage: cap rake TASK=patch:project_category"
-task :rake do
-  if ENV.has_key?('TASK')
-  p "running rake task: #{ENV['TASK']}"
-    run "cd #{current_path} && bundle exec rake RAILS_ENV=#{rails_env} #{ENV['TASK']}"
-  else
-    puts 'Please specify correct task: cap rake TASK= some_task'
+  #def prompt_with_default(var, default)
+  #  set(var) do
+  #    Capistrano::CLI.ui.ask “#{var} [#{default}] : ”
+  #  end
+  #  set var, default if eval(“#{var.to_s}.empty?”)
+  #end
+
+  namespace :restore do
+    task :sys do
+      result = {}
+      i = 0
+      Dir.foreach(local_folder_path) do |d|
+        if d.include?(sys_file_name.gsub(/\d+?(\.7z)/,""))
+          result[i.to_s] = d
+          i+=1
+        end
+      end
+      result.each{|key,value| puts "#{key} - #{value} ##{Time.at(value.scan(/\d+/).first.to_i)} #{File.size(local_folder_path+'/'+value)}"}
+      puts "WARNING: IT WILL OVERWRITE public/system FOLDER!"
+      select = Capistrano::CLI.ui.ask "select : "
+      file = result[select]
+      unless file.nil?
+        puts "You selected #{file}"
+        upload("#{local_folder_path}/#{file}","#{shared_path}/#{file}")
+        run "rm -rfv #{shared_path}/system/*"
+        run "7z x #{shared_path}/#{file} -o#{shared_path}"
+        run "chmod -R o=rX #{shared_path}/system"
+        run "rm -v #{shared_path}/#{file}"
+      end
+    end
   end
-end
 
-namespace :backup do
-  desc "Backup a database"
-  task :db do
-    file_name = fetch(:db_file_name)
-    archive_ext = fetch(:db_archive_ext)
-    dump_file_path = "#{shared_path}/backup/#{file_name}"
-    output_file = "#{dump_file_path}.#{archive_ext}"
-    require 'yaml'
-    run "mkdir -p #{shared_path}/backup"
-    if adapter == "postgresql"
-      
-      run "export PGPASSWORD=\"#{db_password}\" && pg_dump -U #{db_username} #{database} > #{dump_file_path}"
-      run "cd #{shared_path} && 7z a #{output_file} #{dump_file_path} && rm #{dump_file_path}"
+  # PRIKHA-TASK
+  desc "Run custom task usage: cap rake TASK=patch:project_category"
+  task :rake do
+    if ENV.has_key?('TASK')
+      p "running rake task: #{ENV['TASK']}"
+      run "cd #{current_path} && bundle exec rake RAILS_ENV=#{rails_env} #{ENV['TASK']}"
     else
-      puts "Cannot backup, adapter #{adapter} is not implemented for backup yet"
+      puts 'Please specify correct task: cap rake TASK= some_task'
     end
-    system "mkdir -p #{local_folder_path}"
-    download(output_file, "#{local_folder_path}/#{file_name}.#{archive_ext}")
-  end
-  desc "Backup public/system folder"
-  task :sys do
-    file_path = "#{shared_path}/backup/#{sys_file_name}"
-    run "7z a #{file_path} #{shared_path}/system"
-    download(file_path, "#{local_folder_path}/#{sys_file_name}")
-  end
-  desc "Clean backup folder"
-  task :clean do
-    run "rm -rfv #{shared_path}/backup/*"
   end
-end
-if exists?(:backup_db) && fetch(:backup_db) == true
-  before "deploy:update", "backup:db"
-end
-if exists?(:backup_sys) && fetch(:backup_sys) == true
-  before "deploy:update", "backup:sys"
-end
-
-namespace :assets do
-  desc "Assets precompile"
-  task :precompile do
-    system("bundle exec rake assets:precompile && cd public && tar czf assets.tar.gz assets/")
-    upload("public/assets.tar.gz","#{current_path}/public/assets.tar.gz")
-    system("rm public/assets.tar.gz && rm -rf tmp/assets && mv public/assets tmp/assets")
-    run("cd #{current_path}/public && rm -rf assets/ && tar xzf assets.tar.gz && rm assets.tar.gz")
-  end
-end
 
-namespace :nginx do
-  task :restart do
-    run "#{sudo} /etc/init.d/nginx restart"
+  namespace :backup do
+    desc "Backup a database"
+    task :db do
+      file_name = fetch(:db_file_name)
+      archive_ext = fetch(:db_archive_ext)
+      dump_file_path = "#{shared_path}/backup/#{file_name}"
+      output_file = "#{dump_file_path}.#{archive_ext}"
+      require 'yaml'
+      run "mkdir -p #{shared_path}/backup"
+      if adapter == "postgresql"
+
+        run "export PGPASSWORD=\"#{db_password}\" && pg_dump -U #{db_username} #{database} > #{dump_file_path}"
+        run "cd #{shared_path} && 7z a #{output_file} #{dump_file_path} && rm #{dump_file_path}"
+      else
+        puts "Cannot backup, adapter #{adapter} is not implemented for backup yet"
+      end
+      system "mkdir -p #{local_folder_path}"
+      download(output_file, "#{local_folder_path}/#{file_name}.#{archive_ext}")
+    end
+    desc "Backup public/system folder"
+    task :sys do
+      file_path = "#{shared_path}/backup/#{sys_file_name}"
+      run "7z a #{file_path} #{shared_path}/system"
+      download(file_path, "#{local_folder_path}/#{sys_file_name}")
+    end
+    desc "Clean backup folder"
+    task :clean do
+      run "rm -rfv #{shared_path}/backup/*"
+    end
   end
-  task :reload do
-    run "#{sudo} /etc/init.d/nginx reload"
+  if exists?(:backup_db) && fetch(:backup_db) == true
+    before "deploy:update", "backup:db"
   end
-  task :start do
-    run "#{sudo} /etc/init.d/nginx start"
+  if exists?(:backup_sys) && fetch(:backup_sys) == true
+    before "deploy:update", "backup:sys"
   end
-  task :stop do
-    run "#{sudo} /etc/init.d/nginx stop"
+
+  namespace :assets do
+    desc "Assets precompile"
+    task :precompile do
+      system("bundle exec rake RAILS_ENV=development assets:precompile && cd public && tar czf assets.tar.gz assets/")
+      upload("public/assets.tar.gz","#{current_path}/public/assets.tar.gz")
+      system("rm public/assets.tar.gz && rm -rf tmp/assets && mv public/assets tmp/assets")
+      run("cd #{current_path}/public && rm -rf assets/ && tar xzf assets.tar.gz && rm assets.tar.gz")
+    end
   end
-  desc "Add app nginx conf to server"
-  task :conf do
+
+  namespace :nginx do
+    task :restart do
+      run "#{sudo} /etc/init.d/nginx restart"
+    end
+    task :reload do
+      run "#{sudo} /etc/init.d/nginx reload"
+    end
+    task :start do
+      run "#{sudo} /etc/init.d/nginx start"
+    end
+    task :stop do
+      run "#{sudo} /etc/init.d/nginx stop"
+    end
+    desc "Add app nginx conf to server"
+    task :conf do
   default_nginx_template = <<-EOF
     server {
     listen  80;
     server_name  #{server_name};
     root #{current_path}/public;
+
+#    access_log  #{shared_path}/log/nginx.access_log;# buffer=32k;
+#    error_log   #{shared_path}/log/nginx.error_log error;
+
 #    location ~ ^/assets/ {
 #      expires 1y;
 #      add_header Cache-Control public;
@@ -236,123 +272,137 @@ namespace :nginx do
         proxy_pass  http://unix:#{shared_path}/pids/unicorn.sock;
     }
     }
-    EOF
-    if exists?(:server_redirect)
-      server_redirect = fetch(:server_redirect)#.split(" ")
+      EOF
+      if exists?(:server_redirect)
+        server_redirect = fetch(:server_redirect)#.split(" ")
       redirect_template = <<-RED
         server {
           server_name #{server_redirect};
-          rewrite ^(.*)$ http://#{server_name}$1 permanent;
+          rewrite ^(.*)$ http://#{server_name.split(' ').first}$1 permanent;
         }
-      RED
-      default_nginx_template += redirect_template
+        RED
+        default_nginx_template += redirect_template
+      end
+
+      puts default_nginx_template
+
+      if exists?(:server_name)
+        #location = fetch(:template_dir, "config") + '/nginx.conf.erb'
+        #template = File.file?(location) ? File.read(location) : default_nginx_template
+        config = ERB.new(default_nginx_template)
+        #  puts config.result
+        put config.result(binding), "#{shared_path}/nginx.conf"
+        run "#{sudo} ln -sfv #{shared_path}/nginx.conf /etc/nginx/sites-enabled/#{application}"
+      else
+        puts "Aborting because :server_name is not setted in deploy.rb"
+      end
     end
-
-puts default_nginx_template
-
-    if exists?(:server_name)
-      #location = fetch(:template_dir, "config") + '/nginx.conf.erb'
-      #template = File.file?(location) ? File.read(location) : default_nginx_template
-      config = ERB.new(default_nginx_template)
-      #  puts config.result
-      put config.result(binding), "#{shared_path}/nginx.conf"
-      run "#{sudo} ln -sfv #{shared_path}/nginx.conf /etc/nginx/sites-enabled/#{application}"
-    else
-      puts "Aborting because :server_name is not setted in deploy.rb"
+    desc "Del nginx config"
+    task :delconf do
+      run "#{sudo} rm -v /etc/nginx/sites-enabled/#{application}"
     end
   end
-  desc "Del nginx config"
-  task :delconf do
-    run "#{sudo} rm -v /etc/nginx/sites-enabled/#{application}"
-  end
-end
-after "nginx:conf", "nginx:reload"
-after "nginx:delconf", "nginx:reload"
+  after "nginx:conf", "nginx:reload"
+  after "nginx:delconf", "nginx:reload"
 
 
-namespace :bundle do
-  desc "Run bundle install"
-  task :install do
-    without = ['development','test','production']-[rails_env]
-    run "cd #{current_path} && bundle install --without #{without.join(" ")}"
+  namespace :bundle do
+    desc "Run bundle install"
+    task :install do
+      deployment = "--deployment --quiet"
+      without = ['development','test','production']-[rails_env]
+      run "cd #{current_path} && bundle install --without #{without.join(" ")}"
+    end
   end
-end
 
-namespace :log do
-  desc "tail -f production.log"
-  task :tail do
-    stream("tail -f -n 0 #{current_path}/log/production.log")
+  namespace :log do
+    desc "tail -f production.log"
+    task :tail do
+      stream("tail -f -n 0 #{current_path}/log/production.log")
+    end
   end
-end
 
 
 
 
-namespace :install do
-  desc "Install apt-nyaa"
-  task :aptnyaa do
-    run "#{sudo} apt-get --assume-yes install wget > /dev/null 2>&1 && cd /usr/bin/ && #{sudo} wget -Nq https://raw.github.com/nyaa/UbuntuScript/master/apt-nyaa && #{sudo} chmod +x apt-nyaa"
-  end
-  task :p7zip do
-    run "#{sudo} apt-get --assume-yes install p7zip-full"
+  namespace :install do
+    desc "Install apt-nyaa"
+    task :aptnyaa do
+      run "#{sudo} apt-get --assume-yes install wget > /dev/null 2>&1 && cd /usr/bin/ && #{sudo} wget -Nq https://raw.github.com/nyaa/UbuntuScript/master/apt-nyaa && #{sudo} chmod +x apt-nyaa"
+    end
+    task :p7zip do
+      run "#{sudo} apt-get --assume-yes install p7zip-full"
+    end
+    desc "cap install:shmmax MAX=1024 (MB)"
+    task :shmmax do
+      if ENV.has_key?('MAX')
+        bits = ENV['MAX'].to_i*1024*1024
+        puts "setting shmmax to #{bits}"
+        run "#{sudo} sysctl -w kernel.shmmax=#{bits}"
+        run "echo 'kernel.shmmax=#{bits}' | #{sudo} tee -a /etc/sysctl.conf"
+      else
+        puts "Please run with MAX="
+      end
+    end
   end
-end
 
 
-namespace :sphinx do
-  desc "Rebuild indexes"
-  task :rebuild, :roles => :app, :except => {:no_release => true} do
-    run "cd #{current_path} && bundle exec rake RAILS_ENV=#{rails_env} ts:rebuild"
-  end
-  desc "Sphinx start"
-  task :start, :roles => :app, :except => {:no_release => true} do
-    run "cd #{current_path} && bundle exec rake RAILS_ENV=#{rails_env} ts:start"
-  end
-  desc "Sphinx stop"
-  task :stop, :roles => :app, :except => {:no_release => true} do
-    run "cd #{current_path} && bundle exec rake RAILS_ENV=#{rails_env} ts:stop"
-  end
-  desc "Sphinx configure"
-  task :stop, :roles => :app, :except => {:no_release => true} do
-    run "cd #{current_path} && bundle exec rake RAILS_ENV=#{rails_env} ts:conf"
-  end
-  desc "Re-establish symlinks"
-  task :symlink do
-    if exists?(:sphinx) && fetch(:sphinx) == true
-      run "mkdir -pv #{shared_path}/sphinx"
-      run "rm -rf #{release_path}/db/sphinx && ln -sfv #{shared_path}/sphinx #{release_path}/db/sphinx"
-      run "ln -sfv #{shared_path}/sphinx/#{rails_env}.sphinx.conf #{release_path}/config/#{rails_env}.sphinx.conf"
-    else
-      puts "sphinx is disabled in config/deploy.rb to enable add line set :sphinx, true"
+  namespace :sphinx do
+    desc "Rebuild indexes"
+    task :rebuild, :roles => :app, :except => {:no_release => true} do
+      run "cd #{current_path} && bundle exec rake RAILS_ENV=#{rails_env} ts:rebuild"
+    end
+    desc "Sphinx start"
+    task :start, :roles => :app, :except => {:no_release => true} do
+      run "cd #{current_path} && bundle exec rake RAILS_ENV=#{rails_env} ts:start"
+    end
+    desc "Sphinx stop"
+    task :stop, :roles => :app, :except => {:no_release => true} do
+      run "cd #{current_path} && bundle exec rake RAILS_ENV=#{rails_env} ts:stop"
+    end
+    desc "Sphinx configure"
+    task :stop, :roles => :app, :except => {:no_release => true} do
+      run "cd #{current_path} && bundle exec rake RAILS_ENV=#{rails_env} ts:conf"
+    end
+    desc "Re-establish symlinks"
+    task :symlink do
+      if exists?(:sphinx) && fetch(:sphinx) == true
+        run "mkdir -pv #{shared_path}/sphinx"
+        run "rm -rf #{release_path}/db/sphinx && ln -sfv #{shared_path}/sphinx #{release_path}/db/sphinx"
+        run "ln -sfv #{shared_path}/sphinx/#{rails_env}.sphinx.conf #{release_path}/config/#{rails_env}.sphinx.conf"
+      else
+        puts "sphinx is disabled in config/deploy.rb to enable add line set :sphinx, true"
+      end
     end
   end
-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
-    run "cd #{current_path} && bundle exec unicorn -c #{unicorn_conf} -E #{rails_env} -D"
-  end
-  desc "stop unicorn"
-  #task :stop, :roles => :app, :except => {:no_release => true} do
-  task :stop do
-    run "if [ -f #{unicorn_pid} ] && [ -e /proc/$(cat #{unicorn_pid}) ]; then kill -QUIT `cat #{unicorn_pid}`; fi"
-  end
-  desc "restart unicorn"
-  task :restart do
-    puts "Restarting unicorn"
-    unicorn.stop
-    unicorn.start
+
+
+  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
+      run "cd #{current_path} && bundle exec unicorn -c #{unicorn_conf} -E #{rails_env} -D"
+    end
+    desc "stop unicorn"
+    #task :stop, :roles => :app, :except => {:no_release => true} do
+    task :stop do
+      run "if [ -f #{unicorn_pid} ] && [ -e /proc/$(cat #{unicorn_pid}) ]; then kill -QUIT `cat #{unicorn_pid}`; fi"
+    end
+    desc "restart unicorn"
+    task :restart do
+      puts "Restarting unicorn"
+      unicorn.stop
+      unicorn.start
+    end
   end
-end
 
-namespace :deploy do
-  task :restart do
-    unicorn.restart
+  namespace :deploy do
+    task :restart do
+      unicorn.restart
+    end
   end
 end
-end

data/lib/capobvious/version.rb

@@ -1,3 +1,3 @@
 module Capobvious
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capobvious
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000 Z
+date: 2012-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70265208585520 !ruby/object:Gem::Requirement
+  requirement: &16010080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70265208585520
+  version_requirements: *16010080
 description: Capfile that we use every day
 email:
 - donotsendhere@gmail.com
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: capobvious
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Cap recipes