Merge pull request #72 from bodepd/update_travis_no_2_6

Update travis no 2 6

.fixtures.yml

@@ -6,6 +6,5 @@ fixtures:
     "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
     "rabbitmq": "git://github.com/puppetlabs/puppetlabs-rabbitmq.git"
     'inifile':  'git://github.com/cprice-puppet/puppetlabs-inifile'
-    "create_resources": 'git://github.com/puppetlabs/puppetlabs-create_resources'
   symlinks:
     "glance": "#{source_dir}"

.gemfile

@@ -1,5 +0,0 @@
-source :rubygems
-
-puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
-gem 'puppet', puppetversion
-gem 'puppetlabs_spec_helper', '>= 0.1.0'

.travis.yml

@@ -1,18 +1,29 @@
 language: ruby
+bundler_args: --without development
+script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
 rvm:
   - 1.8.7
-before_script:
-after_script:
-script: "rake spec"
+  - 1.9.3
+  - ruby-head
 branches:
   only:
-    - master
-    - folsom
-    - essex
+   - master
+   - folsom
+   - essex
 env:
-  - PUPPET_VERSION=2.7.13
-  - PUPPET_VERSION=2.7.6
-  - PUPPET_VERSION=2.6.9
+  - PUPPET_GEM_VERSION="~> 2.7"
+  - PUPPET_GEM_VERSION="~> 3.0"
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+  exclude:
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION="~> 2.7"
+    - rvm: ruby-head
+      env: PUPPET_GEM_VERSION="~> 2.7"
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION="~> 2.6"
+    - rvm: ruby-head
+      env: PUPPET_GEM_VERSION="~> 2.6"
 notifications:
   email: false
-gemfile: .gemfile

Gemfile

@@ -0,0 +1,13 @@
+source :rubygems
+
+group :development, :test do
+  gem 'puppetlabs_spec_helper', :require => false
+end
+
+if puppetversion = ENV['PUPPET_GEM_VERSION']
+  gem 'puppet', puppetversion, :require => false
+else
+  gem 'puppet', :require => false
+end
+
+# vim:ft=ruby