serverspec 0.2.2 → 0.2.3

data/lib/serverspec/backend/exec.rb

@@ -79,6 +79,11 @@ module Serverspec
         ret[:exit_code] == 0
       end
 
+      def check_running_under_supervisor(process)
+        ret = do_check(commands.check_running_under_supervisor(process))
+        ret[:exit_code] == 0 && ret[:stdout] =~ /RUNNING/
+      end
+
       def check_user(user)
         check_zero(:check_user, user)
       end

data/lib/serverspec/commands/base.rb

@@ -35,6 +35,10 @@ module Serverspec
         "service #{service} status"
       end
 
+      def check_running_under_supervisor service
+        "supervisorctl status #{service}"
+      end
+
       def check_process process
         "ps aux | grep -w #{process} | grep -qv grep"
       end

data/lib/serverspec/matchers/be_installed.rb

@@ -1,5 +1,24 @@
 RSpec::Matchers.define :be_installed do
-  match do |actual|
-    backend.check_installed(actual)
+  match do |name|
+    if @provider.nil?
+      backend.check_installed(name)
+    else
+      check_method = "check_installed_by_#{@provider}".to_sym
+
+      unless backend.respond_to?(check_method)
+        raise ArgumentError.new("`be_installed` matcher doesn't support #{@under}")
+      end
+
+      backend.send(check_method, name, @version)
+    end
   end
+
+  chain :by do |provider|
+    @provider = provider
+  end
+
+  chain :with_version do |version|
+    @version = version
+  end
+
 end

data/lib/serverspec/matchers/be_installed_by_gem.rb

@@ -1,5 +1,13 @@
 RSpec::Matchers.define :be_installed_by_gem do
   match do |name|
+    puts <<EOF
+
+***************************************************
+The matcher be_isntalled_by_gem will be depricated.
+Please use be_installed.by('gem') instead.
+***************************************************
+
+EOF
     backend.check_installed_by_gem(name, @version)
   end
   chain :with_version do |version|

data/lib/serverspec/matchers/be_running.rb

@@ -1,5 +1,20 @@
 RSpec::Matchers.define :be_running do
   match do |process|
-    backend.check_running(process)
+    if (@under)
+      check_method = "check_running_under_#{@under}".to_sym
+
+      unless backend.respond_to?(check_method)
+        raise ArgumentError.new("`be_running` matcher doesn't support #{@under}")
+      end
+
+      backend.send(check_method, process)
+    else
+      backend.check_running(process)
+    end
+
+  end
+
+  chain :under do |under|
+    @under = under
   end
 end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/serverspec.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "net-ssh"
+  spec.add_dependency "rspec"
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rspec"
   spec.add_development_dependency "rake"
 end

data/spec/debian/commands_spec.rb

@@ -34,6 +34,10 @@ describe commands.check_running('httpd') do
   it { should eq 'service httpd status' }
 end
 
+describe commands.check_running_under_supervisor('httpd') do
+  it { should eq 'supervisorctl status httpd' }
+end
+
 describe commands.check_process('httpd') do
   it { should eq 'ps aux | grep -w httpd | grep -qv grep' }
 end

data/spec/debian/matchers_spec.rb

@@ -4,6 +4,7 @@ describe 'Serverspec matchers of Debian family', :os => :debian do
   it_behaves_like 'support be_enabled matcher', 'rc.local'
   it_behaves_like 'support be_installed matcher', 'openssh-server'
   it_behaves_like 'support be_running matcher', 'ssh'
+  it_behaves_like 'support be_running.under("supervisor") matcher', 'growthforecast'
   it_behaves_like 'support be_listening matcher', 22
   it_behaves_like 'support be_file matcher', '/etc/ssh/sshd_config'
   it_behaves_like 'support contain matcher', '/etc/ssh/sshd_config', 'See the sshd_config(5) manpage'
@@ -26,8 +27,8 @@ describe 'Serverspec matchers of Debian family', :os => :debian do
 
   it_behaves_like 'support be_linked_to matcher', '/etc/pam.d/system-auth', '/etc/pam.d/system-auth-ac'
 
-  it_behaves_like 'support be_installed_by_gem matcher', 'jekyll'
-  it_behaves_like 'support be_installed_by_gem.with_version matcher', 'jekyll', '1.0.0'
+  it_behaves_like 'support be_installed.by(gem) matcher', 'jekyll'
+  it_behaves_like 'support be_installed.by(gem).with_version matcher', 'jekyll', '1.0.0'
 
   it_behaves_like 'support belong_to_group matcher', 'root', 'root'
 

data/spec/gentoo/commands_spec.rb

@@ -34,6 +34,10 @@ describe commands.check_running('httpd') do
   it { should eq 'service httpd status' }
 end
 
+describe commands.check_running_under_supervisor('httpd') do
+  it { should eq 'supervisorctl status httpd' }
+end
+
 describe commands.check_process('httpd') do
   it { should eq 'ps aux | grep -w httpd | grep -qv grep' }
 end

data/spec/gentoo/matchers_spec.rb

@@ -4,6 +4,7 @@ describe 'Serverspec matchers of Gentoo family', :os => :gentoo do
   it_behaves_like 'support be_enabled matcher', 'sshd'
   it_behaves_like 'support be_installed matcher', 'openssh'
   it_behaves_like 'support be_running matcher', 'sshd'
+  it_behaves_like 'support be_running.under("supervisor") matcher', 'growthforecast'
   it_behaves_like 'support be_listening matcher', 22
   it_behaves_like 'support be_file matcher', '/etc/ssh/sshd_config'
   it_behaves_like 'support be_directory matcher', '/etc/ssh'
@@ -27,8 +28,8 @@ describe 'Serverspec matchers of Gentoo family', :os => :gentoo do
 
   it_behaves_like 'support be_linked_to matcher', '/etc/pam.d/system-auth', '/etc/pam.d/system-auth-ac'
 
-  it_behaves_like 'support be_installed_by_gem matcher', 'jekyll'
-  it_behaves_like 'support be_installed_by_gem.with_version matcher', 'jekyll', '1.0.0'
+  it_behaves_like 'support be_installed.by(gem) matcher', 'jekyll'
+  it_behaves_like 'support be_installed.by(gem).with_version matcher', 'jekyll', '1.0.0'
 
   it_behaves_like 'support belong_to_group matcher', 'root', 'root'
 

data/spec/redhat/commands_spec.rb

@@ -34,6 +34,10 @@ describe commands.check_running('httpd') do
   it { should eq 'service httpd status' }
 end
 
+describe commands.check_running_under_supervisor('httpd') do
+  it { should eq 'supervisorctl status httpd' }
+end
+
 describe commands.check_process('httpd') do
   it { should eq 'ps aux | grep -w httpd | grep -qv grep' }
 end

data/spec/redhat/matchers_spec.rb

@@ -4,6 +4,8 @@ describe 'Serverspec matchers of Red Hat family', :os => :redhat do
   it_behaves_like 'support be_enabled matcher', 'sshd'
   it_behaves_like 'support be_installed matcher', 'openssh'
   it_behaves_like 'support be_running matcher', 'sshd'
+  it_behaves_like 'support be_running.under("supervisor") matcher', 'growthforecast'
+  it_behaves_like 'support be_running.under("not implemented") matcher', 'growthforecast'
   it_behaves_like 'support be_listening matcher', 22
   it_behaves_like 'support be_file matcher', '/etc/ssh/sshd_config'
   it_behaves_like 'support be_directory matcher', '/etc/ssh'
@@ -27,8 +29,8 @@ describe 'Serverspec matchers of Red Hat family', :os => :redhat do
 
   it_behaves_like 'support be_linked_to matcher', '/etc/pam.d/system-auth', '/etc/pam.d/system-auth-ac'
 
-  it_behaves_like 'support be_installed_by_gem matcher', 'jekyll'
-  it_behaves_like 'support be_installed_by_gem.with_version matcher', 'jekyll', '1.0.0'
+  it_behaves_like 'support be_installed.by(gem) matcher', 'jekyll'
+  it_behaves_like 'support be_installed.by(gem).with_version matcher', 'jekyll', '1.0.0'
 
   it_behaves_like 'support belong_to_group matcher', 'root', 'root'
 

data/spec/solaris/commads_spec.rb

@@ -34,6 +34,10 @@ describe commands.check_running('httpd') do
   it { should eq "svcs -l httpd status 2> /dev/null |grep 'state        online'" }
 end
 
+describe commands.check_running_under_supervisor('httpd') do
+  it { should eq 'supervisorctl status httpd' }
+end
+
 describe commands.check_process('httpd') do
   it { should eq 'ps aux | grep -w httpd | grep -qv grep' }
 end

data/spec/solaris/matchers_spec.rb

@@ -4,6 +4,7 @@ describe 'Serverspec matchers of Solaris family', :os => :solaris do
   it_behaves_like 'support be_enabled matcher', 'svc:/network/ssh:default'
   it_behaves_like 'support be_installed matcher', 'service/network/ssh'
   it_behaves_like 'support be_running matcher', 'svc:/network/ssh:default'
+  it_behaves_like 'support be_running.under("supervisor") matcher', 'growthforecast'
   it_behaves_like 'support be_listening matcher', 22
   it_behaves_like 'support be_file matcher', '/etc/ssh/sshd_config'
   it_behaves_like 'support be_directory matcher', '/etc/ssh'
@@ -27,8 +28,8 @@ describe 'Serverspec matchers of Solaris family', :os => :solaris do
 
   it_behaves_like 'support be_linked_to matcher', '/etc/pam.d/system-auth', '/etc/pam.d/system-auth-ac'
 
-  it_behaves_like 'support be_installed_by_gem matcher', 'jekyll'
-  it_behaves_like 'support be_installed_by_gem.with_version matcher', 'jekyll', '1.0.0'
+  it_behaves_like 'support be_installed.by(gem) matcher', 'jekyll'
+  it_behaves_like 'support be_installed.by(gem).with_version matcher', 'jekyll', '1.0.0'
 
   it_behaves_like 'support belong_to_group matcher', 'root', 'root'
 

data/spec/support/shared_matcher_examples.rb

@@ -44,6 +44,44 @@ shared_examples_for 'support be_running matcher' do |valid_service|
   end
 end
 
+shared_examples_for 'support be_running.under("supervisor") matcher' do |valid_service|
+  describe 'be_running.under("supervisor")' do
+    describe valid_service do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "#{valid_service} RUNNING\r\n"
+        end
+      end
+
+      it { should be_running.under('supervisor') }
+    end
+
+    describe valid_service do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "#{valid_service} STOPPED\r\n"
+        end
+      end
+
+      it { should_not be_running.under('supervisor') }
+    end
+
+    describe 'this-is-invalid-daemon' do
+      it { should_not be_running.under('supervisor') }
+    end
+  end
+end
+
+shared_examples_for 'support be_running.under("not implemented") matcher' do |valid_service|
+  describe 'be_running.under("not implemented")' do
+    it {
+      expect {
+        should be_running.under('not implemented')
+      }.to raise_error(ArgumentError, %r/\A`be_running` matcher doesn't support/)
+    }
+  end
+end
+
 shared_examples_for 'support be_listening matcher' do |valid_port|
   describe 'be_listening' do
     describe "port #{ valid_port }" do
@@ -224,20 +262,20 @@ shared_examples_for 'support be_linked_to matcher' do |file, target|
   end
 end
 
-shared_examples_for 'support be_installed_by_gem matcher' do |name|
-  describe 'be_installed_by_gem' do
+shared_examples_for 'support be_installed.by(gem) matcher' do |name|
+  describe 'be_installed.by(gem)' do
     describe name do
-      it { should be_installed_by_gem }
+      it { should be_installed.by('gem') }
     end
 
     describe 'invalid-gem' do
-      it { should_not be_installed_by_gem }
+      it { should_not be_installed.by('gem') }
     end
   end
 end
 
-shared_examples_for 'support be_installed_by_gem.with_version matcher' do |name, version|
-  describe 'be_installed_by_gem.with_version' do
+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})"
@@ -245,11 +283,11 @@ shared_examples_for 'support be_installed_by_gem.with_version matcher' do |name,
     end
 
     describe name do
-      it { should be_installed_by_gem.with_version(version) }
+      it { should be_installed.by('gem').with_version(version) }
     end
 
     describe name do
-      it { should_not be_installed_by_gem.with_version('invalid-version') }
+      it { should_not be_installed.by('gem').with_version('invalid-version') }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -28,37 +28,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement