Merge pull request #72 from branan/travisci

Update Travis CI config

.travis.yml

@@ -1,22 +1,16 @@
 language: ruby
 rvm:
   - 1.8.7
-  - 1.9.2
-  - ree
 before_script:
-  - "[ '2.6.12' = $PUPPET_VERSION ] && git clone git://github.com/puppetlabs/puppetlabs-create_resources.git spec/fixtures/modules/create_resources || true"
+  - "[ '2.6.9' = $PUPPET_VERSION ] && git clone git://github.com/puppetlabs/puppetlabs-create_resources.git spec/fixtures/modules/create_resources || true"
 after_script:
 script: "rake spec"
 branches:
   only:
-    - tb/travis
+    - master
 env:
-  - PUPPET_VERSION=2.6.12
+  - PUPPET_VERSION=2.7.13
   - PUPPET_VERSION=2.7.6
-  - PUPPET_VERSION=2.7.9
-matrix:
-  exclude:
-    - rvm: 1.9.2
-      env: PUPPET_VERSION=2.6.12
+  - PUPPET_VERSION=2.6.9
 notifications:
   email: false

Gemfile

@@ -10,4 +10,5 @@ group :test do
   gem 'rake', '>= 0.9.0'
   gem 'rspec', '>= 2.8.0'
   gem 'rspec-puppet', '>= 0.1.1'
+  gem 'mocha', '>= 0.11.0'
 end