serverspec 0.4.8 → 0.4.9

data/README.md

@@ -47,13 +47,13 @@ spec/www.example.jp/httpd_spec.rb is a sample spec file and its content is like
 ```ruby
 require 'spec_helper'
 
-describe package('httpd)' do
+describe package('httpd') do
   it { should be_installed }
 end
 
 describe service('httpd') do
-  it { should be_enabled   }
-  it { should be_running   }
+  it { should be_enabled }
+  it { should be_running }
 end
 
 describe port(80) do
@@ -88,7 +88,7 @@ Finished in 0.99715 seconds
 ----
 ## Multi OS support
 
-Serverspec is supporting Red Hat based OS, Debian based OS, Gentoo and Solaris.
+Serverspec is supporting Darwin based OS, Red Hat based OS, Debian based OS, Gentoo and Solaris.
 
 Serverspec can detect target host's OS automatically.
 
@@ -100,11 +100,10 @@ require 'serverspec'
 require 'pathname'
 require 'net/ssh'
 
+include Serverspec::Helper::Ssh
+include Serverspec::Helper::Debian
+
 RSpec.configure do |c|
-  # Include backend helper
-  c.include(Serverspec::Helper::Ssh)
-  # Include OS helper
-  c.include(Serverspec::Helper::Debian)
   # Add SSH before hook in case you use the SSH backend
   # (not required for the Exec backend)
   c.before do
@@ -120,7 +119,7 @@ RSpec.configure do |c|
 end
 ```
 
-You can select **Serverspec::Helper::RedHat**, **Serverspec::Helper::Debian**, **Serverspec::Helper::Gentoo** or **Serverspec::Helper::Solaris**.
+You can select **Serverspec::Helper::RedHat**, **Serverspec::Helper::Debian**, **Serverspec::Helper::Gentoo** , **Serverspec::Helper::Solaris** or **Serverspec::Helper::Darwin**.
 
 See details on [serverspec.org](http://serverspec.org)
 

data/lib/serverspec/backend/exec.rb

@@ -35,16 +35,6 @@ module Serverspec
         check_zero(meth, *args)
       end
 
-      def check_installed_by_gem(example, package, version)
-        @example = example
-        ret = run_command(commands.check_installed_by_gem(package))
-        res = ret[:exit_status] == 0
-        if res && version
-          res = false if not ret[:stdout].match(/\(#{version}\)/)
-        end
-        res
-      end
-
       def check_running(example, process)
         @example = example
         ret = run_command(commands.check_running(process))

data/lib/serverspec/commands/base.rb

@@ -120,9 +120,12 @@ module Serverspec
         "stat -c %N #{escape(link)} | grep -- #{escape(target)}"
       end
 
-      def check_installed_by_gem name
-        gem_name = "^#{name} "
-        "gem list --local | grep -- #{escape(gem_name)}"
+      def check_installed_by_gem name, version=nil
+        cmd = "gem list --local | grep -w -- ^#{escape(name)}"
+        if ! version.nil?
+          cmd = "#{cmd} | grep -w -- #{escape(version)}"
+        end
+        cmd
       end
 
       def check_belonging_group user, group

data/lib/serverspec/matchers/be_installed.rb

@@ -8,7 +8,7 @@ RSpec::Matchers.define :be_installed do
       else
         check_method = "check_installed_by_#{@provider}".to_sym
 
-        unless backend.respond_to?(check_method)
+        unless backend.respond_to?(check_method) || commands.respond_to?(check_method)
           raise ArgumentError.new("`be_installed` matcher doesn't support #{@under}")
         end
 

data/lib/serverspec/type/package.rb

@@ -7,7 +7,7 @@ module Serverspec
         else
           check_method = "check_installed_by_#{provider}".to_sym
 
-          unless backend.respond_to?(check_method)
+          unless backend.respond_to?(check_method) || commands.respond_to?(check_method)
             raise ArgumentError.new("`be_installed` matcher doesn't support #{provider}")
           end
 

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

data/spec/darwin/commands_spec.rb

@@ -2,6 +2,11 @@ require 'spec_helper'
 
 include Serverspec::Helper::Darwin
 
+describe 'Serverspec commands of Darwin family' do
+  it_behaves_like 'support command check_installed_by_gem', 'jekyll'
+  it_behaves_like 'support command check_installed_by_gem', 'jekyll', '1.0.2'
+end
+
 describe 'check_file' do
   subject { commands.check_file('/etc/passwd') }
   it { should eq 'test -f /etc/passwd' }
@@ -146,11 +151,6 @@ describe 'check_link' do
   it { should eq 'stat -c %N /etc/system-release | grep -- /etc/darwin-release' }
 end
 
-describe 'check_installed_by_gem' do
-  subject { commands.check_installed_by_gem('jekyll') }
-  it { should eq 'gem list --local | grep -- \\^jekyll\\ ' }
-end
-
 describe 'check_belonging_group' do
   subject { commands.check_belonging_group('root', 'wheel') }
   it { should eq "id root | awk '{print $3}' | grep -- wheel" }

data/spec/debian/commands_spec.rb

@@ -2,6 +2,11 @@ require 'spec_helper'
 
 include Serverspec::Helper::Debian
 
+describe 'Serverspec commands of Debian family' do
+  it_behaves_like 'support command check_installed_by_gem', 'jekyll'
+  it_behaves_like 'support command check_installed_by_gem', 'jekyll', '1.0.2'
+end
+
 describe 'check_enabled' do
   subject { commands.check_enabled('httpd') }
   it { should eq 'ls /etc/rc3.d/ | grep -- httpd' }
@@ -158,11 +163,6 @@ describe 'check_link' do
   it { should eq 'stat -c %N /etc/system-release | grep -- /etc/redhat-release' }
 end
 
-describe 'check_installed_by_gem' do
-  subject { commands.check_installed_by_gem('jekyll') }
-  it { should eq 'gem list --local | grep -- \\^jekyll\\ ' }
-end
-
 describe 'check_belonging_group' do
   subject { commands.check_belonging_group('root', 'wheel') }
   it { should eq "id root | awk '{print $3}' | grep -- wheel" }

data/spec/gentoo/commands_spec.rb

@@ -2,6 +2,11 @@ require 'spec_helper'
 
 include Serverspec::Helper::Gentoo
 
+describe 'Serverspec commands of Gentoo family' do
+  it_behaves_like 'support command check_installed_by_gem', 'jekyll'
+  it_behaves_like 'support command check_installed_by_gem', 'jekyll', '1.0.2'
+end
+
 describe 'check_enabled' do
   subject { commands.check_enabled('httpd') }
   it { should eq "/sbin/rc-update show | grep -- \\^\\\\s\\*httpd\\\\s\\*\\|\\\\s\\*\\\\\\(boot\\\\\\|default\\\\\\)" }
@@ -156,11 +161,6 @@ describe 'check_link' do
   it { should eq 'stat -c %N /etc/system-release | grep -- /etc/redhat-release' }
 end
 
-describe 'check_installed_by_gem' do
-  subject { commands.check_installed_by_gem('jekyll') }
-  it { should eq 'gem list --local | grep -- \\^jekyll\\ ' }
-end
-
 describe 'check_belonging_group' do
   subject { commands.check_belonging_group('root', 'wheel') }
   it { should eq "id root | awk '{print $3}' | grep -- wheel" }

data/spec/redhat/commands_spec.rb

@@ -2,6 +2,11 @@ require 'spec_helper'
 
 include Serverspec::Helper::RedHat
 
+describe 'Serverspec commands of Red Hat' do
+  it_behaves_like 'support command check_installed_by_gem', 'jekyll'
+  it_behaves_like 'support command check_installed_by_gem', 'jekyll', '1.0.2'
+end
+
 describe 'check_enabled' do
   subject { commands.check_enabled('httpd') }
   it { should eq '/sbin/chkconfig --list httpd | grep 3:on' }
@@ -156,11 +161,6 @@ describe 'check_link' do
   it { should eq 'stat -c %N /etc/system-release | grep -- /etc/redhat-release' }
 end
 
-describe 'check_installed_by_gem' do
-  subject { commands.check_installed_by_gem('jekyll') }
-  it { should eq 'gem list --local | grep -- \\^jekyll\\ ' }
-end
-
 describe 'check_belonging_group' do
   subject { commands.check_belonging_group('root', 'wheel') }
   it { should eq "id root | awk '{print $3}' | grep -- wheel" }

data/spec/solaris/commands_spec.rb

@@ -2,6 +2,11 @@ require 'spec_helper'
 
 include Serverspec::Helper::Solaris
 
+describe 'Serverspec commands of Solaris family' do
+  it_behaves_like 'support command check_installed_by_gem', 'jekyll'
+  it_behaves_like 'support command check_installed_by_gem', 'jekyll', '1.0.2'
+end
+
 describe 'check_enabled' do
   subject { commands.check_enabled('httpd') }
   it { should eq "svcs -l httpd 2> /dev/null | grep 'enabled      true'" }
@@ -156,11 +161,6 @@ describe 'check_link' do
   it { should eq 'stat -c %N /etc/system-release | grep -- /etc/redhat-release' }
 end
 
-describe 'check_installed_by_gem' do
-  subject { commands.check_installed_by_gem('jekyll') }
-  it { should eq 'gem list --local | grep -- \\^jekyll\\ ' }
-end
-
 describe 'check_belonging_group' do
   subject { commands.check_belonging_group('root', 'wheel') }
   it { should eq "id -Gn root | grep -- wheel" }

data/spec/support/shared_commands_examples.rb

@@ -0,0 +1,13 @@
+shared_examples_for 'support command check_installed_by_gem' do |package|
+  describe 'check_installed_by_gem' do
+    subject { commands.check_installed_by_gem(package) }
+    it { should eq "gem list --local | grep -w -- ^#{package}" }
+  end
+end
+
+shared_examples_for 'support command check_installed_by_gem with_version' do |package, version|
+  describe 'check_installed_by_gem with_version' do |package, version|
+    subject { commands.check_installed_by_gem(package) }
+    it { should eq "gem list --local | grep -w -- ^#{package} | grep -w -- ^#{version}" }
+  end
+end

data/spec/support/shared_matcher_examples.rb

@@ -643,12 +643,6 @@ end
 
 shared_examples_for 'support be_installed.by(gem).with_version matcher' do |name, version|
   describe 'be_installed.by(gem).with_version' do
-    before :all do
-      RSpec.configure do |c|
-        c.stdout = "#{name} (#{version})"
-      end
-    end
-
     describe name do
       it { should be_installed.by('gem').with_version(version) }
     end

data/spec/support/shared_package_examples.rb

@@ -24,12 +24,6 @@ end
 
 shared_examples_for 'support package installed by gem with version matcher' do |name, version|
   describe 'installed by gem with version' do
-    before :all do
-      RSpec.configure do |c|
-        c.stdout = "#{name} (#{version})"
-      end
-    end
-
     describe package(name) do
       it { should be_installed.by('gem').with_version(version) }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -313,6 +313,7 @@ files:
 - spec/solaris/zfs_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_command_examples.rb
+- spec/support/shared_commands_examples.rb
 - spec/support/shared_cron_examples.rb
 - spec/support/shared_default_gateway_examples.rb
 - spec/support/shared_file_examples.rb
@@ -433,6 +434,7 @@ test_files:
 - spec/solaris/zfs_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_command_examples.rb
+- spec/support/shared_commands_examples.rb
 - spec/support/shared_cron_examples.rb
 - spec/support/shared_default_gateway_examples.rb
 - spec/support/shared_file_examples.rb