Use configure_bundler script on travis

.travis.yml

@@ -24,14 +24,12 @@ branches:
     - 'develop'
 
 before_install:
-  - gem install bundler
+  - script/ci/prepare.sh
   - mkdir travis-phantomjs
   - wget http://cifiles.diasporafoundation.org/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
   - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
   - export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
 
-bundler_args: "--deployment --without development --with mysql postgresql --jobs 3 --retry 3"
-
 script: "./script/ci/build.sh"
 
 notifications:

script/ci/build.sh

@@ -1,13 +1,5 @@
 #!/bin/sh
 
-
-# Create a database.yml for the right database
-echo "Setting up database.yml for $DB"
-cp config/database.yml.example config/database.yml
-if [ "$DB" = "mysql" ]; then
-  sed -i 's/*common/*mysql/' config/database.yml
-fi
-
 command="bundle exec rake --trace ci:travis:${BUILD_TYPE}"
 
 exec xvfb-run --auto-servernum --server-num=1 --server-args="-screen 0 1280x1024x8" $command

script/ci/prepare.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Create a database.yml for the right database
+echo "Setting up database.yml for ${DB}"
+cp config/database.yml.example config/database.yml
+if [ "${DB}" = "mysql" ]; then
+  sed -i 's/*common/*mysql/' config/database.yml
+fi
+
+gem install bundler
+script/configure_bundler