From 61fadf2931408b3558e128e284aef569ff27b4f5 Mon Sep 17 00:00:00 2001
From: Jonathan Hartman <j@p4nt5.com>
Date: Mon, 13 Apr 2015 18:04:17 -0700
Subject: [PATCH] Update Travis config

---
 .kitchen.travis.yml |  2 +-
 .travis.yml         | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
index 5dd3909..9f19f19 100644
--- a/.kitchen.travis.yml
+++ b/.kitchen.travis.yml
@@ -3,4 +3,4 @@ driver:
   name: digitalocean
 
 platforms:
-  - name: ubuntu-14.04-x64
+  - name: ubuntu-14-04-x64
diff --git a/.travis.yml b/.travis.yml
index 5572590..e0799de 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,23 @@
 language: ruby
 
+cache: bundler
+sudo: true
+
 install:
-  - wget -P /tmp https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chefdk_0.2.0-2_amd64.deb
-  - sudo dpkg -i /tmp/chefdk_0.2.0-2_amd64.deb
-  - sudo chef exec /opt/chefdk/embedded/bin/bundle install --without=development integration
+  - curl -L https://www.opscode.com/chef/install.sh | sudo bash -s -- -P chefdk
+  - chef exec bundle install --without=development
 
 before_script:
-  - ssh-keygen -f $DIGITALOCEAN_SSH_KEY_FILE -b 768 -P ''
   # Pending ENV support in Kitchen's Rake tasks and not just the CLI
   - cp .kitchen.travis.yml .kitchen.local.yml
-  - chef exec /opt/chefdk/embedded/bin/rake upload_key
+  - echo -e $DIGITALOCEAN_SSH_KEY_BODY > ~/.ssh/id_rsa
 
-script: chef exec /opt/chefdk/embedded/bin/rake
+script:
+  - chef exec rake && chef exec rake kitchen:all
 
 after_script:
-  - chef exec /opt/chefdk/embedded/bin/rake delete_key
+  - chef exec kitchen destroy
 
 env:
   global:
     # - KITCHEN_LOCAL_YAML=.kitchen.travis.yml
-    - DIGITALOCEAN_SSH_KEY_FILE=~/.ssh/id_rsa
-    - secure: AT0wkka32uo1DJwLoYBnXOKrg5JZrUV9Kumxb5xx/SP0aDeFRxKw2zClrnTWFhQntreNAv/Y0DIjmgG/dtZ5bfBZCF/8wIVM+A7sQH4BmOdIwoKFmzNL3ce8sWOW5xzUY3wSVBLDpko4ChI//+9NhG+hog3CMXG5mQi3TmGLP5U=
-    - secure: pi2bVnsDIyoE/y9W6gR944lXPfnMmB7uTeCsx5JSE/wkE3XitRgFLMKc66GXZT6JhtGbhUDIMwnG26GPZoWa8EHj7LQ6JH+xu8/HVvwPtMQmUBRPWYQ/IjF17TaAfYP4lZ7WBlDPztfYX/fiP1AiSVYLp+JJmVbx5v3Uaahrv/4=