Merge pull request jhoblitt#39 from jhoblitt/feature/future_parser

Feature/future parser

.travis.yml

@@ -1,25 +1,23 @@
 language: ruby
 rvm:
-  # Workaround for travis-ci/travis-ci#2217, we support 1.8.7 MRI generally
-  - 1.8.7-p374
+  - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.4
 env:
-  - PUPPET_GEM_VERSION="2.7.14"
   - PUPPET_GEM_VERSION="~> 2.7"
   - PUPPET_GEM_VERSION="~> 3.3"
+  - PUPPET_GEM_VERSION="~> 3.7" FUTURE_PARSER="yes"
 matrix:
   allow_failures:
     - rvm: ruby-head
   exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="2.7.14"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="2.7.14"
     - rvm: 1.9.3
       env: PUPPET_GEM_VERSION="~> 2.7"
     - rvm: 2.0.0
       env: PUPPET_GEM_VERSION="~> 2.7"
+    - rvm: 2.1.4
+      env: PUPPET_GEM_VERSION="~> 2.7"
   fast_finish: true
 notifications:
   email: false

Gemfile

@@ -6,9 +6,18 @@ else
   gem 'puppet', :require => false
 end
 
-gem 'rake',                    :require => false
-gem 'puppetlabs_spec_helper',  :require => false
-gem 'puppet-lint',             :require => false
-gem 'puppet-syntax',           :require => false
+gem 'rake',                   :require => false
+gem 'puppetlabs_spec_helper', :require => false
+gem 'puppet-lint',            :require => false
+gem 'puppet-syntax',          :require => false
+# The verify_contents method invocations have been updated to work with
+# rspec-puppet 1.0.1+ but are now incompatible with <= 1.0.1
+# https://github.com/rodjek/rspec-puppet/issues/235
+gem 'rspec-puppet',
+  :git => 'https://github.com/rodjek/rspec-puppet.git',
+  :ref => '6ac97993fa972a15851a73d55fe3d1c0a85172b5',
+  :require => false
+# rspec 3 spews warnings with rspec-puppet 1.0.1
+gem 'rspec-core', '~> 2.0',   :require => false
 
 # vim:ft=ruby

lib/facter/megaraid_virtual_drives.rb

@@ -29,6 +29,7 @@
       end
     end
 
+    next nil if vds.empty?
     vds.sort.join(',')
   end
 end

spec/unit/classes/smartd_spec.rb

@@ -30,7 +30,7 @@
       })
     end
     it "should contain File[#{config_file}] with correct contents" do
-      verify_contents(subject, config_file, content)
+      verify_contents(catalogue, config_file, content)
     end
   end
 
@@ -229,7 +229,7 @@
 
       it { should contain_file('/etc/smartd.conf').with_ensure('present') }
       it 'should contain file /etc/smartd.conf with contents ...' do
-        verify_contents(subject, '/etc/smartd.conf', [
+        verify_contents(catalogue, '/etc/smartd.conf', [
           'DEFAULT -m root -M daily',
           'DEVICESCAN somevalue',
         ])
@@ -248,7 +248,7 @@
 
       it { should contain_file('/etc/smartd.conf').with_ensure('present') }
       it 'should contain file /etc/smartd.conf with contents ...' do
-        verify_contents(subject, '/etc/smartd.conf', [
+        verify_contents(catalogue, '/etc/smartd.conf', [
           'DEFAULT -m root -M daily',
           '/dev/sg1',
           '/dev/sg2',
@@ -268,7 +268,7 @@
 
       it { should contain_file('/etc/smartd.conf').with_ensure('present') }
       it 'should contain file /etc/smartd.conf with contents ...' do
-        verify_contents(subject, '/etc/smartd.conf', [
+        verify_contents(catalogue, '/etc/smartd.conf', [
           'DEFAULT -m root -M daily',
           '/dev/sg1 -o on -S on -a',
           '/dev/sg2 -o on -S on -a',
@@ -293,7 +293,7 @@
 
       it { should contain_file('/etc/smartd.conf').with_ensure('present') }
       it 'should contain file /etc/smartd.conf with contents ...' do
-        verify_contents(subject, '/etc/smartd.conf', [
+        verify_contents(catalogue, '/etc/smartd.conf', [
           'DEFAULT -m root -M daily',
           '/dev/cciss/c0d0 -d cciss,0 -a -o on -S on',
           '/dev/cciss/c0d0 -d cciss,1 -a -o on -S on',
@@ -310,7 +310,7 @@
 
       it { should contain_file('/etc/smartd.conf').with_ensure('present') }
       it 'should contain file /etc/smartd.conf with contents ...' do
-        verify_contents(subject, '/etc/smartd.conf', [
+        verify_contents(catalogue, '/etc/smartd.conf', [
           'DEFAULT -m someguy@localdomain -M daily',
         ])
       end
@@ -321,7 +321,7 @@
 
       it { should contain_file('/etc/smartd.conf').with_ensure('present') }
       it 'should contain file /etc/smartd.conf with contents ...' do
-        verify_contents(subject, '/etc/smartd.conf', [
+        verify_contents(catalogue, '/etc/smartd.conf', [
           'DEFAULT -m root -M diminishing',
         ])
       end