capcake 2.0.1 → 2.0.2

data/lib/capcake.rb

@@ -168,6 +168,7 @@ Capistrano::Configuration.instance(:must_exist).load do
           logger.important "no previous release to rollback to, rollback of symlink skipped"
         end
       end
+      run "rm -rf #{latest_release}/tmp" if (!remote_file_exists?("#{latest_release}/tmp/empty"))
       run "ln -s #{shared_path}/system #{latest_release}/webroot/system && ln -s #{shared_path}/tmp #{latest_release}/tmp";
       run "rm -f #{current_path} && ln -s #{latest_release} #{current_path}"
       cake.database.symlink if (remote_file_exists?(database_path))
@@ -441,7 +442,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       set :cake_branch, ENV['BRANCH'] if ENV.has_key?('BRANCH')
       stream "cd #{cake_path}/cakephp && git checkout #{git_flag_quiet}#{cake_branch}"
       if cake2
-        run "#{try_sudo} ln -s #{shared_path}/cakephp/lib/Cake #{deploy_to}/#{version_dir}/Cake"
+        run "#{try_sudo} ln -s #{shared_path}/cakephp/lib #{deploy_to}/#{version_dir}/lib"
       else
         run "#{try_sudo} ln -s #{shared_path}/cakephp/cake #{deploy_to}/#{version_dir}/cake"
       end
@@ -478,7 +479,13 @@ Capistrano::Configuration.instance(:must_exist).load do
         require 'erb'
         on_rollback { run "rm #{database_path}" }
         puts "Database configuration"
-        _cset :db_driver, defaults(Capistrano::CLI.ui.ask("driver [mysql]:"), 'mysql')
+        if cake2
+          set :db_driver_or_datasource, 'datasource'
+          _cset :db_driver_or_datasource_value, defaults(Capistrano::CLI.ui.ask("datasource [Database/Mysql]:"), 'Database/Mysql')
+        else
+          set :db_driver_or_datasource, 'driver'
+          _cset :db_driver_or_datasource_value, defaults(Capistrano::CLI.ui.ask("driver [mysql]:"), 'mysql')
+        end
         _cset :db_host, defaults(Capistrano::CLI.ui.ask("hostname [localhost]:"), 'localhost')
         _cset :db_login, defaults(Capistrano::CLI.ui.ask("username [#{user}]:"), user)
         _cset :db_password, Capistrano::CLI.password_prompt("password:")

data/lib/templates/database.rphp

@@ -1,7 +1,7 @@
 <?php
 class DATABASE_CONFIG {
    public $default = array(
-       'driver' => '<%= db_driver %>',
+       '<%= db_driver_or_datasource %>' => '<%= db_driver_or_datasource_value %>',
        'persistent' => '<%= db_persistent %>',
        'host' => '<%= db_host %>',
        'login' => '<%= db_login %>',

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Jad Bitar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-28 00:00:00 +02:00
+date: 2012-02-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency