Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2

3 files changed, 6 insertions, 5 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index c5c0d5712..da9f5dc21 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://chouette.dryade.priv/ninoxe
-  revision: b272a1637aab7e8692a57ec7a87147c406814903
+  revision: f6eceeafbdf02f5898256c467e86c60a045737ba
   specs:
     ninoxe (0.0.8)
       GeoRuby
@@ -116,7 +116,7 @@ GEM
     bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0146.1)
-    builder (3.0.3)
+    builder (3.0.4)
     capistrano (2.13.3)
       highline
       net-scp (>= 1.0.0)
diff --git a/config/database.yml.ccontrol b/config/database.yml.ccontrol
index c1cccd735..1936af0e1 100644
--- a/config/database.yml.ccontrol
+++ b/config/database.yml.ccontrol
@@ -7,7 +7,7 @@ development:
 
 test:
   adapter: jdbcpostgresql
-  database: <%= ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master" ? "chouette_test" : "chouette_" + ENV["GIT_BRANCH"] + "_test" %>
+  database: <%= (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_test" : "chouette_" + ENV["GIT_BRANCH"] + "_test" %>
   encoding: utf8
   username: chouette
   password: chouette
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index cfd68a1cf..10857e63a 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -1,10 +1,11 @@
 namespace :ci do
-  task :prepare do
+  task :db_config do
     cp "config/database.yml.ccontrol", "config/database.yml"
   end
+  task :prepare => ["ci:db_config", "db:migrate"]
   task :deploy do
     cp "chouette2.war", "/var/lib/tomcat6/webapps/"
   end
-  task :build => ["db:migrate", "spec", "war", "ci:deploy"]
+  task :build => ["spec", "war", "ci:deploy"]
 end