serverspec 0.6.24 → 0.6.25

data/lib/serverspec/helper/type.rb

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

data/lib/serverspec/type/php_config.rb

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

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.6.24"
+  VERSION = "0.6.25"
 end

data/spec/darwin/php_config_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Darwin
+
+describe php_config('default_mimetype') do
+  let(:stdout) { 'text/html' }
+  its(:value) { should eq 'text/html' }
+  its(:command) { should eq "php -r 'echo get_cfg_var( \"default_mimetype\" );'" }
+end
+
+describe php_config('default_mimetype') do
+  let(:stdout) { 'text/html' }
+  its(:value) { should_not eq 'text/plain' }
+end
+
+describe php_config('session.cache_expire') do
+  let(:stdout) { '180' }
+  its(:value) { should eq 180 }
+  its(:command) { should eq "php -r 'echo get_cfg_var( \"session.cache_expire\" );'" }
+end
+
+describe php_config('session.cache_expire') do
+  let(:stdout) { '180' }
+  its(:value) { should_not eq 360 }
+end
+
+describe php_config('mbstring.http_output_conv_mimetypes') do
+  let(:stdout) { 'application' }
+  its(:value) { should match /application/ }
+  its(:command) { should eq "php -r 'echo get_cfg_var( \"mbstring.http_output_conv_mimetypes\" );'" }
+end
+
+describe php_config('mbstring.http_output_conv_mimetypes') do
+  let(:stdout) { 'application' }
+  its(:value) { should_not match /html/ }
+end

data/spec/darwin/service_spec.rb

@@ -2,10 +2,91 @@ require 'spec_helper'
 
 include Serverspec::Helper::Darwin
 
-describe 'Serverspec service matchers of Darwin family' do
-  it_behaves_like 'support service running matcher', 'sshd'
-  it_behaves_like 'support service running under supervisor matcher', 'sshd'
-  it_behaves_like 'support service running under unimplemented matcher', 'sshd'
-  it_behaves_like 'support service monitored by monit matcher', 'unicorn'
-  it_behaves_like 'support service monitored by unimplemented matcher', 'unicorn'
+#describe service('sshd') do
+#  it { should be_enabled }
+#end
+
+#describe service('invalid-service') do
+#  it { should_not be_enabled }
+#end
+
+#describe service('sshd') do
+#  it { should be_enabled.with_level(3) }
+#end
+
+#describe service('invalid-service') do
+#  it { should_not be_enabled.with_level(3) }
+#end
+
+describe service('sshd') do
+  it { should be_running }
+  its(:command) { should eq "service sshd status" }
+end
+
+describe service('invalid-daemon') do
+  it { should_not be_running }
+end
+
+describe service('sshd') do
+  let(:stdout) { "sshd is stopped\r\n" }
+  it { should be_running }
+end
+
+describe service('sshd') do
+  let(:stdout) { "sshd RUNNING\r\n" }
+  it { should be_running.under('supervisor') }
+end
+
+describe service('sshd') do
+  let(:stdout) { "sshd STOPPED\r\n" }
+  it { should_not be_running.under('supervisor') }
+end
+
+describe service('invalid-daemon') do
+  it { should_not be_running.under('supervisor') }
+end
+
+describe service('sshd') do
+  let(:stdout) { "sshd running\r\n" }
+  it { should be_running.under('upstart') }
+end
+
+describe service('sshd') do
+  let(:stdout) { "sshd waiting\r\n" }
+  it { should_not be_running.under('upstart') }
+end
+
+describe service('invalid-daemon') do
+  it { should_not be_running.under('upstart') }
+end
+
+describe service('sshd') do
+  it {
+    expect {
+      should be_running.under('not implemented')
+    }.to raise_error(ArgumentError, %r/\A`be_running` matcher doesn\'t support/)
+  }
+end
+
+describe service('sshd') do
+  let(:stdout) { "Process 'sshd'\r\n  status running\r\n  monitoring status  monitored" }
+  it { should be_monitored_by('monit') }
+  its(:command) { should eq "monit status" }
+end
+
+describe service('sshd') do
+  let(:stdout) { "Process 'sshd'\r\n  status  not monitored\r\n  monitoring status  not monitored" }
+  it { should_not be_monitored_by('monit') }
+end
+
+describe service('invalid-daemon') do
+  it { should_not be_monitored_by('monit') }
+end
+
+describe service('sshd') do
+  it {
+    expect {
+      should be_monitored_by('not implemented')
+    }.to raise_error(ArgumentError, %r/\A`be_monitored_by` matcher doesn\'t support/)
+  }
 end

data/spec/debian/php_config_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Debian
+describe php_config('default_mimetype') do
+  let(:stdout) { 'text/html' }
+  its(:value) { should eq 'text/html' }
+  its(:command) { should eq "php -r 'echo get_cfg_var( \"default_mimetype\" );'" }
+end
+
+describe php_config('default_mimetype') do
+  let(:stdout) { 'text/html' }
+  its(:value) { should_not eq 'text/plain' }
+end
+
+describe php_config('session.cache_expire') do
+  let(:stdout) { '180' }
+  its(:value) { should eq 180 }
+  its(:command) { should eq "php -r 'echo get_cfg_var( \"session.cache_expire\" );'" }
+end
+
+describe php_config('session.cache_expire') do
+  let(:stdout) { '180' }
+  its(:value) { should_not eq 360 }
+end
+
+describe php_config('mbstring.http_output_conv_mimetypes') do
+  let(:stdout) { 'application' }
+  its(:value) { should match /application/ }
+  its(:command) { should eq "php -r 'echo get_cfg_var( \"mbstring.http_output_conv_mimetypes\" );'" }
+end
+
+describe php_config('mbstring.http_output_conv_mimetypes') do
+  let(:stdout) { 'application' }
+  its(:value) { should_not match /html/ }
+end

data/spec/debian/service_spec.rb

@@ -2,13 +2,93 @@ require 'spec_helper'
 
 include Serverspec::Helper::Debian
 
-describe 'Serverspec service matchers of Red Hat family' do
-  it_behaves_like 'support service enabled matcher', 'sshd'
-  it_behaves_like 'support service enabled with level matcher', 'sshd', 3
-  it_behaves_like 'support service running matcher', 'sshd'
-  it_behaves_like 'support service running under supervisor matcher', 'sshd'
-  it_behaves_like 'support service running under upstart matcher', 'monit'
-  it_behaves_like 'support service running under unimplemented matcher', 'sshd'
-  it_behaves_like 'support service monitored by monit matcher', 'unicorn'
-  it_behaves_like 'support service monitored by unimplemented matcher', 'unicorn'
+describe service('sshd') do
+  it { should be_enabled }
+  its(:command) { should eq "ls /etc/rc3.d/ | grep -- sshd || grep 'start on' /etc/init/sshd.conf" }
+end
+
+describe service('invalid-service') do
+  it { should_not be_enabled }
+end
+
+describe service('sshd') do
+  it { should be_enabled.with_level(4) }
+  its(:command) { should eq "ls /etc/rc4.d/ | grep -- sshd || grep 'start on' /etc/init/sshd.conf" }
+end
+
+describe service('invalid-service') do
+  it { should_not be_enabled.with_level(4) }
+end
+
+describe service('sshd') do
+  it { should be_running }
+  its(:command) { should eq "service sshd status | grep 'running'" }
+end
+
+describe service('invalid-daemon') do
+  it { should_not be_running }
+end
+
+describe service('sshd') do
+  let(:stdout) { "sshd is stopped\r\n" }
+  it { should be_running }
+end
+
+describe service('sshd') do
+  let(:stdout) { "sshd RUNNING\r\n" }
+  it { should be_running.under('supervisor') }
+end
+
+describe service('sshd') do
+  let(:stdout) { "sshd STOPPED\r\n" }
+  it { should_not be_running.under('supervisor') }
+end
+
+describe service('invalid-daemon') do
+  it { should_not be_running.under('supervisor') }
+end
+
+describe service('sshd') do
+  let(:stdout) { "sshd running\r\n" }
+  it { should be_running.under('upstart') }
+end
+
+describe service('sshd') do
+  let(:stdout) { "sshd waiting\r\n" }
+  it { should_not be_running.under('upstart') }
+end
+
+describe service('invalid-daemon') do
+  it { should_not be_running.under('upstart') }
+end
+
+describe service('sshd') do
+  it {
+    expect {
+      should be_running.under('not implemented')
+    }.to raise_error(ArgumentError, %r/\A`be_running` matcher doesn\'t support/)
+  }
+end
+
+describe service('sshd') do
+  let(:stdout) { "Process 'sshd'\r\n  status running\r\n  monitoring status  monitored" }
+  it { should be_monitored_by('monit') }
+  its(:command) { should eq "monit status" }
+end
+
+describe service('sshd') do
+  let(:stdout) { "Process 'sshd'\r\n  status  not monitored\r\n  monitoring status  not monitored" }
+  it { should_not be_monitored_by('monit') }
+end
+
+describe service('invalid-daemon') do
+  it { should_not be_monitored_by('monit') }
+end
+
+describe service('sshd') do
+  it {
+    expect {
+      should be_monitored_by('not implemented')
+    }.to raise_error(ArgumentError, %r/\A`be_monitored_by` matcher doesn\'t support/)
+  }
 end

data/spec/gentoo/php_config_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Gentoo
+
+describe php_config('default_mimetype') do
+  let(:stdout) { 'text/html' }
+  its(:value) { should eq 'text/html' }
+  its(:command) { should eq "php -r 'echo get_cfg_var( \"default_mimetype\" );'" }
+end
+
+describe php_config('default_mimetype') do
+  let(:stdout) { 'text/html' }
+  its(:value) { should_not eq 'text/plain' }
+end
+
+describe php_config('session.cache_expire') do
+  let(:stdout) { '180' }
+  its(:value) { should eq 180 }
+  its(:command) { should eq "php -r 'echo get_cfg_var( \"session.cache_expire\" );'" }
+end
+
+describe php_config('session.cache_expire') do
+  let(:stdout) { '180' }
+  its(:value) { should_not eq 360 }
+end
+
+describe php_config('mbstring.http_output_conv_mimetypes') do
+  let(:stdout) { 'application' }
+  its(:value) { should match /application/ }
+  its(:command) { should eq "php -r 'echo get_cfg_var( \"mbstring.http_output_conv_mimetypes\" );'" }
+end
+
+describe php_config('mbstring.http_output_conv_mimetypes') do
+  let(:stdout) { 'application' }
+  its(:value) { should_not match /html/ }
+end

data/spec/gentoo/service_spec.rb

@@ -2,12 +2,93 @@ require 'spec_helper'
 
 include Serverspec::Helper::Gentoo
 
-describe 'Serverspec service matchers of Gentoo family' do
-  it_behaves_like 'support service enabled matcher', 'sshd'
-  it_behaves_like 'support service enabled with level matcher', 'sshd', 3
-  it_behaves_like 'support service running matcher', 'sshd'
-  it_behaves_like 'support service running under supervisor matcher', 'sshd'
-  it_behaves_like 'support service running under unimplemented matcher', 'sshd'
-  it_behaves_like 'support service monitored by monit matcher', 'unicorn'
-  it_behaves_like 'support service monitored by unimplemented matcher', 'unicorn'
+describe service('sshd') do
+  it { should be_enabled }
+  its(:command) { should eq "rc-update show | grep -- \\^\\\\s\\*sshd\\\\s\\*\\|\\\\s\\*\\\\\\(boot\\\\\\|default\\\\\\)" }
+end
+
+describe service('invalid-service') do
+  it { should_not be_enabled }
+end
+
+describe service('sshd') do
+  it { should be_enabled.with_level(4) }
+  its(:command) { should eq "rc-update show | grep -- \\^\\\\s\\*sshd\\\\s\\*\\|\\\\s\\*\\\\\\(boot\\\\\\|default\\\\\\)" }
+end
+
+describe service('invalid-service') do
+  it { should_not be_enabled.with_level(4) }
+end
+
+describe service('sshd') do
+  it { should be_running }
+  its(:command) { should eq "/etc/init.d/sshd status" }
+end
+
+describe service('invalid-daemon') do
+  it { should_not be_running }
+end
+
+describe service('sshd') do
+  let(:stdout) { "sshd is stopped\r\n" }
+  it { should be_running }
+end
+
+describe service('sshd') do
+  let(:stdout) { "sshd RUNNING\r\n" }
+  it { should be_running.under('supervisor') }
+end
+
+describe service('sshd') do
+  let(:stdout) { "sshd STOPPED\r\n" }
+  it { should_not be_running.under('supervisor') }
+end
+
+describe service('invalid-daemon') do
+  it { should_not be_running.under('supervisor') }
+end
+
+describe service('sshd') do
+  let(:stdout) { "sshd running\r\n" }
+  it { should be_running.under('upstart') }
+end
+
+describe service('sshd') do
+  let(:stdout) { "sshd waiting\r\n" }
+  it { should_not be_running.under('upstart') }
+end
+
+describe service('invalid-daemon') do
+  it { should_not be_running.under('upstart') }
+end
+
+describe service('sshd') do
+  it {
+    expect {
+      should be_running.under('not implemented')
+    }.to raise_error(ArgumentError, %r/\A`be_running` matcher doesn\'t support/)
+  }
+end
+
+describe service('sshd') do
+  let(:stdout) { "Process 'sshd'\r\n  status running\r\n  monitoring status  monitored" }
+  it { should be_monitored_by('monit') }
+  its(:command) { should eq "monit status" }
+end
+
+describe service('sshd') do
+  let(:stdout) { "Process 'sshd'\r\n  status  not monitored\r\n  monitoring status  not monitored" }
+  it { should_not be_monitored_by('monit') }
+end
+
+describe service('invalid-daemon') do
+  it { should_not be_monitored_by('monit') }
+end
+
+describe service('sshd') do
+  it {
+    expect {
+      should be_monitored_by('not implemented')
+    }.to raise_error(ArgumentError, %r/\A`be_monitored_by` matcher doesn\'t support/)
+  }
 end

data/spec/redhat/commands_spec.rb

@@ -2,26 +2,6 @@ require 'spec_helper'
 
 include Serverspec::Helper::RedHat
 
-describe 'Serverspec commands of Red Hat' do
-  it_behaves_like 'support command check_running_under_supervisor', 'httpd'
-
-  it_behaves_like 'support command check_running_under_upstart', 'monit'
-
-  it_behaves_like 'support command check_monitored_by_monit', 'unicorn'
-
-  it_behaves_like 'support command check_process', 'httpd'
-end
-
-describe 'check_enabled' do
-  subject { commands.check_enabled('httpd') }
-  it { should eq 'chkconfig --list httpd | grep 3:on' }
-end
-
-describe 'check_enabled with level 4' do
-  subject { commands.check_enabled('httpd', 4) }
-  it { should eq 'chkconfig --list httpd | grep 4:on' }
-end
-
 describe 'check_yumrepo' do
   subject { commands.check_yumrepo('epel') }
   it { should eq 'yum repolist all -C | grep ^epel' }
@@ -31,8 +11,3 @@ describe 'check_yumrepo_enabled' do
   subject { commands.check_yumrepo_enabled('epel') }
   it { should eq 'yum repolist all -C | grep ^epel | grep enabled' }
 end
-
-describe 'check_running' do
-  subject { commands.check_running('httpd') }
-  it { should eq 'service httpd status' }
-end