zena 0.15.0 → 0.15.1

data/config/deploy.rb

@@ -1,382 +1,38 @@
-=begin
-
-Deployment 'recipe' for capistrano. Creates everything for your zena app.
-
-Assumed:
-  - mysql root user has the same password as ssh
-  - you are using apache 2.2+ (using balance_proxy)
-  - server is running debian etch
-  - you have installed subversion on the server (aptitude install subversion)
-  - you have installed mysql on the server (aptitude install mysql...)
-  - you have installed the required dependencies (see main README file)
-
-========== USAGE ==========
-
-1. Copy the file 'deploy_config_example.rb' to 'deploy_config.rb' and edit the entries in this new file.
-2. Run => cap initial_setup
-3. Run => cap mksite -s host='example.com' -s pass='secret' -s lang='en'
-
-If anything goes wrong, ask the mailing list (lists.zenadmin.org) or read the content of this file to understand what went wrong...
-
-And yes, 'pass' is not as intuitive as 'password' but we cannot use the latter because it's used for the ssh login.
-
-
-=end
-require 'erb'
-
-#================= ADVANCED SETTINGS =============#
-
-set :deploy_to,    "/var/zena"
-set :zena_sites,   "/var/www/zena"
-set :apache2_vhost_root, "/etc/apache2/sites-available"
-set :apache2_deflate,       true
-set :apache2_debug_deflate, false
-set :apache2_debug_rewrite, false
-set :apache2_static,        []
-set :apache2_reload_cmd, "/etc/init.d/apache2 reload"
-set :debian_host,           true
-set :ssh_user,              "root"
-
-load File.join(File.dirname(__FILE__), 'deploy_config')
-
-role :web,         "#{ssh_user}@#{server_ip}"
-role :app,         "#{ssh_user}@#{server_ip}"
-role :db,          "#{ssh_user}@#{server_ip}", :primary => true
-
-#================= END ADVANCED SETTINGS ==========#
-
-
-# helper
-set :in_current, "cd #{deploy_to}/current &&"
-class RenderClass
-  def initialize(path)
-    @text = File.read(path)
-  end
-
-  def render(hash)
-    @values = hash
-    ERB.new(@text).result(binding)
-  end
-
-  def method_missing(sym)
-    return @values[sym] if @values.has_key?(sym)
-    super
-  end
-end
-
-def render(file, hash)
-  RenderClass.new(file).render(hash)
-end
-
-#========================== SOURCE CODE   =========================#
-
-
-desc "set permissions to www-data"
-task :set_permissions, :roles => :app do
-  run "chown -R www-data:www-data #{deploy_to}"
-  run "chown -R www-data:www-data #{zena_sites}"
-end
-
-"Update the currently released version of the software directly via an SCM update operation"
-task :update_current do
-  source.sync(revision, self[:release_path])
-end
-
-desc "clear all zafu compiled templates"
-task :clear_zafu, :roles => :app do
-  run "#{in_current} rake zena:clear_zafu RAILS_ENV=production"
-end
-
-desc "clear all cache compiled templates"
-task :clear_cache, :roles => :app do
-  run "#{in_current} rake zena:clear_cache RAILS_ENV=production"
-end
-
-desc "after code update"
-task :after_update, :roles => :app do
-  app_update_symlinks
-  db_update_config
-  migrate
-  clear_zafu
-  clear_cache
-end
-
-desc "update symlink to 'sites' directory"
-task :app_update_symlinks, :roles => :app do
-  run "test ! -e #{deploy_to}/current/sites || rm #{deploy_to}/current/sites"
-  run "ln -sf #{zena_sites} #{deploy_to}/current/sites"
-  set_permissions
-end
-
-desc "migrate database (zena version)"
-task :migrate, :roles => :db do
-  run "#{in_current} rake zena:migrate RAILS_ENV=production"
-end
-
-desc "initial app setup"
-task :app_setup, :roles => :app do
-  run "test -e #{deploy_to}  || mkdir #{deploy_to}"
-  run "test -e #{zena_sites} || mkdir #{zena_sites}"
-  deploy::setup
-end
-
-#========================== MANAGE HOST   =========================#
-desc "create a new site"
-task :mksite, :roles => :app do
-  run "#{in_current} rake zena:mksite HOST='#{self[:host]}' PASSWORD='#{self[:pass]}' RAILS_ENV='production' LANG='#{self[:lang] || 'en'}'"
-  create_vhost
-  create_awstats
-  set_permissions
-end
-
-desc "update code in the current version"
-task :up, :roles => :app do
-  run "cd #{deploy_to}/current && svn up && (echo #{strategy.configuration[:real_revision]} > #{deploy_to}/current/REVISION)"
-  db_update_config
-  clear_zafu
-  clear_cache
-  migrate
-  restart
-end
-
-desc "light update code (no migration, no clear)"
-task :lightup, :roles => :app do
-  run "cd #{deploy_to}/current && svn up"
-  restart
-end
-
-#========================== MONGREL ===============================#
-desc "configure mongrel"
-task :mongrel_setup, :roles => :app do
-  run "#{in_current} mongrel_rails cluster::configure -e production -p #{mongrel_port} -N #{mongrel_count} -c #{deploy_to}/current -P log/mongrel.pid -l log/mongrel.log -a 127.0.0.1 --user www-data --group www-data"
-  run "#{in_current} echo 'config_script: config/mongrel_upload_progress.conf' >> config/mongrel_cluster.yml"
-end
-
-desc "Stop the drb upload_progress server"
-task :stop_upload_progress , :roles => :app do
-  run "#{in_current} ruby lib/upload_progress_server.rb stop"
-end
-
-desc "Start the drb upload_progress server"
-task :start_upload_progress , :roles => :app do
-  run "#{in_current} lib/upload_progress_server.rb start"
-end
-
-desc "Restart the upload_progress server"
-task :restart_upload_progress, :roles => :app do
-  stop_upload_progress
-  start_upload_progress
-end
-
-desc "Start mongrel"
-task :start, :roles => :app do
-  restart_upload_progress
-  run "#{in_current} mongrel_rails cluster::start"
-end
-
-desc "Stop mongrel"
-task :stop, :roles => :app do
-  stop_upload_progress
-  run "#{in_current} mongrel_rails cluster::stop"
-end
-
-desc "Restart mongrel"
-task :restart, :roles => :app do
-  stop
-  restart_upload_progress
-  start
-end
-
-#========================== APACHE2 ===============================#
-desc "Update vhost configuration file"
-task :create_vhost, :roles => :web do
-  unless self[:host]
-    puts "HOST not set (use -s host=...)"
-  else
-    vhost = render("config/vhost.rhtml",
-                  :host        => self[:host],
-                  :static      => apache2_static,
-                  :deflate       => apache2_deflate,
-                  :debug_deflate => apache2_debug_deflate,
-                  :debug_rewrite => apache2_debug_rewrite,
-                  :balancer    => db_name
-                  )
-    put(vhost, "#{apache2_vhost_root}/#{self[:host]}")
-
-    run "test -e /etc/apache2/sites-enabled/#{self[:host]} || a2ensite #{self[:host]}" if debian_host
-
-    unless self[:host] =~ /^www/
-      vhost_www = render("config/vhost_www.rhtml",
-                    :host        => self[:host]
-                    )
-      put(vhost_www, "#{apache2_vhost_root}/www.#{self[:host]}")
-      run "test -e /etc/apache2/sites-enabled/www.#{self[:host]} || a2ensite www.#{self[:host]}" if debian_host
-    end
-    run apache2_reload_cmd
-  end
-end
-
-#========================== APACHE2 ===============================#
-desc "Update awstats configuration file"
-task :create_awstats, :roles => :web do
-  unless debian_host
-    puts "skipping debian specific awstats"
-  else
-    unless self[:host] && self[:pass]
-      puts "host or password not set (use -s host=... -s pass=...)"
-    else
-      # create awstats config file
-      awstats_conf = render("config/awstats.conf.rhtml", :host => self[:host] )
-      put(awstats_conf, "/etc/awstats/awstats.#{self[:host]}.conf")
-      run "chown www-data:www-data /etc/awstats/awstats.#{self[:host]}.conf"
-      run "chmod 640 /etc/awstats/awstats.#{self[:host]}.conf"
-
-      # create stats vhost
-      stats_vhost = render("config/stats.vhost.rhtml", :host => self[:host] )
-      put(stats_vhost, "#{apache2_vhost_root}/stats.#{self[:host]}")
-      run "test -e /etc/apache2/sites-enabled/stats.#{self[:host]} || a2ensite stats.#{self[:host]}"
-
-      # directory setup for stats
-      run "test -e #{zena_sites}/#{self[:host]}/log/awstats || mkdir #{zena_sites}/#{self[:host]}/log/awstats"
-      run "chown www-data:www-data #{zena_sites}/#{self[:host]}/log/awstats"
-
-      # setup cron task for awstats
-      run "cat /etc/cron.d/awstats | grep \"#{self[:host]}\" || echo \"0,10,20,30,40,50 * * * * www-data [ -x /usr/lib/cgi-bin/awstats.pl -a -f /etc/awstats/awstats.#{self[:host]}.conf -a -r #{zena_sites}/#{self[:host]}/log/apache2.access.log ] && /usr/lib/cgi-bin/awstats.pl -config=#{self[:host]} -update >/dev/null\n\" >> /etc/cron.d/awstats"
-
-      # create .htpasswd file
-      run "test ! -e #{zena_sites}/#{self[:host]}/log/.awstatspw || rm #{zena_sites}/#{self[:host]}/log/.awstatspw"
-      run "htpasswd -c -b #{zena_sites}/#{self[:host]}/log/.awstatspw 'admin' '#{self[:pass]}'"
-
-      # reload apache
-      run "/etc/init.d/apache2 reload"
-    end
-  end
-end
-
-desc "Rename a webhost"
-task :rename_host, :roles => :web do
-  unless self[:host] && self[:old_host]
-    puts "host or old_host not set (use -s host=... -s old_host=...)"
-  else
-    run "#{in_current} rake zena:rename_host OLD_HOST='#{self[:old_host]}' HOST='#{self[:host]}' RAILS_ENV='production'"
-    old_vhost_path = "#{apache2_vhost_root}/#{self[:old_host]}"
-    run "a2dissite #{self[:old_host]}"
-    run "test -e #{old_vhost_path} && rm #{old_vhost_path}"
-    # FIXME: remove old awstats vhost !!
-    create_vhost
-    create_awstats
-    clear_zafu
-    clear_cache
-    set_permissions
-  end
-end
-
-desc "Apache2 initial setup"
-task :apache2_setup, :roles => :web do
-  ports = (mongrel_port.to_i...(mongrel_port.to_i + mongrel_count.to_i)).to_a
-  httpd_conf = render("config/httpd.rhtml", :balancer => db_name, :ports => ports)
-  if debian_host
-    put(httpd_conf, "/etc/apache2/conf.d/#{db_name}")
-  else
-    put(httpd_conf, "/etc/apache2/conf.d/#{db_name}")
-  end
-
-  run "test -e /etc/apache2/sites-enabled/000-default && a2dissite default || echo 'default already disabled'"
-  run "test -e /etc/apache2/mods-enabled/rewrite.load || a2enmod rewrite"
-  run "test -e /etc/apache2/mods-enabled/deflate.load || a2enmod deflate"
-  run "test -e /etc/apache2/mods-enabled/proxy_balancer.load || a2enmod proxy_balancer"
-  run "test -e /etc/apache2/mods-enabled/proxy.load || a2enmod proxy"
-  run "test -e /etc/apache2/mods-enabled/proxy_http.load || a2enmod proxy_http"
-  run "test -e /etc/apache2/mods-enabled/expires.load || a2enmod expires"
-  run "/etc/init.d/apache2 force-reload"
-end
-
-#========================== MYSQL   ===============================#
-
-desc "set database.yml file according to settings"
-task :db_update_config, :roles => :app do
-  db_app_config = render("config/database.rhtml",
-                :db_name     => db_name,
-                :db_user     => db_user,
-                :db_password => db_password
-                )
-  put(db_app_config, "#{deploy_to}/current/config/database.yml")
-end
-
-desc "create database"
-task :db_create, :roles => :db do
-  on_rollback do
-    run "mysql -u root -p -e \"DROP DATABASE #{db_name};\"" do |channel, stream, data|
-      if data =~ /^Enter password:\s*/m
-        logger.info "#{channel[:host]} asked for password"
-        channel.send_data "#{password}\n"
-      end
-      puts data
-    end
-  end
-
-  run "mysql -u root -p -e \"CREATE DATABASE #{db_name} DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci; GRANT ALL ON #{db_name}.* TO '#{db_user}'@'localhost' IDENTIFIED BY '#{db_password}';\"" do |channel, stream, data|
-    if data =~ /^Enter password:\s*/m
-      logger.info "#{channel[:host]} asked for password"
-      channel.send_data "#{password}\n"
-    end
-    puts data
-  end
-end
-
-desc "initial database setup"
-task :db_setup, :roles => :db do
-  transaction do
-    db_create
-  end
-end
-
-
-desc "Full initial setup"
-task :initial_setup do
-  transaction do
-    app_setup
-
-    db_setup
-
-    deploy::update
-
-    mongrel_setup
-
-    apache2_setup
-
-    set_permissions
-
-    start
-  end
+set :db_name,             "zena"   # If you change this: no dots in this name !
+set :server_ip,           nil      # FIXME: set this to your remote server IP in the form: "215.0.0.1"
+set :mongrel_port,        "8000"
+set :mongrel_count,       "3"
+set :db_password,         nil      # FIXME: set password (can be anything).
+set :db_user,             "zena"
+set :repository,          "http://svn.zenadmin.org/zena/trunk"
+
+if self[:server_ip]
+  #================= ADVANCED SETTINGS =============#
+
+  set :deploy_to,    "/var/zena"
+  set :sites_root,   "/var/www/zena"
+  set :vhost_root,   "/etc/apache2/sites-available"
+  set :deflate,       true
+  set :debug_deflate, false
+  set :debug_rewrite, false
+  set :static,        []
+  set :apache2_reload_cmd, "/etc/init.d/apache2 reload"
+  set :debian_host,           true
+  set :ssh_user,              "root"
+
+  role :web,         "#{ssh_user}@#{server_ip}"
+  role :app,         "#{ssh_user}@#{server_ip}"
+  role :db,          "#{ssh_user}@#{server_ip}", :primary => true
+
+  #================= END ADVANCED SETTINGS ==========#
+  require 'zena/deploy'
+
+else
+  puts <<-TXT
+***********************************************************
+You should fix your configurations file 'config/deploy.rb'
+before running capistrano
+***********************************************************
+TXT
 end
 
-desc "Database dump"
-task :db_dump, :roles => :db do
-  run "mysqldump #{db_name} -u root -p > #{deploy_to}/current/#{db_name}.sql" do |channel, stream, data|
-    if data =~ /^Enter password:\s*/m
-      logger.info "#{channel[:host]} asked for password"
-      channel.send_data "#{password}\n"
-    end
-    puts data
-  end
-  run "#{in_current} tar czf #{db_name}.sql.tgz #{db_name}.sql"
-  run "#{in_current} rm #{db_name}.sql"
-end
-
-desc "Get backup file back"
-task :get_backup, :roles => :app do
-  get "#{deploy_to}/current/#{db_name}_data.tgz", "./#{db_name}_#{Time.now.strftime '%Y-%m-%d-%H'}.tgz"
-end
-
-# FIXME: backup not loading data for every site...
-desc "Backup all data and bring it backup here"
-task :backup, :roles => :app do
-  db_dump
-  # key track of the current svn revision for app
-
-  run "#{in_current} svn info > #{deploy_to}/current/zena_version.txt"
-  run "#{in_current} rake zena:full_backup RAILS_ENV='production'"
-  run "#{in_current} tar czf #{db_name}_data.tgz #{db_name}.sql.tgz sites_data.tgz zena_version.txt"
-  get_backup
-end

data/config/gems.yml

@@ -1,10 +1,10 @@
 hpricot:
 gettext:        '= 1.93.0'
 querybuilder:   '= 0.5.6'
-rubyless:       '= 0.3.2'
+rubyless:       '= 0.3.3'
 ruby-recaptcha: '= 1.0.0'
 syntax:         '= 1.0.0'
-tzinfo:         '= 0.3.12'
+tzinfo:         '>= 0.3.12'
 uuidtools:      '= 2.0.0'
 rails:          '= 2.3.4'
 json:           '>= 1.1.9'
@@ -17,12 +17,7 @@ RedCloth:
 #  lib:          'RMagick'
 #  version:      '= 2.11.1'
 
-sqlite3-ruby:
-  lib:          'sqlite3'
-  version:      '>= 1.2.4'
-
 yamltest:
-  development_only:  yes
   version: '= 0.5.3'
 
 grosser-fast_gettext:

data/db/migrate/20091018200734_add_popup_info_to_image_format.rb

@@ -0,0 +1,9 @@
+class AddPopupInfoToImageFormat < ActiveRecord::Migration
+  def self.up
+    add_column :iformats, :popup, :string, :limit => 120
+  end
+
+  def self.down
+    remove_column :iformats, :popup
+  end
+end

data/db/schema.rb

@@ -1,4 +1,4 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# This file is auto-generated from the current state of the database. Instead of editing this file,
 # please use the migrations feature of Active Record to incrementally modify your database, and
 # then regenerate this schema definition.
 #
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20091014183726) do
+ActiveRecord::Schema.define(:version => 20091018200734) do
 
   create_table "cached_pages", :force => true do |t|
     t.text     "path"
@@ -134,6 +134,7 @@ ActiveRecord::Schema.define(:version => 20091014183726) do
     t.integer  "gravity"
     t.integer  "width"
     t.integer  "height"
+    t.string   "popup",      :limit => 120
   end
 
   create_table "links", :force => true do |t|

data/lib/gettext_strings.rb

@@ -89,6 +89,14 @@ module Zena
     N_('status_10')         # removed
     N_('status_0')          # deleted
 
+    N_('status_50_img')         # published
+    N_('status_60_img')         # proposed
+    N_('status_65_img')         # proposed with
+    N_('status_70_img')         # redaction
+    N_('status_20_img')         # replaced
+    N_('status_10_img')         # removed
+    N_('status_0_img')          # deleted
+
     N_('en')
     N_('fr')
     N_('de')

data/lib/tasks/zena.rake

@@ -1,7 +1,7 @@
 require 'yaml'
 require 'fileutils'
 
-require File.join(File.dirname(__FILE__), '..', 'zena.rb') # to have Zena::ROOT
+require File.join(File.dirname(__FILE__), '..', 'zena', 'info') # to have Zena::ROOT
 
 def symlink_assets(from, to)
   from = File.expand_path(from)
@@ -12,7 +12,7 @@ def symlink_assets(from, to)
   #        we could create a symlink in the sites dir to 'shared' -> /var/zena/current/public
   #        and then symlink with "#{host_path}/public/#{dir}" -> "../shared/public/#{dir}"
   #        OR we could symlink /var/zena/current/...
-  ['calendar', 'images', 'javascripts', 'stylesheets', 'icons'].each do |dir|
+  ['calendar', 'images', 'javascripts', 'stylesheets'].each do |dir|
     File.unlink("#{to}/public/#{dir}") if File.symlink?("#{to}/public/#{dir}")
     if File.exist?("#{to}/public/#{dir}")
       if File.directory?("#{to}/public/#{dir}")
@@ -39,23 +39,41 @@ def copy_assets(from, to)
   from = File.expand_path(from)
   to = File.expand_path(to)
   return if from == to
+  ['config/mongrel_upload_progress.conf', 'lib/upload_progress_server.rb', 'config/deploy.rb', 'db/migrate/*.rb', 'public/**/*'].each do |base_path|
+    if base_path =~ /\*/
+      Dir["#{from}/#{base_path}"].each do |path|
+        path = path[(from.length + 1)..-1]
+        next if File.directory?(path)
+        copy_files("#{from}/#{path}", "#{to}/#{path}")
+      end
+    else
+      copy_files("#{from}/#{base_path}", "#{to}/#{base_path}")
+    end
+  end
+end
 
-  ['config/mongrel_upload_progress.conf', 'lib/upload_progress_server.rb'].each do |path|
-    FileUtils.cp("#{from}/#{path}", "#{to}/#{path}") unless File.exist?("#{to}/#{path}")
+def copy_files(from, to)
+  base = File.dirname(to)
+  unless File.exist?(base)
+    FileUtils.mkpath(base)
+  end
+  if File.directory?(from)
+    Dir.foreach(from) do |f|
+      next if f =~ /\A./
+      copy_files("#{from}/#{f}", "#{to}/#{f}")
+    end
+  else
+    FileUtils.cp(from, base)
   end
 end
 
 namespace :zena do
-  desc "Setup a new zena application (symlink static assets, check routes, etc)"
-  task :setup => :zena_config do
-    puts "zena:setup"
+  desc "Copy latest assets from zena gem to application (images, stylesheets, javascripts)."
+  task :assets => :zena_config do
     if Zena::ROOT == RAILS_ROOT
       puts "Copy assets should only be used when zena is loaded externally (via gem for example)."
     else
-      symlink_assets(Zena::ROOT, RAILS_ROOT)
-      puts "* symlinked assets"
       copy_assets(Zena::ROOT, RAILS_ROOT)
-      puts "* copied assets"
     end
   end
 
@@ -103,7 +121,7 @@ namespace :zena do
         FileUtils.mkpath("#{host_path}/#{dir}")
       end
 
-      symlink_assets(Zena::ROOT, host_path)
+      symlink_assets(RAILS_ROOT, host_path)
     end
   end
 
@@ -210,7 +228,7 @@ namespace :zena do
       end
     else
       # migrate all to latest
-      paths  = {'zena' => "#{Zena::ROOT}/db/migrate"}
+      paths  = {'zena' => "#{RAILS_ROOT}/db/migrate"}
       bricks = ['zena']
 
       Bricks::Patcher.foreach_brick do |brick_path|

data/lib/zena/app.rb

@@ -1,3 +1,4 @@
+require File.join(File.dirname(__FILE__), 'info')
 module Zena
   module App
     def self.included(base)
@@ -28,6 +29,7 @@ module Zena
         helper  Zena::Use::I18n::ViewMethods
         helper  Zena::Use::NestedAttributesAlias::ViewMethods
         helper  Zena::Use::Refactor::ViewMethods
+        helper  Zena::Use::Rendering::ViewMethods
         helper  Zena::Use::Urls::ViewMethods
         helper  Zena::Use::Zafu::ViewMethods
         helper  Zena::Use::Zazen::ViewMethods

data/lib/zena/deploy/httpd.rhtml

@@ -0,0 +1,22 @@
+# zena apache2 setup for <%= config[:balancer] %>
+# automatically generated file
+
+NameVirtualHost *
+<% if config[:app_type] == :passenger  %>
+LoadModule upload_progress_module <%= config[:app_root] %>/vendor/apache2_upload_progress/mod_upload_progress.so
+<% elsif config[:app_type] == :mongrel %>
+<Proxy *>
+  Order allow,deny
+  Allow from all
+</Proxy>
+<Proxy balancer://<%= config[:balancer] %>><% config[:ports].each do |port| %>
+  BalancerMember http://127.0.0.1:<%= port %><% end %>
+</Proxy>
+<% end %>
+
+<ifmodule mode_expires.c>
+  <filesmatch "\.(jpg|gif|png|css|js)$">
+    ExpiresActive on
+    ExpiresDefault "access plus 1 year"
+  </filesmatch>
+</ifmodule>

data/{config → lib/zena/deploy}/start.html

@@ -3,8 +3,8 @@
 <html lang='en' xmlns='http://www.w3.org/1999/xhtml'>
 <head>
   <title>zena</title>
-  <script src="../public/javascripts/prototype.js" type="text/javascript"></script>
-  <script src="../public/javascripts/effects.js" type="text/javascript"></script>
+  <script src="../../../public/javascripts/prototype.js" type="text/javascript"></script>
+  <script src="../../../public/javascripts/effects.js" type="text/javascript"></script>
 
   <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 <style>

data/{config/zena.rb → lib/zena/deploy/template.rb}

@@ -1,17 +1,22 @@
 require 'digest/sha1'
-require 'zena/root'
+require 'zena/info'
 # This is a rails template to generate a basic zena application
 
 run 'rm public/index.html'
 
-gem 'zena'
+gem 'zena', :version => Zena::VERSION
 route 'map.zen_routes'
 
 rakefile("zena_tasks.rake") do
-  <<-TASK
-    require 'zena'
-    require 'tasks/zena'
-  TASK
+<<-TASK
+# sync zena tasks to gem version
+env = File.read(File.join(File.dirname(__FILE__), '..', '..', 'config', 'environment.rb'))
+if env =~ /config.gem.*zena.*version.*'(.*?)'/
+  gem 'zena', "= \#{$1}"
+end
+require 'zena'
+require 'tasks/zena'
+TASK
 end
 
 ['development', 'test', 'production'].each do |env|
@@ -27,13 +32,13 @@ inside('app/controllers') do
   end
 end
 
-rake "zena:setup"
+rake 'zena:assets'
 rake 'db:create'
 rake 'zena:migrate'
 rake "zena:mksite HOST='localhost' PASSWORD='admin' LANG='en'"
 inside('.') do
   run 'rake zena:migrate RAILS_ENV=production'
   run "rake zena:mksite HOST='localhost' PASSWORD='admin' LANG='en' RAILS_ENV=production"
-  run "#{Gem.win_platform? ? 'start' : 'open'} #{File.join(Zena::ROOT, 'config', 'start.html')}"
+  run "#{Gem.win_platform? ? 'start' : 'open'} #{File.join(Zena::ROOT, 'lib/zena/deploy/start.html')}"
   exec "script/server -e production -p 3211"
 end