update travis tests

Gemfile

@@ -1,15 +1,19 @@
 source 'https://rubygems.org'
+puppetversion = ENV.key?('PUPPET_VERSION') ? "=#{ENV['PUPPET_VERSION']}" : ['>= 2.7']
+
+gem 'puppet', puppetversion
 
 group :development, :test do
-  gem 'rake',                   :require => false
+  gem 'puppet-blacksmith'
-  gem 'puppet-lint',            :require => false
+  gem 'puppet-lint'
-  gem 'rspec-puppet',           :require => false
+  gem 'puppetlabs_spec_helper'
-  gem 'puppetlabs_spec_helper', :require => false
+  gem 'rake', '>=0.9.2.2'
-  gem 'rspec', '< 3.2.0', {"platforms"=>["ruby_18"]}
+  gem 'rspec-puppet'
 end
 
-if puppetversion = ENV['PUPPET_GEM_VERSION']
+group :system_tests do
-  gem 'puppet', puppetversion, :require => false
+  gem 'beaker-rspec', :require => false
-else
+  gem 'serverspec',   :require => false
-  gem 'puppet', :require => false
 end
+
+gem 'hiera-puppet', :require => false

Rakefile

@@ -1,6 +1,10 @@
 require 'puppetlabs_spec_helper/rake_tasks'
-
+require 'puppet_blacksmith/rake_tasks'
-# Enable puppet-lint for all manifests: rake lint
 require 'puppet-lint/tasks/puppet-lint'
+require 'rake'
+require 'rspec/core/rake_task'
+
 PuppetLint.configuration.send("disable_80chars")    # no warnings on lines over 80 chars.
 PuppetLint.configuration.ignore_paths = ["spec/fixtures/**/*.pp"]
+
+task :default => [:spec, :lint]