serverspec 0.6.24 → 0.6.25

data/spec/solaris11/php_config_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Solaris11
+
+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/solaris11/service_spec.rb

@@ -2,12 +2,93 @@ require 'spec_helper'
 
 include Serverspec::Helper::Solaris11
 
-describe 'Serverspec service matchers of Solaris11' 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 "svcs -l sshd 2> /dev/null | egrep '^enabled *true$'" }
+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 "svcs -l sshd 2> /dev/null | egrep '^enabled *true$'" }
+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 "svcs -l sshd status 2> /dev/null | egrep '^state *online$'" }
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.6.24
+  version: 0.6.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -207,6 +207,7 @@ files:
 - lib/serverspec/type/kernel_module.rb
 - lib/serverspec/type/linux_kernel_parameter.rb
 - lib/serverspec/type/package.rb
+- lib/serverspec/type/php_config.rb
 - lib/serverspec/type/port.rb
 - lib/serverspec/type/routing_table.rb
 - lib/serverspec/type/selinux.rb
@@ -219,19 +220,18 @@ files:
 - spec/backend/exec/configuration_spec.rb
 - spec/backend/ssh/configuration_spec.rb
 - spec/darwin/command_spec.rb
-- spec/darwin/commands_spec.rb
 - spec/darwin/cron_spec.rb
 - spec/darwin/default_gateway_spec.rb
 - spec/darwin/file_spec.rb
 - spec/darwin/group_spec.rb
 - spec/darwin/host_spec.rb
 - spec/darwin/package_spec.rb
+- spec/darwin/php_config_spec.rb
 - spec/darwin/port_spec.rb
 - spec/darwin/routing_table_spec.rb
 - spec/darwin/service_spec.rb
 - spec/darwin/user_spec.rb
 - spec/debian/command_spec.rb
-- spec/debian/commands_spec.rb
 - spec/debian/cron_spec.rb
 - spec/debian/default_gateway_spec.rb
 - spec/debian/file_spec.rb
@@ -242,13 +242,13 @@ files:
 - spec/debian/kernel_module_spec.rb
 - spec/debian/linux_kernel_parameter_spec.rb
 - spec/debian/package_spec.rb
+- spec/debian/php_config_spec.rb
 - spec/debian/port_spec.rb
 - spec/debian/routing_table_spec.rb
 - spec/debian/selinux_spec.rb
 - spec/debian/service_spec.rb
 - spec/debian/user_spec.rb
 - spec/gentoo/command_spec.rb
-- spec/gentoo/commands_spec.rb
 - spec/gentoo/cron_spec.rb
 - spec/gentoo/default_gateway_spec.rb
 - spec/gentoo/file_spec.rb
@@ -259,6 +259,7 @@ files:
 - spec/gentoo/kernel_module_spec.rb
 - spec/gentoo/linux_kernel_parameter_spec.rb
 - spec/gentoo/package_spec.rb
+- spec/gentoo/php_config_spec.rb
 - spec/gentoo/port_spec.rb
 - spec/gentoo/routing_table_spec.rb
 - spec/gentoo/selinux_spec.rb
@@ -277,6 +278,7 @@ files:
 - spec/redhat/kernel_module_spec.rb
 - spec/redhat/linux_kernel_parameter_spec.rb
 - spec/redhat/package_spec.rb
+- spec/redhat/php_config_spec.rb
 - spec/redhat/port_spec.rb
 - spec/redhat/routing_table_spec.rb
 - spec/redhat/selinux_spec.rb
@@ -294,6 +296,7 @@ files:
 - spec/solaris/ipfilter_spec.rb
 - spec/solaris/ipnat_spec.rb
 - spec/solaris/package_spec.rb
+- spec/solaris/php_config_spec.rb
 - spec/solaris/port_spec.rb
 - spec/solaris/routing_table_spec.rb
 - spec/solaris/service_spec.rb
@@ -301,6 +304,7 @@ files:
 - spec/solaris/user_spec.rb
 - spec/solaris/zfs_spec.rb
 - spec/solaris10/commands_spec.rb
+- spec/solaris10/php_config_spec.rb
 - spec/solaris11/command_spec.rb
 - spec/solaris11/commands_spec.rb
 - spec/solaris11/cron_spec.rb
@@ -311,6 +315,7 @@ files:
 - spec/solaris11/ipfilter_spec.rb
 - spec/solaris11/ipnat_spec.rb
 - spec/solaris11/package_spec.rb
+- spec/solaris11/php_config_spec.rb
 - spec/solaris11/port_spec.rb
 - spec/solaris11/routing_table_spec.rb
 - spec/solaris11/service_spec.rb
@@ -318,8 +323,6 @@ files:
 - spec/solaris11/user_spec.rb
 - spec/solaris11/zfs_spec.rb
 - spec/spec_helper.rb
-- spec/support/shared_commands_examples.rb
-- spec/support/shared_service_examples.rb
 homepage: http://serverspec.org/
 licenses:
 - MIT
@@ -349,19 +352,18 @@ test_files:
 - spec/backend/exec/configuration_spec.rb
 - spec/backend/ssh/configuration_spec.rb
 - spec/darwin/command_spec.rb
-- spec/darwin/commands_spec.rb
 - spec/darwin/cron_spec.rb
 - spec/darwin/default_gateway_spec.rb
 - spec/darwin/file_spec.rb
 - spec/darwin/group_spec.rb
 - spec/darwin/host_spec.rb
 - spec/darwin/package_spec.rb
+- spec/darwin/php_config_spec.rb
 - spec/darwin/port_spec.rb
 - spec/darwin/routing_table_spec.rb
 - spec/darwin/service_spec.rb
 - spec/darwin/user_spec.rb
 - spec/debian/command_spec.rb
-- spec/debian/commands_spec.rb
 - spec/debian/cron_spec.rb
 - spec/debian/default_gateway_spec.rb
 - spec/debian/file_spec.rb
@@ -372,13 +374,13 @@ test_files:
 - spec/debian/kernel_module_spec.rb
 - spec/debian/linux_kernel_parameter_spec.rb
 - spec/debian/package_spec.rb
+- spec/debian/php_config_spec.rb
 - spec/debian/port_spec.rb
 - spec/debian/routing_table_spec.rb
 - spec/debian/selinux_spec.rb
 - spec/debian/service_spec.rb
 - spec/debian/user_spec.rb
 - spec/gentoo/command_spec.rb
-- spec/gentoo/commands_spec.rb
 - spec/gentoo/cron_spec.rb
 - spec/gentoo/default_gateway_spec.rb
 - spec/gentoo/file_spec.rb
@@ -389,6 +391,7 @@ test_files:
 - spec/gentoo/kernel_module_spec.rb
 - spec/gentoo/linux_kernel_parameter_spec.rb
 - spec/gentoo/package_spec.rb
+- spec/gentoo/php_config_spec.rb
 - spec/gentoo/port_spec.rb
 - spec/gentoo/routing_table_spec.rb
 - spec/gentoo/selinux_spec.rb
@@ -407,6 +410,7 @@ test_files:
 - spec/redhat/kernel_module_spec.rb
 - spec/redhat/linux_kernel_parameter_spec.rb
 - spec/redhat/package_spec.rb
+- spec/redhat/php_config_spec.rb
 - spec/redhat/port_spec.rb
 - spec/redhat/routing_table_spec.rb
 - spec/redhat/selinux_spec.rb
@@ -424,6 +428,7 @@ test_files:
 - spec/solaris/ipfilter_spec.rb
 - spec/solaris/ipnat_spec.rb
 - spec/solaris/package_spec.rb
+- spec/solaris/php_config_spec.rb
 - spec/solaris/port_spec.rb
 - spec/solaris/routing_table_spec.rb
 - spec/solaris/service_spec.rb
@@ -431,6 +436,7 @@ test_files:
 - spec/solaris/user_spec.rb
 - spec/solaris/zfs_spec.rb
 - spec/solaris10/commands_spec.rb
+- spec/solaris10/php_config_spec.rb
 - spec/solaris11/command_spec.rb
 - spec/solaris11/commands_spec.rb
 - spec/solaris11/cron_spec.rb
@@ -441,6 +447,7 @@ test_files:
 - spec/solaris11/ipfilter_spec.rb
 - spec/solaris11/ipnat_spec.rb
 - spec/solaris11/package_spec.rb
+- spec/solaris11/php_config_spec.rb
 - spec/solaris11/port_spec.rb
 - spec/solaris11/routing_table_spec.rb
 - spec/solaris11/service_spec.rb
@@ -448,5 +455,3 @@ test_files:
 - spec/solaris11/user_spec.rb
 - spec/solaris11/zfs_spec.rb
 - spec/spec_helper.rb
-- spec/support/shared_commands_examples.rb
-- spec/support/shared_service_examples.rb

data/spec/darwin/commands_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-include Serverspec::Helper::Darwin
-
-describe 'Serverspec commands of Darwin family' do
-  it_behaves_like 'support command check_running_under_supervisor', 'httpd'
-  it_behaves_like 'support command check_monitored_by_monit', 'unicorn'
-  it_behaves_like 'support command check_process', 'httpd'
-end

data/spec/debian/commands_spec.rb

@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-include Serverspec::Helper::Debian
-
-describe 'Serverspec commands of Debian family' 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 "ls /etc/rc3.d/ | grep -- httpd || grep 'start on' /etc/init/httpd.conf" }
-end
-
-describe 'check_enabled with run level 5' do
-  subject { commands.check_enabled('httpd', 5) }
-  it { should eq "ls /etc/rc5.d/ | grep -- httpd || grep 'start on' /etc/init/httpd.conf" }
-end
-
-describe 'check_running' do
-  subject { commands.check_running('httpd') }
-  it { should eq "service httpd status | grep 'running'" }
-end

data/spec/gentoo/commands_spec.rb

@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-include Serverspec::Helper::Gentoo
-
-describe 'Serverspec commands of Gentoo family' do
-  it_behaves_like 'support command check_running_under_supervisor', 'httpd'
-  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 "rc-update show | grep -- \\^\\\\s\\*httpd\\\\s\\*\\|\\\\s\\*\\\\\\(boot\\\\\\|default\\\\\\)" }
-end
-
-describe 'check_running' do
-  subject { commands.check_running('httpd') }
-  it { should eq '/etc/init.d/httpd status' }
-end
-

data/spec/support/shared_commands_examples.rb

@@ -1,19 +0,0 @@
-shared_examples_for 'support command check_running_under_supervisor' do |service|
-  subject { commands.check_running_under_supervisor(service) }
-  it { should eq "supervisorctl status #{service}" }
-end
-
-shared_examples_for 'support command check_running_under_upstart' do |service|
-  subject { commands.check_running_under_upstart(service) }
-  it { should eq "initctl status #{service}" }
-end
-
-shared_examples_for 'support command check_monitored_by_monit' do |service|
-  subject { commands.check_monitored_by_monit(service) }
-  it { should eq "monit status" }
-end
-
-shared_examples_for 'support command check_process' do |process|
-  subject { commands.check_process(process) }
-  it { should eq "ps aux | grep -w -- #{process} | grep -qv grep" }
-end

data/spec/support/shared_service_examples.rb

@@ -1,118 +0,0 @@
-shared_examples_for 'support service enabled matcher' do |valid_service|
-  describe 'be_enabled' do
-    describe service(valid_service) do
-      it { should be_enabled }
-    end
-
-    describe service('invalid-service') do
-      it { should_not be_enabled }
-    end
-  end
-end
-
-shared_examples_for 'support service enabled with level matcher' do |valid_service, level|
-  describe 'be_enabled' do
-    describe service(valid_service) do
-      it { should be_enabled.with_level(level) }
-    end
-
-    describe service('invalid-service') do
-      it { should_not be_enabled.with_level(level) }
-    end
-  end
-end
-
-shared_examples_for 'support service running matcher' do |valid_service|
-  describe 'be_running' do
-    describe service(valid_service) do
-      it { should be_running }
-    end
-
-    describe service('invalid-daemon') do
-      it { should_not be_running }
-    end
-
-    describe service(valid_service) do
-      let(:stdout) { "#{valid_service} is stopped\r\n" }
-      it { should be_running }
-    end
-  end
-end
-
-shared_examples_for 'support service running under supervisor matcher' do |valid_service|
-  describe 'be_running.under("supervisor")' do
-    describe service(valid_service) do
-      let(:stdout) { "#{valid_service} RUNNING\r\n" }
-      it { should be_running.under('supervisor') }
-    end
-
-    describe service(valid_service) do
-      let(:stdout) { "#{valid_service} STOPPED\r\n" }
-      it { should_not be_running.under('supervisor') }
-    end
-
-    describe service('invalid-daemon') do
-      it { should_not be_running.under('supervisor') }
-    end
-  end
-end
-
-shared_examples_for 'support service running under upstart matcher' do |valid_service|
-  describe 'be_running.under("upstart")' do
-    describe service(valid_service) do
-      let(:stdout) { "#{valid_service} running\r\n" }
-      it { should be_running.under('upstart') }
-    end
-
-    describe service(valid_service) do
-      let(:stdout) { "#{valid_service} waiting\r\n" }
-      it { should_not be_running.under('upstart') }
-    end
-
-    describe service('invalid-daemon') do
-      it { should_not be_running.under('upstart') }
-    end
-  end
-end
-
-shared_examples_for 'support service running under unimplemented matcher' do |valid_service|
-  describe 'be_running.under("not implemented")' do
-    describe service(valid_service) do
-      it {
-        expect {
-          should be_running.under('not implemented')
-        }.to raise_error(ArgumentError, %r/\A`be_running` matcher doesn\'t support/)
-      }
-    end
-  end
-end
-
-shared_examples_for 'support service monitored by monit matcher' do |valid_service|
-  describe 'be_monitored_by("monit")' do
-    describe service(valid_service) do
-      let(:stdout) { "Process '#{valid_service}'\r\n  status running\r\n  monitoring status  monitored" }
-      it { should be_monitored_by('monit') }
-    end
-
-    describe service(valid_service) do
-      let(:stdout) { "Process '#{valid_service}'\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
-  end
-end
-
-shared_examples_for 'support service monitored by unimplemented matcher' do |valid_service|
-  describe 'be_monitored_by("not implemented")' do
-    describe service(valid_service) do
-      it {
-        expect {
-          should be_monitored_by('not implemented')
-        }.to raise_error(ArgumentError, %r/\A`be_monitored_by` matcher doesn\'t support/)
-      }
-    end
-  end
-end