Merge pull request #116 from ghoneycutt/fix_travis

Fix TravisCI

.travis.yml

@@ -22,11 +22,13 @@ env:
     - PUPPET_GEM_VERSION="~> 4.1.0"
     - PUPPET_GEM_VERSION="~> 4.2.0"
     - PUPPET_GEM_VERSION="~> 4.3.0"
+    - PUPPET_GEM_VERSION="~> 4.4.0"
+    - PUPPET_GEM_VERSION="~> 4.5.0"
     - PUPPET_GEM_VERSION="~> 4"
 
 sudo: false
 
-script: 'bundle exec metadata-json-lint metadata.json && bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'
+script: 'bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'
 
 matrix:
   fast_finish: true
@@ -49,6 +51,10 @@ matrix:
       env: PUPPET_GEM_VERSION="~> 4.2.0"
     - rvm: 1.8.7
       env: PUPPET_GEM_VERSION="~> 4.3.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4.4.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4.5.0"
     - rvm: 1.8.7
       env: PUPPET_GEM_VERSION="~> 4"
 

Gemfile

@@ -7,10 +7,10 @@ else
 end
 
 gem 'metadata-json-lint'
-gem 'puppetlabs_spec_helper', '>= 0.1.0'
+gem 'puppetlabs_spec_helper', '>= 1.1.1'
 gem 'facter', '>= 1.7.0'
 gem 'rspec-puppet'
-gem 'puppet-lint', :git => 'https://github.com/rodjek/puppet-lint.git'
+gem 'puppet-lint', '>= 1.0', '< 3.0'
 gem 'puppet-lint-absolute_classname-check'
 gem 'puppet-lint-alias-check'
 gem 'puppet-lint-empty_string-check'
@@ -26,6 +26,11 @@ gem 'puppet-lint-variable_contains_upcase'
 
 # rspec must be v2 for ruby 1.8.7
 if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
-  gem 'rake', '~> 10.0'
+  # rake >=11 does not support ruby 1.8.7
   gem 'rspec', '~> 2.0'
+  gem 'rake', '~> 10.0'
+end
+
+if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '2.0'
+  gem 'json', '~> 1.0'
 end

manifests/init.pp

@@ -207,7 +207,7 @@
         }
       }
       # ensures that sysklogd is absent, which is needed on EL5
-      require 'sysklogd'
+      require '::sysklogd'
     }
     'Debian': {
       $default_logrotate_present = true