serverspec 0.0.2 → 0.0.3

data/README.md

@@ -26,9 +26,9 @@ Or install it yourself as:
 $ serverspec-init
  + spec/
  + spec/www.example.jp/
+ + spec/www.example.jp/httpd_spec.rb
  + spec/spec_helper.rb
  + Rakefile
- + spec/www.example.jp/httpd_spec.rb
 ```
 spec/www.example.jp/httpd_spec.rb is a sample spec file and its content is like this.
 
@@ -59,6 +59,8 @@ You should create ~/.ssh/config like this before running tests.
 Host *.example.jp
    User root
    IdentityFile ~/.ssh/id_rsa
+   StrictHostKeyChecking no
+   UserKnownHostsFile /dev/null
 ```
 
 Run tests.
@@ -69,7 +71,7 @@ $ rake spec
 ----
 ## Multi OS support
 
-Serverspec is supporting Red Hat (and its clone) and Debian (and its clone) now.
+Serverspec is supporting Red Hat based OS and Debian based OS now.
 
 If your target host's OS is Debian, you can write the spec like this.
 
@@ -126,9 +128,9 @@ describe 'www.example.jp', :os => :debian do
 end
 ```
 
-Or modify generated spec/spec_helper.rb like this
+Or modify spec/spec_helper.rb generated by serverspec-init command like this
 
-```
+```ruby
 require 'serverspec'
 require 'pathname'
 

data/lib/serverspec/commands/base.rb

@@ -8,7 +8,19 @@ module Serverspec
       end
 
       def check_file file
-        "test -f #{file} 2> /dev/null"
+        "test -f #{file}"
+      end
+
+      def check_directory directory
+        "test -d #{directory}"
+      end
+
+      def check_user user
+        "id #{user}"
+      end
+
+      def check_group group
+        "getent group | grep -wq #{group}"
       end
 
       def check_installed package
@@ -16,15 +28,15 @@ module Serverspec
       end
 
       def check_listening port
-        "netstat -tnl 2> /dev/null | grep ':#{port} '"
+        "netstat -tnl | grep ':#{port} '"
       end
 
       def check_running service
-        "service #{service} status 2> /dev/null"
+        "service #{service} status"
       end
 
       def check_file_contain file, expected_pattern
-        "\"grep -q '#{expected_pattern}' #{file} \" 2> /dev/null"
+        "grep -q '#{expected_pattern}' #{file} "
       end
     end
   end

data/lib/serverspec/commands/debian.rb

@@ -2,11 +2,11 @@ module Serverspec
   module Commands
     class Debian < Base
       def check_enabled service
-        "ls /etc/rc3.d/ 2> /dev/null | grep #{service}"
+        "ls /etc/rc3.d/ | grep #{service}"
       end
 
       def check_installed package
-        "dpkg -s #{package} 2> /dev/null"
+        "dpkg -s #{package}"
       end
     end
   end

data/lib/serverspec/commands/redhat.rb

@@ -2,11 +2,11 @@ module Serverspec
   module Commands
     class RedHat < Base
       def check_enabled service
-        "chkconfig --list #{service} 2> /dev/null | grep 3:on"
+        "chkconfig --list #{service} | grep 3:on"
       end
 
       def check_installed package
-        "rpm -q #{package} 2> /dev/null"
+        "rpm -q #{package}"
       end
     end
   end

data/lib/serverspec/helper.rb

@@ -1,8 +1,51 @@
+require 'net/ssh'
+require 'etc'
+
 module Serverspec
   module Helper
     def ssh_exec(host, cmd, opt={})
-      `ssh root@#{host} -o'StrictHostKeyChecking no' -o'UserKnownHostsFile /dev/null' #{cmd}`
+      options = Net::SSH::Config.for(host)
+      user    = options[:user] || Etc.getlogin
+
+      ret = {}
+      Net::SSH.start(host, user, options) do |ssh|
+        ret = ssh_exec!(ssh, cmd)
+      end
+      ret
+    end
+
+    private
+    def ssh_exec!(ssh, command)
+      stdout_data = ''
+      stderr_data = ''
+      exit_code   = nil
+      exit_signal = nil
+      ssh.open_channel do |channel|
+        channel.exec(command) do |ch, success|
+          unless success
+            abort "FAILED: couldn't execute command (ssh.channel.exec)"
+          end
+          channel.on_data do |ch,data|
+            stdout_data += data
+          end
+
+          channel.on_extended_data do |ch,type,data|
+            stderr_data += data
+          end
+
+          channel.on_request("exit-status") do |ch,data|
+            exit_code = data.read_long
+          end
+
+          channel.on_request("exit-signal") do |ch, data|
+            exit_signal = data.read_long
+          end
+        end
+      end
+      ssh.loop
+      { :stdout => stdout_data, :stderr => stderr_data, :exit_code => exit_code, :exit_signal => exit_signal }
     end
+
   end
 
   module RedHatHelper

data/lib/serverspec/matchers.rb

@@ -1,6 +1,9 @@
 require 'serverspec/matchers/be_enabled'
 require 'serverspec/matchers/be_file'
+require 'serverspec/matchers/be_directory'
 require 'serverspec/matchers/be_installed'
 require 'serverspec/matchers/be_listening'
 require 'serverspec/matchers/be_running'
 require 'serverspec/matchers/contain'
+require 'serverspec/matchers/be_user'
+require 'serverspec/matchers/be_group'

data/lib/serverspec/matchers/be_directory.rb

@@ -0,0 +1,6 @@
+RSpec::Matchers.define :be_directory do
+  match do |actual|
+    ret = ssh_exec(RSpec.configuration.host, commands.check_directory(actual))
+    ret[:exit_code] == 0
+  end
+end

data/lib/serverspec/matchers/be_enabled.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_enabled do
   match do |actual|
-    ssh_exec(RSpec.configuration.host, commands.check_enabled(actual))
-    $? == 0
+    ret = ssh_exec(RSpec.configuration.host, commands.check_enabled(actual))
+    ret[:exit_code] == 0
   end
 end

data/lib/serverspec/matchers/be_file.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_file do
   match do |actual|
-    ssh_exec(RSpec.configuration.host, commands.check_file(actual))
-    $? == 0
+    ret = ssh_exec(RSpec.configuration.host, commands.check_file(actual))
+    ret[:exit_code] == 0
   end
 end

data/lib/serverspec/matchers/be_group.rb

@@ -0,0 +1,6 @@
+RSpec::Matchers.define :be_group do
+  match do |actual|
+    ret = ssh_exec(RSpec.configuration.host, commands.check_group(actual))
+    ret[:exit_code] == 0
+  end
+end

data/lib/serverspec/matchers/be_installed.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_installed do
   match do |actual|
-    ssh_exec(RSpec.configuration.host, commands.check_installed(actual))
-    $? == 0
+    ret = ssh_exec(RSpec.configuration.host, commands.check_installed(actual))
+    ret[:exit_code] == 0
   end
 end

data/lib/serverspec/matchers/be_listening.rb

@@ -1,7 +1,7 @@
 RSpec::Matchers.define :be_listening do
   match do |actual|
     port = actual.gsub(/port\s+/, '')
-    ssh_exec(RSpec.configuration.host, commands.check_listening(port))
-    $? == 0
+    ret = ssh_exec(RSpec.configuration.host, commands.check_listening(port))
+    ret[:exit_code] == 0
   end
 end

data/lib/serverspec/matchers/be_running.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_running do
   match do |actual|
-    ssh_exec(RSpec.configuration.host, commands.check_running(actual))
-    $? == 0
+    ret = ssh_exec(RSpec.configuration.host, commands.check_running(actual))
+    ret[:exit_code] == 0
   end
 end

data/lib/serverspec/matchers/be_user.rb

@@ -0,0 +1,6 @@
+RSpec::Matchers.define :be_user do
+  match do |actual|
+    ret = ssh_exec(RSpec.configuration.host, commands.check_user(actual))
+    ret[:exit_code] == 0
+  end
+end

data/lib/serverspec/matchers/contain.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :contain do |expected|
   match do |actual|
-    ssh_exec(RSpec.configuration.host, commands.check_file_contain(actual, expected))
-    $? == 0
+    ret = ssh_exec(RSpec.configuration.host, commands.check_file_contain(actual, expected))
+    ret[:exit_code] == 0
   end
 end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/redhat/matchers_spec.rb

@@ -8,5 +8,8 @@ describe 'Serverspec matchers of Red Hat family', :os => :redhat do
   it_behaves_like 'support be_running matcher', 'sshd'
   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'
   it_behaves_like 'support contain matcher', '/etc/ssh/sshd_config', 'This is the sshd server system-wide configuration file'
+  it_behaves_like 'support be_user matcher', 'root'
+  it_behaves_like 'support be_group matcher', 'wheel'
 end

data/spec/support/shared_matcher_examples.rb

@@ -59,6 +59,18 @@ shared_examples_for 'support be_file matcher' do |valid_file|
   end
 end
 
+shared_examples_for 'support be_directory matcher' do |valid_directory|
+  describe 'be_directory' do
+    describe valid_directory do
+      it { should be_directory }
+    end
+
+    describe '/etc/thid_is_dummy_directory' do
+      it { should_not be_directory }
+    end
+  end
+end
+
 shared_examples_for 'support contain matcher' do |valid_file, pattern|
   describe 'contain' do
     describe valid_file do
@@ -70,3 +82,27 @@ shared_examples_for 'support contain matcher' do |valid_file, pattern|
     end
   end
 end
+
+shared_examples_for 'support be_user matcher' do |valid_user|
+  describe 'be_user' do
+    describe valid_user do
+      it { should be_user }
+    end
+
+    describe 'i_am_dummy_user' do
+      it { should_not be_user }
+    end
+  end
+end
+
+shared_examples_for 'support be_group matcher' do |valid_group|
+  describe 'be_group' do
+    describe valid_group do
+      it { should be_group }
+    end
+
+    describe 'we_are_dummy_group' do
+      it { should_not be_group }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -63,11 +63,14 @@ files:
 - lib/serverspec/commands/redhat.rb
 - lib/serverspec/helper.rb
 - lib/serverspec/matchers.rb
+- lib/serverspec/matchers/be_directory.rb
 - lib/serverspec/matchers/be_enabled.rb
 - lib/serverspec/matchers/be_file.rb
+- lib/serverspec/matchers/be_group.rb
 - lib/serverspec/matchers/be_installed.rb
 - lib/serverspec/matchers/be_listening.rb
 - lib/serverspec/matchers/be_running.rb
+- lib/serverspec/matchers/be_user.rb
 - lib/serverspec/matchers/contain.rb
 - lib/serverspec/setup.rb
 - lib/serverspec/version.rb