Update puppet and ruby versions.

.fixtures.yml

@@ -4,7 +4,4 @@ fixtures:
     repositories:
       stdlib:
         repo: https://github.com/puppetlabs/puppetlabs-stdlib.git
-        ref: 4.6.0
-      hieradata:
-        repo: 'git@gitlab.com:singlestone/hieradata.git'
     forge_modules:

.travis.yml

@@ -1,14 +1,21 @@
-branches:
-script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
+---
+
+before_install:
+  - rm -f Gemfile.lock
+
 bundler_args: --without development
 
-rvm:
-- 1.9.3
-- 2.0.0
-- 2.1.5
-- 2.2.0
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 3.2"
-    - PUPPET_GEM_VERSION="~> 3.7"
+cache: bundler
+
+matrix:
+  include:
+    - env: PUPPET_GEM_VERSION="~> 4.10"
+      rvm: 2.1.9
+    - env: PUPPET_GEM_VERSION="~> 5.5"
+      rvm: 2.4.5
+    - env: PUPPET_GEM_VERSION="~> 6.0"
+      rvm: 2.5.1
+
+script:
+  - bundle exec rake spec SPEC_OPTS='--format documentation'
 

Gemfile

@@ -1,22 +1,23 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 group :test do
-  gem "rake"
-  gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.7.3'
-  gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet.git'
-  gem "puppetlabs_spec_helper"
+  gem 'rake'
+  gem 'puppet', ENV['PUPPET_VERSION']
+  gem 'rspec'
+  gem 'rspec-puppet', :git => 'https://github.com/rodjek/rspec-puppet.git'
+  gem 'puppetlabs_spec_helper'
   gem 'rspec-puppet-utils', :git => 'https://github.com/Accuity/rspec-puppet-utils.git'
   # there seems to be a bug with puppet-blacksmith and metadata-json-lint
   # removing metadata for now
-  gem "metadata-json-lint"
+  gem 'metadata-json-lint'
   gem 'puppet-syntax'
   gem 'puppet-lint'
   gem 'awesome_print'
 end
 
 group :development do
-  gem "travis"
-  gem "travis-lint"
-  gem "puppet-blacksmith"
+  gem 'travis'
+  gem 'travis-lint'
+  gem 'puppet-blacksmith'
 end
 

spec/spec_helper.rb

@@ -1,3 +1,8 @@
+RSpec.configure do |c|
+    c.formatter = 'documentation'
+    c.mock_with :rspec
+end
+
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet-utils'
 
@@ -9,8 +14,3 @@ def fixtures_path
 
 # Uncomment this to show coverage report, also useful for debugging
 #at_exit { RSpec::Puppet::Coverage.report! }
-
-RSpec.configure do |c|
-    c.formatter = 'documentation'
-    c.mock_with :rspec
-end