capcake 2.0.1 → 2.0.2
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/capcake.rb +9 -2
- data/lib/templates/database.rphp +1 -1
- metadata +3 -3
data/lib/capcake.rb
CHANGED
@@ -168,6 +168,7 @@ Capistrano::Configuration.instance(:must_exist).load do
|
|
168
168
|
logger.important "no previous release to rollback to, rollback of symlink skipped"
|
169
169
|
end
|
170
170
|
end
|
171
|
+
run "rm -rf #{latest_release}/tmp" if (!remote_file_exists?("#{latest_release}/tmp/empty"))
|
171
172
|
run "ln -s #{shared_path}/system #{latest_release}/webroot/system && ln -s #{shared_path}/tmp #{latest_release}/tmp";
|
172
173
|
run "rm -f #{current_path} && ln -s #{latest_release} #{current_path}"
|
173
174
|
cake.database.symlink if (remote_file_exists?(database_path))
|
@@ -441,7 +442,7 @@ Capistrano::Configuration.instance(:must_exist).load do
|
|
441
442
|
set :cake_branch, ENV['BRANCH'] if ENV.has_key?('BRANCH')
|
442
443
|
stream "cd #{cake_path}/cakephp && git checkout #{git_flag_quiet}#{cake_branch}"
|
443
444
|
if cake2
|
444
|
-
run "#{try_sudo} ln -s #{shared_path}/cakephp/lib
|
445
|
+
run "#{try_sudo} ln -s #{shared_path}/cakephp/lib #{deploy_to}/#{version_dir}/lib"
|
445
446
|
else
|
446
447
|
run "#{try_sudo} ln -s #{shared_path}/cakephp/cake #{deploy_to}/#{version_dir}/cake"
|
447
448
|
end
|
@@ -478,7 +479,13 @@ Capistrano::Configuration.instance(:must_exist).load do
|
|
478
479
|
require 'erb'
|
479
480
|
on_rollback { run "rm #{database_path}" }
|
480
481
|
puts "Database configuration"
|
481
|
-
|
482
|
+
if cake2
|
483
|
+
set :db_driver_or_datasource, 'datasource'
|
484
|
+
_cset :db_driver_or_datasource_value, defaults(Capistrano::CLI.ui.ask("datasource [Database/Mysql]:"), 'Database/Mysql')
|
485
|
+
else
|
486
|
+
set :db_driver_or_datasource, 'driver'
|
487
|
+
_cset :db_driver_or_datasource_value, defaults(Capistrano::CLI.ui.ask("driver [mysql]:"), 'mysql')
|
488
|
+
end
|
482
489
|
_cset :db_host, defaults(Capistrano::CLI.ui.ask("hostname [localhost]:"), 'localhost')
|
483
490
|
_cset :db_login, defaults(Capistrano::CLI.ui.ask("username [#{user}]:"), user)
|
484
491
|
_cset :db_password, Capistrano::CLI.password_prompt("password:")
|
data/lib/templates/database.rphp
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
<?php
|
2
2
|
class DATABASE_CONFIG {
|
3
3
|
public $default = array(
|
4
|
-
'
|
4
|
+
'<%= db_driver_or_datasource %>' => '<%= db_driver_or_datasource_value %>',
|
5
5
|
'persistent' => '<%= db_persistent %>',
|
6
6
|
'host' => '<%= db_host %>',
|
7
7
|
'login' => '<%= db_login %>',
|
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 2
|
7
7
|
- 0
|
8
|
-
-
|
9
|
-
version: 2.0.
|
8
|
+
- 2
|
9
|
+
version: 2.0.2
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- Jad Bitar
|
@@ -14,7 +14,7 @@ autorequire:
|
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
16
|
|
17
|
-
date: 2012-
|
17
|
+
date: 2012-02-03 00:00:00 +02:00
|
18
18
|
default_executable:
|
19
19
|
dependencies:
|
20
20
|
- !ruby/object:Gem::Dependency
|