crossroads_capistrano 1.4.27 → 1.4.28

data/crossroads_capistrano.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "crossroads_capistrano"
-  s.version     = "1.4.27"
+  s.version     = "1.4.28"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Steve Kenworthy", "Ben Tillman", "Nathan Broadbent"]
   s.email       = ["it_dept@crossroads.org.hk"]

data/lib/crossroads_capistrano/recipes/mysql.rb

@@ -28,8 +28,11 @@ EOF
   desc "Download production database to local machine"
   task :pull do
     prompt_with_default("Remote database name", :database_name, "#{application}_#{stage}")
-    prompt_with_default("Local role", :local_role, "root")
-    prompt_with_default("Overwrite local development db? (y/n)", :overwrite, "y")
+    prompt_with_default("Overwrite local db? (y/n)", :overwrite, "y")
+    if overwrite.to_s.downcase[0,1] == "y"
+      prompt_with_default("Local role", :local_role, "root")
+      prompt_with_default("Local db name", :local_db, "#{application}_development")
+    end
 
     # Dump database
     sudo "mysqldump #{database_name} > /tmp/db_dump.sql", :hosts => first_db_host
@@ -40,7 +43,7 @@ EOF
     if overwrite.to_s.downcase[0,1] == "y"
       # Import data
       puts "== Importing data to local database..."
-      system "mysql -u #{local_role} #{application}_development < tmp/#{application}_#{stage}_dump.sql"
+      system "mysql -u #{local_role} #{local_db} < tmp/#{application}_#{stage}_dump.sql"
     end
   end
 end

data/lib/crossroads_capistrano/recipes/postgresql.rb

@@ -28,8 +28,11 @@ EOF
   task :pull do
     prompt_with_default("Database name", :dbname, "#{application}_#{stage}")
     prompt_with_default("Database user", :username, "postgres")
-    prompt_with_default("Local role", :local_role, "postgres")
-    prompt_with_default("Overwrite local development db? (y/n)", :overwrite, "y")
+    prompt_with_default("Local role", :local_role, "root")
+    if overwrite.to_s.downcase[0,1] == "y"
+      prompt_with_default("Local db name", :local_db, "#{application}_development")
+    end
+
 
     # Dump database
     sudo "pg_dump -U #{username} #{dbname} > /tmp/db_dump.sql", :hosts => first_db_host
@@ -41,7 +44,7 @@ EOF
     system("sed -i s/#{application}/#{local_role}/g tmp/#{application}_#{stage}_dump.sql")
     if overwrite.to_s.downcase[0,1] == "y"
       # Import data
-      system("psql -d #{application}_development < tmp/#{application}_#{stage}_dump.sql")
+      system("psql -d #{local_db} < tmp/#{application}_#{stage}_dump.sql")
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: crossroads_capistrano
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.4.27
+  version: 1.4.28
 platform: ruby
 authors: 
 - Steve Kenworthy