Merge pull request datamapper#274 from joshk/patch-1

Use the new build env on Travis

.travis.yml

@@ -1,16 +1,5 @@
 language: ruby
-services:
-  - mysql
-  - postgresql
-before_script:
-  - mysql -e "create database datamapper_alternate_tests;"
-  - mysql -e "create database datamapper_default_tests;"
-  - psql  -c "create database datamapper_default_tests;" -U postgres
-  - psql  -c "create database datamapper_alternate_tests;" -U postgres
-before_install:
-  - gem install bundler
-bundler_args: --without yard guard metrics benchmarks
-script: "bundle exec rake spec"
+
 rvm:
   - ree
   - 1.8.7
@@ -20,16 +9,30 @@ rvm:
   - rbx-18mode
   - rbx-19mode
   - jruby-18mode
+
 env:
   - "GIT_BRANCH=release-1.2 ADAPTER=in_memory"
   - "GIT_BRANCH=release-1.2 ADAPTER=yaml"
   - "GIT_BRANCH=release-1.2 ADAPTER=sqlite"
   - "GIT_BRANCH=release-1.2 ADAPTER=mysql DM_DB_USER=root DM_DB_PASSWORD=''"
   - "GIT_BRANCH=release-1.2 ADAPTER=postgres DM_DB_USER=postgres DM_DB_PASSWORD=''"
-notifications:
-  irc: "irc.freenode.org#datamapper"
-  email:
-    - [email protected]
+
+sudo: false
+
+services:
+  - mysql
+  - postgresql
+
+before_script:
+  - mysql -e "create database datamapper_alternate_tests;"
+  - mysql -e "create database datamapper_default_tests;"
+  - psql  -c "create database datamapper_default_tests;" -U postgres
+  - psql  -c "create database datamapper_alternate_tests;" -U postgres
+
+bundler_args: --without yard guard metrics benchmarks --retry 3
+
+script: "bundle exec rake spec"
+
 matrix:
   allow_failures:
     - rvm: rbx-19mode
@@ -39,6 +42,12 @@ matrix:
       env: JRUBY_OPTS="$JRUBY_OPTS --debug"
     - rvm: jruby-head
       env: JRUBY_OPTS="$JRUBY_OPTS --debug"
+
 branches:
   only:
     - /^release-.*$/
+
+notifications:
+  irc: "irc.freenode.org#datamapper"
+  email:
+    - [email protected]