serverspec 0.4.4 → 0.4.5

data/lib/serverspec/helper/type.rb

@@ -3,7 +3,7 @@ module Serverspec
     module Type
       types = %w(
         base service package port file cron command linux_kernel_parameter iptables host
-        routing_table default_gateway selinux user group
+        routing_table default_gateway selinux user group zfs ipnat ipfilter
       )
 
       types.each {|type| require "serverspec/type/#{type}" }

data/lib/serverspec/matchers.rb

@@ -41,4 +41,6 @@ require 'serverspec/matchers/return_stdout'
 require 'serverspec/matchers/return_stderr'
 require 'serverspec/matchers/match_md5checksum'
 
+# For explicit types
 require 'serverspec/matchers/have_rule'
+

data/lib/serverspec/matchers/have_rule.rb

@@ -1,6 +1,10 @@
 RSpec::Matchers.define :have_rule do |rule|
-  match do |iptables|
-    iptables.has_rule?(rule, @table, @chain)
+  match do |subject|
+    if subject.class.name == 'Serverspec::Type::Iptables'
+      subject.has_rule?(rule, @table, @chain)
+    else
+      subject.has_rule?(rule)
+    end
   end
   chain :with_table do |table|
     @table = table

data/lib/serverspec/type/ipfilter.rb

@@ -0,0 +1,13 @@
+module Serverspec
+  module Type
+    class Ipfilter < Base
+      def has_rule?(rule)
+        backend.check_ipfilter_rule(nil, rule)
+      end
+
+      def to_s
+        'ipfilter'
+      end
+    end
+  end
+end

data/lib/serverspec/type/ipnat.rb

@@ -0,0 +1,13 @@
+module Serverspec
+  module Type
+    class Ipnat < Base
+      def has_rule?(rule)
+        backend.check_ipnat_rule(nil, rule)
+      end
+
+      def to_s
+        'ipnat'
+      end
+    end
+  end
+end

data/lib/serverspec/type/service.rb

@@ -18,6 +18,10 @@ module Serverspec
           backend.check_running(nil, @name)
         end
       end
+
+      def has_property?(property)
+        backend.check_svcprops(nil, @name, property)
+      end
     end
   end
 end

data/lib/serverspec/type/zfs.rb

@@ -0,0 +1,17 @@
+module Serverspec
+  module Type
+    class Zfs < Base
+      def exists?
+        backend.check_zfs(nil, @name)
+      end
+
+      def has_property?(property)
+        backend.check_zfs(nil, @name, property)
+      end
+
+      def to_s
+        'ZFS'
+      end
+    end
+  end
+end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/spec/solaris/ipfilter_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Solaris
+
+describe ipfilter do
+  it { should have_rule 'pass in quick on lo0 all' }
+end

data/spec/solaris/ipnat_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Solaris
+
+describe ipnat do
+  it { should have_rule 'map net1 192.168.0.0/24 -> 0.0.0.0/32' }
+end

data/spec/solaris/svcprop_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Solaris
+
+describe service('svc:/network/http:apache22') do
+  it { should have_property 'httpd/enable_64bit' => false }
+  it { should have_property 'httpd/enable_64bit' => false, 'httpd/server_type'  => 'worker' }
+end

data/spec/solaris/zfs_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Solaris
+
+describe zfs('rpool') do
+  it { should exist }
+  it { should have_property 'mountpoint' => '/rpool'  }
+  it { should have_property 'mountpoint' => '/rpool', 'compression' => 'off' }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -220,6 +220,8 @@ files:
 - lib/serverspec/type/file.rb
 - lib/serverspec/type/group.rb
 - lib/serverspec/type/host.rb
+- lib/serverspec/type/ipfilter.rb
+- lib/serverspec/type/ipnat.rb
 - lib/serverspec/type/iptables.rb
 - lib/serverspec/type/linux_kernel_parameter.rb
 - lib/serverspec/type/package.rb
@@ -228,6 +230,7 @@ files:
 - lib/serverspec/type/selinux.rb
 - lib/serverspec/type/service.rb
 - lib/serverspec/type/user.rb
+- lib/serverspec/type/zfs.rb
 - lib/serverspec/version.rb
 - serverspec.gemspec
 - spec/darwin/command_spec.rb
@@ -298,12 +301,16 @@ files:
 - spec/solaris/file_spec.rb
 - spec/solaris/group_spec.rb
 - spec/solaris/host_spec.rb
+- spec/solaris/ipfilter_spec.rb
+- spec/solaris/ipnat_spec.rb
 - spec/solaris/matchers_spec.rb
 - spec/solaris/package_spec.rb
 - spec/solaris/port_spec.rb
 - spec/solaris/routing_table_spec.rb
 - spec/solaris/service_spec.rb
+- spec/solaris/svcprop_spec.rb
 - spec/solaris/user_spec.rb
+- spec/solaris/zfs_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_command_examples.rb
 - spec/support/shared_cron_examples.rb
@@ -414,12 +421,16 @@ test_files:
 - spec/solaris/file_spec.rb
 - spec/solaris/group_spec.rb
 - spec/solaris/host_spec.rb
+- spec/solaris/ipfilter_spec.rb
+- spec/solaris/ipnat_spec.rb
 - spec/solaris/matchers_spec.rb
 - spec/solaris/package_spec.rb
 - spec/solaris/port_spec.rb
 - spec/solaris/routing_table_spec.rb
 - spec/solaris/service_spec.rb
+- spec/solaris/svcprop_spec.rb
 - spec/solaris/user_spec.rb
+- spec/solaris/zfs_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_command_examples.rb
 - spec/support/shared_cron_examples.rb