serverspec 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7db443421700dfdacefd2e30f55e0d7fa0351361
-  data.tar.gz: a2853fb2095bb792edee67cd39bf82c920406182
+  metadata.gz: c455583699b9962898ac154d786fadc8cec05082
+  data.tar.gz: 66337a76008e11dc60380cb24fdd2730ecac98b8
 SHA512:
-  metadata.gz: 7a577e8153713fee9665b849583edf38eb74bad7759947ac73d1f4e0886a1028b7e0fb2d16cd36602f25f95de83220971be524e1d6a97e78cf441185b254e6d7
-  data.tar.gz: eae422a0ad172a6f68bb2974f219a688b03c28714b27fe451ecc104163cd350ee817e07420bba86c3c3922fe797d1297cc9228ca272e3e53d3fcf077f8cc8e64
+  metadata.gz: 4f95c10a464f2a548804e4a65fa30431ca4b0350de6da6e1085161f74f18a8e305724a937bd7d4e6bb6e82e71e108472e2b49f9f3bf8a980e70deca782c11b58
+  data.tar.gz: c43fb7bd5b7231f104b7567ad1fd6974938224d0c2b288bee043b59f44f14c2bc90e4c2e891af3fab6635cf370e37a00a95c1188d2bf65c3d7450511c3aadce6

data/Gemfile

@@ -1,4 +1,8 @@
 source 'https://rubygems.org'
 
+group :test do
+  gem 'coveralls', :require => false
+end
+
 # Specify your gem's dependencies in serverspec.gemspec
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-# Serverspec [![Gem Version](https://badge.fury.io/rb/serverspec.png)](http://badge.fury.io/rb/serverspec) [![BuildStatus](https://secure.travis-ci.org/serverspec/serverspec.png)](http://travis-ci.org/serverspec/serverspec)
+# Serverspec [![Gem Version](https://badge.fury.io/rb/serverspec.png)](http://badge.fury.io/rb/serverspec) [![BuildStatus](https://secure.travis-ci.org/serverspec/serverspec.png)](http://travis-ci.org/serverspec/serverspec) [![Coverage Status](https://coveralls.io/repos/serverspec/serverspec/badge.png)](https://coveralls.io/r/serverspec/serverspec)
 
 RSpec tests for your servers configured by Puppet, Chef or anything else
 

data/lib/serverspec/backend/cmd.rb

@@ -30,6 +30,11 @@ module Serverspec
           { :stdout => stdout, :stderr => nil, :status => $? }
         end
       end
+
+      def check_os
+        # Dirty hack for specs
+        'Windows'
+      end
     end
   end
 end

data/lib/serverspec/backend/exec.rb

@@ -158,6 +158,7 @@ module Serverspec
       end
 
       def check_os
+        return RSpec.configuration.os if RSpec.configuration.os
         if run_command('ls /etc/redhat-release')[:exit_status] == 0
           'RedHat'
         elsif run_command('ls /etc/system-release')[:exit_status] == 0

data/lib/serverspec/backend/ssh.rb

@@ -40,8 +40,9 @@ module Serverspec
       def ssh_exec!(command)
         stdout_data = ''
         stderr_data = ''
-        exit_status   = nil
+        exit_status = nil
         exit_signal = nil
+        pass_prompt = RSpec.configuration.pass_prompt || /^\[sudo\] password for/
 
         ssh = RSpec.configuration.ssh
         ssh.open_channel do |channel|
@@ -51,7 +52,7 @@ module Serverspec
           channel.exec("#{command}") do |ch, success|
             abort "FAILED: couldn't execute command (ssh.channel.exec)" if !success
             channel.on_data do |ch, data|
-              if data =~ /^\[sudo\] password for/
+              if data.match pass_prompt
                 abort "Please set sudo password by using SUDO_PASSWORD or ASK_SUDO_PASSWORD environment variable" if RSpec.configuration.sudo_password.nil?
                 channel.send_data "#{RSpec.configuration.sudo_password}\n"
               else

data/lib/serverspec/configuration.rb

@@ -1,7 +1,7 @@
 module Serverspec
   module Configuration
     class << self
-      VALID_OPTIONS_KEYS = [:path, :pre_command, :stdout, :stderr, :sudo_path].freeze
+      VALID_OPTIONS_KEYS = [:path, :pre_command, :stdout, :stderr, :sudo_path, :passprompt].freeze
       attr_accessor(*VALID_OPTIONS_KEYS)
     
       def defaults

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

data/spec/aix/command_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+RSpec.configure do |c|
+  c.os = 'AIX'
+end
 
 describe command('cat /etc/resolv.conf') do
   let(:stdout) { "nameserver 127.0.0.1\r\n" }

data/spec/aix/cron_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+RSpec.configure do |c|
+  c.os = 'AIX'
+end
 
 describe cron do
   it { should have_entry '* * * * * /usr/local/bin/batch.sh' }

data/spec/aix/default_gateway_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+RSpec.configure do |c|
+  c.os = 'AIX'
+end
 
 describe default_gateway do
   let(:stdout) { "default via 192.168.1.1 dev eth1 \r\n" }

data/spec/aix/file_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+RSpec.configure do |c|
+  c.os = 'AIX'
+end
 
 describe file('/etc/ssh/sshd_config') do
   it { should be_file }

data/spec/aix/group_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+RSpec.configure do |c|
+  c.os = 'AIX'
+end
 
 describe group('root') do
   it { should exist }

data/spec/aix/host_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+RSpec.configure do |c|
+  c.os = 'AIX'
+end
 
 describe host('127.0.0.1') do
   it { should be_resolvable }

data/spec/aix/package_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+RSpec.configure do |c|
+  c.os = 'AIX'
+end
 
 describe package('httpd') do
   it { should be_installed }

data/spec/aix/php_config_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+RSpec.configure do |c|
+  c.os = 'AIX'
+end
 
 describe php_config('default_mimetype') do
   let(:stdout) { 'text/html' }

data/spec/aix/port_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+RSpec.configure do |c|
+  c.os = 'AIX'
+end
 
 describe port(80) do
   it { should be_listening }

data/spec/aix/routing_table_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+RSpec.configure do |c|
+  c.os = 'AIX'
+end
 
 describe routing_table do
   let(:stdout) { "192.168.100.0/24 dev eth1  proto kernel  scope link  src 192.168.100.10 \r\ndefault via 192.168.100.1 dev eth0 \r\n" }

data/spec/aix/service_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+RSpec.configure do |c|
+  c.os = 'AIX'
+end
 
 describe service('sshd') do
   it { should be_enabled }

data/spec/aix/user_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+RSpec.configure do |c|
+  c.os = 'AIX'
+end
 
 describe user('root') do
   it { should exist }

data/spec/darwin/command_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Darwin
+RSpec.configure do |c|
+  c.os = 'Darwin'
+end
 
 describe command('cat /etc/resolv.conf') do
   let(:stdout) { "nameserver 127.0.0.1\r\n" }

data/spec/darwin/cron_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Darwin
+RSpec.configure do |c|
+  c.os = 'Darwin'
+end
 
 describe cron do
   it { should have_entry '* * * * * /usr/local/bin/batch.sh' }

data/spec/darwin/default_gateway_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Darwin
+RSpec.configure do |c|
+  c.os = 'Darwin'
+end
 
 describe default_gateway do
   let(:stdout) { "default via 192.168.1.1 dev eth1 \r\n" }

data/spec/darwin/file_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Darwin
+RSpec.configure do |c|
+  c.os = 'Darwin'
+end
 
 describe file('/etc/ssh/sshd_config') do
   it { should be_file }

data/spec/darwin/group_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Darwin
+RSpec.configure do |c|
+  c.os = 'Darwin'
+end
 
 describe group('root') do
   it { should exist }

data/spec/darwin/host_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Darwin
+RSpec.configure do |c|
+  c.os = 'Darwin'
+end
 
 describe host('127.0.0.1') do
   it { should be_resolvable }

data/spec/darwin/mail_alias_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Darwin
+RSpec.configure do |c|
+  c.os = 'Darwin'
+end
 
 describe mail_alias('daemon') do
   it { should be_aliased_to "root" }

data/spec/darwin/package_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Darwin
+RSpec.configure do |c|
+  c.os = 'Darwin'
+end
 
 describe package('jekyll') do
   it { should be_installed.by('gem') }

data/spec/darwin/php_config_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Darwin
+RSpec.configure do |c|
+  c.os = 'Darwin'
+end
 
 describe php_config('default_mimetype') do
   let(:stdout) { 'text/html' }

data/spec/darwin/port_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Darwin
+RSpec.configure do |c|
+  c.os = 'Darwin'
+end
 
 describe port(80) do
   it { should be_listening }

data/spec/darwin/routing_table_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Darwin
+RSpec.configure do |c|
+  c.os = 'Darwin'
+end
 
 describe routing_table do
   let(:stdout) { "192.168.100.0/24 dev eth1  proto kernel  scope link  src 192.168.100.10 \r\ndefault via 192.168.100.1 dev eth0 \r\n" }

data/spec/darwin/service_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Darwin
+RSpec.configure do |c|
+  c.os = 'Darwin'
+end
 
 #describe service('sshd') do
 #  it { should be_enabled }

data/spec/darwin/user_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Darwin
+RSpec.configure do |c|
+  c.os = 'Darwin'
+end
 
 describe user('root') do
   it { should exist }

data/spec/debian/command_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Debian
+RSpec.configure do |c|
+  c.os = 'Debian'
+end
 
 describe command('cat /etc/resolv.conf') do
   let(:stdout) { "nameserver 127.0.0.1\r\n" }

data/spec/debian/cron_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Debian
+RSpec.configure do |c|
+  c.os = 'Debian'
+end
 
 describe cron do
   it { should have_entry '* * * * * /usr/local/bin/batch.sh' }

data/spec/debian/default_gateway_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Debian
+RSpec.configure do |c|
+  c.os = 'Debian'
+end
 
 describe default_gateway do
   let(:stdout) { "default via 192.168.1.1 dev eth1 \r\n" }

data/spec/debian/file_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Debian
+RSpec.configure do |c|
+  c.os = 'Debian'
+end
 
 describe file('/etc/ssh/sshd_config') do
   it { should be_file }

data/spec/debian/group_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Debian
+RSpec.configure do |c|
+  c.os = 'Debian'
+end
 
 describe group('root') do
   it { should exist }

data/spec/debian/host_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Debian
+RSpec.configure do |c|
+  c.os = 'Debian'
+end
 
 describe host('127.0.0.1') do
   it { should be_resolvable }

data/spec/debian/interface_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Debian
+RSpec.configure do |c|
+  c.os = 'Debian'
+end
 
 describe interface('eth0') do
   let(:stdout) { '1000' }

data/spec/debian/iptables_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Debian
+RSpec.configure do |c|
+  c.os = 'Debian'
+end
 
 describe iptables do
   it { should have_rule '-P INPUT ACCEPT'  }

data/spec/debian/kernel_module_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Debian
+RSpec.configure do |c|
+  c.os = 'Debian'
+end
 
 describe kernel_module('lp') do
   it { should be_loaded }

data/spec/debian/linux_kernel_parameter_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Debian
+RSpec.configure do |c|
+  c.os = 'Debian'
+end
 
 describe linux_kernel_parameter('net.ipv4.tcp_syncookies') do
   let(:stdout) { "1\n" }

data/spec/debian/mail_alias_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Debian
+RSpec.configure do |c|
+  c.os = 'Debian'
+end
 
 describe mail_alias('daemon') do
   it { should be_aliased_to "root" }

data/spec/debian/package_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Debian
+RSpec.configure do |c|
+  c.os = 'Debian'
+end
 
 describe package('apache2') do
   it { should be_installed }

data/spec/debian/php_config_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Debian
+RSpec.configure do |c|
+  c.os = 'Debian'
+end
+
 describe php_config('default_mimetype') do
   let(:stdout) { 'text/html' }
   its(:value) { should eq 'text/html' }

data/spec/debian/port_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Debian
+RSpec.configure do |c|
+  c.os = 'Debian'
+end
 
 describe port(80) do
   it { should be_listening }

data/spec/debian/routing_table_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Debian
+RSpec.configure do |c|
+  c.os = 'Debian'
+end
 
 describe routing_table do
   let(:stdout) { "192.168.100.0/24 dev eth1  proto kernel  scope link  src 192.168.100.10 \r\ndefault via 192.168.100.1 dev eth0 \r\n" }

data/spec/debian/selinux_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Debian
+RSpec.configure do |c|
+  c.os = 'Debian'
+end
 
 describe selinux do
   it { should be_enforcing }

data/spec/debian/service_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Debian
+RSpec.configure do |c|
+  c.os = 'Debian'
+end
 
 describe service('sshd') do
   it { should be_enabled }

data/spec/debian/user_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Debian
+RSpec.configure do |c|
+  c.os = 'Debian'
+end
 
 describe user('root') do
   it { should exist }

data/spec/debian/zfs_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Debian
+RSpec.configure do |c|
+  c.os = 'Debian'
+end
 
 describe zfs('rpool') do
   it { should exist }

data/spec/freebsd/command_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::FreeBSD
+include Serverspec::Helper::DetectOS
 
 describe command('cat /etc/resolv.conf') do
   let(:stdout) { "nameserver 127.0.0.1\r\n" }

data/spec/freebsd/cron_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::FreeBSD
+RSpec.configure do |c|
+  c.os = 'FreeBSD'
+end
 
 describe cron do
   it { should have_entry '* * * * * /usr/local/bin/batch.sh' }

data/spec/freebsd/default_gateway_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::FreeBSD
+RSpec.configure do |c|
+  c.os = 'FreeBSD'
+end
 
 describe default_gateway do
   let(:stdout) { "default via 192.168.1.1 dev eth1 \r\n" }

data/spec/freebsd/file_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::FreeBSD
+RSpec.configure do |c|
+  c.os = 'FreeBSD'
+end
 
 describe file('/etc/ssh/sshd_config') do
   it { should be_file }

data/spec/freebsd/group_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::FreeBSD
+RSpec.configure do |c|
+  c.os = 'FreeBSD'
+end
 
 describe group('root') do
   it { should exist }

data/spec/freebsd/host_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::FreeBSD
+RSpec.configure do |c|
+  c.os = 'FreeBSD'
+end
 
 describe host('127.0.0.1') do
   it { should be_resolvable }