.fixtures.yml

@@ -1,7 +1,7 @@
 fixtures:
   repositories:
-    'stdlib':
+    stdlib:
       repo: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
       ref: '4.6.0'
   symlinks:
-    'dnsclient': "#{source_dir}"
+    dnsclient: "#{source_dir}"

.gitignore

@@ -12,7 +12,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-Gemfile.lock
 
 # YARD artifacts
 .yardoc
@@ -22,10 +21,14 @@ doc/
 # Vim
 *.swp
 
+# Eclipse
+.project
+
 # OS X
 .DS_Store
 
 # Puppet
 coverage/
+spec/fixtures/manifests/*
 spec/fixtures/modules/*
-spec/fixtures
+Gemfile.lock

.travis.yml

@@ -26,11 +26,13 @@ env:
     - PUPPET_GEM_VERSION="~> 4.4.0"
     - PUPPET_GEM_VERSION="~> 4.5.0"
     - PUPPET_GEM_VERSION="~> 4.6.0"
+    - PUPPET_GEM_VERSION="~> 4.7.0"
+    - PUPPET_GEM_VERSION="~> 4.8.0"
     - PUPPET_GEM_VERSION="~> 4"
 
 sudo: false
 
-script: 'bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'
+script: 'SPEC_OPTS="--format documentation" bundle exec rake validate lint spec'
 
 matrix:
   fast_finish: true
@@ -59,6 +61,10 @@ matrix:
       env: PUPPET_GEM_VERSION="~> 4.5.0"
     - rvm: 1.8.7
       env: PUPPET_GEM_VERSION="~> 4.6.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4.7.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4.8.0"
     - rvm: 1.8.7
       env: PUPPET_GEM_VERSION="~> 4"
     - rvm: 2.3.1

CHANGELOG

@@ -1,3 +1,9 @@
+3.5.2 - 2016-10-12
+  * Explicitly support puppet-lint v2
+
+3.5.1 - 2016-08-31
+  * No changes, just another release to appease an issue with the Forge.
+
 3.5.0 - 2016-08-31
   * Add support for Ruby v2.3.1
 

Gemfile

@@ -6,11 +6,10 @@ else
   gem 'puppet', :require => false
 end
 
-gem 'metadata-json-lint'
 gem 'puppetlabs_spec_helper', '>= 1.2.0'
 gem 'facter', '>= 1.7.0'
 gem 'rspec-puppet'
-gem 'puppet-lint', '>= 1.0', '< 3.0'
+gem 'puppet-lint', '~> 2.0'
 gem 'puppet-lint-absolute_classname-check'
 gem 'puppet-lint-alias-check'
 gem 'puppet-lint-empty_string-check'
@@ -27,3 +26,5 @@ gem 'rspec',     '~> 2.0'   if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
 gem 'rake',      '~> 10.0'  if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
 gem 'json',      '<= 1.8'   if RUBY_VERSION < '2.0.0'
 gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0'
+gem 'metadata-json-lint', '0.0.11'   if RUBY_VERSION < '1.9'
+gem 'metadata-json-lint'             if RUBY_VERSION >= '1.9'

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2010-2013 Garrett Honeycutt <code@garretthoneycutt.com>
+Copyright (C) 2010-2016 Garrett Honeycutt <code@garretthoneycutt.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "ghoneycutt-dnsclient",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "author": "ghoneycutt",
   "summary": "Manage resolver",
   "license": "Apache-2.0",
@@ -9,14 +9,10 @@
   "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 < 5.0.0"
-    },
-    {
-      "name": "puppet",
-      "version_requirement": ">= 3.0.0 < 5.0.0"
-    }
+    {"name":"puppet","version_requirement":">= 3.0.0 < 5.0.0"}
+  ],
+  "dependencies": [
+    {"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0 < 6.0.0"}
   ],
   "operatingsystem_support": [
     {
@@ -76,8 +72,5 @@
         "12.04"
       ]
     }
-  ],
-  "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0 < 6.0.0"}
   ]
 }

spec/spec_helper.rb

@@ -1,2 +1,16 @@
-require 'rubygems'
 require 'puppetlabs_spec_helper/module_spec_helper'
+
+RSpec.configure do |config|
+  config.hiera_config = 'spec/fixtures/hiera/hiera.yaml'
+  config.before :each do
+    # Ensure that we don't accidentally cache facts and environment between
+    # test cases.  This requires each example group to explicitly load the
+    # facts being exercised with something like
+    # Facter.collection.loader.load(:ipaddress)
+    Facter.clear
+    Facter.clear_messages
+  end
+  config.default_facts = {
+    :environment => 'rp_env',
+  }
+end