zen 0.2.8 → 0.3b

data/lib/zen/spec/simplecov.rb

@@ -1,7 +1,7 @@
 require 'ramaze'
 
 Ramaze.setup(:verbose => false) do
-  gem 'simplecov', ['~> 0.4.2']
+  gem 'simplecov', ['>= 0.4.2']
 end
 
 SimpleCov.configure do
@@ -10,13 +10,13 @@ SimpleCov.configure do
   project_name 'Zen'
 
   add_group 'Packages'   , 'zen/package'
-  add_group 'Plugins'    , 'zen/plugin'
   add_group 'Helpers'    , 'zen/helper'
   add_group 'Controllers', 'zen/controller'
 
-  # Don't actually test the coverage of the tests themselves
   add_filter 'spec'
   add_filter 'lib/zen/model/settings'
+  add_filter 'vendor'
+  add_filter 'lib/zen/model/init'
 end
 
 SimpleCov.start

data/lib/zen/task.rb

@@ -2,6 +2,5 @@ require 'rake'
 
 import __DIR__('task/db.rake')
 import __DIR__('task/package.rake')
-import __DIR__('task/plugin.rake')
 import __DIR__('task/proto.rake')
 import __DIR__('task/theme.rake')

data/lib/zen/task/build.rake

@@ -1,36 +1,23 @@
-require 'open3'
-
-# Task group used for building various elements such as the Gem and the
-# documentation.
 namespace :build do
   desc 'Builds the documentation using YARD'
-  task :doc do
-    zen_path = File.expand_path('../../../../', __FILE__)
-    command  = "yard doc #{zen_path}/lib -m markdown -M rdiscount -o #{zen_path}/doc "
-    command += "-r #{zen_path}/README.md --private --protected"
+  task :doc => ['clean:yard'] do
+    root = File.expand_path('../../../../', __FILE__)
+    Dir.chdir(root)
 
-    sh(command)
+    sh('yard doc')
   end
 
   desc 'Builds a new Gem'
   task :gem do
-    zen_path     = __DIR__('../../../')
-    gemspec_path = File.join(
-      zen_path,
-      "#{Zen::Gemspec.name}-#{Zen::Gemspec.version.version}.gem"
-    )
-
-    pkg_path = File.join(
-      zen_path,
-      'pkg',
-      "#{Zen::Gemspec.name}-#{Zen::Gemspec.version.version}.gem"
-    )
+    root = File.expand_path('../../../../', __FILE__)
+    name = "#{Zen::Gemspec.name}-#{Zen::Gemspec.version.version}.gem"
+    path = File.join(root, name)
+    pkg  = File.join(root, 'pkg', name)
 
     # Build and install the gem
-
-    sh('gem', 'build'     , File.join(zen_path, 'zen.gemspec'))
-    sh('mv' , gemspec_path, pkg_path)
-    sh('gem', 'install'   , pkg_path)
+    sh('gem', 'build', File.join(root, 'zen.gemspec'))
+    sh('mv' , path, pkg)
+    sh('gem', 'install', pkg)
   end
 
   # Stolen from Ramaze
@@ -46,9 +33,42 @@ namespace :build do
       io.puts "Following persons have contributed to Zen."
       io.puts '(Sorted by number of submitted patches, then alphabetically)'
       io.puts ''
-      authors.sort_by{|(n,e),c| [-c, n.downcase] }.each do |(name, email), count|
+      authors.sort_by { |(n,e),c| [-c, n.downcase] }.each do |(name, email), count|
         io.puts("%6d %s <%s>" % [count, name, email])
       end
     end
   end
-end # namespace :build
+
+  desc 'Builds a list of changes since a given Git tag and outputs it'
+  task :changes, [:tag] do |t, args|
+    args.with_defaults(:tag => `git tag`.split(/\n/)[-1])
+
+    stop  = `git log -1 --pretty=oneline --color=never`.split(/\s+/)[0]
+    start = `git show #{args[:tag]} --pretty=oneline --color=never` \
+      .split(/\s+/)[0]
+
+    log = `git --no-pager log --color=never --pretty=oneline \
+      #{start}..#{stop}`.split(/\n/)
+
+    log.each do |line|
+      line    = line.split(/\s+/, 2)[1].strip
+      wrapped = '* '
+      chars   = 0
+
+      # Wrap the string
+      line.split(/\s+/).each do |chunk|
+        length = chunk.length
+
+        if ( chars + length ) <= ( 80 - length )
+          wrapped += "#{chunk} "
+          chars   += length
+        else
+          wrapped += "\n  #{chunk} "
+          chars    = 0
+        end
+      end
+
+      puts wrapped
+    end
+  end
+end

data/lib/zen/task/clean.rake

@@ -1,7 +1,3 @@
-require 'fileutils'
-
-# Task group used to remove various files that aren't needed when releasing gems
-# and such.
 namespace :clean do
   desc 'Removes all the gems located in pkg/'
   task :gem do
@@ -14,9 +10,20 @@ namespace :clean do
 
   desc 'Removes all YARD files'
   task :yard do
-    zen_path = File.expand_path('../../../../', __FILE__)
+    require 'fileutils'
+
+    root = File.expand_path('../../../../', __FILE__)
+
+    FileUtils.rm_rf("#{root}/doc")
+    FileUtils.rm_rf("#{root}/.yardoc")
+  end
+
+  desc 'Removes all the minified assets used for the specs'
+  task :assets do
+    path = File.expand_path('../../../../spec/public/minified/*', __FILE__)
 
-    FileUtils.rm_rf("#{zen_path}/doc")
-    FileUtils.rm_rf("#{zen_path}/.yardoc")
+    Dir.glob(path).each do |file|
+      File.unlink(file)
+    end
   end
 end

data/lib/zen/task/db.rake

@@ -1,20 +1,20 @@
-# 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)
@@ -24,28 +24,29 @@ namespace :db do
       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)
@@ -55,17 +56,17 @@ namespace :db do
       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)]
@@ -83,15 +84,17 @@ namespace :db do
       ).save
     end
 
-    if !user.nil?
+    unless user.nil?
       abort "The default user has already been inserted."
     end
 
-    user = Users::Model::User.new(
-      :email => 'admin@website.tld', :name => 'Administrator',
-      :password => password, :status => 'open'
-    ).save
+    user = Users::Model::User.create(
+      :email    => 'admin@website.tld',
+      :name     => 'Administrator',
+      :password => password
+    )
 
+    user.activate!
     user.user_group_pks = [group.id]
 
     puts "Default administrator account has been created.
@@ -99,7 +102,6 @@ namespace :db do
 Email: admin@website.tld
 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

data/lib/zen/task/package.rake

@@ -1,26 +1,27 @@
-# Task group for managing packages.
 namespace :package do
-
   desc 'Lists all installed packages'
   task :list do
-    Zen::Package::Registered.each do |name, pkg|
-      message = <<-MSG
-#{name}
---------------------
-#{pkg.about}
-
-MSG
-
-      puts message
+    require File.expand_path('../../../zen', __FILE__)
+
+    Zen::Package::REGISTERED.each do |name, pkg|
+      if pkg.about.nil? or pkg.about.empty?
+        puts "* #{name}"
+      else
+        puts "* #{name}\n  #{pkg.about}"
+      end
     end
   end
 
   desc 'Migrates a package to a certain version'
   task :migrate, :name, :version do |task, args|
+    require File.expand_path('../../../zen', __FILE__)
+
     if !args[:name]
       abort "You need to specify the name of a package to migrate"
     end
 
+    name = args[:name].to_sym
+
     if !args[:version]
       version = nil
     else
@@ -28,17 +29,17 @@ MSG
     end
 
     # Validate the package name
-    if !Zen::Package::Registered[args[:name].to_sym]
-      abort "The package name \"#{args[:name]}\" is invalid."
+    if !Zen::Package::REGISTERED[name]
+      abort "The package name \"#{name}\" is invalid."
     end
 
-    package = Zen::Package::Registered[args[:name].to_sym]
+    package = Zen::Package::REGISTERED[name]
 
     # Get the migrations directory
-    if package.respond_to?(:migration_dir) and !package.migration_dir.nil?
-      dir = package.migration_dir
+    if package.respond_to?(:migrations) and !package.migrations.nil?
+      dir = package.migrations
     else
-      dir = package.directory + '/../../migrations'
+      abort 'The specified package has no migrations directory set'
     end
 
     # Validate the directory
@@ -51,11 +52,6 @@ MSG
     Ramaze::Log.info('Migrating package...')
 
     # Run all migrations
-    Zen.database.transaction do
-      Sequel::Migrator.run(
-        Zen.database, dir, :table => table, :target => version
-      )
-    end
+    Sequel::Migrator.run(Zen.database, dir, :table => table, :target => version)
   end
-
 end

data/lib/zen/task/proto.rake

@@ -1,10 +1,9 @@
-require 'fileutils'
-
-# Task group used for creating various prototypes.
 namespace :proto do
-
   desc 'Creates a new migration'
   task :migration, :directory, :name do |task, args|
+    require File.expand_path('../../../zen', __FILE__)
+    require 'fileutils'
+
     # Validate the input
     if !args[:directory]
       abort 'You need to specify a directory for the migration.'
@@ -29,5 +28,4 @@ namespace :proto do
       puts "Failed to create the migration: #{e.message}"
     end
   end
-
 end

data/lib/zen/task/setup.rake

@@ -0,0 +1,4 @@
+desc 'Installs all the required gems (requires RVM)'
+task :setup do
+  sh('rvm gemset import .gems')
+end

data/lib/zen/task/test.rake

@@ -1,9 +1,34 @@
-desc 'Runs all the Bacon specifications'
-task :test do
-  spec_dir = __DIR__('../../../spec')
-  db_path  = File.join(spec_dir, 'database.db')
+namespace :test do
+  spec_dir = File.expand_path('../../../../spec', __FILE__)
+  command  = 'rake db:delete; rake db:migrate; rake db:test_user; ' \
+    'ruby zen/all.rb'
 
-  File.unlink(db_path) if File.exist?(db_path)
+  desc 'Runs all specifications using SQLite3 or custom settings'
+  task :default => ['clean:assets'] do
+    Dir.chdir(spec_dir)
 
-  sh("cd #{spec_dir}; rake db:migrate; rake db:test_user; ruby zen/all.rb")
+    sh(command)
+  end
+
+  desc 'Runs all specifications using MySQL'
+  task :mysql => ['clean:assets'] do
+    Dir.chdir(spec_dir)
+
+    ENV['DATABASE'] = 'zen_dev'
+    ENV['ADAPTER']  = 'mysql2'
+    ENV['USERNAME'] = 'zen'
+
+    sh(command)
+  end
+
+  desc 'Runs all specifications using PostgreSQL'
+  task :postgres => ['clean:assets'] do
+    Dir.chdir(spec_dir)
+
+    ENV['DATABASE'] = 'zen_dev'
+    ENV['ADAPTER']  = 'postgres'
+    ENV['USERNAME'] = 'zen'
+
+    sh(command)
+  end
 end

data/lib/zen/task/theme.rake

@@ -1,22 +1,21 @@
-# Task group for managing themes.
 namespace :theme do
-
   desc 'Lists all installed themes'
   task :list do
-    Zen::Theme::Registered.each do |name, pkg|
-      message = <<-MSG
-#{name}
---------------------
-#{pkg.about}
-
-MSG
-
-      puts message
+    require File.expand_path('../../../zen', __FILE__)
+
+    Zen::Theme::REGISTERED.each do |name, pkg|
+      if pkg.about.nil? or pkg.about.empty?
+        puts "* #{name}"
+      else
+        puts "* #{name}\n  #{pkg.about}"
+      end
     end
   end
 
   desc 'Migrates a theme to the given version'
   task :migrate, :name, :version do |task, args|
+    require File.expand_path('../../../zen', __FILE__)
+
     if !args[:name]
       abort 'You need to specify the name of the theme.'
     end
@@ -30,11 +29,11 @@ MSG
 
     name = args[:name].to_sym
 
-    if !Zen::Theme::Registered[name]
+    if !Zen::Theme::REGISTERED[name]
       abort 'The specified theme does not exist.'
     end
 
-    theme = Zen::Theme::Registered[name]
+    theme = Zen::Theme::REGISTERED[name]
     table = 'migrations_theme_' + theme.name.to_s
 
     # Fetch the migrations directory
@@ -51,11 +50,6 @@ MSG
     # Time to migrate the theme
     Ramaze::Log.info('Migrating package...')
 
-    Zen.database.transaction do
-      Sequel::Migrator.run(
-        Zen.database, dir, :table => table, :target => version
-      )
-    end
+    Sequel::Migrator.run(Zen.database, dir, :table => table, :target => version)
   end
-
 end