serverspec 0.2.6 → 0.2.7

data/lib/serverspec/commands/base.rb

@@ -104,6 +104,18 @@ module Serverspec
       def check_ipfilter_rule rule
         raise NotImplementedError.new
       end
+
+      def check_ipnat_rule rule
+        raise NotImplementedError.new
+      end
+
+      def check_svcprop svc, property, value
+        raise NotImplementedError.new
+      end
+
+      def check_svcprops svc, property
+        raise NotImplementedError.new
+      end
     end
   end
 end

data/lib/serverspec/commands/solaris.rb

@@ -38,6 +38,21 @@ module Serverspec
         "/sbin/ipfstat -io 2> /dev/null | grep '#{rule}'"
       end
 
+      def check_ipnat_rule rule
+        "/sbin/ipnat -l 2> /dev/null | grep '^#{rule}$'"
+      end
+
+      def check_svcprop svc, property, value
+        "svcprop -p #{property} #{svc} | grep ^#{value}$"
+      end
+
+      def check_svcprops svc, property
+        commands = []
+        property.sort.each do |key, value|
+          commands << "svcprop -p #{key} #{svc} | grep ^#{value}$"
+        end
+        commands.join(' && ')
+      end
     end
   end
 end

data/lib/serverspec/matchers.rb

@@ -21,3 +21,6 @@ require 'serverspec/matchers/be_readable'
 require 'serverspec/matchers/be_writable'
 require 'serverspec/matchers/be_executable'
 require 'serverspec/matchers/have_ipfilter_rule'
+require 'serverspec/matchers/have_ipnat_rule'
+require 'serverspec/matchers/have_svcprop'
+require 'serverspec/matchers/have_svcprops'

data/lib/serverspec/matchers/have_ipnat_rule.rb

@@ -0,0 +1,5 @@
+RSpec::Matchers.define :have_ipnat_rule do |rule|
+  match do |ipnat|
+    backend.check_ipnat_rule(example, rule)
+  end
+end

data/lib/serverspec/matchers/have_svcprop.rb

@@ -0,0 +1,9 @@
+RSpec::Matchers.define :have_svcprop do |property|
+  match do |svc|
+    backend.check_svcprop(example, svc, property, @value)
+  end
+
+  chain :with_value do |value|
+    @value = value
+  end
+end

data/lib/serverspec/matchers/have_svcprops.rb

@@ -0,0 +1,5 @@
+RSpec::Matchers.define :have_svcprops do |property|
+  match do |svc|
+    backend.check_svcprops(example, svc, property)
+  end
+end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/spec/solaris/commands_spec.rb

@@ -119,3 +119,21 @@ describe commands.check_ipfilter_rule('pass in quick on lo0 all') do
   it { should eq "/sbin/ipfstat -io 2> /dev/null | grep 'pass in quick on lo0 all'" }
 end
 
+describe commands.check_ipnat_rule('map net1 192.168.0.0/24 -> 0.0.0.0/32') do
+  it { should eq "/sbin/ipnat -l 2> /dev/null | grep '^map net1 192.168.0.0/24 -> 0.0.0.0/32$'" }
+end
+
+
+
+describe commands.check_svcprop('svc:/network/http:apache22', 
+                                'httpd/enable_64bit','false') do 
+  it { should eq "svcprop -p httpd/enable_64bit svc:/network/http:apache22 | grep ^false$" }
+end
+
+describe commands.check_svcprops('svc:/network/http:apache22', {
+  'httpd/enable_64bit' => 'false',
+  'httpd/server_type'  => 'worker',
+}) do
+  it { should eq "svcprop -p httpd/enable_64bit svc:/network/http:apache22 | grep ^false$ && svcprop -p httpd/server_type svc:/network/http:apache22 | grep ^worker$" }
+end
+

data/spec/solaris/matchers_spec.rb

@@ -53,4 +53,9 @@ describe 'Serverspec matchers of Solaris family', :os => :solaris do
   it_behaves_like 'support be_executable_by_others matcher', '/dev'
 
   it_behaves_like 'support have_ipfilter_rule matcher', 'pass in quick on lo0 all'
+
+  it_behaves_like 'support have_ipnat_rule matcher', 'map net1 192.168.0.0/24 -> 0.0.0.0/32'
+
+  it_behaves_like 'support have_svcprop.with_value matcher', 'svc:/network/http:apache22', 'httpd/server_type', 'worker'
+  it_behaves_like 'support have_svcprops matcher', 'svc:/network/http:apache22', {'httpd/enable_64bit' => 'false', 'httpd/server_type' => 'worker' }
 end

data/spec/support/shared_matcher_examples.rb

@@ -644,3 +644,38 @@ shared_examples_for 'support have_ipfilter_rule matcher' do |rule|
   end
 end
 
+shared_examples_for 'support have_ipnat_rule matcher' do |rule|
+  describe 'have_ipnat_rule' do
+    describe 'ipnat' do
+      it { should have_ipnat_rule rule }
+    end
+
+    describe 'ipnat' do
+      it { should_not have_ipnat_rule 'invalid-rule' }
+    end
+  end
+end
+
+shared_examples_for 'support have_svcprop.with_value matcher' do |svc, property, value|
+  describe 'have_svcprop' do
+    describe svc do
+      it { should have_svcprop(property).with_value(value) }
+    end
+
+    describe 'this-is-invalid-svc' do
+      it { should_not have_svcprop(property).with_value(value) }
+    end
+  end
+end
+
+shared_examples_for 'support have_svcprops matcher' do |svc, property|
+  describe 'have_svcprop' do
+    describe svc do
+      it { should have_svcprops(property) }
+    end
+
+    describe 'this-is-invalid-svc' do
+      it { should_not have_svcprops(property) }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -133,7 +133,10 @@ files:
 - lib/serverspec/matchers/get_stdout.rb
 - lib/serverspec/matchers/have_cron_entry.rb
 - lib/serverspec/matchers/have_ipfilter_rule.rb
+- lib/serverspec/matchers/have_ipnat_rule.rb
 - lib/serverspec/matchers/have_iptables_rule.rb
+- lib/serverspec/matchers/have_svcprop.rb
+- lib/serverspec/matchers/have_svcprops.rb
 - lib/serverspec/setup.rb
 - lib/serverspec/version.rb
 - serverspec.gemspec