capobvious 0.3.pre3 → 0.3.pre4

data/bin/capobvious

@@ -38,6 +38,8 @@ end
 
 repository=`git remote -v`.split("\n").first.split("\t").last.split(/\s+/).first rescue nil
 
+deploy_to = 'set :deploy_to, "/home/#{user}/www/#{application}"'
+
 files = {
   "Capfile" => <<FILE,
 load 'deploy'
@@ -48,23 +50,20 @@ FILE
 
   "config/deploy.rb" => <<FILE,
 # -*- encoding : utf-8 -*-
-set :rvm_ruby_string, '1.9.3'
-set :application, "appname"
+set :ruby_version, '#{RUBY_VERSION}'
+set :application, "#{File.basename(Dir.getwd)}"
 set :user, "USER_NAME_HERE"
 set :serv, "IP_ADDRESS_HERE"
 
 set :repository,  "#{repository||'REPOSITORY_HERE'}"
 set :branch, "master"
-set :server_name, "example.com"
-set :server_redirect, "www.example.com"
+set :server_name, "EXAMPLE.com"
+set :server_redirect, "WWW.EXAMPLE.COM"
 
-set :assets, true
 set :backup_db, false
 set :backup_sys, false
-set :auto_migrate, true
 
-#set :deploy_folder, "/home/user/www/application"
-set :deploy_via, :remote_cache
+#{deploy_to}
 
 set :keep_releases, 5
 set :use_sudo, false

data/lib/capobvious/recipes/backup.rb

@@ -1,7 +1,16 @@
 Capistrano::Configuration.instance(:must_exist).load do
+  def database_yml(env = rails_env)
+    yml = File.read(fetch(:database_yml_path))
+    config = YAML::load(yml)[env.to_s]
+    config.keys.each do |key|
+      config[(key.to_sym rescue key) || key] = config.delete(key)
+    end
+    config
+  end
   namespace :backup do
     desc "Backup a database"
     task :db do
+      yml = database_yml
       file_name = fetch(:db_file_name)
       archive_ext = fetch(:db_archive_ext)
       dump_file_path = "#{shared_path}/backup/#{file_name}"
@@ -9,15 +18,15 @@ Capistrano::Configuration.instance(:must_exist).load do
       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}"
+      if yml[:adapter] == "postgresql"
+        logger.important("Backup database #{yml[:database]}", "Backup:db")
+        run "export PGPASSWORD=\"#{yml[:password]}\" && pg_dump -U #{yml[:username]} #{yml[:database]} > #{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"
+        puts "Cannot backup, adapter #{yml[:adapter]} is not implemented for backup yet"
       end
-      system "mkdir -p #{local_folder_path}"
-      download_path = "#{local_folder_path}/#{file_name}.#{archive_ext}"
+      system "mkdir -p #{backup_folder_path}"
+      download_path = "#{backup_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)
@@ -27,7 +36,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       file_path = "#{shared_path}/backup/#{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}"
+      download_path = "#{backup_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)

data/lib/capobvious/recipes/db.rb

@@ -54,14 +54,16 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     task :import do
+      yml = database_yml(:development)
+      yml[:username] = `whoami`.chop unless yml[:username]
+
       file_name = "#{db_file_name}.#{db_archive_ext}"
       file_path = "#{backup_folder_path}/#{file_name}"
       system "cd #{backup_folder_path} && #{arch_extract} #{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} < #{backup_folder_path}/#{db_file_name}"
-      puts "ENTER your development password: #{local_db_password}"
-      system "#{psql} -U#{local_db_username} #{local_database} < #{backup_folder_path}/#{db_file_name}"
+      system "echo \"drop database IF EXISTS #{yml[:database]}\" | #{psql_postgres}"
+      system "echo \"create database #{yml[:database]} owner #{yml[:username]};\" | #{psql_postgres}"
+      puts "ENTER your development password: #{yml[:password]}"
+      system "#{psql} -U#{yml[:username]} #{yml[:database]} < #{backup_folder_path}/#{db_file_name}"
       system "rm #{backup_folder_path}/#{db_file_name}"
     end
     task :pg_import do

data/lib/capobvious/recipes/main.rb

@@ -10,6 +10,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   _cset :del_backup, true
   _cset :backup_folder_path, "tmp/backup"
   _cset :database_yml_path, 'config/database.yml'
+  _cset :auto_migrate, true
 
   set :rvmrc_string ,"rvm use #{fetch(:ruby_version)}"
   after "deploy:update_code", "create:rvmrc"

data/lib/capobvious/version.rb

@@ -1,3 +1,3 @@
 module Capobvious
-  VERSION = "0.3.pre3"
+  VERSION = "0.3.pre4"
 end

metadata

@@ -1,48 +1,48 @@
 --- !ruby/object:Gem::Specification
 name: capobvious
 version: !ruby/object:Gem::Version
-  version: 0.3.pre3
   prerelease: 4
+  version: 0.3.pre4
 platform: ruby
 authors:
 - Dmitry Gruzd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-01 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: capistrano
-  prerelease: false
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  name: capistrano
 - !ruby/object:Gem::Dependency
-  name: rvm-capistrano
-  prerelease: false
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  name: rvm-capistrano
 description: Capfile that we use every day
 email:
 - donotsendhere@gmail.com
@@ -80,17 +80,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
-  none: false
 requirements: []
 rubyforge_project: capobvious
 rubygems_version: 1.8.24