serverspec 0.6.17 → 0.6.18

data/README.md

@@ -121,6 +121,30 @@ end
 
 You can select **Serverspec::Helper::RedHat**, **Serverspec::Helper::Debian**, **Serverspec::Helper::Gentoo** , **Serverspec::Helper::Solaris** or **Serverspec::Helper::Darwin**.
 
+## Vagrant support
+
+Serverspec now has Vagrant support, and can be automatically configured from a Vagrantfile
+
+```
+$ serverspec-init
+Select a backend type:
+
+  1) SSH
+  2) Exec (local)
+
+Select number:1
+
+Vagrant instance y/n: y
+Auto-configure Vagrant from Vagrantfile? y/n: y
+0) web
+1) db
+1
+ + spec/db/
+ + spec/db/httpd_spec.rb
+ + spec/spec_helper.rb
+ + Rakefile
+```
+
 See details on [serverspec.org](http://serverspec.org)
 
 ----

data/Rakefile

@@ -4,7 +4,7 @@ require 'rspec/core/rake_task'
 task :spec => 'spec:all'
 
 namespace :spec do
-  oses = %w( darwin debian gentoo redhat solaris )
+  oses = %w( darwin debian gentoo redhat solaris solaris10 smartos )
 
   task :all => [ oses.map {|os| "spec:#{os}" }, :helpers, :exec, :ssh ].flatten
 

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/solaris10'
 require 'serverspec/commands/smartos'
 require 'serverspec/commands/darwin'
 require 'serverspec/configuration'
@@ -29,12 +30,13 @@ end
 
 RSpec.configure do |c|
   c.include(Serverspec::Helper::Configuration)
-  c.include(Serverspec::Helper::RedHat,  :os => :redhat)
-  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.include(Serverspec::Helper::RedHat,    :os => :redhat)
+  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::Solaris10, :os => :solaris10)
+  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
   c.add_setting :ssh,           :default => nil

data/lib/serverspec/backend/exec.rb

@@ -197,8 +197,10 @@ module Serverspec
           'Debian'
         elsif run_command('ls /etc/gentoo-release')[:exit_status] == 0
           'Gentoo'
-        elsif run_command('uname -s')[:stdout] =~ /SunOS/i
-          if run_command('grep -q SmartOS /etc/release')
+        elsif os = run_command('uname -sr')[:stdout] && os =~ /SunOS/i
+          if os =~ /5.10/
+            'Solaris10'
+          elsif run_command('grep -q SmartOS /etc/release')
             'SmartOS'
           else
             'Solaris'

data/lib/serverspec/commands/solaris10.rb

@@ -0,0 +1,7 @@
+module Serverspec
+  module Commands
+    class Solaris10 < Solaris
+      # Please implement Solaris 10 specific commands
+    end
+  end
+end

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/solaris10'
 require 'serverspec/helper/smartos'
 require 'serverspec/helper/darwin'
 require 'serverspec/helper/detect_os'

data/lib/serverspec/helper/solaris10.rb

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

data/lib/serverspec/setup.rb

@@ -21,15 +21,22 @@ EOF
         @vagrant = gets.chomp
         if @vagrant =~ (/(true|t|yes|y|1)$/i)
           @vagrant = true
+          print "Auto-configure Vagrant from Vagrantfile? y/n: "
+          auto_config = gets.chomp
+          if auto_config =~ (/(true|t|yes|y|1)$/i)
+            auto_vagrant_configuration
+          else
+            print("Input vagrant instance name: ")
+            @hostname = gets.chomp
+          end
         else
           @vagrant = false
+          print("Input target host name: ")
+          @hostname = gets.chomp
         end
-        @vagrant ? print("Input vagrant instance name: ") : print("Input target host name: ")
-        @hostname = gets.chomp
-     else
+      else
         @hostname = 'localhost'
       end
-
       [ 'spec', "spec/#{@hostname}" ].each { |dir| safe_mkdir(dir) }
       safe_create_spec
       safe_create_spec_helper
@@ -128,7 +135,8 @@ EOF
   end")
             if @vagrant
               content.gsub!(/### include vagrant conf ###/,"
-      config = `vagrant ssh-config --host \#{host}`
+      vagrant_up = `vagrant up #{@hostname}`
+      config = `vagrant ssh-config #{@hostname}`
       if config != ''
         config.each_line do |line|
           if match = /HostName (.*)/.match(line)
@@ -189,5 +197,34 @@ EOF
         puts ' + Rakefile'
       end
     end
+
+    def self.auto_vagrant_configuration
+      if File.exists?("Vagrantfile")
+        vagrant_list = `vagrant status`
+        list_of_vms = []
+        if vagrant_list != ''
+          vagrant_list.each_line do |line|
+            if match = /([a-z]+[\s]+)(created|not created|poweroff|running|saved)[\s](\(virtualbox\)|\(vmware\))/.match(line)
+              list_of_vms << match[1].strip!
+            end
+          end
+          if list_of_vms.length == 1
+            @hostname = list_of_vms[0]
+          else
+            list_of_vms.each_with_index { |vm, index | puts "#{index}) #{vm}\n" }
+            print "Choose a VM from the Vagrantfile: "
+            chosen_vm = gets.chomp
+            @hostname = list_of_vms[chosen_vm.to_i]
+          end
+        else
+          $stderr.puts "Vagrant status error - Check your Vagrantfile or .vagrant"
+          exit 1
+        end
+      else
+        $stderr.puts "Vagrantfile not found in directory!"
+        exit 1
+      end
+    end
+
   end
 end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.6.17"
+  VERSION = "0.6.18"
 end

data/spec/darwin/commands_spec.rb

@@ -7,15 +7,6 @@ describe 'Serverspec commands of Darwin family' do
   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_user', 'root'

data/spec/darwin/package_spec.rb

@@ -2,11 +2,57 @@ require 'spec_helper'
 
 include Serverspec::Helper::Darwin
 
-describe 'Serverspec package matchers of Darwin family' do
-  it_behaves_like 'support package installed by gem matcher', 'jekyll'
-  it_behaves_like 'support package installed by gem with version matcher', 'jekyll', '1.1.1'
-  it_behaves_like 'support package installed by npm matcher', 'bower'
-  it_behaves_like 'support package installed by npm with version matcher', 'bower', '0.9.2'
-  it_behaves_like 'support package installed by pecl matcher', 'mongo'
-  it_behaves_like 'support package installed by pecl with version matcher', 'mongo', '1.4.1'
+describe package('jekyll') do
+  it { should be_installed.by('gem') }
+  its(:command) { should eq "gem list --local | grep -w -- ^jekyll" }
+end
+
+describe package('invalid-gem') do
+  it { should_not be_installed.by('gem') }
+end
+
+describe package('jekyll') do
+  it { should be_installed.by('gem').with_version('1.1.1') }
+  its(:command) { should eq "gem list --local | grep -w -- ^jekyll | grep -w -- 1.1.1" }
+end
+
+describe package('jekyll') do
+  it { should_not be_installed.by('gem').with_version('invalid-version') }
+end
+
+describe package('bower') do
+  it { should be_installed.by('npm') }
+  its(:command) { should eq "npm ls bower -g" }
+end
+
+describe package('invalid-npm-package') do
+  it { should_not be_installed.by('npm') }
+end
+
+describe package('bower') do
+  it { should be_installed.by('npm').with_version('0.9.2') }
+  its(:command) { should eq "npm ls bower -g | grep -w -- 0.9.2" }
+end
+
+describe package('bower') do
+  it { should_not be_installed.by('npm').with_version('invalid-version') }
+end
+
+
+describe package('mongo') do
+  it { should be_installed.by('pecl') }
+  its(:command) { should eq "pecl list | grep -w -- ^mongo" }
+end
+
+describe package('invalid-pecl') do
+  it { should_not be_installed.by('pecl') }
+end
+
+describe package('mongo') do
+  it { should be_installed.by('pecl').with_version('1.4.1') }
+  its(:command) { should eq "pecl list | grep -w -- ^mongo | grep -w -- 1.4.1" }
+end
+
+describe package('mongo') do
+  it { should_not be_installed.by('pecl').with_version('invalid-version') }
 end

data/spec/debian/commands_spec.rb

@@ -7,15 +7,6 @@ describe 'Serverspec commands of Debian family' do
   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_user', 'root'
@@ -69,11 +60,6 @@ describe 'check_enabled with run level 5' do
   it { should eq "ls /etc/rc5.d/ | grep -- httpd || grep 'start on' /etc/init/httpd.conf" }
 end
 
-describe 'check_installed'  do
-  subject { commands.check_installed('httpd') }
-  it { should eq "dpkg -s httpd && ! dpkg -s httpd | grep -E '^Status: .+ not-installed$'" }
-end
-
 describe 'check_running' do
   subject { commands.check_running('httpd') }
   it { should eq "service httpd status | grep 'running'" }

data/spec/debian/package_spec.rb

@@ -2,12 +2,66 @@ require 'spec_helper'
 
 include Serverspec::Helper::Debian
 
-describe 'Serverspec package matchers of Debian family' do
-  it_behaves_like 'support package installed matcher', 'httpd'
-  it_behaves_like 'support package installed by gem matcher', 'jekyll'
-  it_behaves_like 'support package installed by gem with version matcher', 'jekyll', '1.1.1'
-  it_behaves_like 'support package installed by npm matcher', 'bower'
-  it_behaves_like 'support package installed by npm with version matcher', 'bower', '0.9.2'
-  it_behaves_like 'support package installed by pecl matcher', 'mongo'
-  it_behaves_like 'support package installed by pecl with version matcher', 'mongo', '1.4.1'
+describe package('apache2') do
+  it { should be_installed }
+  its(:command) { should eq "dpkg -s apache2 && ! dpkg -s apache2 | grep -E '^Status: .+ not-installed$'" }
+end
+
+describe package('invalid-package') do
+  it { should_not be_installed }
+end
+
+describe package('jekyll') do
+  it { should be_installed.by('gem') }
+  its(:command) { should eq "gem list --local | grep -w -- ^jekyll" }
+end
+
+describe package('invalid-gem') do
+  it { should_not be_installed.by('gem') }
+end
+
+describe package('jekyll') do
+  it { should be_installed.by('gem').with_version('1.1.1') }
+  its(:command) { should eq "gem list --local | grep -w -- ^jekyll | grep -w -- 1.1.1" }
+end
+
+describe package('jekyll') do
+  it { should_not be_installed.by('gem').with_version('invalid-version') }
+end
+
+describe package('bower') do
+  it { should be_installed.by('npm') }
+  its(:command) { should eq "npm ls bower -g" }
+end
+
+describe package('invalid-npm-package') do
+  it { should_not be_installed.by('npm') }
+end
+
+describe package('bower') do
+  it { should be_installed.by('npm').with_version('0.9.2') }
+  its(:command) { should eq "npm ls bower -g | grep -w -- 0.9.2" }
+end
+
+describe package('bower') do
+  it { should_not be_installed.by('npm').with_version('invalid-version') }
+end
+
+
+describe package('mongo') do
+  it { should be_installed.by('pecl') }
+  its(:command) { should eq "pecl list | grep -w -- ^mongo" }
+end
+
+describe package('invalid-pecl') do
+  it { should_not be_installed.by('pecl') }
+end
+
+describe package('mongo') do
+  it { should be_installed.by('pecl').with_version('1.4.1') }
+  its(:command) { should eq "pecl list | grep -w -- ^mongo | grep -w -- 1.4.1" }
+end
+
+describe package('mongo') do
+  it { should_not be_installed.by('pecl').with_version('invalid-version') }
 end

data/spec/gentoo/commands_spec.rb

@@ -7,15 +7,6 @@ describe 'Serverspec commands of Gentoo family' do
   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_user', 'root'
@@ -60,11 +51,6 @@ describe 'check_enabled' do
   it { should eq "rc-update show | grep -- \\^\\\\s\\*httpd\\\\s\\*\\|\\\\s\\*\\\\\\(boot\\\\\\|default\\\\\\)" }
 end
 
-describe 'check_installed' do
-  subject { commands.check_installed('httpd') }
-  it { should eq 'eix httpd --installed' }
-end
-
 describe 'check_running' do
   subject { commands.check_running('httpd') }
   it { should eq '/etc/init.d/httpd status' }

data/spec/gentoo/package_spec.rb

@@ -2,12 +2,66 @@ require 'spec_helper'
 
 include Serverspec::Helper::Gentoo
 
-describe 'Serverspec package matchers of Gentoo family' do
-  it_behaves_like 'support package installed matcher', 'httpd'
-  it_behaves_like 'support package installed by gem matcher', 'jekyll'
-  it_behaves_like 'support package installed by gem with version matcher', 'jekyll', '1.1.1'
-  it_behaves_like 'support package installed by npm matcher', 'bower'
-  it_behaves_like 'support package installed by npm with version matcher', 'bower', '0.9.2'
-  it_behaves_like 'support package installed by pecl matcher', 'mongo'
-  it_behaves_like 'support package installed by pecl with version matcher', 'mongo', '1.4.1'
+describe package('apache') do
+  it { should be_installed }
+  its(:command) { should eq "eix apache --installed" }
+end
+
+describe package('invalid-package') do
+  it { should_not be_installed }
+end
+
+describe package('jekyll') do
+  it { should be_installed.by('gem') }
+  its(:command) { should eq "gem list --local | grep -w -- ^jekyll" }
+end
+
+describe package('invalid-gem') do
+  it { should_not be_installed.by('gem') }
+end
+
+describe package('jekyll') do
+  it { should be_installed.by('gem').with_version('1.1.1') }
+  its(:command) { should eq "gem list --local | grep -w -- ^jekyll | grep -w -- 1.1.1" }
+end
+
+describe package('jekyll') do
+  it { should_not be_installed.by('gem').with_version('invalid-version') }
+end
+
+describe package('bower') do
+  it { should be_installed.by('npm') }
+  its(:command) { should eq "npm ls bower -g" }
+end
+
+describe package('invalid-npm-package') do
+  it { should_not be_installed.by('npm') }
+end
+
+describe package('bower') do
+  it { should be_installed.by('npm').with_version('0.9.2') }
+  its(:command) { should eq "npm ls bower -g | grep -w -- 0.9.2" }
+end
+
+describe package('bower') do
+  it { should_not be_installed.by('npm').with_version('invalid-version') }
+end
+
+
+describe package('mongo') do
+  it { should be_installed.by('pecl') }
+  its(:command) { should eq "pecl list | grep -w -- ^mongo" }
+end
+
+describe package('invalid-pecl') do
+  it { should_not be_installed.by('pecl') }
+end
+
+describe package('mongo') do
+  it { should be_installed.by('pecl').with_version('1.4.1') }
+  its(:command) { should eq "pecl list | grep -w -- ^mongo | grep -w -- 1.4.1" }
+end
+
+describe package('mongo') do
+  it { should_not be_installed.by('pecl').with_version('invalid-version') }
 end

data/spec/redhat/commands_spec.rb

@@ -7,15 +7,6 @@ describe 'Serverspec commands of Red Hat' do
   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_user', 'root'
@@ -77,16 +68,6 @@ describe 'check_yumrepo_enabled' do
   it { should eq 'yum repolist all -C | grep ^epel | grep enabled' }
 end
 
-describe 'check_installed' do
-  subject { commands.check_installed('httpd') }
-  it { should eq 'rpm -q httpd' }
-end
-
-describe 'check_installed' do
-  subject { commands.check_installed('httpd','2.2') }
-  it { should eq 'rpm -q httpd | grep -w -- 2.2' }
-end
-
 describe 'check_running' do
   subject { commands.check_running('httpd') }
   it { should eq 'service httpd status' }

data/spec/redhat/package_spec.rb

@@ -2,13 +2,75 @@ require 'spec_helper'
 
 include Serverspec::Helper::RedHat
 
-describe 'Serverspec package matchers of Red Hat family' do
-  it_behaves_like 'support package installed matcher', 'httpd'
-  it_behaves_like 'support package installed with version matcher', 'httpd', '2.2'
-  it_behaves_like 'support package installed by gem matcher', 'jekyll'
-  it_behaves_like 'support package installed by gem with version matcher', 'jekyll', '1.1.1'
-  it_behaves_like 'support package installed by npm matcher', 'bower'
-  it_behaves_like 'support package installed by npm with version matcher', 'bower', '0.9.2'
-  it_behaves_like 'support package installed by pecl matcher', 'mongo'
-  it_behaves_like 'support package installed by pecl with version matcher', 'mongo', '1.4.1'
+describe package('httpd') do
+  it { should be_installed }
+  its(:command) { should eq "rpm -q httpd" }
+end
+
+describe package('invalid-package') do
+  it { should_not be_installed }
+end
+
+describe package('httpd') do
+  it { should be_installed.with_version('2.2.15-28.el6') }
+  its(:command) { should eq "rpm -q httpd | grep -w -- 2.2.15-28.el6" }
+end
+
+describe package('httpd') do
+  it { should_not be_installed.with_version('invalid-version') }
+end
+
+describe package('jekyll') do
+  it { should be_installed.by('gem') }
+  its(:command) { should eq "gem list --local | grep -w -- ^jekyll" }
+end
+
+describe package('invalid-gem') do
+  it { should_not be_installed.by('gem') }
+end
+
+describe package('jekyll') do
+  it { should be_installed.by('gem').with_version('1.1.1') }
+  its(:command) { should eq "gem list --local | grep -w -- ^jekyll | grep -w -- 1.1.1" }
+end
+
+describe package('jekyll') do
+  it { should_not be_installed.by('gem').with_version('invalid-version') }
+end
+
+describe package('bower') do
+  it { should be_installed.by('npm') }
+  its(:command) { should eq "npm ls bower -g" }
+end
+
+describe package('invalid-npm-package') do
+  it { should_not be_installed.by('npm') }
+end
+
+describe package('bower') do
+  it { should be_installed.by('npm').with_version('0.9.2') }
+  its(:command) { should eq "npm ls bower -g | grep -w -- 0.9.2" }
+end
+
+describe package('bower') do
+  it { should_not be_installed.by('npm').with_version('invalid-version') }
+end
+
+
+describe package('mongo') do
+  it { should be_installed.by('pecl') }
+  its(:command) { should eq "pecl list | grep -w -- ^mongo" }
+end
+
+describe package('invalid-pecl') do
+  it { should_not be_installed.by('pecl') }
+end
+
+describe package('mongo') do
+  it { should be_installed.by('pecl').with_version('1.4.1') }
+  its(:command) { should eq "pecl list | grep -w -- ^mongo | grep -w -- 1.4.1" }
+end
+
+describe package('mongo') do
+  it { should_not be_installed.by('pecl').with_version('invalid-version') }
 end

data/spec/smartos/commands_spec.rb

@@ -7,15 +7,6 @@ describe 'Serverspec commands of Solaris family specified SmartOS' do
   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_user', 'root'

data/spec/solaris/commands_spec.rb

@@ -7,15 +7,6 @@ describe 'Serverspec commands of Solaris family' do
   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_user', 'root'
@@ -50,16 +41,6 @@ describe 'check_enabled' do
   it { should eq "svcs -l httpd 2> /dev/null | grep -wx '^enabled.*true$'" }
 end
 
-describe 'check_installed' do
-  subject { commands.check_installed('httpd') }
-  it { should eq 'pkg list -H httpd 2> /dev/null' }
-end
-
-describe 'check_installed' do
-  subject { commands.check_installed('httpd', '2.2') }
-  it { should eq 'pkg list -H httpd 2> /dev/null | grep -qw -- 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') }

data/spec/solaris/package_spec.rb

@@ -2,13 +2,75 @@ require 'spec_helper'
 
 include Serverspec::Helper::Solaris
 
-describe 'Serverspec package matchers of Solaris family' do
-  it_behaves_like 'support package installed matcher', 'httpd'
-  it_behaves_like 'support package installed with version matcher', 'httpd', '2.2'
-  it_behaves_like 'support package installed by gem matcher', 'jekyll'
-  it_behaves_like 'support package installed by gem with version matcher', 'jekyll', '1.1.1'
-  it_behaves_like 'support package installed by npm matcher', 'bower'
-  it_behaves_like 'support package installed by npm with version matcher', 'bower', '0.9.2'
-  it_behaves_like 'support package installed by pecl matcher', 'mongo'
-  it_behaves_like 'support package installed by pecl with version matcher', 'mongo', '1.4.1'
+describe package('httpd') do
+  it { should be_installed }
+  its(:command) { should eq "pkg list -H httpd 2> /dev/null" }
+end
+
+describe package('invalid-package') do
+  it { should_not be_installed }
+end
+
+describe package('httpd') do
+  it { should be_installed.with_version('2.2') }
+  its(:command) { should eq "pkg list -H httpd 2> /dev/null | grep -qw -- 2.2" }
+end
+
+describe package('httpd') do
+  it { should_not be_installed.with_version('invalid-version') }
+end
+
+describe package('jekyll') do
+  it { should be_installed.by('gem') }
+  its(:command) { should eq "gem list --local | grep -w -- ^jekyll" }
+end
+
+describe package('invalid-gem') do
+  it { should_not be_installed.by('gem') }
+end
+
+describe package('jekyll') do
+  it { should be_installed.by('gem').with_version('1.1.1') }
+  its(:command) { should eq "gem list --local | grep -w -- ^jekyll | grep -w -- 1.1.1" }
+end
+
+describe package('jekyll') do
+  it { should_not be_installed.by('gem').with_version('invalid-version') }
+end
+
+describe package('bower') do
+  it { should be_installed.by('npm') }
+  its(:command) { should eq "npm ls bower -g" }
+end
+
+describe package('invalid-npm-package') do
+  it { should_not be_installed.by('npm') }
+end
+
+describe package('bower') do
+  it { should be_installed.by('npm').with_version('0.9.2') }
+  its(:command) { should eq "npm ls bower -g | grep -w -- 0.9.2" }
+end
+
+describe package('bower') do
+  it { should_not be_installed.by('npm').with_version('invalid-version') }
+end
+
+
+describe package('mongo') do
+  it { should be_installed.by('pecl') }
+  its(:command) { should eq "pecl list | grep -w -- ^mongo" }
+end
+
+describe package('invalid-pecl') do
+  it { should_not be_installed.by('pecl') }
+end
+
+describe package('mongo') do
+  it { should be_installed.by('pecl').with_version('1.4.1') }
+  its(:command) { should eq "pecl list | grep -w -- ^mongo | grep -w -- 1.4.1" }
+end
+
+describe package('mongo') do
+  it { should_not be_installed.by('pecl').with_version('invalid-version') }
 end

data/spec/solaris10/commands_spec.rb

@@ -0,0 +1,138 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Solaris10
+
+describe 'Serverspec commands of Solaris family' 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_mounted', '/'
+
+  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_monitored_by_monit', 'unicorn'
+  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
+
+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_running' do
+  subject { commands.check_running('httpd') }
+  it { should eq "svcs -l httpd status 2> /dev/null |grep -wx '^state.*online$'" }
+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

data/spec/support/shared_commands_examples.rb

@@ -1,33 +1,3 @@
-shared_examples_for 'support command check_installed_by_gem' do |package|
-  subject { commands.check_installed_by_gem(package) }
-  it { should eq "gem list --local | grep -w -- ^#{package}" }
-end
-
-shared_examples_for 'support command check_installed_by_gem with_version' do |package, version|
-  subject { commands.check_installed_by_gem(package, version) }
-  it { should eq "gem list --local | grep -w -- ^#{package} | grep -w -- #{version}" }
-end
-
-shared_examples_for 'support command check_installed_by_npm' do |package|
-  subject { commands.check_installed_by_npm(package) }
-  it { should eq "npm ls #{package} -g" }
-end
-
-shared_examples_for 'support command check_installed_by_npm with_version' do |package, version|
-  subject { commands.check_installed_by_npm(package, version) }
-  it { should eq "npm ls #{package} -g | grep -w -- #{version}" }
-end
-
-shared_examples_for 'support command check_installed_by_pecl' do |package|
-  subject { commands.check_installed_by_pecl(package) }
-  it { should eq "pecl list | grep -w -- ^#{package}" }
-end
-
-shared_examples_for 'support command check_installed_by_pecl with_version' do |package, version|
-  subject { commands.check_installed_by_pecl(package, version) }
-  it { should eq "pecl list | grep -w -- ^#{package} | grep -w -- #{version}" }
-end
-
 shared_examples_for 'support command check_file' do |file|
   subject { commands.check_file(file) }
   it { should eq "test -f #{file}" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.6.17
+  version: 0.6.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -152,6 +152,7 @@ files:
 - lib/serverspec/commands/redhat.rb
 - lib/serverspec/commands/smartos.rb
 - lib/serverspec/commands/solaris.rb
+- lib/serverspec/commands/solaris10.rb
 - lib/serverspec/configuration.rb
 - lib/serverspec/helper.rb
 - lib/serverspec/helper/attributes.rb
@@ -166,6 +167,7 @@ files:
 - lib/serverspec/helper/redhat.rb
 - lib/serverspec/helper/smartos.rb
 - lib/serverspec/helper/solaris.rb
+- lib/serverspec/helper/solaris10.rb
 - lib/serverspec/helper/ssh.rb
 - lib/serverspec/helper/type.rb
 - lib/serverspec/matchers.rb
@@ -295,12 +297,12 @@ files:
 - spec/solaris/svcprop_spec.rb
 - spec/solaris/user_spec.rb
 - spec/solaris/zfs_spec.rb
+- spec/solaris10/commands_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_commands_examples.rb
 - spec/support/shared_file_examples.rb
 - spec/support/shared_group_examples.rb
 - spec/support/shared_kernel_module_examples.rb
-- spec/support/shared_package_examples.rb
 - spec/support/shared_selinux_examples.rb
 - spec/support/shared_service_examples.rb
 - spec/support/shared_user_examples.rb
@@ -325,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: RSpec tests for your servers configured by Puppet, Chef or anything else
@@ -414,12 +416,12 @@ test_files:
 - spec/solaris/svcprop_spec.rb
 - spec/solaris/user_spec.rb
 - spec/solaris/zfs_spec.rb
+- spec/solaris10/commands_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_commands_examples.rb
 - spec/support/shared_file_examples.rb
 - spec/support/shared_group_examples.rb
 - spec/support/shared_kernel_module_examples.rb
-- spec/support/shared_package_examples.rb
 - spec/support/shared_selinux_examples.rb
 - spec/support/shared_service_examples.rb
 - spec/support/shared_user_examples.rb

data/spec/support/shared_package_examples.rb

@@ -1,95 +0,0 @@
-shared_examples_for 'support package installed matcher' do |name|
-  describe 'be_installed' do
-    describe package(name) do
-      it { should be_installed }
-    end
-
-    describe package('invalid-package') do
-      it { should_not be_installed }
-    end
-  end
-end
-
-shared_examples_for 'support package installed with version matcher' do |name,version|
-  describe 'installed with version' do
-    describe package(name) do
-      it { should be_installed.with_version(version) }
-    end
-
-    describe package('invalid-package') do
-      it { should_not be_installed.with_version(version) }
-    end
-  end
-end
-
-shared_examples_for 'support package installed by gem matcher' do |name|
-  describe 'installed by gem' do
-    describe package(name) do
-      it { should be_installed.by('gem') }
-    end
-
-    describe package('invalid-gem') do
-      it { should_not be_installed.by('gem') }
-    end
-  end
-end
-
-shared_examples_for 'support package installed by gem with version matcher' do |name, version|
-  describe 'installed by gem with version' do
-    describe package(name) do
-      it { should be_installed.by('gem').with_version(version) }
-    end
-
-    describe package('invalid-gem-package') do
-      it { should_not be_installed.by('gem').with_version('invalid-version') }
-    end
-  end
-end
-
-shared_examples_for 'support package installed by npm matcher' do |name|
-  describe 'installed by npm' do
-    describe package(name) do
-      it { should be_installed.by('npm') }
-    end
-
-    describe package('invalid-npm-package') do
-      it { should_not be_installed.by('npm') }
-    end
-  end
-end
-
-shared_examples_for 'support package installed by npm with version matcher' do |name, version|
-  describe 'installed by npm with version' do
-    describe package(name) do
-      it { should be_installed.by('npm').with_version(version) }
-    end
-
-    describe package('invalid-npm-package') do
-      it { should_not be_installed.by('npm').with_version('invalid-version') }
-    end
-  end
-end
-
-shared_examples_for 'support package installed by pecl matcher' do |name|
-  describe 'installed by pecl' do
-    describe package(name) do
-      it { should be_installed.by('pecl') }
-    end
-
-    describe package('invalid-pecl') do
-      it { should_not be_installed.by('pecl') }
-    end
-  end
-end
-
-shared_examples_for 'support package installed by pecl with version matcher' do |name, version|
-  describe 'installed by pecl with version' do
-    describe package(name) do
-      it { should be_installed.by('pecl').with_version(version) }
-    end
-
-    describe package('invalid-pecl-package') do
-      it { should_not be_installed.by('pecl').with_version('invalid-version') }
-    end
-  end
-end