serverspec 0.6.15 → 0.6.16

data/.gitignore

@@ -2,6 +2,7 @@
 *.rbc
 *.swp
 .bundle
+.rvmrc
 .config
 .yardoc
 .rspec

data/lib/serverspec.rb

@@ -12,6 +12,7 @@ require 'serverspec/commands/redhat'
 require 'serverspec/commands/debian'
 require 'serverspec/commands/gentoo'
 require 'serverspec/commands/solaris'
+require 'serverspec/commands/smartos'
 require 'serverspec/commands/darwin'
 require 'serverspec/configuration'
 require 'rspec/core/formatters/base_formatter'
@@ -32,6 +33,7 @@ RSpec.configure do |c|
   c.include(Serverspec::Helper::Debian,  :os => :debian)
   c.include(Serverspec::Helper::Gentoo,  :os => :gentoo)
   c.include(Serverspec::Helper::Solaris, :os => :solaris)
+  c.include(Serverspec::Helper::SmartOS, :os => :smartos)
   c.include(Serverspec::Helper::Darwin,  :os => :darwin)
   c.add_setting :os,            :default => nil
   c.add_setting :host,          :default => nil

data/lib/serverspec/backend/exec.rb

@@ -182,7 +182,11 @@ module Serverspec
         elsif run_command('ls /etc/gentoo-release')[:exit_status] == 0
           'Gentoo'
         elsif run_command('uname -s')[:stdout] =~ /SunOS/i
-          'Solaris'
+          if run_command('grep -q SmartOS /etc/release')
+            'SmartOS'
+          else
+            'Solaris'
+          end
         elsif run_command('uname -s')[:stdout] =~ /Darwin/i
           'Darwin'
         else

data/lib/serverspec/commands/smartos.rb

@@ -0,0 +1,13 @@
+module Serverspec
+  module Commands
+    class SmartOS < Serverspec::Commands::Solaris
+      def check_installed(package, version=nil)
+        cmd = "/opt/local/bin/pkgin list 2> /dev/null | grep -qw ^#{escape(package)}"
+        if version
+          cmd = "#{cmd}-#{escape(version)}"
+        end
+        cmd
+      end
+    end
+  end
+end

data/lib/serverspec/commands/solaris.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Commands
     class Solaris < Base
       def check_enabled(service, level=3)
-        "svcs -l #{escape(service)} 2> /dev/null | grep 'enabled      true'"
+        "svcs -l #{escape(service)} 2> /dev/null | grep -wx '^enabled.*true$'"
       end
 
       def check_installed(package, version=nil)
@@ -19,7 +19,7 @@ module Serverspec
       end
 
       def check_running(service)
-        "svcs -l #{escape(service)} status 2> /dev/null |grep 'state        online'"
+        "svcs -l #{escape(service)} status 2> /dev/null |grep -wx '^state.*online$'"
       end
 
       def check_cron_entry(user, entry)

data/lib/serverspec/helper.rb

@@ -10,6 +10,7 @@ require 'serverspec/helper/redhat'
 require 'serverspec/helper/debian'
 require 'serverspec/helper/gentoo'
 require 'serverspec/helper/solaris'
+require 'serverspec/helper/smartos'
 require 'serverspec/helper/darwin'
 require 'serverspec/helper/detect_os'
 

data/lib/serverspec/helper/smartos.rb

@@ -0,0 +1,10 @@
+module Serverspec
+  module Helper
+    module SmartOS
+      def commands
+        Serverspec::Commands::SmartOS.new
+      end
+    end
+  end
+end
+

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.6.15"
+  VERSION = "0.6.16"
 end

data/spec/smartos/commands_spec.rb

@@ -0,0 +1,193 @@
+require 'spec_helper'
+
+include Serverspec::Helper::SmartOS
+
+describe 'Serverspec commands of Solaris family specified SmartOS' do
+  it_behaves_like 'support command check_file', '/etc/passwd'
+  it_behaves_like 'support command check_directory', '/var/log'
+  it_behaves_like 'support command check_socket', '/var/run/unicorn.sock'
+
+  it_behaves_like 'support command check_installed_by_gem', 'jekyll'
+  it_behaves_like 'support command check_installed_by_gem with_version', 'jekyll', '1.0.2'
+
+  it_behaves_like 'support command check_installed_by_npm', 'hubot'
+  it_behaves_like 'support command check_installed_by_npm with_version', 'hubot', '1.0.2'
+
+  it_behaves_like 'support command check_installed_by_pecl', 'mongo'
+  it_behaves_like 'support command check_installed_by_pecl with_version', 'mongo', '1.4.1'
+
+  it_behaves_like 'support command check_mounted', '/'
+
+  it_behaves_like 'support command check_routing_table', '192.168.100.1/24'
+  it_behaves_like 'support command check_resolvable'
+
+  it_behaves_like 'support command check_user', 'root'
+  it_behaves_like 'support command check_user', 'wheel'
+
+  it_behaves_like 'support command check_file_md5checksum', '/etc/passewd', '96c8c50f81a29965f7af6de371ab4250'
+
+  it_behaves_like 'support command check_running_under_supervisor', 'httpd'
+  it_behaves_like 'support command check_process', 'httpd'
+
+  it_behaves_like 'support command check_file_contain', '/etc/passwd', 'root'
+
+  it_behaves_like 'support command check_mode', '/etc/sudoers', 440
+  it_behaves_like 'support command check_owner', '/etc/sudoers', 'root'
+  it_behaves_like 'support command check_grouped', '/etc/sudoers', 'wheel'
+
+  it_behaves_like 'support command check_link', '/etc/system-release', '/etc/redhat-release'
+
+  it_behaves_like 'support command check_uid', 'root', 0
+
+  it_behaves_like 'support command check_login_shell', 'root', '/bin/bash'
+  it_behaves_like 'support command check_home_directory', 'root', '/root'
+
+  it_behaves_like 'support command check_authorized_key'
+
+  it_behaves_like 'support command get_mode'
+end
+
+describe 'check_enabled' do
+  subject { commands.check_enabled('httpd') }
+  it { should eq "svcs -l httpd 2> /dev/null | grep -wx '^enabled.*true$'" }
+end
+
+## SmartOS
+describe 'check_installed' do
+  subject { commands.check_installed('httpd') }
+  it { should eq '/opt/local/bin/pkgin list 2> /dev/null | grep -qw ^httpd' }
+end
+
+## SmartOS
+describe 'check_installed' do
+  subject { commands.check_installed('httpd', '2.2') }
+  it { should eq '/opt/local/bin/pkgin list 2> /dev/null | grep -qw ^httpd-2.2' }
+end
+
+describe 'check_file_contain_within' do
+  context 'contain a pattern in the file' do
+    subject { commands.check_file_contain_within('Gemfile', 'rspec') }
+    it { should eq "sed -n 1,\\$p Gemfile | grep -q -- rspec /dev/stdin" }
+  end
+
+  context 'contain a pattern after a line in a file' do
+    subject { commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test do/') }
+    it { should eq "sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -q -- rspec /dev/stdin" }
+  end
+
+  context 'contain a pattern before a line in a file' do
+    subject {commands.check_file_contain_within('Gemfile', 'rspec', nil, '/^end/') }
+    it { should eq "sed -n 1,/\\^end/p Gemfile | grep -q -- rspec /dev/stdin" }
+  end
+
+  context 'contain a pattern from within a line and another line in a file' do
+    subject { commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test do/', '/^end/') }
+    it { should eq "sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -q -- rspec /dev/stdin" }
+  end
+end
+
+describe 'check_listening' do
+  subject { commands.check_listening(80) }
+  it { should eq "netstat -an 2> /dev/null | egrep 'LISTEN|Idle' | grep -- .80\\ " }
+end
+
+describe 'check_running' do
+  subject { commands.check_running('httpd') }
+  it { should eq "svcs -l httpd status 2> /dev/null |grep -wx '^state.*online$'" }
+end
+
+describe 'check_cron_entry' do
+  context 'specify root user' do
+    subject { commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') }
+    it { should eq 'crontab -l root | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  end
+
+  context 'no specified user' do
+    subject { commands.check_cron_entry(nil, '* * * * * /usr/local/bin/batch.sh') }
+    it { should eq 'crontab -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  end
+end
+
+describe 'check_belonging_group' do
+  subject { commands.check_belonging_group('root', 'wheel') }
+  it { should eq "id -Gn root | grep -- wheel" }
+end
+
+describe 'check_gid' do
+  subject { commands.check_gid('root', 0) }
+  it { should eq "getent group | grep -- \\^root: | cut -f 3 -d ':' | grep -w -- 0" }
+end
+
+describe 'check_zfs' do
+  context 'check without properties' do
+    subject { commands.check_zfs('rpool') }
+    it { should eq "zfs list -H rpool" }
+  end
+
+  context 'check with a property' do
+    subject { commands.check_zfs('rpool', { 'mountpoint' => '/rpool' }) }
+    it { should eq "zfs list -H -o mountpoint rpool | grep -- \\^/rpool\\$" }
+  end
+
+  context 'check with multiple properties' do
+    subject { commands.check_zfs('rpool', { 'mountpoint'  => '/rpool', 'compression' => 'off' }) }
+    it { should eq "zfs list -H -o compression rpool | grep -- \\^off\\$ && zfs list -H -o mountpoint rpool | grep -- \\^/rpool\\$" }
+  end
+end
+
+describe 'check_ip_filter_rule' do
+  subject { commands.check_ipfilter_rule('pass in quick on lo0 all') }
+  it { should eq "ipfstat -io 2> /dev/null | grep -- pass\\ in\\ quick\\ on\\ lo0\\ all" }
+end
+
+describe 'check_ipnat_rule' do
+  subject { commands.check_ipnat_rule('map net1 192.168.0.0/24 -> 0.0.0.0/32') }
+  it { should eq "ipnat -l 2> /dev/null | grep -- \\^map\\ net1\\ 192.168.0.0/24\\ -\\>\\ 0.0.0.0/32\\$" }
+end
+
+describe 'check_svcprop' do
+  subject { commands.check_svcprop('svc:/network/http:apache22', 'httpd/enable_64bit','false') }
+  it { should eq "svcprop -p httpd/enable_64bit svc:/network/http:apache22 | grep -- \\^false\\$" }
+end
+
+describe 'check_svcprops' do
+  subject {
+    commands.check_svcprops('svc:/network/http:apache22', {
+      'httpd/enable_64bit' => 'false',
+      'httpd/server_type'  => 'worker',
+    })
+  }
+  it { should eq "svcprop -p httpd/enable_64bit svc:/network/http:apache22 | grep -- \\^false\\$ && svcprop -p httpd/server_type svc:/network/http:apache22 | grep -- \\^worker\\$" }
+end
+
+describe 'check_access_by_user' do
+  context 'read access' do
+    subject {commands.check_access_by_user '/tmp/something', 'dummyuser1', 'r'}
+    it { should eq 'su dummyuser1 -c "test -r /tmp/something"' }
+  end
+
+  context 'write access' do
+    subject {commands.check_access_by_user '/tmp/somethingw', 'dummyuser2', 'w'}
+    it { should eq 'su dummyuser2 -c "test -w /tmp/somethingw"' }
+  end
+
+  context 'execute access' do
+    subject {commands.check_access_by_user '/tmp/somethingx', 'dummyuser3', 'x'}
+    it { should eq 'su dummyuser3 -c "test -x /tmp/somethingx"' }
+  end
+end
+
+describe 'check_reachable' do
+  context "connect with name from /etc/services to localhost" do
+    subject { commands.check_reachable('localhost', 'ssh', 'tcp', 1) }
+    it { should eq "nc -vvvvzt -w 1 localhost ssh" }
+  end
+  context "connect with ip and port 11111 and timeout of 5" do
+    subject { commands.check_reachable('127.0.0.1', '11111', 'udp', 5) }
+    it { should eq "nc -vvvvzu -w 5 127.0.0.1 11111" }
+  end
+  context "do a ping" do
+    subject { commands.check_reachable('127.0.0.1', nil, 'icmp', 1) }
+    it { should eq "ping -n 127.0.0.1 1" }
+  end
+end

data/spec/solaris/commands_spec.rb

@@ -49,7 +49,7 @@ end
 
 describe 'check_enabled' do
   subject { commands.check_enabled('httpd') }
-  it { should eq "svcs -l httpd 2> /dev/null | grep 'enabled      true'" }
+  it { should eq "svcs -l httpd 2> /dev/null | grep -wx '^enabled.*true$'" }
 end
 
 describe 'check_installed' do
@@ -91,7 +91,7 @@ end
 
 describe 'check_running' do
   subject { commands.check_running('httpd') }
-  it { should eq "svcs -l httpd status 2> /dev/null |grep 'state        online'" }
+  it { should eq "svcs -l httpd status 2> /dev/null |grep -wx '^state.*online$'" }
 end
 
 describe 'check_cron_entry' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.6.15
+  version: 0.6.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -150,6 +150,7 @@ files:
 - lib/serverspec/commands/gentoo.rb
 - lib/serverspec/commands/linux.rb
 - lib/serverspec/commands/redhat.rb
+- lib/serverspec/commands/smartos.rb
 - lib/serverspec/commands/solaris.rb
 - lib/serverspec/configuration.rb
 - lib/serverspec/helper.rb
@@ -163,6 +164,7 @@ files:
 - lib/serverspec/helper/gentoo.rb
 - lib/serverspec/helper/puppet.rb
 - lib/serverspec/helper/redhat.rb
+- lib/serverspec/helper/smartos.rb
 - lib/serverspec/helper/solaris.rb
 - lib/serverspec/helper/ssh.rb
 - lib/serverspec/helper/type.rb
@@ -275,6 +277,7 @@ files:
 - spec/redhat/service_spec.rb
 - spec/redhat/user_spec.rb
 - spec/redhat/yumrepo_spec.rb
+- spec/smartos/commands_spec.rb
 - spec/solaris/command_spec.rb
 - spec/solaris/commands_spec.rb
 - spec/solaris/cron_spec.rb
@@ -401,6 +404,7 @@ test_files:
 - spec/redhat/service_spec.rb
 - spec/redhat/user_spec.rb
 - spec/redhat/yumrepo_spec.rb
+- spec/smartos/commands_spec.rb
 - spec/solaris/command_spec.rb
 - spec/solaris/commands_spec.rb
 - spec/solaris/cron_spec.rb