serverspec 2.0.0.beta2 → 2.0.0.beta3

data/lib/serverspec/type/interface.rb

@@ -2,14 +2,14 @@ module Serverspec
   module Type
     class Interface < Base
       def speed
-        ret = backend.run_command(commands.get_interface_speed_of(@name))
+        ret = @runner.run_command(commands.get_interface_speed_of(@name))
         val = ret.stdout.strip
         val = val.to_i if val.match(/^\d+$/)
         val
       end
 
       def has_ipv4_address?(ip_address)
-        backend.check_ipv4_address(@name, ip_address)
+        @runner.check_ipv4_address(@name, ip_address)
       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(rule)
+        @runner.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(rule)
+        @runner.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(rule, table, chain)
+        @runner.check_iptables_rule(rule, table, chain)
       end
 
       def to_s

data/lib/serverspec/type/kernel_module.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class KernelModule < Base
       def loaded?
-        backend.check_kernel_module_loaded(@name)
+        @runner.check_kernel_module_loaded(@name)
       end
     end
   end

data/lib/serverspec/type/linux_kernel_parameter.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class LinuxKernelParameter < Base
       def value
-        ret = backend.run_command("/sbin/sysctl -q -n #{@name}")
+        ret = @runner.run_command("/sbin/sysctl -q -n #{@name}")
         val = ret.stdout.strip
         val = val.to_i if val.match(/^\d+$/)
         val

data/lib/serverspec/type/lxc.rb

@@ -2,11 +2,11 @@ module Serverspec
   module Type
     class Lxc < Base
       def exists?
-        backend.check_container(@name)
+        @runner.check_container(@name)
       end
 
       def running?
-        backend.check_container_running(@name)
+        @runner.check_container_running(@name)
       end
 
       def to_s

data/lib/serverspec/type/mail_alias.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class MailAlias < Base
       def aliased_to?(target)
-        backend.check_mail_alias(@name, target)
+        @runner.check_mail_alias(@name, target)
       end
     end
   end

data/lib/serverspec/type/package.rb

@@ -3,20 +3,20 @@ module Serverspec
     class Package < Base
       def installed?(provider, version)
         if provider.nil?
-          backend.check_installed(@name, version)
+          @runner.check_installed(@name, version)
         else
           check_method = "check_installed_by_#{provider}".to_sym
 
-          unless backend.respond_to?(check_method) || commands.respond_to?(check_method)
+          unless @runner.respond_to?(check_method) || commands.respond_to?(check_method)
             raise ArgumentError.new("`be_installed` matcher doesn't support #{provider}")
           end
 
-          backend.send(check_method, @name, version)
+          @runner.send(check_method, @name, version)
         end
       end
 
       def version
-        ret = backend.run_command(commands.get_package_version(@name)).stdout.strip
+        ret = @runner.run_command(commands.get_package_version(@name)).stdout.strip
         if ret.empty?
           nil
         else

data/lib/serverspec/type/php_config.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class PhpConfig < Base
       def value
-        ret = backend.run_command("php -r 'echo get_cfg_var( \"#{@name}\" );'")
+        ret = @runner.run_command("php -r 'echo get_cfg_var( \"#{@name}\" );'")
         val = ret.stdout
         val = val.to_i if val.match(/^\d+$/)
         val

data/lib/serverspec/type/port.rb

@@ -8,9 +8,9 @@ module Serverspec
             raise ArgumentError.new("`be_listening` matcher doesn't support #{protocol}")
           end
 
-          backend.check_listening_with_protocol(@name, protocol)
+          @runner.check_listening_with_protocol(@name, protocol)
         else
-          backend.check_listening(@name)
+          @runner.check_listening(@name)
         end
       end
     end

data/lib/serverspec/type/process.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class Process < Base
       def running?
-        pid = backend.run_command(commands.get_process(@name, :format => "pid=")).stdout
+        pid = @runner.run_command(commands.get_process(@name, :format => "pid=")).stdout
         not pid.empty?
       end
 
@@ -19,7 +19,7 @@ module Serverspec
       end
 
       def get_column(keyword)
-        ret = backend.get_process(@name, :format => "#{keyword}=")
+        ret = @runner.get_process(@name, :format => "#{keyword}=")
         val = ret.stdout.strip
         val = val.to_i if val.match(/^\d+$/)
         val

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(entry)
+        @runner.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('disabled')
+        @runner.check_selinux('disabled')
       end
 
       def enforcing?
-        backend.check_selinux('enforcing')
+        @runner.check_selinux('enforcing')
       end
 
       def permissive?
-        backend.check_selinux('permissive')
+        @runner.check_selinux('permissive')
       end
 
       def to_s

data/lib/serverspec/type/service.rb

@@ -2,15 +2,15 @@ module Serverspec
   module Type
     class Service < Base
       def enabled?(level=3)
-        backend.check_enabled(@name, level)
+        @runner.check_enabled(@name, level)
       end
 
       def installed?(name, version)
-        backend.check_service_installed(@name)
+        @runner.check_service_installed(@name)
       end
 
       def has_start_mode?(mode)
-        backend.check_service_start_mode(@name, mode)
+        @runner.check_service_start_mode(@name, mode)
       end
 
       def running?(under)
@@ -21,9 +21,9 @@ module Serverspec
             raise ArgumentError.new("`be_running` matcher doesn't support #{under}")
           end
 
-          backend.send(check_method, @name)
+          @runner.send(check_method, @name)
         else
-          backend.check_running(@name)
+          @runner.check_running(@name)
         end
       end
 
@@ -32,12 +32,11 @@ module Serverspec
         unless monitor && commands.respond_to?(check_method)
           raise ArgumentError.new("`be_monitored_by` matcher doesn't support #{monitor}")
         end
-
-        backend.send(check_method, @name)
+        res = @runner.send(check_method, @name)
       end
 
       def has_property?(property)
-        backend.check_svcprops(@name, property)
+        @runner.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(@name)
+        @runner.check_user(@name)
       end
 
       def belongs_to_group?(group)
-        backend.check_belonging_group(@name, group)
+        @runner.check_belonging_group(@name, group)
       end
 
       def has_uid?(uid)
-        backend.check_uid(@name, uid)
+        @runner.check_uid(@name, uid)
       end
 
       def has_home_directory?(path)
-        backend.check_home_directory(@name, path)
+        @runner.check_home_directory(@name, path)
       end
 
       def has_login_shell?(shell)
-        backend.check_login_shell(@name, shell)
+        @runner.check_login_shell(@name, shell)
       end
 
       def has_authorized_key?(key)
-        backend.check_authorized_key(@name, key)
+        @runner.check_authorized_key(@name, key)
       end
     end
   end

data/lib/serverspec/type/windows_feature.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class WindowsFeature < Base
       def installed?(provider, version)
-        backend.check_windows_feature_enabled(@name, provider)
+        @runner.check_windows_feature_enabled(@name, provider)
       end
     end
   end

data/lib/serverspec/type/windows_hot_fix.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class WindowsHotFix < Base
       def installed?(provider, version)
-        backend.check_windows_hot_fix_installed(@name, version)
+        @runner.check_windows_hot_fix_installed(@name, version)
       end
     end
   end

data/lib/serverspec/type/windows_registry_key.rb

@@ -2,19 +2,19 @@ module Serverspec
   module Type
     class WindowsRegistryKey < Base
       def exists?
-        backend.check_registry_key(@name)
+        @runner.check_registry_key(@name)
       end
 
       def has_property?(property_name, property_type = :type_string)
-        backend.check_registry_key(@name, {:name => property_name, :type => property_type})
+        @runner.check_registry_key(@name, {:name => property_name, :type => property_type})
       end
 
       def has_value?(value)
-        backend.check_registry_key(@name, {:name => '', :type => :type_string, :value => value})
+        @runner.check_registry_key(@name, {:name => '', :type => :type_string, :value => value})
       end
 
       def has_property_value?(property_name, property_type, value)
-        backend.check_registry_key(@name, {:name => property_name, :type => property_type, :value => value})
+        @runner.check_registry_key(@name, {:name => property_name, :type => property_type, :value => value})
       end
     end
   end

data/lib/serverspec/type/windows_scheduled_task.rb

@@ -0,0 +1,9 @@
+module Serverspec
+  module Type
+    class WindowsScheduledTask < Base
+      def exists?
+        @runner.check_scheduled_task(@name)
+      end
+    end
+  end
+end

data/lib/serverspec/type/yumrepo.rb

@@ -2,11 +2,11 @@ module Serverspec
   module Type
     class Yumrepo < Base
       def exists?
-        backend.check_yumrepo(@name)
+        @runner.check_yumrepo(@name)
       end
 
       def enabled?
-        backend.check_yumrepo_enabled(@name)
+        @runner.check_yumrepo_enabled(@name)
       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(@name)
+        @runner.check_zfs(@name)
       end
 
       def has_property?(property)
-        backend.check_zfs(@name, property)
+        @runner.check_zfs(@name, property)
       end
 
       def to_s

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.0.0.beta2"
+  VERSION = "2.0.0.beta3"
 end

data/spec/spec_helper.rb

@@ -6,47 +6,16 @@ include Specinfra::Helper::Exec
 
 PROJECT_ROOT = (Pathname.new(File.dirname(__FILE__)) + '..').expand_path
 
-Dir[PROJECT_ROOT.join("spec/support/**/*.rb")].each { |file| require(file) }
-
-
 module Specinfra
   module Backend
-    module TestCommandRunner
-      def do_run cmd
-        if @example
-          @example.metadata[:subject].set_command(cmd)
-        end
-
+    class Exec < Base
+      def run_command cmd
         CommandResult.new({
           :stdout      => ::Specinfra.configuration.stdout,
           :stderr      => ::Specinfra.configuration.stderr,
           :exit_status => cmd =~ /invalid/ ? 1 : 0,
           :exit_signal => nil,
         })
-
-      end
-    end
-    [Exec, Ssh, Cmd, WinRM].each do |clz|
-      clz.class_eval do
-        include TestCommandRunner
-        def run_command(cmd)
-          cmd = build_command(cmd.to_s)
-          cmd = add_pre_command(cmd)
-          do_run cmd
-        end
-      end
-    end
-  end
-end
-
-module Serverspec
-  module Type
-    class Base
-      def set_command(command)
-        @command = command
-      end
-      def command
-        @command
       end
     end
   end

data/spec/type/cgroup_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+include Specinfra::Helper::RedHat
+
+describe cgroup('group1') do
+  let(:stdout) { "1\r\n" }
+  its('cpuset.cpus') { should eq 1 }
+end
+
+describe cgroup('group1') do
+  let(:stdout) { "1\r\n" }
+  its('cpuset.cpus') { should_not eq 0 }
+end

data/spec/type/command_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+include Specinfra::Helper::RedHat
+
+=begin
+describe command('cat /etc/resolv.conf') do
+  let(:stdout) { "nameserver 127.0.0.1\r\n" }
+  it { should return_stdout("nameserver 127.0.0.1") }
+end
+
+describe 'complete matching of stdout' do
+  context command('cat /etc/resolv.conf') do
+    let(:stdout) { "foocontent-should-be-includedbar\r\n" }
+    it { should_not return_stdout('content-should-be-included') }
+  end
+end
+
+describe 'regexp matching of stdout' do
+  context command('cat /etc/resolv.conf') do
+    let(:stdout) { "nameserver 127.0.0.1\r\n" }
+    it { should return_stdout(/127\.0\.0\.1/) }
+  end
+end
+
+describe command('cat /etc/resolv.conf') do
+  let(:stderr) { "No such file or directory\r\n" }
+  it { should return_stderr("No such file or directory") }
+end
+
+describe 'complete matching of stderr' do
+  context command('cat /etc/resolv.conf') do
+    let(:stderr) { "No such file or directory\r\n" }
+    it { should_not return_stderr('file') }
+  end
+end
+
+describe 'regexp matching of stderr' do
+  context command('cat /etc/resolv.conf') do
+    let(:stderr) { "No such file or directory\r\n" }
+    it { should return_stderr(/file/) }
+  end
+end
+
+describe command('cat /etc/resolv.conf') do
+  it { should return_exit_status 0 }
+end
+=end
+
+describe command('ls -al /') do
+ let(:stdout) { <<EOF
+total 88
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 .
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 ..
+drwxr-xr-x   2 root root  4096 Sep 11 16:43 bin
+drwxr-xr-x   3 root root  4096 Sep 23 18:14 boot
+drwxr-xr-x  14 root root  4260 Oct 14 16:14 dev
+drwxr-xr-x 104 root root  4096 Oct 14 17:34 etc
+drwxr-xr-x   8 root root  4096 Oct  1 15:09 home
+EOF
+    }
+
+  its(:stdout) { should match /bin/ }
+  its(:stdout) { should eq stdout }
+end