capobvious 0.1.7 → 0.1.8

data/README.markdown

@@ -38,7 +38,7 @@ run rake db:seed with right RAILS_ENV
 import remote server postgresql database to your development postgresql database IT WILL DELETE YOUR DEV DATABASE (NOTE: need installed p7zip)
 
 
-r**ake TASK=db:seed**  
+**rake TASK=db:seed**  
 runs custom rake task
 
 

data/bin/capobvious

@@ -52,6 +52,7 @@ set :user, "USER_NAME_HERE"
 set :serv, "IP_ADDRESS_HERE"
 
 set :repository,  "REPOSITORY_HERE"
+set :branch, "master"
 set :server_name, "example.com"
 set :server_redirect, "www.example.com"
 
@@ -60,12 +61,19 @@ set :backup_db, false
 set :backup_sys, false
 set :auto_migrate, true
 
+#set :deploy_to, "/home/user/www/application"
+set :deploy_via, :remote_cache
+
+set :keep_releases, 5
+set :use_sudo, false
+
+set :scm, :git
 
 role :app, serv
 role :web, serv
 role :db, serv, :primary => true
 FILE
-  "config/unicorn.rb" => <<FILE
+"config/unicorn.rb" => <<FILE
 # -*- encoding : utf-8 -*-
 APP_PATH = File.expand_path(File.dirname(File.dirname(__FILE__)))
 SHARED_PATH = File.expand_path(APP_PATH+"/../shared")
@@ -91,7 +99,7 @@ SHARED_PATH = File.expand_path(APP_PATH+"/../shared")
 
 
 before_exec do |server|
-  ENV["BUNDLE_GEMFILE"] = APP_PATH}+"/Gemfile"
+  ENV["BUNDLE_GEMFILE"] = APP_PATH+"/Gemfile"
 end
 
 before_fork do |server, worker|

data/lib/capistrano/ext/capobvious.rb

@@ -48,12 +48,14 @@ Capistrano::Configuration.instance.load do
 
   set :local_folder_path, "tmp/backup"
   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 :db_file_name, "#{database}-#{timestamp}.sql"
-  set :db_archive_ext, "7z"
   set :sys_file_name, "#{application}-system-#{timestamp}.#{db_archive_ext}"
+  set :del_backup, true
 
-  set :arch_extract, "7z x"
-  set :arch_create, "7z a"
 
 
   #after "deploy:symlink", "auto:run"
@@ -235,24 +237,32 @@ Capistrano::Configuration.instance.load 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}"
+      output_file = "#{file_name}.#{archive_ext}"
+      output_file_path = "#{dump_file_path}.#{archive_ext}"
       require 'yaml'
       run "mkdir -p #{shared_path}/backup"
       if adapter == "postgresql"
-
+        logger.important("Backup database #{database}", "Backup:db")
         run "export PGPASSWORD=\"#{db_password}\" && pg_dump -U #{db_username} #{database} > #{dump_file_path}"
-        run "cd #{shared_path} && #{arch_create} #{output_file} #{dump_file_path} && rm #{dump_file_path}"
+        run "cd #{shared_path}/backup && #{arch_create} #{output_file} #{file_name} && 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}")
+      download_path = "#{local_folder_path}/#{file_name}.#{archive_ext}"
+      logger.important("Downloading database to #{download_path}", "Backup:db")
+      download(output_file_path, download_path)
+      run "rm -v #{output_file_path}" if fetch(:del_backup)
     end
     desc "Backup public/system folder"
     task :sys do
       file_path = "#{shared_path}/backup/#{sys_file_name}"
-      run "#{arch_create} #{file_path} #{shared_path}/system"
-      download(file_path, "#{local_folder_path}/#{sys_file_name}")
+      logger.important("Backup shared/system folder", "Backup:sys")
+      run "#{arch_create} #{file_path} -C #{shared_path} system"
+      download_path = "#{local_folder_path}/#{sys_file_name}"
+      logger.important("Downloading system to #{download_path}", "Backup:db")
+      download(file_path, download_path)
+      run "rm -v #{file_path}" if fetch(:del_backup)
     end
     task :all do
       backup.db
@@ -473,4 +483,10 @@ Capistrano::Configuration.instance.load do
       unicorn.restart
     end
   end
+
+
+  def file_size(file_path)
+    size = run("wc -c #{file_path} | cut -d' ' -f1")
+    return size
+  end
 end

data/lib/capobvious/version.rb

@@ -1,3 +1,3 @@
 module Capobvious
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capobvious
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-06-09 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