zena 0.16.0 → 0.16.1

data/History.txt

@@ -1,3 +1,10 @@
+== 0.16.1 2010-01-16
+
+* 3 minor enhancements
+  * rewrite of rake and capistrano tasks for sphinx brick
+  * rewrite of rake and capistrano tasks for worker brick
+  * fixed asset copying (should not overwrite without asking)
+
 == 0.16.0 2010-01-15
 
 * 3 major enhancements:

data/app/models/site.rb

@@ -315,7 +315,6 @@ class Site < ActiveRecord::Base
       Site.connection.execute "DELETE FROM caches WHERE site_id = #{self[:id]}"
       Site.connection.execute "DELETE FROM cached_pages_nodes WHERE cached_pages_nodes.node_id IN (SELECT nodes.id FROM nodes WHERE nodes.site_id = #{self[:id]})"
       Site.connection.execute "DELETE FROM cached_pages WHERE site_id = #{self[:id]}"
-      Node.connection.execute "UPDATE nodes SET fullpath = NULL, basepath = NULL WHERE site_id = #{self[:id]}"
     end
 
     if clear_zafu

data/bricks/sphinx/lib/use_sphinx.rb

@@ -42,7 +42,7 @@ module Bricks
         begin
           require 'thinking_sphinx/deltas/delayed_delta'
           ThinkingSphinx::Deltas::DelayedDelta
-          has_dd = Bricks::CONFIG['delayed_job']
+          has_dd = Bricks::CONFIG['worker']
         rescue LoadError
           has_dd = false
         end

data/bricks/sphinx/misc/deploy.rb

@@ -1,20 +1,48 @@
 require 'thinking_sphinx/deploy/capistrano'
 
 Capistrano::Configuration.instance(:must_exist).load do
-
-  # FIXME: we should find a way to write a clean 'before' hook
-  # so that this is simply appeded to existing rules !!
-  task :before_update_code, :roles => [:app] do
-    thinking_sphinx.stop
+  task :sphinx_stop, :roles => [:app] do
+    # stop sphinx search daemon
+    run "#{in_current} rake RAILS_ENV=production sphinx:stop"
   end
 
-  task :after_update_code, :roles => [:app] do
-    symlink_sphinx_indexes
-    thinking_sphinx.configure
-    thinking_sphinx.start
+  task :sphinx_start, :roles => [:app] do
+    # make sure sphinx can access the indexes
+    sphinx_symlink_indexes
+    # make sure a cron indexer is in place
+    sphinx_setup_indexer
+    # start search daemon
+    run "#{in_current} rake RAILS_ENV=production sphinx:start"
   end
 
-  task :symlink_sphinx_indexes, :roles => [:app] do
+  task :sphinx_symlink_indexes, :roles => [:app] do
+    run "test -e #{shared_path}/db || mkdir #{shared_path}/db"
+    run "test -e #{shared_path}/db/sphinx || mkdir #{shared_path}/db/sphinx"
     run "ln -nfs #{shared_path}/db/sphinx #{current_path}/db/sphinx"
   end
-end
+
+  task :sphinx_setup, :roles => [:app] do
+    # setup sphinx
+    run "#{in_current} rake RAILS_ENV=production sphinx:setup"
+  end
+
+  task :sphinx_index, :roles => [:app] do
+    # rebuild sphinx index now
+    run "#{in_current} rake RAILS_ENV=production sphinx:index"
+  end
+
+  task :sphinx_setup_indexer, :roles => [:app] do
+    # install cron job to rebuild indexes
+    run "#{in_current} rake RAILS_ENV=production sphinx:setup_indexer"
+  end
+
+  # Hook start/stop methods into app start/stop/restart
+
+  on_stop do
+    sphinx_stop
+  end
+
+  on_start do
+    sphinx_start
+  end
+end

data/bricks/sphinx/misc/sphinx.yml

@@ -4,8 +4,9 @@ test:
 production:
   enable_star: 1
   min_infix_len: 2
-  pid_file: /var/zena/shared/tmp/searchd.pid
+  pid_file: /var/zena/shared/log/searchd.pid
   searchd_files: /var/zena/shared/db/sphinx
+  run_indexer_at: "10,40"
 
 development:
   enable_star: 1

data/bricks/sphinx/misc/tasks.rb

@@ -1,21 +1,138 @@
-require 'thinking_sphinx'
-require 'thinking_sphinx/tasks'
-
-begin
-  require 'thinking_sphinx/deltas/delayed_delta/tasks'
-  require 'thinking_sphinx/deltas/delayed_delta' # we need this line for the ts:dd job runner
-rescue LoadError
-  # no delayed_delta
-end
+# The ThinkingSphinx::Configuration needs RAILS_ROOT and RAILS_ENV in order to function. Only 'setup' needs the
+# environment since it needs to get configuration settings from the classes in zena.
+require 'tempfile'
+require 'yaml'
 
 namespace :sphinx do
+  setup_done = File.exist?("#{RAILS_ROOT}/config/#{RAILS_ENV}.sphinx.conf")
+
+  desc "Create a default configuration file and generate sphinx query"
+  task :setup => :environment do
+    # TODO: find another way to make sure the models are loaded:
+    [Node, Version]
 
-  desc "Create a default configuration file"
-  task :config do
     if File.exist?("#{RAILS_ROOT}/config/sphinx.yml")
-      puts "#{RAILS_ROOT}/config/sphinx.yml exists, not copying"
+      puts "Sphinx searchd: config/sphinx.yml exists, not copying"
     else
       FileUtils.cp(File.join(File.dirname(__FILE__), 'sphinx.yml'), "#{RAILS_ROOT}/config/sphinx.yml")
+      puts "Sphinx searchd: created initial config/sphinx.yml"
+    end
+
+    sphinx_conf = ThinkingSphinx::Configuration.instance
+
+    # We need this mess because mkdir_p does not properly resolve symlinks
+    db_path = sphinx_conf.searchd_file_path
+    base = File.dirname(db_path)
+    sym_base = `readlink #{base.inspect}`
+    if sym_base != '' && $? == 0
+      base = sym_base.chomp
+    end
+
+    db_path = File.join(base, File.basename(db_path))
+
+    FileUtils.mkdir_p db_path
+
+    sphinx_conf.build
+    puts "Sphinx searchd: created Sphinx configuration (#{sphinx_conf.config_file})"
+  end
+
+  desc "Create a crontab entry to run the indexer every 30 minutes"
+  task :setup_indexer do
+    Rake::Task['sphinx:setup'].invoke if !setup_done
+
+    config = YAML.load_file(File.join(RAILS_ROOT, 'config', 'sphinx.yml'))[RAILS_ENV]
+    every  = config['run_indexer_at'] || '10,40'
+    res = `crontab -l 2>&1`
+    if $? != 0 || res =~ /crontab/
+      puts "Sphinx indexer: could not access crontab (#{res.chomp})"
+    else
+      crontab = res.chomp.split("\n")
+      res = []
+      job = "#{every} *  *   *   *     /usr/bin/rake RAILS_ENV=production sphinx:index >> /root/cron.log 2>&1"
+      job_inserted = false
+      job_action   = 'install'
+      crontab.each do |line|
+        if line =~ /sphinx:index/
+          if !job_inserted
+            # update
+            res << job
+            job_inserted = true
+            job_action   = 'update'
+          end
+        else
+          res << line
+        end
+      end
+
+      if !job_inserted
+        # new entry in crontab
+        res << job
+      end
+
+      tmpf = Tempfile.new('crontab')
+      File.open(tmpf.path, 'wb') do |file|
+        file.puts res.join("\n")
+      end
+      user = `whoami`
+      res = `crontab -u #{user.chomp} #{tmpf.path}`
+      if $? == 0
+        puts "Sphinx indexer: cron job #{job_action} ok"
+      else
+        puts "Sphinx indexer: could not #{job_action} cron job\n#{res}"
+      end
+    end
+  end
+
+  desc "Start a Sphinx searchd daemon using Thinking Sphinx's settings"
+  task :start do
+    sphinx_conf = ThinkingSphinx::Configuration.instance
+
+    Rake::Task['sphinx:setup'].invoke if !setup_done
+
+    if ThinkingSphinx.sphinx_running?
+      puts "Sphinx searchd: already started (pid #{ThinkingSphinx.sphinx_pid})"
+    else
+      Dir["#{sphinx_conf.searchd_file_path}/*.spl"].each { |file| File.delete(file) }
+
+      sphinx_conf.controller.start
+
+      if ThinkingSphinx.sphinx_running?
+        puts "Sphinx searchd: started successfully (pid #{ThinkingSphinx.sphinx_pid})."
+      else
+        tail = `tail -n 10 #{sphinx_conf.searchd_log_file.inspect}`
+        puts "Sphinx searchd: failed to start.\n#{tail}"
+      end
+    end
+  end
+
+  desc "Stop Sphinx searchd"
+  task :stop do
+    unless ThinkingSphinx.sphinx_running?
+      puts "Sphinx searchd: already stopped."
+    else
+      ThinkingSphinx::Configuration.instance.controller.stop
+      puts "Sphinx searchd: stopped (pid #{ThinkingSphinx.sphinx_pid})."
     end
   end
+
+  desc "Restart Sphinx searchd"
+  task :restart do
+    Rake::Task['sphinx:stop'].invoke
+    sleep(1)
+    Rake::Task['sphinx:start'].invoke
+  end
+
+  desc "Index data for Sphinx using Thinking Sphinx's settings"
+  task :index do
+
+    Rake::Task['sphinx:setup'].invoke if !setup_done
+
+    res = ThinkingSphinx::Configuration.instance.controller.index
+    if $? == 0
+      puts "Sphinx searchd: successfully indexed data"
+    else
+      puts "Sphinx searchd: indexing failed\n#{res}"
+    end
+  end
+
 end

data/bricks/worker/misc/deploy.rb

@@ -0,0 +1,22 @@
+require 'thinking_sphinx/deploy/capistrano'
+
+Capistrano::Configuration.instance(:must_exist).load do
+
+  task :worker_stop, :roles => [:app] do
+    # stop delayed job worker
+    run "#{in_current} rake RAILS_ENV=production worker:stop"
+  end
+
+  on_stop do
+    worker_stop
+  end
+
+  task :worker_start, :roles => [:app] do
+    # start delayed job worker
+    run "#{in_current} rake RAILS_ENV=production worker:start"
+  end
+
+  on_start do
+    worker_start
+  end
+end

data/bricks/worker/misc/tasks.rb

@@ -0,0 +1,68 @@
+
+class WorkerCmd
+  OK_MESSAGE = {'start' => 'started', 'stop' => 'stopped'}
+  def initialize(name, script)
+    @name   = name
+    @script = script
+  end
+
+  def execute(cmd)
+    res = `cd #{RAILS_ROOT} && #{@script} RAILS_ENV=#{RAILS_ENV} #{cmd}`
+    if $? == 0
+      puts "#{@name}: #{OK_MESSAGE[cmd]} (pid #{pid})"
+    else
+      puts "#{@name}: failed to #{cmd}\n#{res}"
+    end
+    @pid = nil
+  end
+
+  def start
+    if running?
+      puts "#{@name}: already started (pid #{pid})"
+    else
+      execute('start')
+    end
+  end
+
+  def stop
+    if !running?
+      puts "#{@name}: already stopped"
+    else
+      execute('stop')
+    end
+  end
+
+  def pid_file
+    @pid_file ||= File.expand_path(File.join(RAILS_ROOT, 'log', "#{@name}.pid"))
+  end
+
+  def pid
+    @pid ||= File.exists?(pid_file) ? File.read(pid_file)[/\d+/] : nil
+  end
+
+  def running?
+    pid && Process.kill(0, pid.to_i) rescue false
+  end
+end
+
+
+namespace :worker do
+  worker = WorkerCmd.new('worker', File.expand_path(File.join(File.dirname(__FILE__), 'worker')))
+
+  desc "Start the delayed jobs worker"
+  task :start do
+    worker.start
+  end
+
+  desc "Stop the delayed jobs worker"
+  task :stop do
+    worker.stop
+  end
+
+  desc "Restart the delayed jobs worker"
+  task :restart do
+    worker.stop
+    sleep(1)
+    worker.start
+  end
+end

data/bricks/worker/misc/worker

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'daemons'
+
+env, cmd = 'development', nil
+ARGV.each do |arg|
+  if arg =~ /RAILS_ENV\s*=\s*(\w+)/
+    env = $1
+  else
+    cmd = arg
+  end
+end
+
+unless %w{index start stop restart}.include?(cmd)
+  puts "Usage: script/sphinx RAILS_ENV=production [index|start|stop|restart]"
+  exit -1
+end
+
+dir = File.expand_path('.')
+
+daemon_options = {
+  :multiple   => false,
+  :dir_mode   => :normal,
+  :dir        => File.join(dir, 'log'),
+  :backtrace  => true
+}
+
+ARGV.clear
+ARGV << cmd
+
+Daemons.run_proc('worker', daemon_options) do
+  ARGV.clear
+
+  Dir.chdir dir
+  ENV['RAILS_ENV'] = RAILS_ENV = env
+  require File.join('config', 'environment')
+  require 'delayed_job'
+
+  Delayed::Worker.new.start
+end

data/config/bricks.yml

@@ -2,7 +2,7 @@ test:
   tags:     ON
   captcha:  ON
   sphinx:   OFF
-  delayed_job: OFF
+  worker:   OFF
 
 development:
   tags:     ON
@@ -14,7 +14,7 @@ development:
       adapter: 'mysql,postgresql'
     run_if:
       file: 'log/searchd.development.pid'
-  delayed_job:
+  worker:
     switch:  OFF
     activate_if:
       gem: 'delayed_job'
@@ -29,7 +29,7 @@ production:
       adapter: 'mysql,postgresql'
     run_if:
       file: 'log/searchd.production.pid'
-  delayed_job:
+  worker:
     switch:  ON
     activate_if:
       gem: 'delayed_job'

data/config/deploy.rb

@@ -1,5 +1,5 @@
 set :db_name,             "zena"   # If you change this: no dots in this name !
-set :server_ip,           3333      # FIXME: set this to your remote server IP in the form: "215.0.0.1"
+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).
@@ -32,7 +32,16 @@ if self[:server_ip]
   if !defined?(::RAILS_ENV)
     ::RAILS_ENV = 'production'
   end
-  require 'zena/deploy'
+
+  # This file is copied into zena applications.
+  deploy_path = "#{RAILS_ROOT}/lib/zena/deploy"
+  if File.exist?("#{deploy_path}.rb")
+    # We are running directly inside zena
+    require deploy_path
+  else
+    # Zena app, using zena as gem
+    require 'zena/deploy'
+  end
 
 else
   puts <<-TXT

data/config/gems.yml

@@ -23,13 +23,13 @@ thinking-sphinx:
   optional:     yes
   source:       'http://gemcutter.org'
   lib:          'thinking_sphinx'
-  version:      '>= 1.3.1'
+  version:      '>= 1.3.14'
 
 ts-delayed-delta:
   optional:      yes
   source:       'http://gemcutter.org'
   lib:          'thinking_sphinx/deltas/delayed_delta'
-  version:      '>= 1.0.0'
+  version:      '>= 1.0.2'
 
 delayed_job:
   optional:     yes
@@ -61,4 +61,3 @@ thoughtbot-shoulda:
 
 jeweler:
   version:    '>= 1.4.0'
-  development_only: true

data/config/sphinx.yml

@@ -5,6 +5,7 @@ production:
   enable_star: 1
   min_infix_len: 2
   sql_range_step: 10000000
+  run_indexer_at: "10,40"
 
 development:
   enable_star: 1

data/db/migrate/20091026161708_add_persistence_token.rb

@@ -1,7 +1,11 @@
 class AddPersistenceToken < ActiveRecord::Migration
+  User.reset_column_information
   def self.up
     add_column :users, :persistence_token, :string
-    add_column :users, :password_salt, :string
+    unless User.column_names.include?('password_salt')
+      # Strangely some legacy apps already have the password_salt. Better be safe.
+      add_column :users, :password_salt, :string
+    end
     rename_column :users, :password, :crypted_password
   end
 

data/db/migrate/20091124161608_rebuild_fullpath.rb

@@ -1,5 +1,11 @@
 class RebuildFullpath < ActiveRecord::Migration
   def self.up
+
+    # Reset column information (used when running all migrations at once)
+    [User, Node, Version, Site, Group].each do |klass|
+      klass.reset_column_information
+    end
+
     Site.all.each do |site|
       puts "===== rebuilding fullpath for #{site.host} (#{Node.count(:conditions => "site_id = #{site.id}")} nodes)"
       site.rebuild_fullpath

data/db/migrate/20100115134729_rebuild_fullpath_after_fix.rb

@@ -0,0 +1,11 @@
+class RebuildFullpathAfterFix < ActiveRecord::Migration
+  def self.up
+    Site.all.each do |site|
+      puts "===== rebuilding fullpath for #{site.host} (#{Node.count(:conditions => "site_id = #{site.id}")} nodes)"
+      site.rebuild_fullpath
+    end
+  end
+
+  def self.down
+  end
+end

data/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20091124161608) do
+ActiveRecord::Schema.define(:version => 20100115134729) do
 
   create_table "cached_pages", :force => true do |t|
     t.text     "path"

data/lib/tasks/zena.rake

@@ -59,6 +59,8 @@ def copy_assets(from, to)
   end
 end
 
+COPY_FILE_OVERWRITE_ALL = {}
+
 def copy_files(from, to)
   base = File.dirname(to)
   unless File.exist?(base)
@@ -69,6 +71,32 @@ def copy_files(from, to)
       next if f =~ /\A./
       copy_files("#{from}/#{f}", "#{to}/#{f}")
     end
+  elsif File.exist?(to)
+    if COPY_FILE_OVERWRITE_ALL.has_key?(base)
+      if COPY_FILE_OVERWRITE_ALL[base]
+        FileUtils.cp(from, base)
+      else
+        # skip
+      end
+    elsif File.read(from) != File.read(to)
+      # ask
+      puts "\n## exists: #{to}\n   (a= overwrite all in same destination, s= overwrite none in same destination)"
+      print "   overwrite (ayNs) ? "
+      answer = STDIN.gets.chomp.downcase
+      case answer
+      when 'y'
+        FileUtils.cp(from, base)
+      when 'a'
+        COPY_FILE_OVERWRITE_ALL[base] = true
+        puts "overwrite all in #{base}"
+        FileUtils.cp(from, base)
+      when 's'
+        COPY_FILE_OVERWRITE_ALL[base] = false
+        puts "overwrite none in #{base}"
+      else
+        puts "skip #{to}"
+      end
+    end
   else
     FileUtils.cp(from, base)
   end
@@ -395,20 +423,28 @@ namespace :zena do
     end
   end
 
-  desc "Create the database, migrate, create 'localhost' site and start application"
+  desc "Create the database, migrate, create 'localhost' site and start application (in production environment by default)"
   task :init do
     # FIXME: how to run sub-task
-    [
-      "rake zena:migrate RAILS_ENV=production",
-      "rake zena:mksite HOST='localhost' PASSWORD='admin' LANG='en' RAILS_ENV=production",
-      "#{Gem.win_platform? ? 'start' : 'open'} #{File.join(Zena::ROOT, 'lib/zena/deploy/start.html')}"
-    ].each do |cmd|
-      puts cmd
-      system(cmd)
-    end
-    cmd = "script/server -e production -p 3211"
+    ENV['RAILS_ENV'] = RAILS_ENV || 'production'
+    ENV['HOST']      ||= 'localhost'
+    ENV['LANG']      ||= 'en'
+    ENV['PASSWORD']  ||= 'admin'
+
+    Rake::Task["db:create"].invoke
+    Rake::Task["zena:migrate"].invoke
+
+    # We cannot use 'invoke' here because the User class needs to be reloaded
+    env = %w{RAILS_ENV HOST LANG PASSWORD}.map{|e| "#{e}=#{ENV[e]}"}.join(' ')
+    cmd = "rake zena:mksite #{env}"
+    puts cmd
+    system(cmd)
+
+    system("#{Gem.win_platform? ? 'start' : 'open'} #{File.join(Zena::ROOT, 'lib/zena/deploy/start.html')}")
+
+    cmd = "script/server -e #{ENV['RAILS_ENV']} -p 3211"
     puts cmd
     exec cmd
   end
 
-end
+end

data/lib/zena/deploy.rb

@@ -27,13 +27,18 @@ require File.join(File.dirname(__FILE__), 'info')
 require File.join(File.dirname(__FILE__), '..', 'bricks')
 
 Capistrano::Configuration.instance(:must_exist).load do
+
   set :templates, File.join(File.dirname(__FILE__), 'deploy')
   self[:app_type]   ||= :mongrel
   self[:app_root]   ||= '/var/zena/current'
   self[:sites_root] ||= '/var/www/zena'
   self[:balancer]   ||= db_name
+  self[:runner]     ||= 'root'
+  self[:on_stop]    = []
+  self[:on_start]   = []
 
   set :in_current, "cd #{deploy_to}/current &&"
+
   class RenderClass
     def initialize(path)
       @text = File.read(path)
@@ -54,6 +59,14 @@ Capistrano::Configuration.instance(:must_exist).load do
     RenderClass.new(file).render(hash)
   end
 
+  def on_stop(&block)
+    self[:on_stop] << block
+  end
+
+  def on_start(&block)
+    self[:on_start] << block
+  end
+
   #========================== SOURCE CODE   =========================#
 
 
@@ -69,12 +82,12 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   desc "clear all zafu compiled templates"
   task :clear_zafu, :roles => :app do
-    run "#{in_current} rake zena:clear_zafu RAILS_ENV=production"
+    run "#{in_current} rake RAILS_ENV=production zena:clear_zafu"
   end
 
   desc "clear all cache compiled templates"
   task :clear_cache, :roles => :app do
-    run "#{in_current} rake zena:clear_cache RAILS_ENV=production"
+    run "#{in_current} rake RAILS_ENV=production zena:clear_cache"
   end
 
   desc "after code update"
@@ -96,7 +109,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   desc "migrate database (zena version)"
   task :migrate, :roles => :db do
-    run "#{in_current} rake zena:migrate RAILS_ENV=production"
+    run "#{in_current} rake RAILS_ENV=production zena:migrate"
   end
 
   desc "initial app setup"
@@ -133,46 +146,19 @@ Capistrano::Configuration.instance(:must_exist).load do
     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
+  desc "Restart application"
+  task :restart, :roles => :app do
+    deploy.restart
   end
 
-  desc "Start mongrel"
+  desc "Start application"
   task :start, :roles => :app do
-    restart_upload_progress
-    run "#{in_current} mongrel_rails cluster::start"
+    deploy.start
   end
 
-  desc "Stop mongrel"
+  desc "Stop application"
   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
+    deploy.stop
   end
 
   #========================== APACHE2 ===============================#
@@ -361,8 +347,6 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       deploy::update
 
-      mongrel_setup
-
       apache2_setup
 
       set_permissions
@@ -402,4 +386,104 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
 
   Bricks.load_misc('deploy')
+
+
+  #========================== MONGREL ===============================#
+  namespace :mongrel do
+
+    desc "configure mongrel"
+    task :configure, :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 :upload_progress_stop , :roles => :app do
+      run "#{in_current} ruby lib/upload_progress_server.rb stop"
+    end
+
+    desc "Start the drb upload_progress server"
+    task :upload_progress_start , :roles => :app do
+      run "#{in_current} lib/upload_progress_server.rb start"
+    end
+
+    desc "Restart the upload_progress server"
+    task :upload_progress_restart, :roles => :app do
+      upload_progress_stop
+      upload_progress_start
+    end
+
+    desc "Restart mongrels"
+    task :restart, :roles => :app do
+      stop
+      start
+    end
+
+    desc "Start mongrels"
+    task :start, :roles => :app do
+      configure
+      upload_progress_start
+      run "#{in_current} mongrel_rails cluster::start"
+    end
+
+    desc "Stop mongrels"
+    task :stop, :roles => :app do
+      configure
+      upload_progress_stop
+      run "#{in_current} mongrel_rails cluster::stop"
+    end
+  end
+
+  namespace :deploy do
+
+    desc "Restart application"
+    task :restart, :roles => :app do
+
+      self[:on_stop].each do |block|
+        block.call
+      end
+
+      self[:on_start].each do |block|
+        block.call
+      end
+      case self[:app_type]
+      when :mongrel
+        mongrel.restart
+      else
+        puts "'#{self[:app_type]}' not supported."
+      end
+    end
+
+    desc "Start application"
+    task :start, :roles => :app do
+
+      self[:on_start].each do |block|
+        block.call
+      end
+
+      case self[:app_type]
+      when :mongrel
+        mongrel.start
+      else
+        puts "'#{self[:app_type]}' not supported."
+      end
+    end
+
+    desc "Stop application"
+    task :stop, :roles => :app do
+
+      self[:on_stop].each do |block|
+        block.call
+      end
+
+      case self[:app_type]
+      when :mongrel
+        mongrel.stop
+      else
+        puts "'#{self[:app_type]}' not supported."
+      end
+    end
+
+  end
+
 end

data/lib/zena/info.rb

@@ -9,7 +9,7 @@ ZENA_CALENDAR_LANGS = ["en", "fr"] # FIXME: build this dynamically from existing
 ENABLE_XSENDFILE = false
 
 module Zena
-  VERSION = '0.16.0'
+  VERSION = '0.16.1'
   REVISION = 1336
   ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 end

data/test/unit/site_test.rb

@@ -227,7 +227,7 @@ class SiteTest < Zena::Unit::TestCase
     assert_equal Hash['w'=>{'fr' => versions_id(:opening_red_fr), 'en' => versions_id(:opening_en)},
                       'r'=>{'fr' => versions_id(:opening_fr),     'en' => versions_id(:opening_en)}], opening.vhash
   end
-  
+
   def test_rebuild_fullpath
     login(:tiger)
     Node.connection.execute "UPDATE nodes SET fullpath = NULL"
@@ -239,17 +239,32 @@ class SiteTest < Zena::Unit::TestCase
     assert_equal 'projects/cleanWater/status', status.fullpath
     assert_equal 'projects/cleanWater', status.basepath
     assert_equal false, status.custom_base
-    
+
     assert_equal 'projects/cleanWater/opening', opening.fullpath
     assert_equal 'projects/cleanWater', opening.basepath
     assert_equal false, opening.custom_base
-    
+
     assert_equal 'projects/cleanWater', cleanWater.fullpath
     assert_equal 'projects/cleanWater', cleanWater.basepath
     assert_equal true, cleanWater.custom_base
-    
+
     assert_equal 'collections/art', art.fullpath
     assert_equal '', art.basepath
     assert_equal false, art.custom_base
   end
+
+  context 'Clearing a site cache' do
+    setup do
+      login(:tiger)
+      @site = visitor.site
+    end
+
+    should 'not alter fullpath' do
+      node = secure!(Node) { nodes(:status) }
+      assert_equal 'projects/cleanWater/status', node.fullpath
+      @site.clear_cache
+      node = secure!(Node) { nodes(:status) }
+      assert_equal 'projects/cleanWater/status', node.fullpath
+    end
+  end
 end

data/test/unit/user_test.rb

@@ -272,4 +272,26 @@ class UserTest < Zena::Unit::TestCase
     login(:lion)
     assert_equal ['hello'], visitor.to_publish.map {|r| r.node.name}
   end
+
+  context 'Creating a new user' do
+    setup do
+      login(:lion)
+    end
+
+    context 'with new' do
+      should 'accept a password attribute' do
+        user = nil
+        assert_nothing_raised { user = User.new('name' => 'R2D2', 'password' => 'Artoo') }
+        assert_equal Zena::CryptoProvider::Initial.encrypt('Artoo'), user.crypted_password
+      end
+    end
+
+    context 'with new_no_defaults' do
+      should 'accept a password attribute' do
+        user = nil
+        assert_nothing_raised { user = User.new_no_defaults('name' => 'R2D2', 'password' => 'Artoo') }
+        assert_equal Zena::CryptoProvider::Initial.encrypt('Artoo'), user.crypted_password
+      end
+    end
+  end
 end

data/zena.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zena}
-  s.version = "0.16.0"
+  s.version = "0.16.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2010-01-15}
+  s.date = %q{2010-01-16}
   s.default_executable = %q{zena}
   s.description = %q{zena is a Ruby on Rails  CMS (content managment system) with a focus on usability, ease of customization and web 2.0 goodness (application like behaviour).}
   s.email = %q{gaspard@teti.ch}
@@ -250,10 +250,6 @@ Gem::Specification.new do |s|
      "bricks/captcha/patch/application_helper.rb",
      "bricks/captcha/patch/site.rb",
      "bricks/captcha/zafu/captcha.rb",
-     "bricks/delayed_job/README",
-     "bricks/delayed_job/migrate/20091104191643_create_delayed_jobs_table.rb",
-     "bricks/delayed_job/misc/init.rb",
-     "bricks/delayed_job/misc/tasks.rb",
      "bricks/math/patch/application_helper.rb",
      "bricks/sphinx/MIT-LICENSE",
      "bricks/sphinx/README",
@@ -270,6 +266,12 @@ Gem::Specification.new do |s|
      "bricks/tags/test/unit/tags_test.rb",
      "bricks/tags/test/zafu/tags.yml",
      "bricks/toto.zip",
+     "bricks/worker/README",
+     "bricks/worker/migrate/20091104191643_create_delayed_jobs_table.rb",
+     "bricks/worker/misc/deploy.rb",
+     "bricks/worker/misc/init.rb",
+     "bricks/worker/misc/tasks.rb",
+     "bricks/worker/misc/worker",
      "config/boot.rb",
      "config/bricks.yml",
      "config/database_example.yml",
@@ -367,6 +369,7 @@ Gem::Specification.new do |s|
      "db/migrate/20091101184952_add_session_table.rb",
      "db/migrate/20091123175137_add_single_access_token.rb",
      "db/migrate/20091124161608_rebuild_fullpath.rb",
+     "db/migrate/20100115134729_rebuild_fullpath_after_fix.rb",
      "db/schema.rb",
      "doc/README_FOR_APP",
      "doc/fixtures.graffle",
@@ -1605,9 +1608,6 @@ Gem::Specification.new do |s|
      "script/performance/benchmarker",
      "script/performance/profiler",
      "script/plugin",
-     "script/process/inspector",
-     "script/process/reaper",
-     "script/process/spawner",
      "script/runner",
      "script/server",
      "script/set_revision",
@@ -2017,17 +2017,17 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rails>, ["= 2.3.4"])
       s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
       s.add_runtime_dependency(%q<authlogic>, [">= 0"])
-      s.add_runtime_dependency(%q<ts-delayed-delta>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<ts-delayed-delta>, [">= 1.0.2"])
       s.add_runtime_dependency(%q<pvande-differ>, ["= 0.1.1"])
       s.add_runtime_dependency(%q<mislav-will_paginate>, ["~> 2.2.3"])
       s.add_runtime_dependency(%q<delayed_job>, [">= 1.8.4"])
       s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
-      s.add_runtime_dependency(%q<thinking-sphinx>, [">= 1.3.1"])
+      s.add_runtime_dependency(%q<thinking-sphinx>, [">= 1.3.14"])
       s.add_runtime_dependency(%q<yamltest>, ["= 0.5.3"])
       s.add_runtime_dependency(%q<json>, [">= 1.1.9"])
       s.add_runtime_dependency(%q<gettext>, ["= 1.93.0"])
       s.add_runtime_dependency(%q<rmagick>, [">= 2.11.1"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.4.0"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 1.4.0"])
       s.add_runtime_dependency(%q<grosser-fast_gettext>, ["~> 0.4.16"])
       s.add_runtime_dependency(%q<thoughtbot-shoulda>, ["= 2.10.2"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
@@ -2040,12 +2040,12 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rails>, ["= 2.3.4"])
       s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
       s.add_dependency(%q<authlogic>, [">= 0"])
-      s.add_dependency(%q<ts-delayed-delta>, [">= 1.0.0"])
+      s.add_dependency(%q<ts-delayed-delta>, [">= 1.0.2"])
       s.add_dependency(%q<pvande-differ>, ["= 0.1.1"])
       s.add_dependency(%q<mislav-will_paginate>, ["~> 2.2.3"])
       s.add_dependency(%q<delayed_job>, [">= 1.8.4"])
       s.add_dependency(%q<syntax>, ["= 1.0.0"])
-      s.add_dependency(%q<thinking-sphinx>, [">= 1.3.1"])
+      s.add_dependency(%q<thinking-sphinx>, [">= 1.3.14"])
       s.add_dependency(%q<yamltest>, ["= 0.5.3"])
       s.add_dependency(%q<json>, [">= 1.1.9"])
       s.add_dependency(%q<gettext>, ["= 1.93.0"])
@@ -2064,12 +2064,12 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rails>, ["= 2.3.4"])
     s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
     s.add_dependency(%q<authlogic>, [">= 0"])
-    s.add_dependency(%q<ts-delayed-delta>, [">= 1.0.0"])
+    s.add_dependency(%q<ts-delayed-delta>, [">= 1.0.2"])
     s.add_dependency(%q<pvande-differ>, ["= 0.1.1"])
     s.add_dependency(%q<mislav-will_paginate>, ["~> 2.2.3"])
     s.add_dependency(%q<delayed_job>, [">= 1.8.4"])
     s.add_dependency(%q<syntax>, ["= 1.0.0"])
-    s.add_dependency(%q<thinking-sphinx>, [">= 1.3.1"])
+    s.add_dependency(%q<thinking-sphinx>, [">= 1.3.14"])
     s.add_dependency(%q<yamltest>, ["= 0.5.3"])
     s.add_dependency(%q<json>, [">= 1.1.9"])
     s.add_dependency(%q<gettext>, ["= 1.93.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zena
 version: !ruby/object:Gem::Version 
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 +01:00
+date: 2010-01-16 00:00:00 +01:00
 default_executable: zena
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,7 +80,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 1.0.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: pvande-differ
@@ -130,7 +130,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.1
+        version: 1.3.14
     version: 
 - !ruby/object:Gem::Dependency 
   name: yamltest
@@ -174,7 +174,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  type: :development
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -473,10 +473,6 @@ files:
 - bricks/captcha/patch/application_helper.rb
 - bricks/captcha/patch/site.rb
 - bricks/captcha/zafu/captcha.rb
-- bricks/delayed_job/README
-- bricks/delayed_job/migrate/20091104191643_create_delayed_jobs_table.rb
-- bricks/delayed_job/misc/init.rb
-- bricks/delayed_job/misc/tasks.rb
 - bricks/math/patch/application_helper.rb
 - bricks/sphinx/MIT-LICENSE
 - bricks/sphinx/README
@@ -493,6 +489,12 @@ files:
 - bricks/tags/test/unit/tags_test.rb
 - bricks/tags/test/zafu/tags.yml
 - bricks/toto.zip
+- bricks/worker/README
+- bricks/worker/migrate/20091104191643_create_delayed_jobs_table.rb
+- bricks/worker/misc/deploy.rb
+- bricks/worker/misc/init.rb
+- bricks/worker/misc/tasks.rb
+- bricks/worker/misc/worker
 - config/boot.rb
 - config/bricks.yml
 - config/database_example.yml
@@ -590,6 +592,7 @@ files:
 - db/migrate/20091101184952_add_session_table.rb
 - db/migrate/20091123175137_add_single_access_token.rb
 - db/migrate/20091124161608_rebuild_fullpath.rb
+- db/migrate/20100115134729_rebuild_fullpath_after_fix.rb
 - db/schema.rb
 - doc/README_FOR_APP
 - doc/fixtures.graffle
@@ -1828,9 +1831,6 @@ files:
 - script/performance/benchmarker
 - script/performance/profiler
 - script/plugin
-- script/process/inspector
-- script/process/reaper
-- script/process/spawner
 - script/runner
 - script/server
 - script/set_revision

data/bricks/delayed_job/misc/tasks.rb

@@ -1,2 +0,0 @@
-require 'delayed_job'
-require 'delayed/tasks'

data/script/process/inspector

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
-require 'commands/process/inspector'

data/script/process/reaper

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
-require 'commands/process/reaper'

data/script/process/spawner

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
-require 'commands/process/spawner'