serverspec 0.2.15 → 0.2.16

data/lib/serverspec/filter.rb

@@ -7,8 +7,10 @@ module Serverspec
       %w( abi crypto debug dev fs kernel net sunrpc vm ).each do |param|
         if description_args.match(/^#{param}\./)
           ret = backend(Serverspec::Commands::Base).do_check("sysctl -q -n #{description_args}")
+          val = ret[:stdout].strip
+          val = val.to_i if val.match(/^\d+$/)
           subject = Serverspec::Subject.new
-          subject.value(ret[:stdout].strip.to_i)
+          subject.value(val)
           return subject
         end
       end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.2.15"
+  VERSION = "0.2.16"
 end

data/spec/debian/matchers_spec.rb

@@ -58,5 +58,7 @@ describe 'Serverspec matchers of Debian family', :os => :debian do
   it_behaves_like 'support return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
   it_behaves_like 'support return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
 
-  it_behaves_like 'support linux kernel parameter checking', 'net.ipv4.tcp_syncookies'
+  it_behaves_like 'support linux kernel parameter checking with integer', 'net.ipv4.tcp_syncookies', 1
+  it_behaves_like 'support linux kernel parameter checking with string',  'kernel.osrelease', '2.6.32-131.0.15.el6.x86_64'
+  it_behaves_like 'support linux kernel parameter checking with regexp',  'net.ipv4.tcp_wmem', /4096\t16384\t4194304/
 end

data/spec/gentoo/matchers_spec.rb

@@ -59,5 +59,7 @@ describe 'Serverspec matchers of Gentoo family', :os => :gentoo do
   it_behaves_like 'support return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
   it_behaves_like 'support return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
 
-  it_behaves_like 'support linux kernel parameter checking', 'net.ipv4.tcp_syncookies'
+  it_behaves_like 'support linux kernel parameter checking with integer', 'net.ipv4.tcp_syncookies', 1
+  it_behaves_like 'support linux kernel parameter checking with string',  'kernel.osrelease', '2.6.32-131.0.15.el6.x86_64'
+  it_behaves_like 'support linux kernel parameter checking with regexp',  'net.ipv4.tcp_wmem', /4096\t16384\t4194304/
 end

data/spec/redhat/matchers_spec.rb

@@ -64,5 +64,7 @@ describe 'Serverspec matchers of Red Hat family', :os => :redhat do
   it_behaves_like 'support return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
   it_behaves_like 'support return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
 
-  it_behaves_like 'support linux kernel parameter checking', 'net.ipv4.tcp_syncookies'
+  it_behaves_like 'support linux kernel parameter checking with integer', 'net.ipv4.tcp_syncookies', 1
+  it_behaves_like 'support linux kernel parameter checking with string',  'kernel.osrelease', '2.6.32-131.0.15.el6.x86_64'
+  it_behaves_like 'support linux kernel parameter checking with regexp',  'net.ipv4.tcp_wmem', /4096\t16384\t4194304/
 end

data/spec/support/shared_matcher_examples.rb

@@ -791,20 +791,56 @@ shared_examples_for 'support return_stderr matcher with regexp' do |command, con
   end
 end
 
-shared_examples_for 'support linux kernel parameter checking' do |param|
+shared_examples_for 'support linux kernel parameter checking with integer' do |param, value|
   describe 'linux kernel parameter' do
     before :all do
       RSpec.configure do |c|
-        c.stdout = "1\n"
+        c.stdout = "#{value}\n"
       end
     end
 
     context param do
-      its(:value) { should eq 1 }
+      its(:value) { should eq value }
     end
 
     context param do
-      its(:value) { should_not eq 0 }
+      its(:value) { should_not eq value + 1 }
+    end
+  end
+end
+
+shared_examples_for 'support linux kernel parameter checking with string' do |param, value|
+  describe 'linux kernel parameter' do
+    before :all do
+      RSpec.configure do |c|
+        c.stdout = "#{value}\n"
+      end
+    end
+
+    context param do
+      its(:value) { should eq value }
+    end
+
+    context param do
+      its(:value) { should_not eq value + '_suffix' }
+    end
+  end
+end
+
+shared_examples_for 'support linux kernel parameter checking with regexp' do |param, regexp|
+  describe 'linux kernel parameter' do
+    before :all do
+      RSpec.configure do |c|
+        c.stdout = "4096	16384	4194304\n"
+      end
+    end
+
+    context param do
+      its(:value) { should match regexp }
+    end
+
+    context param do
+      its(:value) { should_not match /invalid-string/ }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-28 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh