Merge pull request #647 from mterzo/3.0.0

Remove 1.8 references.

.travis.yml

@@ -13,9 +13,6 @@ rvm:
   - 2.1.9
   - 2.3.1
   - 2.4.0
-matrix:
-  allow_failures:
-  - rvm: 1.8.7
 notifications:
   email:
     - tim@bombasticmonkey.com

Gemfile

@@ -6,6 +6,7 @@ group :test do
   gem 'rake', '~> 10.0'
   gem 'rspec-its', '~> 1.0'
   gem 'rspec-collection_matchers', '~> 1.0'
+  gem 'rspec-json_expectations', '~> 1.4'
 
   if RUBY_VERSION < '2.0'
     # json 2.x requires ruby 2.0. Lock to 1.8
@@ -20,18 +21,10 @@ group :test do
     gem 'rspec', '~> 3.0'
     gem 'json'
   end
-
-  if RUBY_VERSION > '1.8'
-    # requires ruby 1.9+, on 1.8 we'll fall back to the old regex parsing
-    gem 'rspec-json_expectations', '~> 1.4'
-  end
 end
 
 group :development do
-  # For Changelog generation
-  if RUBY_VERSION > '1.9'
-    gem 'github_changelog_generator',                                 :require => false if RUBY_VERSION >= '2.2.2'
-    gem 'github_changelog_generator', '~> 1.13.0',                    :require => false if RUBY_VERSION < '2.2.2'
-    gem 'rack', '~> 1.0',                                             :require => false if RUBY_VERSION < '2.2.2'
-  end
+  gem 'github_changelog_generator',                                 :require => false if RUBY_VERSION >= '2.2.2'
+  gem 'github_changelog_generator', '~> 1.13.0',                    :require => false if RUBY_VERSION < '2.2.2'
+  gem 'rack', '~> 1.0',                                             :require => false if RUBY_VERSION < '2.2.2'
 end

spec/spec_helper.rb

@@ -1,11 +1,7 @@
 require 'puppet-lint'
 require 'rspec/its'
 require 'rspec/collection_matchers'
-begin
-  require 'rspec/json_expectations'
-rescue LoadError, SyntaxError
-  puts 'rspec/json_expectations is not available'
-end
+require 'rspec/json_expectations'
 
 module RSpec
   module LintExampleGroup