capobvious 0.2.0 → 0.2.1

data/lib/capistrano/ext/capobvious.rb

@@ -19,11 +19,13 @@ Capistrano::Configuration.instance.load do
 
   set :unicorn_init, "unicorn_#{application}"
 
-  run_local_psql = if `uname -a`.include?("Darwin")
-    "psql -h localhost -U postgres"
-  else
-    "#{sudo} -u postgres psql"
-  end
+  psql = "psql -h localhost"
+  psql_postgres = "#{psql} -U postgres"
+
+#  psql_postgre = if `uname -a`.include?("Darwin")
+#  else
+#    "#{sudo} -u postgres psql"
+#  end
 
   database_yml_path = "config/database.yml"
 
@@ -44,7 +46,7 @@ Capistrano::Configuration.instance.load do
   local_rails_env = 'development'
   local_adapter = config[local_rails_env]["adapter"]
   local_database = config[local_rails_env]["database"]
-  local_db_username = config[local_rails_env]["username"]
+  local_db_username = config[local_rails_env]["username"]||`whoami`.chop
   local_db_password = config[local_rails_env]["password"]
 
 
@@ -97,6 +99,18 @@ Capistrano::Configuration.instance.load do
     end
   end
 
+  namespace :delayed_job do 
+    desc 'Start the delayed_job process'
+    task :start, :roles => :app do
+      run "cd #{current_path} && RAILS_ENV=#{rails_env} script/delayed_job start"
+    end
+    desc "Restart the delayed_job process"
+    task :restart, :roles => :app do
+      logger.important 'Restarting delayed_job process'
+      run "cd #{current_path}; RAILS_ENV=#{rails_env} script/delayed_job restart"
+    end
+  end
+
   after "deploy:update_code", "create:dbconf"
   namespace :create do
     task :files do
@@ -135,6 +149,9 @@ Capistrano::Configuration.instance.load do
       if exists?(:auto_migrate) && fetch(:auto_migrate) == true
         db.migrate
       end
+      if exists?(:delayed_job) && fetch(:delayed_job) == true
+        delayed_job.restart
+      end
     end
     task :prepare do
       db.create
@@ -170,11 +187,11 @@ Capistrano::Configuration.instance.load do
       file_name = "#{db_file_name}.#{db_archive_ext}"
       file_path = "#{local_folder_path}/#{file_name}"
       system "cd #{local_folder_path} && #{arch_extract} #{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}"
+      system "echo \"drop database IF EXISTS #{local_database}\" | #{psql_postgres}"
+      system "echo \"create database #{local_database} owner #{local_db_username};\" | #{psql_postgres}"
+      #    system "#{psql_postgre} #{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 "#{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

data/lib/capobvious/version.rb

@@ -1,3 +1,3 @@
 module Capobvious
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capobvious
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2012-08-21 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.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Cap recipes