Merge pull request jhoblitt#42 from jhoblitt/feature/puppet-4.0

Feature/puppet 4.0

.fixtures.yml

@@ -2,7 +2,7 @@ fixtures:
   repositories:
     stdlib:
       repo: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
-      ref:  '4.2.0'
-    shell_config: 'http://tig.csail.mit.edu/git-public/shell_config.git/'
+      ref:  '4.6.0'
+    shell_config: 'https://github.com/jhoblitt/shell_config.git'
   symlinks:
     smartd: "#{source_dir}"

.gitignore

@@ -1,5 +1,7 @@
 .bundle
 Gemfile.lock
+junit/
+log/
 *.orig
 *.patch
 pkg/

.travis.yml

@@ -1,28 +1,18 @@
 sudo: false
 language: ruby
+bundler_args: --without beaker
 rvm:
   - 1.8.7
   - 1.9.3
   - 2.0
   - 2.1
-  - 2.2
 env:
-  - PUPPET_GEM_VERSION="~> 2.7"
-  - PUPPET_GEM_VERSION="~> 3.3"
-  - PUPPET_GEM_VERSION="~> 3.7" FUTURE_PARSER="yes"
+  - PUPPET_GEM_VERSION="~> 3.7"
+  - PUPPET_GEM_VERSION="~> 4.0"
 matrix:
-  allow_failures:
-    - rvm: 2.2
-    - rvm: ruby-head
   exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7"
-    - rvm: 2.0
-      env: PUPPET_GEM_VERSION="~> 2.7"
-    - rvm: 2.1
-      env: PUPPET_GEM_VERSION="~> 2.7"
-    - rvm: 2.2
-      env: PUPPET_GEM_VERSION="~> 2.7"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4.0"
   fast_finish: true
 notifications:
   email: false

Gemfile

@@ -6,15 +6,28 @@ else
   gem 'puppet', :require => false
 end
 
+if facterversion = ENV['FACTER_GEM_VERSION']
+  gem 'facter', facterversion, :require => false
+else
+  gem 'facter', :require => false
+end
+
 group :development, :test do
-  gem 'rake',                    :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'puppet-lint', '>= 1.1.0', :require => false
-  gem 'puppet-syntax',           :require => false
-  gem 'rspec-puppet',
-    :git     => 'https://github.com/rodjek/rspec-puppet.git',
-    :ref     => 'v2.0.0',
-    :require => false
+  gem 'rake',                     :require => false
+  # https://github.com/rspec/rspec-core/issues/1864
+  gem 'rspec', '< 3.2.0', {"platforms"=>["ruby_18"]}
+  gem 'puppetlabs_spec_helper',   :require => false
+  gem 'puppet-lint', '>= 1.1.0',  :require => false
+  gem 'puppet-syntax',            :require => false
+  gem 'rspec-puppet', '~> 2.1.0', :require => false
+  gem 'metadata-json-lint',       :require => false
+end
+
+group :beaker do
+  gem 'serverspec',               :require => false
+  gem 'beaker',                   :require => false
+  gem 'beaker-rspec',             :require => false
+  gem 'pry',                      :require => false
 end
 
 # vim:ft=ruby

Rakefile

@@ -10,7 +10,7 @@ PuppetLint::RakeTask.new :lint do |config|
 end
 
 task :default => [
-  :syntax,
+  :validate,
   :lint,
   :spec,
 ]

manifests/params.pp

@@ -23,7 +23,7 @@
   $default_options    = undef
 
   # smartd.conf < 5.43 does not support the 'DEFAULT' directive
-  if versioncmp($::smartmontools_version, 5.43) >= 0 {
+  if versioncmp($::smartmontools_version, '5.43') >= 0 {
     $enable_default = true
   } else {
     $enable_default = false

metadata.json

@@ -19,7 +19,7 @@
     { "operatingsystem": "FreeBSD" }
   ],
   "dependencies": [
-    { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.2.0 < 5.0.0" },
+    { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.6.0 < 5.0.0" },
     { "name": "csail/shell_config", "version_requirement": ">= 0.0.1" }
   ]
 }

spec/acceptance/nodesets/centos-6.6.yml

@@ -0,0 +1,9 @@
+HOSTS:
+  centos-6.6:
+    roles:
+      - master
+    platform: el-6-x86_64
+    box: chef/centos-6.6
+    hypervisor: vagrant
+CONFIG:
+  type: foss

spec/acceptance/nodesets/centos-7.0.yml

@@ -0,0 +1,9 @@
+HOSTS:
+  centos-7.0:
+    roles:
+      - master
+    platform: el-7-x86_64
+    box: chef/centos-7.0
+    hypervisor: vagrant
+CONFIG:
+  type: foss

spec/acceptance/nodesets/default.yml

@@ -0,0 +1 @@
+centos-7.0.yml

spec/acceptance/nodesets/fedora-21.yml

@@ -0,0 +1,9 @@
+HOSTS:
+  fedora-21:
+    roles:
+      - master
+    platform: fedora-21-x86_64
+    box: chef/fedora-21 
+    hypervisor: vagrant
+CONFIG:
+  type: foss

spec/acceptance/nodesets/ubuntu-12.04.yml

@@ -0,0 +1,9 @@
+HOSTS:
+  ubuntu-12.04:
+    roles:
+      - master
+    platform: ubuntu-12.04-amd64
+    box: chef/ubuntu-12.04
+    hypervisor: vagrant
+CONFIG:
+  type: foss

spec/acceptance/nodesets/ubuntu-14.04.yml

@@ -0,0 +1,9 @@
+HOSTS:
+  ubuntu-14.04:
+    roles:
+      - master
+    platform: ubuntu-14.04-amd64
+    box: chef/ubuntu-14.04
+    hypervisor: vagrant
+CONFIG:
+  type: foss