.travis.yml

@@ -1,18 +1,39 @@
 ---
-env:
-- PUPPET_VERSION=3.3.2
-- PUPPET_VERSION=3.4.2
-notifications:
-email: false
+language: ruby
+
 rvm:
-- 2.0.0
-- 1.9.3
-- 1.8.7
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+
+env:
+  matrix:
+    - PUPPET_GEM_VERSION="~> 3.1.0"
+    - PUPPET_GEM_VERSION="~> 3.2.0"
+    - PUPPET_GEM_VERSION="~> 3.3.0"
+    - PUPPET_GEM_VERSION="~> 3.4.0"
+    - PUPPET_GEM_VERSION="~> 3.5.1"
+    - PUPPET_GEM_VERSION="~> 3.6.0"
+    - PUPPET_GEM_VERSION="~> 3.7.0"
+
+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'
+
 matrix:
   fast_finish: true
-  allow_failures:
-  - rvm: 2.0.0
-language: ruby
-before_script: "gem install --no-ri --no-rdoc bundler"
-script: 'bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'
-gemfile: Gemfile
+  exclude:
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 3.1.0"
+    - rvm: 2.1.0
+      env: PUPPET_GEM_VERSION="~> 3.1.0"
+    - rvm: 2.1.0
+      env: PUPPET_GEM_VERSION="~> 3.2.0"
+    - rvm: 2.1.0
+      env: PUPPET_GEM_VERSION="~> 3.3.0"
+    - rvm: 2.1.0
+      env: PUPPET_GEM_VERSION="~> 3.4.0"
+
+notifications:
+  email: false

Gemfile

@@ -1,7 +1,17 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 3.3']
-gem 'puppet', puppetversion
+if puppetversion = ENV['PUPPET_GEM_VERSION']
+  gem 'puppet', puppetversion, :require => false
+else
+  gem 'puppet', :require => false
+end
+
+gem 'metadata-json-lint'
 gem 'puppetlabs_spec_helper', '>= 0.1.0'
-gem 'puppet-lint', '>= 0.3.2'
-gem 'facter', '>= 1.7.0', "< 1.8.0"
+gem 'puppet-lint', '>= 1.0.0'
+gem 'facter', '>= 1.7.0'
+
+# rspec must be v2 for ruby 1.8.7
+if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
+  gem 'rspec', '~> 2.0'
+end

README.markdown → README.md

@@ -10,7 +10,7 @@ code with no modifications to the module itself as a guiding principle.
 
 # Compatibility #
 
-This module has been tested to work on the following systems with Puppet v3.x and Ruby versions 1.8.7 and 1.9.3.
+This module has been tested to work on the following systems with Puppet v3.x on Ruby versions 1.8.7, 1.9.3, 2.0.0 and 2.1.0.
 
  * EL 5
  * EL 6

Rakefile

@@ -1,10 +1,10 @@
-require 'rubygems'
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.relative = true
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
 
-desc "Run puppet in noop mode and check for syntax errors."
+desc 'Validate manifests, templates, and ruby files'
 task :validate do
   Dir['manifests/**/*.pp'].each do |manifest|
     sh "puppet parser validate --noop #{manifest}"

metadata.json

@@ -1,21 +1,21 @@
 {
   "name": "ghoneycutt-dnsclient",
-  "version": "3.1.1",
+  "version": "3.3.0",
   "author": "ghoneycutt",
   "summary": "Manage resolver",
-  "license": "Apache License, Version 2.0",
+  "license": "Apache-2.0",
   "source": "git://github.com/ghoneycutt/puppet-module-dnsclient.git",
   "project_page": "https://github.com/ghoneycutt/puppet-module-dnsclient/",
   "issues_url": "https://github.com/ghoneycutt/puppet-module-dnsclient/issues",
   "description": "Manage a DNS client's resolver",
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": ">= 3.0.0"
+      "version_requirement": ">= 3.0.0 < 4.0.0"
     },
     {
       "name": "puppet",
-      "version_requirement": ">= 3.0.0"
+      "version_requirement": ">= 3.0.0 < 4.0.0"
     }
   ],
   "operatingsystem_support": [
@@ -29,28 +29,32 @@
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "5",
-        "6"
+        "6",
+        "7"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "5",
-        "6"
+        "6",
+        "7"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
         "5",
-        "6"
+        "6",
+        "7"
       ]
     },
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
         "5",
-        "6"
+        "6",
+        "7"
       ]
     },
     {
@@ -74,6 +78,6 @@
     }
   ],
   "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">= 3.2.0"}
+    {"name":"puppetlabs/stdlib","version_requirement":">= 3.2.0 < 6.0.0"}
   ]
 }