capobvious 0.1.3 → 0.1.4

data/lib/capistrano/ext/capobvious.rb

@@ -49,8 +49,11 @@ Capistrano::Configuration.instance.load do
   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 :sys_file_name, "#{application}-system-#{timestamp}.#{db_archive_ext}"
+
+  set :arch_extract, "7z x"
+  set :arch_create, "7z a"
 
 
   #after "deploy:symlink", "auto:run"
@@ -84,6 +87,22 @@ Capistrano::Configuration.instance.load do
     end
   end
 
+  after "deploy:update_code", "create:dbconf"
+  namespace :create do
+    task :files do
+      create.rvmrc
+    end
+    desc "Create .rvmrc & files"
+    task :rvmrc do
+      put rvmrc, "#{current_path}/.rvmrc"
+    end
+    task :dbconf do
+      serv_path = (exists?(:dbconf) && fetch(:dbconf)) || "#{database_yml_path}.server"
+      if File.exist?(serv_path)
+        run "cd #{latest_release} && cp -v #{serv_path} #{database_yml_path}"
+      end
+    end
+  end
   namespace :bundle do
     desc "Run bundle install"
     task :install do
@@ -113,15 +132,6 @@ Capistrano::Configuration.instance.load do
       install.p7zip
     end
   end
-  namespace :create do
-    task :files do
-      create.rvmrc
-    end
-    desc "Create .rvmrc & files"
-    task :rvmrc do
-      put rvmrc, "#{current_path}/.rvmrc"
-    end
-  end
 
 
   namespace :db do
@@ -145,7 +155,7 @@ Capistrano::Configuration.instance.load do
     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 "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}"
@@ -163,7 +173,7 @@ Capistrano::Configuration.instance.load do
     task :sys do
       backup.sys
       system "rm -rfv public/system/"
-      system "7z x #{local_folder_path}/#{sys_file_name} -opublic"
+      system "#{arch_extract} #{local_folder_path}/#{sys_file_name} -opublic"
     end
     task :db do
       db.pg_import
@@ -182,7 +192,8 @@ Capistrano::Configuration.instance.load do
       result = {}
       i = 0
       Dir.foreach(local_folder_path) do |d|
-        if d.include?(sys_file_name.gsub(/\d+?(\.7z)/,""))
+        regexp = Regexp.new("\d+?(\.#{archive_ext})")
+        if d.include?(sys_file_name.gsub(regexp,""))
           result[i.to_s] = d
           i+=1
         end
@@ -195,7 +206,7 @@ Capistrano::Configuration.instance.load do
         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 "#{arch_extract} #{shared_path}/#{file} -o#{shared_path}"
         run "chmod -R o=rX #{shared_path}/system"
         run "rm -v #{shared_path}/#{file}"
       end
@@ -225,7 +236,7 @@ Capistrano::Configuration.instance.load do
       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}"
+        run "cd #{shared_path} && #{arch_create} #{output_file} #{dump_file_path} && rm #{dump_file_path}"
       else
         puts "Cannot backup, adapter #{adapter} is not implemented for backup yet"
       end
@@ -235,9 +246,13 @@ Capistrano::Configuration.instance.load do
     desc "Backup public/system folder"
     task :sys do
       file_path = "#{shared_path}/backup/#{sys_file_name}"
-      run "7z a #{file_path} #{shared_path}/system"
+      run "#{arch_create} #{file_path} #{shared_path}/system"
       download(file_path, "#{local_folder_path}/#{sys_file_name}")
     end
+    task :all do
+      backup.db
+      backup.sys
+    end
     desc "Clean backup folder"
     task :clean do
       run "rm -rfv #{shared_path}/backup/*"
@@ -437,10 +452,9 @@ Capistrano::Configuration.instance.load do
     end
     desc "restart unicorn"
     task :restart do
-      remote_file_exists = capture("ps -p $(cat #{unicorn_pid}) ; true").strip.split("\n").size == 2
-      if remote_file_exists
+      if remote_file_exists?(unicorn_pid)
         logger.important("Stopping...", "Unicorn")
-        run "#{try_sudo} kill -s USR2 `cat #{unicorn_pid}`"
+        run "kill -s USR2 `cat #{unicorn_pid}`"
       else
         logger.important("No PIDs found. Starting Unicorn server...", "Unicorn")
         run "cd #{current_path} && bundle exec unicorn -c #{unicorn_conf} -E #{rails_env} -D"

data/lib/capobvious/version.rb

@@ -1,3 +1,3 @@
 module Capobvious
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

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