sumodev_deploy 0.2.6 → 0.2.7

data/lib/sumodev_deploy.rb

@@ -7,6 +7,14 @@ configuration.load do
     end
   end
 
+  def staging?
+    fetch(:stage, '').to_sym == :staging
+  end
+
+  def production?
+    fetch(:stage, '').to_sym == :production
+  end
+
   _cset(:client)  { abort "sumodev_deploy requires that you set client and project names in your capfile" }
   _cset(:project) { abort "sumodev_deploy requires that you set client and project names in your capfile"}
 
@@ -23,7 +31,7 @@ configuration.load do
   _cset(:app_path) { "apps/#{client}/#{project}" }
   _cset(:shared_files_path) { "#{shared_path}/files/"}
   _cset(:document_root) { "#{homedir}#{client}/#{project}" }
-  _cset(:keep_releases) { fetch(:stage, 'production').to_sym == :staging ? 1 : 3 }
+  _cset(:keep_releases) { staging? ? 1 : 3 }
 
   set(:application) { project }
   set(:deploy_to) { "#{homedir}#{app_path}"}
@@ -36,6 +44,20 @@ configuration.load do
 
   namespace :sumodev do
     namespace :db do
+      def remote_db_name
+        production? && !fetch(:production_db, '').empty? ?
+          production_db :
+          db_name
+      end
+
+      def remote_db_options
+        {:db_host => 'host', :db_username => 'user', :db_password => 'password'}.inject('') do |options, (key, param)|
+          value = fetch(key, '')
+          options << "--#{param}=#{value} " unless value.empty?
+          options
+        end
+      end
+
       desc "Create the database. Reads :db_name variable, or it is composed from client / project"
       task :create, :roles => :db do
         run "create_db #{db_name}"
@@ -57,7 +79,7 @@ configuration.load do
         run_locally %{mysqladmin create #{db_name}} rescue nil
 
         mysql = IO.popen("mysql #{db_name}", 'r+')
-        run "mysqldump --set-charset #{db_name}" do |ch, stream, out|
+        run "mysqldump --set-charset #{remote_db_options} #{remote_db_name}" do |ch, stream, out|
           if stream == :err
             ch[:options][:logger].send(:important, out, "#{stream} :: #{ch[:server]}" )
           else
@@ -76,13 +98,14 @@ configuration.load do
 
       desc "Imports the database from your local server to the remote one"
       task :put, :roles => :db, :only => {:primary => true} do
-        run "mysqldump --set-charset #{db_name} > #{current_path}/#{release_name}.sql" rescue nil
+        run "mysqldump --set-charset #{remote_db_options} #{remote_db_name} > #{current_path}/#{release_name}.sql" rescue nil
 
         dump = StringIO.new(run_locally "mysqldump --set-charset #{db_name}")
         dump_path = "#{shared_path}/db_upload.tmp.sql"
         upload dump, dump_path
+
         run %{
-          mysql #{db_name} < #{dump_path} &&
+          mysql #{options} #{real_db_name} < #{dump_path} &&
           rm #{dump_path}
         }
       end

data/sumodev_deploy.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sumodev_deploy"
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.authors = ["Jan De Poorter"]
   s.date = "2012-04-18"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sumodev_deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors: