lib/zen/task/db.rake in zen-0.2.8 vs lib/zen/task/db.rake in zen-0.3b

@@ -1,73 +1,74 @@
-# Task group for database related tasks such as migrating and removing the
-# database.
 namespace :db do
-
   desc 'Migrates the database to the newest version'
   task :migrate do
-    if Zen::Package::Registered.empty?
+    require File.expand_path('../../../zen', __FILE__)
+
+    if Zen::Package::REGISTERED.empty?
       abort "No packages have been registered."
     end
 
     # Get the details required to run a migration
-    Zen::Package::Registered.each do |name, pkg|
+    Zen::Package::REGISTERED.each do |name, pkg|
       # Get the migration directory
-      if pkg.respond_to?(:migration_dir) and !pkg.migration_dir.nil?
-        dir = pkg.migration_dir
+      if pkg.respond_to?(:migrations) and !pkg.migrations.nil?
+        dir = pkg.migrations
       else
-        dir = pkg.directory + '/../../migrations'
+        puts "Skipping #{pkg.title} as it has no migrations directory"
+        next
       end
 
       if !File.directory?(dir)
         abort "The migration directory #{dir} doesn't exist."
       end
 
       table = 'migrations_package_' + pkg.name.to_s
 
       # Migration time
-      Zen.database.transaction do
-        Sequel::Migrator.run(Zen.database, dir, :table => table)
-        Ramaze::Log.info("Successfully migrated \"#{pkg.name}\"")
-      end
+      Sequel::Migrator.run(Zen.database, dir, :table => table)
+      Ramaze::Log.info("Successfully migrated \"#{pkg.name}\"")
     end
   end
 
   desc 'Deletes the entire database'
   task :delete do
-    if Zen::Package::Registered.empty?
+    require File.expand_path('../../../zen', __FILE__)
+
+    if Zen::Package::REGISTERED.empty?
       abort "No packages have been registered."
     end
 
-    packages = Zen::Package::Registered.map { |name, pkg| [name, pkg] }.reverse
+    packages = Zen::Package::REGISTERED.map { |name, pkg| [name, pkg] }.reverse
 
     # Get the details required to run a migration
     packages.each do |name, pkg|
       # Get the migration directory
-      if pkg.respond_to?(:migration_dir) and !pkg.migration_dir.nil?
-        dir = pkg.migration_dir
+      if pkg.respond_to?(:migrations) and !pkg.migrations.nil?
+        dir = pkg.migrations
       else
-        dir = pkg.directory + '/../../migrations'
+        puts "Skipping #{pkg.title} as it has no migrations directory"
+        next
       end
 
       if !File.directory?(dir)
         abort "The migration directory #{dir} doesn't exist."
       end
 
       table = 'migrations_package_' + pkg.name.to_s
 
       # Migration time
-      Zen.database.transaction do
-        Sequel::Migrator.run(Zen.database, dir, :table => table, :target => 0)
-        Zen.database.drop_table(table)
+      Sequel::Migrator.run(Zen.database, dir, :table => table, :target => 0)
+      Zen.database.drop_table(table)
 
-        Ramaze::Log.info("Successfully uninstalled \"#{pkg.name}\"")
-      end
+      Ramaze::Log.info("Successfully uninstalled \"#{pkg.name}\"")
     end
   end
 
   desc 'Creates a default administrator with a random password'
   task :user do
+    require File.expand_path('../../../zen', __FILE__)
+
     password = (0..12).map do
       letter = ('a'..'z').to_a[rand(26)]
       number = (0..9).to_a[rand(26)]
       letter + number.to_s
     end.join
@@ -81,25 +82,26 @@
         :name => 'Administrators',
         :slug => 'administrators', :super_group => true
       ).save
     end
 
-    if !user.nil?
+    unless user.nil?
       abort "The default user has already been inserted."
     end
 
-    user = Users::Model::User.new(
-      :email => '[e-mail]', :name => 'Administrator',
-      :password => password, :status => 'open'
-    ).save
+    user = Users::Model::User.create(
+      :email    => '[e-mail]',
+      :name     => 'Administrator',
+      :password => password
+    )
 
+    user.activate!
     user.user_group_pks = [group.id]
 
     puts "Default administrator account has been created.
 
 Email: [e-mail]
 Passowrd: #{password}
 
-You can login by going to http://domain.tld/admin/users/login/
-"
+You can login by going to http://domain.tld/admin/users/login/"
   end
 end