serverspec 0.3.2 → 0.4.0

data/Rakefile

@@ -1,4 +1,16 @@
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
+task :spec => 'spec:all'
+
+namespace :spec do
+  oses = %w( darwin debian gentoo redhat solaris )
+
+  task :all => oses.map {|os| "spec:#{os}" }
+
+  oses.each do |os|
+    RSpec::Core::RakeTask.new(os.to_sym) do |t|
+      t.pattern = "spec/#{os}/*_spec.rb"
+    end
+  end
+end

data/lib/serverspec/helper.rb

@@ -18,3 +18,7 @@ require 'serverspec/helper/obsoleted'
 
 # Attributes helper
 require 'serverspec/helper/attributes'
+
+# Subject type helper
+require 'serverspec/helper/type'
+include Serverspec::Helper::Type

data/lib/serverspec/helper/type.rb

@@ -0,0 +1,11 @@
+require 'serverspec/type/service'
+
+module Serverspec
+  module Helper
+    module Type
+      def service name
+        Serverspec::Type::Service.new(name)
+      end
+    end
+  end
+end

data/lib/serverspec/matchers/be_enabled.rb

@@ -1,5 +1,9 @@
 RSpec::Matchers.define :be_enabled do
-  match do |actual|
-    backend.check_enabled(example, actual)
+  match do |name|
+    if name.respond_to?(:enabled?)
+      name.enabled?
+    else
+      backend.check_enabled(example, name)
+    end
   end
 end

data/lib/serverspec/matchers/be_running.rb

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

data/lib/serverspec/setup.rb

@@ -8,7 +8,6 @@ Select a backend type:
 
   1) SSH
   2) Exec (local)
-  3) Puppet providers (local)
 
 Select number: 
 EOF
@@ -16,7 +15,7 @@ EOF
       num = gets.to_i - 1
       puts
 
-      @backend_type = [ 'Ssh', 'Exec', 'Puppet' ][num]
+      @backend_type = [ 'Ssh', 'Exec' ][num]
       if @backend_type == 'Ssh'
         print "Input target host name: "
         @hostname = gets.chomp

data/lib/serverspec/type/service.rb

@@ -0,0 +1,31 @@
+module Serverspec
+  module Type
+    class Service
+      def initialize name
+        @name = name
+      end
+
+      def enabled?
+        backend.check_enabled(nil, @name)
+      end
+
+      def running? under
+        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, nil, @name)
+        else
+          backend.check_running(nil, @name)
+        end
+      end
+
+      def to_s
+        "Service #{@name}"
+      end
+    end
+  end
+end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/serverspec.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "net-ssh"
-  spec.add_dependency "rspec"
-  spec.add_dependency "highline"
+  spec.add_runtime_dependency "net-ssh"
+  spec.add_runtime_dependency "rspec", "~> 2.0"
+  spec.add_runtime_dependency "highline"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

data/spec/darwin/commands_spec.rb

@@ -1,16 +1,18 @@
 require 'spec_helper'
 
-describe 'check_file', :os => :darwin do
+include Serverspec::Helper::Darwin
+
+describe 'check_file' do
   subject { commands.check_file('/etc/passwd') }
   it { should eq 'test -f /etc/passwd' }
 end
 
-describe 'check_mounted', :os => :darwin  do
+describe 'check_mounted'  do
   subject { commands.check_mounted('/') }
   it { should eq "mount | grep -w -- on\\ /" }
 end
 
-describe 'check_reachable', :os => :darwin  do
+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 localhost ssh -w 1" }
@@ -25,12 +27,12 @@ describe 'check_reachable', :os => :darwin  do
   end
 end
 
-describe 'check_routing_table', :os => :darwin do
+describe 'check_routing_table' do
   subject { commands.check_routing_table('192.168.100.0/24') }
   it { should eq "ip route | grep -E '^192.168.100.0/24 |^default '" }
 end
 
-describe 'check_resolvable', :os => :darwin  do
+describe 'check_resolvable'  do
   context "resolve localhost by hosts" do
     subject { commands.check_resolvable('localhost', 'hosts') }
     it { should eq "grep -w -- localhost /etc/hosts" }
@@ -45,47 +47,47 @@ describe 'check_resolvable', :os => :darwin  do
   end
 end
 
-describe 'check_directory', :os => :darwin do
+describe 'check_directory' do
   subject { commands.check_directory('/var/log') }
   it { should eq 'test -d /var/log' }
 end
 
-describe 'check_user', :os => :darwin do
+describe 'check_user' do
   subject { commands.check_user('root') }
   it { should eq 'id root' }
 end
 
-describe 'check_group', :os => :darwin do
+describe 'check_group' do
   subject { commands.check_group('wheel') }
   it { should eq 'getent group | grep -wq -- wheel' }
 end
 
-describe 'check_listening', :os => :darwin do
+describe 'check_listening' do
   subject { commands.check_listening(80) }
   it { should eq "netstat -tunl | grep -- :80\\ " }
 end
 
-describe 'check_running', :os => :darwin do
+describe 'check_running' do
   subject { commands.check_running('httpd') }
   it { should eq 'service httpd status' }
 end
 
-describe 'check_running_under_supervisor', :os => :darwin do
+describe 'check_running_under_supervisor' do
   subject { commands.check_running_under_supervisor('httpd') }
   it { should eq 'supervisorctl status httpd' }
 end
 
-describe 'check_process', :os => :darwin do
+describe 'check_process' do
   subject { commands.check_process('httpd') }
   it { should eq 'ps aux | grep -w -- httpd | grep -qv grep' }
 end
 
-describe 'check_file_contain', :os => :darwin do
+describe 'check_file_contain' do
   subject { commands.check_file_contain('/etc/passwd', 'root') }
   it { should eq "grep -q -- root /etc/passwd" }
 end
 
-describe 'check_file_contain_within', :os => :darwin do
+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 -" }
@@ -107,67 +109,67 @@ describe 'check_file_contain_within', :os => :darwin do
   end
 end
 
-describe 'check_file_md5checksum', :os => :darwin do
+describe 'check_file_md5checksum' do
   subject { commands.check_file_md5checksum('/usr/bin/rsync', '03ba2dcdd50ec3a7a45d3900902a83ce') }
   it { should eq "openssl md5 /usr/bin/rsync | cut -d'=' -f2 | cut -c 2- | grep -E ^03ba2dcdd50ec3a7a45d3900902a83ce$" }
 end
 
-describe 'check_mode', :os => :darwin do
+describe 'check_mode' do
   subject { commands.check_mode('/etc/sudoers', 440) }
   it { should eq 'stat -f %A /etc/sudoers | grep -- \\^440\\$' }
 end
 
-describe 'check_owner', :os => :darwin do
+describe 'check_owner' do
   subject { commands.check_owner('/etc/passwd', 'root') }
   it { should eq 'stat -f %Su /etc/passwd | grep -- \\^root\\$' }
 end
 
-describe 'check_grouped', :os => :darwin do
+describe 'check_grouped' do
   subject { commands.check_grouped('/etc/passwd', 'wheel') }
   it { should eq 'stat -f %Sg /etc/passwd | grep -- \\^wheel\\$' }
 end
 
-describe 'check_cron_entry', :os => :darwin do
+describe 'check_cron_entry' do
   subject { commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') }
   it { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
 end
 
-describe 'check_link', :os => :darwin do
+describe 'check_link' do
   subject { commands.check_link('/etc/system-release', '/etc/darwin-release') }
   it { should eq 'stat -c %N /etc/system-release | grep -- /etc/darwin-release' }
 end
 
-describe 'check_installed_by_gem', :os => :darwin do
+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', :os => :darwin do
+describe 'check_belonging_group' do
   subject { commands.check_belonging_group('root', 'wheel') }
   it { should eq "id root | awk '{print $3}' | grep -- wheel" }
 end
 
-describe 'have_gid', :os => :darwin do
+describe 'have_gid' do
   subject { commands.check_gid('root', 0) }
   it { should eq "getent group | grep -w -- \\^root | cut -f 3 -d ':' | grep -w -- 0" }
 end
 
-describe 'have_uid', :os => :darwin do
+describe 'have_uid' do
   subject { commands.check_uid('root', 0) }
   it { should eq "id root | grep -- \\^uid\\=0\\(" }
 end
 
-describe 'have_login_shell', :os => :darwin do
+describe 'have_login_shell' do
   subject { commands.check_login_shell('root', '/bin/bash') }
   it { should eq "getent passwd root | cut -f 7 -d ':' | grep -w -- /bin/bash" }
 end
 
-describe 'have_home_directory', :os => :darwin do
+describe 'have_home_directory' do
   subject { commands.check_home_directory('root', '/root') }
   it { should eq "getent passwd root | cut -f 6 -d ':' | grep -w -- /root" }
 end
 
-describe 'have_authorized_key', :os => :darwin do
+describe 'have_authorized_key' do
   key = "ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH"
   escaped_key = key.gsub(/ /, '\ ')
 
@@ -185,12 +187,12 @@ describe 'have_authorized_key', :os => :darwin do
   end
 end
 
-describe 'get_mode', :os => :darwin do
+describe 'get_mode' do
   subject { commands.get_mode('/dev') }
   it { should eq 'stat -f %A /dev' }
 end
 
-describe 'check_access_by_user', :os => :darwin do
+describe 'check_access_by_user' do
   context 'read access' do
     subject {commands.check_access_by_user '/tmp/something', 'dummyuser1', 'r'}
     it { should eq 'sudo -u dummyuser1 -s /bin/test -r /tmp/something' }

data/spec/darwin/matchers_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-describe 'Serverspec matchers of Darwin', :os => :darwin do
+include Serverspec::Helper::Darwin
+
+describe 'Serverspec matchers of Darwin' do
   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'

data/spec/darwin/service_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Darwin
+
+describe 'Serverspec service matchers of Darwin family' do
+  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'
+end

data/spec/debian/commands_spec.rb

@@ -1,26 +1,28 @@
 require 'spec_helper'
 
-describe 'check_enabled', :os => :debian do
+include Serverspec::Helper::Debian
+
+describe 'check_enabled' do
   subject { commands.check_enabled('httpd') }
   it { should eq 'ls /etc/rc3.d/ | grep -- httpd' }
 end
 
-describe 'check_file', :os => :debian  do
+describe 'check_file'  do
   subject { commands.check_file('/etc/passwd') }
   it { should eq 'test -f /etc/passwd' }
 end
 
-describe 'check_mounted', :os => :debian  do
+describe 'check_mounted'  do
   subject { commands.check_mounted('/') }
   it { should eq "mount | grep -w -- on\\ /" }
 end
 
-describe 'check_routing_table', :os => :debian do
+describe 'check_routing_table' do
   subject { commands.check_routing_table('192.168.100.0/24') }
   it { should eq "ip route | grep -E '^192.168.100.0/24 |^default '" }
 end
 
-describe 'check_reachable', :os => :debian  do
+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 localhost ssh -w 1" }
@@ -35,7 +37,7 @@ describe 'check_reachable', :os => :debian  do
   end
 end
 
-describe 'check_resolvable', :os => :debian  do
+describe 'check_resolvable'  do
   context "resolve localhost by hosts" do
     subject { commands.check_resolvable('localhost', 'hosts') }
     it { should eq "grep -w -- localhost /etc/hosts" }
@@ -50,59 +52,59 @@ describe 'check_resolvable', :os => :debian  do
   end
 end
 
-describe 'check_file_md5checksum', :os => :debian do
+describe 'check_file_md5checksum' do
   subject { commands.check_file_md5checksum('/etc/passwd', '96c8c50f81a29965f7af6de371ab4250') }
   it { should eq "md5sum /etc/passwd | grep -iw -- ^96c8c50f81a29965f7af6de371ab4250" }
 end
 
 
-describe 'check_directory', :os => :debian  do
+describe 'check_directory'  do
   subject { commands.check_directory('/var/log') }
   it { should eq 'test -d /var/log' }
 end
 
-describe 'check_user', :os => :debian  do
+describe 'check_user'  do
   subject { commands.check_user('root') }
   it { should eq 'id root' }
 end
 
-describe 'check_group', :os => :debian  do
+describe 'check_group'  do
   subject { commands.check_group('wheel') }
   it { should eq 'getent group | grep -wq -- wheel' }
 end
 
-describe 'check_installed', :os => :debian  do
+describe 'check_installed'  do
   subject { commands.check_installed('httpd') }
   it { should eq 'dpkg -s httpd' }
 end
 
-describe 'check_listening', :os => :debian do
+describe 'check_listening' do
   subject { commands.check_listening(80) }
   it { should eq "netstat -tunl | grep -- :80\\ " }
 end
 
-describe 'check_running', :os => :debian do
+describe 'check_running' do
   subject { commands.check_running('httpd') }
   it { should eq 'service httpd status' }
 end
 
 
-describe 'check_running_under_supervisor', :os => :debian do
+describe 'check_running_under_supervisor' do
   subject { commands.check_running_under_supervisor('httpd') }
   it { should eq 'supervisorctl status httpd' }
 end
 
-describe 'check_process', :os => :debian do
+describe 'check_process' do
   subject { commands.check_process('httpd') }
   it { should eq 'ps aux | grep -w -- httpd | grep -qv grep' }
 end
 
-describe 'check_file_contain', :os => :debian do
+describe 'check_file_contain' do
   subject { commands.check_file_contain('/etc/passwd', 'root') }
   it { should eq "grep -q -- root /etc/passwd" }
 end
 
-describe 'check_file_contain_within', :os => :debian do
+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 -" }
@@ -124,62 +126,62 @@ describe 'check_file_contain_within', :os => :debian do
   end
 end
 
-describe 'check_mode', :os => :debian do
+describe 'check_mode' do
   subject { commands.check_mode('/etc/sudoers', 440) }
   it { should eq 'stat -c %a /etc/sudoers | grep -- \\^440\\$' }
 end
 
-describe 'check_owner', :os => :debian do
+describe 'check_owner' do
   subject { commands.check_owner('/etc/passwd', 'root') }
   it { should eq 'stat -c %U /etc/passwd | grep -- \\^root\\$' }
 end
 
-describe 'check_grouped', :os => :debian do
+describe 'check_grouped' do
   subject { commands.check_grouped('/etc/passwd', 'wheel') }
   it { should eq 'stat -c %G /etc/passwd | grep -- \\^wheel\\$' }
 end
 
-describe 'check_cron_entry', :os => :debian do
+describe 'check_cron_entry' do
   subject { commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') }
   it { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
 end
 
-describe 'check_link', :os => :debian do
+describe 'check_link' do
   subject { commands.check_link('/etc/system-release', '/etc/redhat-release') }
   it { should eq 'stat -c %N /etc/system-release | grep -- /etc/redhat-release' }
 end
 
-describe 'check_installed_by_gem', :os => :debian do
+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', :os => :debian do
+describe 'check_belonging_group' do
   subject { commands.check_belonging_group('root', 'wheel') }
   it { should eq "id root | awk '{print $3}' | grep -- wheel" }
 end
 
-describe 'have_gid', :os => :debian do
+describe 'have_gid' do
   subject { commands.check_gid('root', 0) }
   it { should eq "getent group | grep -w -- \\^root | cut -f 3 -d ':' | grep -w -- 0" }
 end
 
-describe 'have_uid', :os => :debian do
+describe 'have_uid' do
   subject { commands.check_uid('root', 0) }
   it { should eq "id root | grep -- \\^uid\\=0\\(" }
 end
 
-describe 'have_login_shell', :os => :debian do
+describe 'have_login_shell' do
   subject { commands.check_login_shell('root', '/bin/bash') }
   it { should eq "getent passwd root | cut -f 7 -d ':' | grep -w -- /bin/bash" }
 end
 
-describe 'have_home_directory', :os => :debian do
+describe 'have_home_directory' do
   subject { commands.check_home_directory('root', '/root') }
   it { should eq "getent passwd root | cut -f 6 -d ':' | grep -w -- /root" }
 end
 
-describe 'have_authorized_key', :os => :debian do
+describe 'have_authorized_key' do
   key = "ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH"
   escaped_key = key.gsub(/ /, '\ ')
 
@@ -197,7 +199,7 @@ describe 'have_authorized_key', :os => :debian do
   end
 end
 
-describe 'check_ipatbles', :os => :debian do
+describe 'check_ipatbles' do
   context 'check a rule without a table and a chain' do
     subject { commands.check_iptables_rule('-P INPUT ACCEPT') }
     it { should eq "iptables -S | grep -- -P\\ INPUT\\ ACCEPT" }
@@ -209,7 +211,7 @@ describe 'check_ipatbles', :os => :debian do
   end
 end
 
-describe 'check_selinux', :os => :debian do
+describe 'check_selinux' do
   context 'enforcing' do
     subject { commands.check_selinux('enforcing') }
     it { should eq "/usr/sbin/getenforce | grep -i -- enforcing" }
@@ -226,12 +228,12 @@ describe 'check_selinux', :os => :debian do
   end
 end
 
-describe 'get_mode', :os => :debian do
+describe 'get_mode' do
   subject { commands.get_mode('/dev') }
   it { should eq 'stat -c %a /dev' }
 end
 
-describe 'check_access_by_user', :os => :debian do
+describe 'check_access_by_user' do
   context 'read access' do
     subject {commands.check_access_by_user '/tmp/something', 'dummyuser1', 'r'}
     it { should eq  'su -s /bin/sh -c "/usr/bin/test -r /tmp/something" dummyuser1' }