lib/spontaneous/tasks/database.rake in spontaneous-0.2.0.beta5 vs lib/spontaneous/tasks/database.rake in spontaneous-0.2.0.beta6

@@ -9,27 +9,22 @@
 end
 
 namespace :db do
   desc "Make a dump of the current database"
   task :dump do
-    dumpfilename = ENV['dumpfile']
-    if dumpfilename.nil?
-      dumpfilename = "#{Time.now.to_i}.mysql.gz"
-    end
-    dump_file = "tmp/#{dumpfilename}"
     dumper = Spontaneous::Utils::Database.dumper_for_database
-    # Spontaneous::Cli::Site::MySQL.new(Spontaneous.database)
-    dumper.dump(dump_file)
+    dumpfilename = ENV['dumpfile'] || dumper.dumpfilename
+    dumpfile = "tmp/#{dumpfilename}"
+    dumper.dump(dumpfile)
   end
 
   desc "Load a database dump into the local database"
   task :load do
     dumpfile = ENV['dumpfile']
+    dumper = Spontaneous::Utils::Database.dumper_for_database
     if dumpfile.nil?
-      $stderr.puts "Usage: rake spot:database:load dumpfile=/path/to/dump.mysql.gz"
+      $stderr.puts "Usage: rake spot:database:load dumpfile=/path/to/dump.#{dumper.name}.gz"
       exit 1
     end
-    dumper = Spontaneous::Utils::Database.dumper_for_database
-    # dumper = Spontaneous::Cli::Site::MySQL.new(Spontaneous.database)
     dumper.load(dumpfile)
   end
 end