Merge pull request #23 from petems/remove_class_swap_files

Remove Class for Swap file

Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 group :test do
   gem 'rake'
-  gem 'puppet', ENV['PUPPET_VERSION'] || '~> 3.4.0'
+  gem 'puppet', ENV['PUPPET_VERSION'] || '~> 3.8.0'
   gem 'puppet-lint'
   gem 'rspec-puppet', :git => 'https://github.com/rodjek/rspec-puppet.git'
   gem 'puppet-syntax'

Gemfile.lock

@@ -224,10 +224,10 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    puppet (3.4.3)
-      facter (~> 1.6)
+    puppet (3.8.1)
+      facter (> 1.6, < 3)
       hiera (~> 1.0)
-      rgen (~> 0.6.5)
+      json_pure
     puppet-blacksmith (3.2.0)
       puppet (>= 2.7.16)
       rest-client
@@ -256,7 +256,6 @@ GEM
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     retriable (1.4.1)
-    rgen (0.6.6)
     rspec (3.2.0)
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
@@ -332,7 +331,7 @@ DEPENDENCIES
   beaker-rspec
   guard-rake
   metadata-json-lint
-  puppet (~> 3.4.0)
+  puppet (~> 3.8.0)
   puppet-blacksmith
   puppet-lint
   puppet-module
@@ -343,3 +342,6 @@ DEPENDENCIES
   simplecov
   travis
   travis-lint
+
+BUNDLED WITH
+   1.10.5

README.markdown

@@ -66,7 +66,7 @@ class { 'swap_file':
 
 However, this had many problems, such as not being able to declare more than one swap_file because of duplicate class errors.
 
-This is now deprecated and will give a warning. 
+This is now removed from 2.x.x onwards.
 
 ##Limitations
 

metadata.json

@@ -43,7 +43,7 @@
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": ">= 3.2.0 < 3.4.0"
+      "version_requirement": ">= 3.2.0"
     },
     {
       "name": "puppet",

spec/acceptance/swap_file_files_multiple_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper_acceptance'
+
+describe 'swap_file class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+
+  context 'multiple swap_file::files', :unless => ['FreeBSD'].include?(fact('osfamily')) do
+    it 'should work with no errors' do
+      pp = <<-EOS
+      swap_file::files { 'tmp file swap 1':
+      ensure   => present,
+        swapfile => '/tmp/swapfile1',
+      }
+
+      swap_file::files { 'tmp file swap 2':
+      ensure   => present,
+        swapfile => '/tmp/swapfile2',
+      }
+      EOS
+
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes  => true)
+    end
+    it 'should contain the given swapfile' do
+      shell('/sbin/swapon -s | grep /tmp/swapfile1', :acceptable_exit_codes => [0])
+      shell('/sbin/swapon -s | grep /tmp/swapfile2', :acceptable_exit_codes => [0])
+    end
+    it 'should contain the default fstab setting' do
+      shell('cat /etc/fstab | grep /tmp/swapfile1', :acceptable_exit_codes => [0])
+      shell('cat /etc/fstab | grep /tmp/swapfile2', :acceptable_exit_codes => [0])
+    end
+  end
+end

spec/acceptance/swap_file_files_parameters_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper_acceptance'
+
+describe 'swap_file class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+
+  context 'swap_file' do
+    context 'custom parameters' do
+      it 'should work with no errors' do
+        pp = <<-EOS
+        swap_file::files { 'tmp file swap':
+          ensure   => present,
+          swapfile => '/tmp/swapfile',
+        }
+        EOS
+
+        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, :catch_changes  => true)
+      end
+      it 'should contain the given swapfile' do
+        if ["FreeBSD"].include?(fact('osfamily'))
+          shell('/usr/sbin/swapinfo | grep /dev/md99', :acceptable_exit_codes => [0])
+        else
+          shell('/sbin/swapon -s | grep /tmp/swapfile', :acceptable_exit_codes => [0])
+        end
+      end
+      it 'should contain the given fstab setting' do
+        shell('cat /etc/fstab | grep /tmp/swapfile', :acceptable_exit_codes => [0])
+        if ["FreeBSD"].include?(fact('osfamily'))
+          shell('cat /etc/fstab | grep md99', :acceptable_exit_codes => [0])
+        else
+          shell('cat /etc/fstab | grep defaults', :acceptable_exit_codes => [0])
+        end
+      end
+    end
+  end
+end