Prepare the database all in one step, removing another rake task.

core/lib/generators/refinery/cms/cms_generator.rb

@@ -42,9 +42,7 @@ def generate
 
       run_additional_generators! if self.options[:fresh_installation]
 
-      migrate_database!
-
-      seed_database!
+      prepare_database!
 
       deploy_to_hosting?
     end
@@ -204,10 +202,13 @@ def manage_roadblocks!
       end
     end
 
-    def migrate_database!
+    def prepare_database!
       unless self.options[:skip_migrations]
         command = %w[railties:install:migrations]
-        command |= %w[db:create db:migrate] unless self.options[:skip_db]
+        unless self.options[:skip_db]
+          command |= %w[db:create db:migrate]
+          command |= %w[db:seed] unless self.options[:skip_migrations]
+        end
         rake command.join(' ')
       end
     end
@@ -263,10 +264,6 @@ def sanity_check_heroku_application_name!
       options[:heroku] = '' if options[:heroku] == 'heroku'
     end
 
-    def seed_database!
-      rake 'db:seed' unless self.options[:skip_db] || self.options[:skip_migrations]
-    end
-
     def start_pretending?
       # Only pretend to do the next actions if this is Refinery to stay DRY
       if destination_path == Refinery.root