serverspec 0.5.3 → 0.5.4

data/lib/serverspec.rb

@@ -39,6 +39,7 @@ RSpec.configure do |c|
   c.add_setting :sudo_password, :default => nil
   Serverspec.configuration.defaults.each { |k, v| c.add_setting k, :default => v }
   c.before :each do
+    backend.set_example(example)
     if described_class.nil?
       puts
       puts "*****************************************"
@@ -72,6 +73,18 @@ module RSpec
             message
           end
         end
+        def failure_message_for_should_not(&block)
+          if block.to_s =~ /serverspec\/matchers\/.+\.rb/
+            @custom = true
+          end
+          if @custom
+            cache_or_call_cached(:failure_message_for_should, &block)
+          else
+            message =  "#{example.metadata[:command]}\n"
+            message += "#{example.metadata[:stdout]}"
+            message
+          end
+        end
       end
     end
   end

data/lib/serverspec/backend/exec.rb

@@ -1,8 +1,16 @@
+require 'singleton'
+
 module Serverspec
   module Backend
     class Exec
-      def initialize(commands)
-        @commands ||= commands
+      include Singleton
+
+      def set_commands(c)
+        @commands = c
+      end
+
+      def set_example(e)
+        @example = e
       end
 
       def commands
@@ -16,7 +24,7 @@ module Serverspec
         # In ruby 1.9, it is possible to use Open3.capture3, but not in 1.8
         #stdout, stderr, status = Open3.capture3(cmd)
 
-        if ! @example.nil?
+        if @example
           @example.metadata[:command] = cmd
           @example.metadata[:stdout]  = stdout
         end
@@ -49,13 +57,10 @@ module Serverspec
 
       # Default action is to call check_zero with args
       def method_missing(meth, *args, &block)
-        # Remove example object from *args
-        @example = args.shift
         check_zero(meth, *args)
       end
 
-      def check_running(example, process)
-        @example = example
+      def check_running(process)
         ret = run_command(commands.check_running(process))
         if ret[:exit_status] == 1 || ret[:stdout] =~ /stopped/
           ret = run_command(commands.check_process(process))
@@ -63,14 +68,12 @@ module Serverspec
         ret[:exit_status] == 0
       end
 
-      def check_running_under_supervisor(example, process)
-        @example = example
+      def check_running_under_supervisor(process)
         ret = run_command(commands.check_running_under_supervisor(process))
         ret[:exit_status] == 0 && ret[:stdout] =~ /RUNNING/
       end
 
-      def check_readable(example, file, by_whom)
-        @example = example
+      def check_readable(file, by_whom)
         mode = sprintf('%04s',run_command(commands.get_mode(file))[:stdout].strip)
         mode = mode.split('')
         mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
@@ -86,8 +89,7 @@ module Serverspec
         end
       end
 
-      def check_writable(example, file, by_whom)
-        @example = example
+      def check_writable(file, by_whom)
         mode = sprintf('%04s',run_command(commands.get_mode(file))[:stdout].strip)
         mode = mode.split('')
         mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
@@ -103,8 +105,7 @@ module Serverspec
         end
       end
 
-      def check_executable(example, file, by_whom)
-        @example = example
+      def check_executable(file, by_whom)
         mode = sprintf('%04s',run_command(commands.get_mode(file))[:stdout].strip)
         mode = mode.split('')
         mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
@@ -120,8 +121,7 @@ module Serverspec
         end
       end
 
-      def check_mounted(example, path, expected_attr, only_with)
-        @example = example
+      def check_mounted(path, expected_attr, only_with)
         ret = run_command(commands.check_mounted(path))
         if expected_attr.nil? || ret[:exit_status] != 0
           return ret[:exit_status] == 0
@@ -154,8 +154,7 @@ module Serverspec
         end
       end
 
-      def check_routing_table(example, expected_attr)
-        @example = example
+      def check_routing_table(expected_attr)
         return false if ! expected_attr[:destination]
         ret = run_command(commands.check_routing_table(expected_attr[:destination]))
         return false if ret[:exit_status] != 0

data/lib/serverspec/backend/ssh.rb

@@ -7,10 +7,12 @@ module Serverspec
         cmd = build_command(cmd)
         cmd = add_pre_command(cmd)
         ret = ssh_exec!(cmd)
-        if ! @example.nil?
+
+        if @example
           @example.metadata[:command] = cmd
           @example.metadata[:stdout]  = ret[:stdout]
         end
+
         ret
       end
 

data/lib/serverspec/helper/exec.rb

@@ -2,7 +2,9 @@ module Serverspec
   module Helper
     module Exec
       def backend(commands_object=nil)
-        Serverspec::Backend::Exec.new(commands_object || commands)
+        instance = Serverspec::Backend::Exec.instance
+        instance.set_commands(commands_object || commands)
+        instance
       end
     end
   end

data/lib/serverspec/helper/ssh.rb

@@ -2,7 +2,9 @@ module Serverspec
   module Helper
     module Ssh
       def backend(commands_object=nil)
-        Serverspec::Backend::Ssh.new(commands_object || commands)
+        instance = Serverspec::Backend::Ssh.instance
+        instance.set_commands(commands_object || commands)
+        instance
       end
     end
   end

data/lib/serverspec/matchers/be_default_gateway.rb

@@ -1,7 +1,6 @@
 RSpec::Matchers.define :be_default_gateway do
   match do |ip_address|
     backend.check_routing_table(
-      example,
       {
         :destination => 'default',
         :gateway     => ip_address,

data/lib/serverspec/matchers/be_directory.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :be_directory do
     if actual.respond_to?(:directory?)
       actual.directory?
     else
-      backend.check_directory(example, actual)
+      backend.check_directory(actual)
     end
   end
 end

data/lib/serverspec/matchers/be_disabled.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :be_disabled do
     if subject.respond_to?(:disabled?)
       subject.disabled?
     else
-      backend.check_selinux(example, 'disabled')
+      backend.check_selinux('disabled')
     end
   end
 end

data/lib/serverspec/matchers/be_enabled.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :be_enabled do
     if name.respond_to?(:enabled?)
       name.enabled?
     else
-      backend.check_enabled(example, name)
+      backend.check_enabled(name)
     end
   end
 end

data/lib/serverspec/matchers/be_enforcing.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :be_enforcing do
     if subject.respond_to?(:enforcing?)
       subject.enforcing?
     else
-      backend.check_selinux(example, 'enforcing')
+      backend.check_selinux('enforcing')
     end
   end
 end

data/lib/serverspec/matchers/be_executable.rb

@@ -4,9 +4,9 @@ RSpec::Matchers.define :be_executable do
       file.executable?(@by_whom, @by_user)
     else
       if @by_user != nil
-        backend.check_access_by_user(example, file, @by_user, 'x')
+        backend.check_access_by_user(file, @by_user, 'x')
       else
-        backend.check_executable(example, file, @by_whom)
+        backend.check_executable(file, @by_whom)
       end
     end
   end

data/lib/serverspec/matchers/be_file.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :be_file do
     if actual.respond_to?(:file?)
       actual.file?
     else
-      backend.check_file(example, actual)
+      backend.check_file(actual)
     end
   end
 end

data/lib/serverspec/matchers/be_group.rb

@@ -1,5 +1,5 @@
 RSpec::Matchers.define :be_group do
   match do |actual|
-    backend.check_group(example, actual)
+    backend.check_group(actual)
   end
 end

data/lib/serverspec/matchers/be_grouped_into.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :be_grouped_into do |group|
     if file.respond_to?(:grouped_into?)
       file.grouped_into?(group)
     else
-      backend.check_grouped(example, file, group)
+      backend.check_grouped(file, group)
     end
   end
 end

data/lib/serverspec/matchers/be_installed.rb

@@ -4,7 +4,7 @@ RSpec::Matchers.define :be_installed do
       name.installed?(@provider, @version)
     else
       if @provider.nil?
-        backend.check_installed(example, name)
+        backend.check_installed(name)
       else
         check_method = "check_installed_by_#{@provider}".to_sym
 
@@ -12,7 +12,7 @@ RSpec::Matchers.define :be_installed do
           raise ArgumentError.new("`be_installed` matcher doesn't support #{@under}")
         end
 
-        backend.send(check_method, example, name, @version)
+        backend.send(check_method, name, @version)
       end
     end
   end

data/lib/serverspec/matchers/be_linked_to.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :be_linked_to do |target|
     if link.respond_to?(:linked_to?)
       link.linked_to?(target)
     else
-      backend.check_link(example, link, target)
+      backend.check_link(link, target)
     end
   end
 end

data/lib/serverspec/matchers/be_listening.rb

@@ -4,7 +4,7 @@ RSpec::Matchers.define :be_listening do
       actual.listening?
     else
       port = actual.gsub(/port\s+/, '')
-      backend.check_listening(example, port)
+      backend.check_listening(port)
     end
   end
 end

data/lib/serverspec/matchers/be_mode.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :be_mode do |mode|
     if file.respond_to?(:mode?)
       file.mode?(mode)
     else
-      backend.check_mode(example, file, mode)
+      backend.check_mode(file, mode)
     end
   end
 end

data/lib/serverspec/matchers/be_mounted.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :be_mounted do
     if path.respond_to?(:mounted?)
       path.mounted?(@attr, @only_with)
     else
-      backend.check_mounted(example, path, @attr, @only_with)
+      backend.check_mounted(path, @attr, @only_with)
     end
   end
   chain :with do |attr|

data/lib/serverspec/matchers/be_owned_by.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :be_owned_by do |owner|
     if file.respond_to?(:owned_by?)
       file.owned_by?(owner)
     else
-      backend.check_owner(example, file, owner)
+      backend.check_owner(file, owner)
     end
   end
 end

data/lib/serverspec/matchers/be_permissive.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :be_permissive do
     if subject.respond_to?(:permissive?)
       subject.permissive?
     else
-      backend.check_selinux(example, 'permissive')
+      backend.check_selinux('permissive')
     end
   end
 end

data/lib/serverspec/matchers/be_reachable.rb

@@ -11,7 +11,7 @@ RSpec::Matchers.define :be_reachable  do
     if host.respond_to?(:reachable?)
       host.reachable?(port, proto, timeout)
     else
-      backend.check_reachable(example, host, port, proto, timeout)
+      backend.check_reachable(host, port, proto, timeout)
     end
   end
 

data/lib/serverspec/matchers/be_readable.rb

@@ -4,9 +4,9 @@ RSpec::Matchers.define :be_readable do
       file.readable?(@by_whom, @by_user)
     else
       if @by_user != nil
-        backend.check_access_by_user(example, file, @by_user, 'r')
+        backend.check_access_by_user(file, @by_user, 'r')
       else
-        backend.check_readable(example, file, @by_whom)
+        backend.check_readable(file, @by_whom)
       end
     end
   end

data/lib/serverspec/matchers/be_resolvable.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :be_resolvable do
     if name.respond_to?(:resolvable?)
       name.resolvable?(@type)
     else
-      backend.check_resolvable(example, name, @type)
+      backend.check_resolvable(name, @type)
     end
   end
   chain :by do |type|

data/lib/serverspec/matchers/be_running.rb

@@ -10,9 +10,9 @@ RSpec::Matchers.define :be_running do
           raise ArgumentError.new("`be_running` matcher doesn't support #{@under}")
         end
 
-        backend.send(check_method, example, process)
+        backend.send(check_method, process)
       else
-        backend.check_running(example, process)
+        backend.check_running(process)
       end
     end
   end

data/lib/serverspec/matchers/be_user.rb

@@ -1,5 +1,5 @@
 RSpec::Matchers.define :be_user do
   match do |actual|
-    backend.check_user(example, actual)
+    backend.check_user(actual)
   end
 end

data/lib/serverspec/matchers/be_writable.rb

@@ -4,9 +4,9 @@ RSpec::Matchers.define :be_writable do
       file.writable?(@by_whom, @by_user)
     else
       if @by_user != nil
-        backend.check_access_by_user(example, file, @by_user, 'w')
+        backend.check_access_by_user(file, @by_user, 'w')
       else
-        backend.check_writable(example, file, @by_whom)
+        backend.check_writable(file, @by_whom)
       end
     end
   end

data/lib/serverspec/matchers/be_zfs.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_zfs do
   match do |zfs|
-    backend.check_zfs(example, zfs, @property)
+    backend.check_zfs(zfs, @property)
   end
 
   chain :with do |property|

data/lib/serverspec/matchers/belong_to_group.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :belong_to_group do |group|
     if user.respond_to?(:belongs_to_group?)
       user.belongs_to_group?(group)
     else
-      backend.check_belonging_group(example, user, group)
+      backend.check_belonging_group(user, group)
     end
   end
 end

data/lib/serverspec/matchers/have_authorized_key.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :have_authorized_key do |key|
     if user.respond_to?(:has_authorized_key?)
       user.has_authorized_key?(key)
     else
-      backend.check_authorized_key(example, user, key)
+      backend.check_authorized_key(user, key)
     end
   end
 end

data/lib/serverspec/matchers/have_cron_entry.rb

@@ -1,7 +1,7 @@
 RSpec::Matchers.define :have_cron_entry do |entry|
   match do |actual|
     @user ||= 'root'
-    backend.check_cron_entry(example, @user, entry)
+    backend.check_cron_entry(@user, entry)
   end
   chain :with_user do |user|
     @user = user

data/lib/serverspec/matchers/have_entry.rb

@@ -5,7 +5,7 @@ RSpec::Matchers.define :have_entry do |entry|
     elsif subject.respond_to?(:has_entry?)
       subject.has_entry?(entry)
     else
-      backend.check_routing_table(example, entry)
+      backend.check_routing_table(entry)
     end
   end
   # For cron type

data/lib/serverspec/matchers/have_gid.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :have_gid do |gid|
     if group.respond_to?(:has_gid?)
       group.has_gid?(gid)
     else
-      backend.check_gid(example, group, gid)
+      backend.check_gid(group, gid)
     end
   end
 end

data/lib/serverspec/matchers/have_home_directory.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :have_home_directory do |path_to_home|
     if user.respond_to?(:has_home_directory?)
       user.has_home_directory?(path_to_home)
     else
-      backend.check_home_directory(example, user, path_to_home)
+      backend.check_home_directory(user, path_to_home)
     end
   end
 end

data/lib/serverspec/matchers/have_ipfilter_rule.rb

@@ -1,5 +1,5 @@
 RSpec::Matchers.define :have_ipfilter_rule do |rule|
   match do |iptables|
-    backend.check_ipfilter_rule(example, rule)
+    backend.check_ipfilter_rule(rule)
   end
 end

data/lib/serverspec/matchers/have_ipnat_rule.rb

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

data/lib/serverspec/matchers/have_iptables_rule.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :have_iptables_rule do |rule|
   match do |iptables|
-    backend.check_iptables_rule(example, rule, @table, @chain)
+    backend.check_iptables_rule(rule, @table, @chain)
   end
   chain :with_table do |table|
     @table = table

data/lib/serverspec/matchers/have_login_shell.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :have_login_shell do |path_to_shell|
     if user.respond_to?(:has_login_shell?)
       user.has_login_shell?(path_to_shell)
     else
-      backend.check_login_shell(example, user, path_to_shell)
+      backend.check_login_shell(user, path_to_shell)
     end
   end
 end

data/lib/serverspec/matchers/have_svcprop.rb

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

data/lib/serverspec/matchers/have_svcprops.rb

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

data/lib/serverspec/matchers/have_uid.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :have_uid do |uid|
     if user.respond_to?(:has_uid?)
       user.has_uid?(uid)
     else
-      backend.check_uid(example, user, uid)
+      backend.check_uid(user, uid)
     end
   end
 end

data/lib/serverspec/matchers/match_md5checksum.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :match_md5checksum do |pattern|
     if file.respond_to?(:match_md5checksum)
       file.match_md5checksum(pattern)
     else
-      backend.check_file_md5checksum(example, file, pattern)
+      backend.check_file_md5checksum(file, pattern)
     end
   end
 end

data/lib/serverspec/type/cron.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class Cron < Base
       def has_entry?(user, entry)
-        backend.check_cron_entry(nil, user, entry)
+        backend.check_cron_entry(user, entry)
       end
       def to_s
         'Cron'

data/lib/serverspec/type/file.rb

@@ -2,67 +2,67 @@ module Serverspec
   module Type
     class File < Base
       def file?
-        backend.check_file(nil, @name)
+        backend.check_file(@name)
       end
 
       def directory?
-        backend.check_directory(nil, @name)
+        backend.check_directory(@name)
       end
 
       def contain(pattern, from, to)
         if (@from || @to).nil?
-          cmd = backend.check_file_contain(nil, @name, pattern)
+          cmd = backend.check_file_contain(@name, pattern)
         else
-          cmd = backend.check_file_contain_within(nil, @name, pattern, from, to)
+          cmd = backend.check_file_contain_within(@name, pattern, from, to)
         end
       end
 
       def mode?(mode)
-        backend.check_mode(nil, @name, mode)
+        backend.check_mode(@name, mode)
       end
 
       def owned_by?(owner)
-        backend.check_owner(nil, @name, owner)
+        backend.check_owner(@name, owner)
       end
 
       def grouped_into?(group)
-        backend.check_grouped(nil, @name, group)
+        backend.check_grouped(@name, group)
       end
 
       def linked_to?(target)
-        backend.check_link(nil, @name, target)
+        backend.check_link(@name, target)
       end
 
       def readable?(by_whom, by_user)
         if by_user != nil
-          backend.check_access_by_user(nil, @name, by_user, 'r')
+          backend.check_access_by_user(@name, by_user, 'r')
         else
-          backend.check_readable(nil, @name, by_whom)
+          backend.check_readable(@name, by_whom)
         end
       end
 
       def writable?(by_whom, by_user)
         if by_user != nil
-          backend.check_access_by_user(nil, @name, by_user, 'w')
+          backend.check_access_by_user(@name, by_user, 'w')
         else
-          backend.check_writable(nil, @name, by_whom)
+          backend.check_writable(@name, by_whom)
         end
       end
 
       def executable?(by_whom, by_user)
         if by_user != nil
-          backend.check_access_by_user(nil, @name, by_user, 'x')
+          backend.check_access_by_user(@name, by_user, 'x')
         else
-          backend.check_executable(nil, @name, by_whom)
+          backend.check_executable(@name, by_whom)
         end
       end
 
       def mounted?(attr, only_with)
-        backend.check_mounted(nil, @name, attr, only_with)
+        backend.check_mounted(@name, attr, only_with)
       end
 
       def match_md5checksum(md5sum)
-        backend.check_file_md5checksum(nil, @name, md5sum)
+        backend.check_file_md5checksum(@name, md5sum)
       end
 
     end

data/lib/serverspec/type/group.rb

@@ -2,11 +2,11 @@ module Serverspec
   module Type
     class Group < Base
       def exists?
-        backend.check_group(nil, @name)
+        backend.check_group(@name)
       end
 
       def has_gid?(gid)
-        backend.check_gid(nil, @name, gid)
+        backend.check_gid(@name, gid)
       end
     end
   end

data/lib/serverspec/type/host.rb

@@ -2,11 +2,11 @@ module Serverspec
   module Type
     class Host < Base
       def resolvable?(type)
-        backend.check_resolvable(nil, @name, type)
+        backend.check_resolvable(@name, type)
       end
 
       def reachable?(port, proto, timeout)
-        backend.check_reachable(nil, @name, port, proto, timeout)
+        backend.check_reachable(@name, port, proto, timeout)
       end
     end
   end

data/lib/serverspec/type/ipfilter.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class Ipfilter < Base
       def has_rule?(rule)
-        backend.check_ipfilter_rule(nil, rule)
+        backend.check_ipfilter_rule(rule)
       end
 
       def to_s

data/lib/serverspec/type/ipnat.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class Ipnat < Base
       def has_rule?(rule)
-        backend.check_ipnat_rule(nil, rule)
+        backend.check_ipnat_rule(rule)
       end
 
       def to_s

data/lib/serverspec/type/iptables.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class Iptables < Base
       def has_rule?(rule, table, chain)
-        backend.check_iptables_rule(nil, rule, table, chain)
+        backend.check_iptables_rule(rule, table, chain)
       end
       def to_s
         'iptables'

data/lib/serverspec/type/package.rb

@@ -3,7 +3,7 @@ module Serverspec
     class Package < Base
       def installed?(provider, version)
         if provider.nil?
-          backend.check_installed(nil, @name)
+          backend.check_installed(@name)
         else
           check_method = "check_installed_by_#{provider}".to_sym
 
@@ -11,7 +11,7 @@ module Serverspec
             raise ArgumentError.new("`be_installed` matcher doesn't support #{provider}")
           end
 
-          backend.send(check_method, nil, @name, version)
+          backend.send(check_method, @name, version)
         end
       end
     end

data/lib/serverspec/type/port.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class Port < Base
       def listening?
-        backend.check_listening(nil, @name)
+        backend.check_listening(@name)
       end
     end
   end

data/lib/serverspec/type/routing_table.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class RoutingTable < Base
       def has_entry?(entry)
-        backend.check_routing_table(nil, entry)
+        backend.check_routing_table(entry)
       end
 
       def to_s

data/lib/serverspec/type/selinux.rb

@@ -2,15 +2,15 @@ module Serverspec
   module Type
     class Selinux < Base
       def disabled?
-        backend.check_selinux(nil, 'disabled')
+        backend.check_selinux('disabled')
       end
 
       def enforcing?
-        backend.check_selinux(nil, 'enforcing')
+        backend.check_selinux('enforcing')
       end
 
       def permissive?
-        backend.check_selinux(nil, 'permissive')
+        backend.check_selinux('permissive')
       end
 
       def to_s

data/lib/serverspec/type/service.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class Service < Base
       def enabled?
-        backend.check_enabled(nil, @name)
+        backend.check_enabled(@name)
       end
 
       def running? under
@@ -13,14 +13,14 @@ module Serverspec
             raise ArgumentError.new("`be_running` matcher doesn't support #{@under}")
           end
 
-          backend.send(check_method, nil, @name)
+          backend.send(check_method, @name)
         else
-          backend.check_running(nil, @name)
+          backend.check_running(@name)
         end
       end
 
       def has_property?(property)
-        backend.check_svcprops(nil, @name, property)
+        backend.check_svcprops(@name, property)
       end
     end
   end

data/lib/serverspec/type/user.rb

@@ -2,27 +2,27 @@ module Serverspec
   module Type
     class User < Base
       def exists?
-        backend.check_user(nil, @name)
+        backend.check_user(@name)
       end
 
       def belongs_to_group?(group)
-        backend.check_belonging_group(nil, @name, group)
+        backend.check_belonging_group(@name, group)
       end
 
       def has_uid?(uid)
-        backend.check_uid(nil, @name, uid)
+        backend.check_uid(@name, uid)
       end
 
       def has_home_directory?(path)
-        backend.check_home_directory(nil, @name, path)
+        backend.check_home_directory(@name, path)
       end
 
       def has_login_shell?(shell)
-        backend.check_login_shell(nil, @name, shell)
+        backend.check_login_shell(@name, shell)
       end
 
       def has_authorized_key?(key)
-        backend.check_authorized_key(nil, @name, key)
+        backend.check_authorized_key(@name, key)
       end
     end
   end

data/lib/serverspec/type/zfs.rb

@@ -2,11 +2,11 @@ module Serverspec
   module Type
     class Zfs < Base
       def exists?
-        backend.check_zfs(nil, @name)
+        backend.check_zfs(@name)
       end
 
       def has_property?(property)
-        backend.check_zfs(nil, @name, property)
+        backend.check_zfs(@name, property)
       end
 
       def to_s

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/spec/helpers/attributes_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
+require 'serverspec/helper/base'
 
+include Serverspec::Helper::Base
 include Serverspec::Helper::Attributes
 
 describe 'Attributes Helper' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh