serverspec 0.1.7 → 0.2.1

data/README.md

@@ -2,6 +2,8 @@
 
 RSpec tests for your servers provisioned by Puppet, Chef or anything else
 
+You can see the details of serverspec on [serverspec.org](http://serverspec.org/).
+
 ----
 
 ## Installation
@@ -24,6 +26,13 @@ Or install it yourself as:
 
 ```
 $ serverspec-init
+Select a backend type:
+
+  1) SSH
+  2) Exec (local)
+
+Select number: 1
+
 Input target host name: www.example.jp
 
 Select OS type of target host:
@@ -92,7 +101,7 @@ Finished in 0.99715 seconds
 
 Serverspec is supporting Red Hat based OS, Debian based OS, Gentoo and Solaris now.
 
-If your target host's OS is Debian, you should include Serverspec::DebianHelper like this.
+If your target host's OS is Debian, you should include `Serverspec::Helper::Debian` like this.
 
 ```ruby
 require 'serverspec'
@@ -100,8 +109,12 @@ require 'pathname'
 require 'net/ssh'
 
 RSpec.configure do |c|
+  # Include backend helper
+  c.include(Serverspec::Helper::Ssh)
   # Include OS helper
-  c.include(Serverspec::DebianHelper)
+  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
     host  = File.basename(Pathname.new(example.metadata[:location]).dirname)
     if c.host != host

data/lib/serverspec/backend/exec.rb

@@ -0,0 +1,99 @@
+module Serverspec
+  module Backend
+    class Exec
+      def initialize(commands)
+        @commands ||= commands
+      end
+
+      def commands
+        @commands
+      end
+
+      def do_check(cmd, opts={})
+        stdout = `#{cmd} 2>&1`
+        # In ruby 1.9, it is possible to use Open3.capture3, but not in 1.8
+        #stdout, stderr, status = Open3.capture3(cmd)
+        { :stdout => stdout, :stderr => nil,
+          :exit_code => $?, :exit_signal => nil }
+      end
+
+      def check_zero(cmd, *args)
+        ret = do_check(commands.send(cmd, *args))
+        ret[:exit_code] == 0
+      end
+
+      def check_directory(directory)
+        check_zero(:check_directory, directory)
+      end
+
+      def check_enabled(service)
+        check_zero(:check_enabled, service)
+      end
+
+      def check_file(file)
+        check_zero(:check_file, file)
+      end
+
+      def check_group(group)
+        check_zero(:check_group, group)
+      end
+
+      def check_grouped(file, group)
+        check_zero(:check_grouped, file, group)
+      end
+
+      def check_installed(package)
+        check_zero(:check_installed, package)
+      end
+
+      def check_installed_by_gem(package, version)
+        ret = do_check(commands.check_installed_by_gem(package))
+        res = ret[:exit_code] == 0
+        if res && version
+          res = false if not ret[:stdout].match(/\(#{version}\)/)
+        end
+        res
+      end
+
+      def check_link(link, target)
+        check_zero(:check_link, link, target)
+      end
+
+      def check_listening(port)
+        check_zero(:check_listening, port)
+      end
+
+      def check_mode(file, mode)
+        check_zero(:check_mode, file, mode)
+      end
+
+      def check_owner(file, owner)
+        check_zero(:check_owner, file, owner)
+      end
+
+      def check_running(process)
+        ret = do_check(commands.check_running(process))
+        if ret[:exit_code] == 1 || ret[:stdout] =~ /stopped/
+          ret = do_check(commands.check_process(process))
+        end
+        ret[:exit_code] == 0
+      end
+
+      def check_user(user)
+        check_zero(:check_user, user)
+      end
+
+      def check_belonging_group(user, group)
+        check_zero(:check_belonging_group, user, group)
+      end
+
+      def check_cron_entry(user, entry)
+        check_zero(:check_cron_entry, user, entry)
+      end
+
+      def check_iptables_rule(rule, table, chain)
+        check_zero(:check_iptables_rule, rule, table, chain)
+      end
+    end
+  end
+end

data/lib/serverspec/backend/puppet.rb

@@ -0,0 +1,108 @@
+require 'puppet'
+require 'puppet/type/file'
+require 'puppet/type/group'
+require 'puppet/type/user'
+require 'puppet/type/package'
+require 'puppet/type/service'
+
+module Serverspec
+  module Backend
+    class Puppet < Exec # Use Exec methods as fallbacks
+
+      def check_directory(directory)
+        d = ::Puppet::Type::File.new(:name => directory, :ensure => 'directory')
+        d.insync?(d.retrieve)
+      end
+
+      def check_enabled(service)
+        s = ::Puppet::Type::Service.new(:name => service, :enable => 'true')
+        s.insync?(s.retrieve)
+      end
+
+      def check_file(file)
+        f = ::Puppet::Type::File.new(:name => file, :ensure => 'file')
+        f.insync?(f.retrieve)
+      end
+
+      def check_group(group)
+        g = ::Puppet::Type::Group.new(:name => group)
+        g_real = g.retrieve
+        if g.provider.exists?
+          g.insync?(g_real)
+        else
+          false
+        end
+      end
+
+      def check_grouped(file, group)
+        f = ::Puppet::Type::File.new(:name => file, :group => group)
+        f.insync?(f.retrieve)
+      end
+
+      def check_installed(package)
+        p = ::Puppet::Type::Package.new(:name => package)
+        p_real = p.retrieve
+        if p.exists?
+          p.insync?(p_real)
+        else
+          false
+        end
+      end
+
+      def check_installed_by_gem(package, version)
+        p = ::Puppet::Type::Package.new(:name => package, :provider => 'gem',
+                                        :ensure => version || 'present')
+        p_real = p.retrieve
+        if p.exists?
+          p.insync?(p_real)
+        else
+          false
+        end
+      end
+
+      def check_link(link, target)
+        f = ::Puppet::Type::File.new(:name => link, :ensure => 'link', :target => target)
+        f.insync?(f.retrieve)
+      end
+
+      # check_listening: inherited
+
+      def check_mode(file, mode)
+        f = ::Puppet::Type::File.new(:name => file, :mode => mode)
+        f.insync?(f.retrieve)
+      end
+
+      def check_owner(file, owner)
+        f = ::Puppet::Type::File.new(:name => file, :owner => owner)
+        f.insync?(f.retrieve)
+      end
+
+      def check_running(process)
+        s = ::Puppet::Type::Service.new(:name => process, :ensure => 'running')
+        s.insync?(s.retrieve)
+      end
+
+      def check_user(user)
+        u = ::Puppet::Type::User.new(:name => user)
+        u_real = u.retrieve
+        if u.provider.exists?
+          u.insync?(u_real)
+        else
+          false
+        end
+      end
+
+      # check_belonging_group: inherited, TODO
+      #def check_belonging_group(user, group)
+      #  return false unless check_user(user)
+      #  u = ::Puppet::Type::User.new(:name => user)
+      #  u_real = u.retrieve
+      #  # Get groups and compare
+      #end
+
+      # check_cron_entry: inherited
+
+      # check_iptables_rule: inherited
+    end
+  end
+end

data/lib/serverspec/backend/ssh.rb

@@ -0,0 +1,47 @@
+require 'serverspec/backend/exec'
+
+module Serverspec
+  module Backend
+    class Ssh < Exec
+      def do_check(cmd, opt={})
+        cmd = "sudo #{cmd}" if not RSpec.configuration.ssh.options[:user] == 'root'
+        ssh_exec!(cmd)
+      end
+
+      private
+      def ssh_exec!(command)
+        stdout_data = ''
+        stderr_data = ''
+        exit_code   = nil
+        exit_signal = nil
+
+        ssh = RSpec.configuration.ssh
+        ssh.open_channel do |channel|
+          channel.request_pty do |ch, success|
+            abort "Could not obtain pty " if !success
+          end
+          channel.exec("#{command}") do |ch, success|
+            abort "FAILED: couldn't execute command (ssh.channel.exec)" if !success
+            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
+  end
+end

data/lib/serverspec/backend.rb

@@ -0,0 +1,2 @@
+require 'serverspec/backend/ssh'
+require 'serverspec/backend/exec'

data/lib/serverspec/commands/base.rb

@@ -72,7 +72,7 @@ module Serverspec
       end
 
       def check_installed_by_gem name
-        "gem list --local | grep #{name}"
+        "gem list --local | grep '^#{name} '"
       end
 
       def check_belonging_group user, group

data/lib/serverspec/helper/debian.rb

@@ -0,0 +1,9 @@
+module Serverspec
+  module Helper
+    module Debian
+      def commands
+        Serverspec::Commands::Debian.new
+      end
+    end
+  end
+end

data/lib/serverspec/helper/exec.rb

@@ -0,0 +1,9 @@
+module Serverspec
+  module Helper
+    module Exec
+      def backend
+        Serverspec::Backend::Exec.new(commands)
+      end
+    end
+  end
+end

data/lib/serverspec/helper/gentoo.rb

@@ -0,0 +1,9 @@
+module Serverspec
+  module Helper
+    module Gentoo
+      def commands
+        Serverspec::Commands::Gentoo.new
+      end
+    end
+  end
+end

data/lib/serverspec/helper/obsoleted.rb

@@ -0,0 +1,62 @@
+module Serverspec
+  module SshHelper
+    def self.included(mod)
+      puts
+      puts "***********************************************************"
+      puts "Serverspec::SshHelper in spec/spec_helper.rb is deprecated."
+      puts "Use Serverspec::Helper::Ssh instead."
+      puts "Or remove spec/spec_helper.rb and run severspec-init again."
+      puts "***********************************************************"
+      puts
+      exit 1
+    end
+  end
+  module DebianHelper
+    def self.included(mod)
+      puts
+      puts "**************************************************************"
+      puts "Serverspec::DebianHelper in spec/spec_helper.rb is deprecated."
+      puts "Use Serverspec::Helper::Debian instead."
+      puts "Or remove spec/spec_helper.rb and run severspec-init again."
+      puts "**************************************************************"
+      puts
+      exit 1
+    end
+  end
+  module GentooHelper
+    def self.included(mod)
+      puts
+      puts "**************************************************************"
+      puts "Serverspec::GentooHelper in spec/spec_helper.rb is deprecated."
+      puts "Use Serverspec::Helper::Gentoo instead."
+      puts "Or remove spec/spec_helper.rb and run severspec-init again."
+      puts "**************************************************************"
+      puts
+      exit 1
+    end
+  end
+  module RedHatHelper
+    def self.included(mod)
+      puts
+      puts "**************************************************************"
+      puts "Serverspec::RedHatHelper in spec/spec_helper.rb is deprecated."
+      puts "Use Serverspec::Helper::RedHat instead."
+      puts "Or remove spec/spec_helper.rb and run severspec-init again."
+      puts "**************************************************************"
+      puts
+      exit 1
+    end
+  end
+  module SolarisHelper
+    def self.included(mod)
+      puts
+      puts "***************************************************************"
+      puts "Serverspec::SolarisHelper in spec/spec_helper.rb is deprecated."
+      puts "Use Serverspec::Helper::Solaris instead."
+      puts "Or remove spec/spec_helper.rb and run severspec-init again."
+      puts "***************************************************************"
+      puts
+      exit 1
+    end
+  end
+end

data/lib/serverspec/helper/puppet.rb

@@ -0,0 +1,9 @@
+module Serverspec
+  module Helper
+    module Puppet
+      def backend
+        Serverspec::Backend::Puppet.new(commands)
+      end
+    end
+  end
+end

data/lib/serverspec/helper/redhat.rb

@@ -0,0 +1,9 @@
+module Serverspec
+  module Helper
+    module RedHat
+      def commands
+        Serverspec::Commands::RedHat.new
+      end
+    end
+  end
+end

data/lib/serverspec/helper/solaris.rb

@@ -0,0 +1,9 @@
+module Serverspec
+  module Helper
+    module Solaris
+      def commands
+        Serverspec::Commands::Solaris.new
+      end
+    end
+  end
+end

data/lib/serverspec/helper/ssh.rb

@@ -0,0 +1,10 @@
+module Serverspec
+  module Helper
+    module Ssh
+      def backend
+        Serverspec::Backend::Ssh.new(commands)
+      end
+    end
+  end
+end
+

data/lib/serverspec/helper.rb

@@ -1,79 +1,15 @@
 require 'etc'
 
-module Serverspec
-  module SshHelper
-    def do_check(cmd, opt={})
-      cmd = "sudo #{cmd}" if not RSpec.configuration.ssh.options[:user] == 'root'
-      ssh_exec!(cmd)
-    end
-
-    private
-    def ssh_exec!(command)
-      stdout_data = ''
-      stderr_data = ''
-      exit_code   = nil
-      exit_signal = nil
-
-      ssh = RSpec.configuration.ssh
-      ssh.open_channel do |channel|
-        channel.request_pty do |ch, success|
-          abort "Could not obtain pty " if !success
-        end
-        channel.exec("#{command}") do |ch, success|
-          abort "FAILED: couldn't execute command (ssh.channel.exec)" if !success
-          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 ExecHelper
-    def do_check(cmd, opts={})
-      stdout = `#{cmd} 2>&1`
-      # In ruby 1.9, it is possible to use Open3.capture3, but not in 1.8
-      #stdout, stderr, status = Open3.capture3(cmd)
-      { :stdout => stdout, :stderr => nil,
-        :exit_code => $?, :exit_signal => nil }
-    end
-  end
-
-  module RedHatHelper
-    def commands
-      Serverspec::Commands::RedHat.new
-    end
-  end
-
-  module DebianHelper
-    def commands
-      Serverspec::Commands::Debian.new
-    end
-  end
-
-  module GentooHelper
-    def commands
-      Serverspec::Commands::Gentoo.new
-    end
-  end
-
-  module SolarisHelper
-    def commands
-      Serverspec::Commands::Solaris.new
-    end
-  end
-end
+# Backend helpers
+require 'serverspec/helper/ssh'
+require 'serverspec/helper/exec'
+require 'serverspec/helper/puppet'
+
+# Command helpers
+require 'serverspec/helper/redhat'
+require 'serverspec/helper/debian'
+require 'serverspec/helper/gentoo'
+require 'serverspec/helper/solaris'
+
+# Obsoleted helpers
+require 'serverspec/helper/obsoleted'

data/lib/serverspec/matchers/be_directory.rb

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

data/lib/serverspec/matchers/be_enabled.rb

@@ -1,6 +1,5 @@
 RSpec::Matchers.define :be_enabled do
   match do |actual|
-    ret = do_check(commands.check_enabled(actual))
-    ret[:exit_code] == 0
+    backend.check_enabled(actual)
   end
 end

data/lib/serverspec/matchers/be_file.rb

@@ -1,6 +1,5 @@
 RSpec::Matchers.define :be_file do
   match do |actual|
-    ret = do_check(commands.check_file(actual))
-    ret[:exit_code] == 0
+    backend.check_file(actual)
   end
 end

data/lib/serverspec/matchers/be_group.rb

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

data/lib/serverspec/matchers/be_grouped_into.rb

@@ -1,6 +1,5 @@
 RSpec::Matchers.define :be_grouped_into do |group|
   match do |file|
-    ret = do_check(commands.check_grouped(file, group))
-    ret[:exit_code] == 0
+    backend.check_grouped(file, group)
   end
 end

data/lib/serverspec/matchers/be_installed.rb

@@ -1,6 +1,5 @@
 RSpec::Matchers.define :be_installed do
   match do |actual|
-    ret = do_check(commands.check_installed(actual))
-    ret[:exit_code] == 0
+    backend.check_installed(actual)
   end
 end

data/lib/serverspec/matchers/be_installed_by_gem.rb

@@ -1,11 +1,6 @@
 RSpec::Matchers.define :be_installed_by_gem do
   match do |name|
-    ret = do_check(commands.check_installed_by_gem(name))
-    res = ret[:exit_code] == 0
-    if res && @version
-      res = false if not ret[:stdout].match(/\(#{@version}\)/)
-    end
-    res
+    backend.check_installed_by_gem(name, @version)
   end
   chain :with_version do |version|
     @version = version

data/lib/serverspec/matchers/be_linked_to.rb

@@ -1,6 +1,5 @@
 RSpec::Matchers.define :be_linked_to do |target|
   match do |link|
-    ret = do_check(commands.check_link(link, target))
-    ret[:exit_code] == 0
+    backend.check_link(link, target)
   end
 end

data/lib/serverspec/matchers/be_listening.rb

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

data/lib/serverspec/matchers/be_mode.rb

@@ -1,6 +1,5 @@
 RSpec::Matchers.define :be_mode do |mode|
   match do |file|
-    ret = do_check(commands.check_mode(file, mode))
-    ret[:exit_code] == 0
+    backend.check_mode(file, mode)
   end
 end

data/lib/serverspec/matchers/be_owned_by.rb

@@ -1,6 +1,5 @@
 RSpec::Matchers.define :be_owned_by do |owner|
   match do |file|
-    ret = do_check(commands.check_owner(file, owner))
-    ret[:exit_code] == 0
+    backend.check_owner(file, owner)
   end
 end

data/lib/serverspec/matchers/be_running.rb

@@ -1,9 +1,5 @@
 RSpec::Matchers.define :be_running do
   match do |process|
-    ret = do_check(commands.check_running(process))
-    if ret[:exit_code] == 1 || ret[:stdout] =~ /stopped/
-      ret = do_check(commands.check_process(process))
-    end
-    ret[:exit_code] == 0
+    backend.check_running(process)
   end
 end

data/lib/serverspec/matchers/be_user.rb

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

data/lib/serverspec/matchers/belong_to_group.rb

@@ -1,6 +1,5 @@
 RSpec::Matchers.define :belong_to_group do |group|
   match do |user|
-    ret = do_check(commands.check_belonging_group(user, group))
-    ret[:exit_code] == 0
+    backend.check_belonging_group(user, group)
   end
 end

data/lib/serverspec/matchers/contain.rb

@@ -1,11 +1,11 @@
 RSpec::Matchers.define :contain do |pattern|
   match do |file|
     if (@from || @to).nil?
-      cmd = commands.check_file_contain(file, pattern)
+      cmd = backend.commands.check_file_contain(file, pattern)
     else
-      cmd = commands.check_file_contain_within(file, pattern, @from, @to)
+      cmd = backend.commands.check_file_contain_within(file, pattern, @from, @to)
     end
-    ret = do_check(cmd)
+    ret = backend.do_check(cmd)
     ret[:exit_code] == 0
   end
   # for contain(pattern).from(/A/).to(/B/)

data/lib/serverspec/matchers/get_stdout.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :get_stdout do |expected|
   match do |command|
-    ret = do_check(command)
+    ret = backend.do_check(command)
     ret[:stdout] =~ /#{expected}/
   end
 end

data/lib/serverspec/matchers/have_cron_entry.rb

@@ -1,8 +1,7 @@
 RSpec::Matchers.define :have_cron_entry do |entry|
   match do |actual|
     @user ||= 'root'
-    ret = do_check(commands.check_cron_entry(@user, entry))
-    ret[:exit_code] == 0
+    backend.check_cron_entry(@user, entry)
   end
   chain :with_user do |user|
     @user = user

data/lib/serverspec/matchers/have_iptables_rule.rb

@@ -1,7 +1,6 @@
 RSpec::Matchers.define :have_iptables_rule do |rule|
   match do |iptables|
-    ret = do_check(commands.check_iptables_rule(rule, @table, @chain))
-    ret[:exit_code] == 0
+    backend.check_iptables_rule(rule, @table, @chain)
   end
   chain :with_table do |table|
     @table = table

data/lib/serverspec/setup.rb

@@ -8,6 +8,7 @@ Select a backend type:
 
   1) SSH
   2) Exec (local)
+  3) Puppet providers (local)
 
 Select number: 
 EOF
@@ -15,7 +16,7 @@ EOF
       num = gets.to_i - 1
       puts
 
-      @backend_type = [ 'Ssh', 'Exec' ][num]
+      @backend_type = [ 'Ssh', 'Exec', 'Puppet' ][num]
       if @backend_type == 'Ssh'
         print "Input target host name: "
         @hostname = gets.chomp
@@ -41,6 +42,7 @@ EOF
       puts
 
       @os_type = [ 'RedHat', 'Debian', 'Gentoo', 'Solaris', nil ][num]
+
       [ 'spec', "spec/#{@hostname}" ].each { |dir| safe_mkdir(dir) }
       safe_create_spec
       safe_create_spec_helper
@@ -96,7 +98,7 @@ EOF
       content = <<-EOF
 require 'serverspec'
 require 'pathname'
-require 'net/ssh'
+### include requirements ###
 
 RSpec.configure do |c|
   ### include backend helper ###
@@ -106,9 +108,11 @@ end
 EOF
 
         if not @backend_type.nil?
-          content.gsub!(/### include backend helper ###/, "c.include(Serverspec::#{@backend_type}Helper)")
-          if @backend_type == 'Ssh'
-            content.gsub!(/### include backend conf ###/, "c.before do
+          content.gsub!(/### include backend helper ###/, "c.include(Serverspec::Helper::#{@backend_type})")
+          case @backend_type
+            when 'Ssh'
+              content.gsub!(/### include requirements ###/, "require 'net/ssh'")
+              content.gsub!(/### include backend conf ###/, "c.before do
     host  = File.basename(Pathname.new(example.metadata[:location]).dirname)
     if c.host != host
       c.ssh.close if c.ssh
@@ -118,11 +122,14 @@ EOF
       c.ssh   = Net::SSH.start(c.host, user, options)
     end
   end
+")
+            when 'Puppet'
+              content.gsub!(/### include requirements ###/, "require 'puppet'\nrequire 'serverspec/backend/puppet'
 ")
           end
         end
         if not @os_type.nil?
-          content.gsub!(/### include os helper ###/, "c.include(Serverspec::#{@os_type}Helper)")
+          content.gsub!(/### include os helper ###/, "c.include(Serverspec::Helper::#{@os_type})")
         end
 
       if File.exists? 'spec/spec_helper.rb'

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.1.7"
+  VERSION = "0.2.1"
 end

data/lib/serverspec.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'rspec'
 require 'serverspec/version'
 require 'serverspec/matchers'
+require 'serverspec/backend'
 require 'serverspec/helper'
 require 'serverspec/setup'
 require 'serverspec/commands/base'
@@ -11,11 +12,11 @@ require 'serverspec/commands/gentoo'
 require 'serverspec/commands/solaris'
 
 RSpec.configure do |c|
-  c.include(Serverspec::SshHelper)
-  c.include(Serverspec::RedHatHelper,  :os => :redhat)
-  c.include(Serverspec::DebianHelper,  :os => :debian)
-  c.include(Serverspec::GentooHelper,  :os => :gentoo)
-  c.include(Serverspec::SolarisHelper, :os => :solaris)
+  c.include(Serverspec::Helper::Ssh)
+  c.include(Serverspec::Helper::RedHat,  :os => :redhat)
+  c.include(Serverspec::Helper::Debian,  :os => :debian)
+  c.include(Serverspec::Helper::Gentoo,  :os => :gentoo)
+  c.include(Serverspec::Helper::Solaris, :os => :solaris)
   c.add_setting :host, :default => nil
   c.add_setting :ssh,  :default => nil
 end

data/spec/debian/commands_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::DebianHelper
+include Serverspec::Helper::Debian
 
 describe commands.check_enabled('httpd') do
   it { should eq 'ls /etc/rc3.d/ | grep httpd' }
@@ -79,7 +79,7 @@ describe commands.check_link('/etc/system-release', '/etc/redhat-release') do
 end
 
 describe commands.check_installed_by_gem('jekyll') do
-  it { should eq 'gem list --local | grep jekyll' }
+  it { should eq 'gem list --local | grep \'^jekyll \'' }
 end
 
 describe commands.check_belonging_group('root', 'wheel') do

data/spec/gentoo/commands_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::GentooHelper
+include Serverspec::Helper::Gentoo
 
 describe commands.check_enabled('httpd') do
   it { should eq "/sbin/rc-update show | grep '^\\s*httpd\\s*|\\s*\\(boot\\|default\\)'" }
@@ -79,7 +79,7 @@ describe commands.check_link('/etc/system-release', '/etc/redhat-release') do
 end
 
 describe commands.check_installed_by_gem('jekyll') do
-  it { should eq 'gem list --local | grep jekyll' }
+  it { should eq 'gem list --local | grep \'^jekyll \'' }
 end
 
 describe commands.check_belonging_group('root', 'wheel') do

data/spec/redhat/commands_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::RedHatHelper
+include Serverspec::Helper::RedHat
 
 describe commands.check_enabled('httpd') do
   it { should eq 'chkconfig --list httpd | grep 3:on' }
@@ -79,7 +79,7 @@ describe commands.check_link('/etc/system-release', '/etc/redhat-release') do
 end
 
 describe commands.check_installed_by_gem('jekyll') do
-  it { should eq 'gem list --local | grep jekyll' }
+  it { should eq 'gem list --local | grep \'^jekyll \'' }
 end
 
 describe commands.check_belonging_group('root', 'wheel') do

data/spec/solaris/commads_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::SolarisHelper
+include Serverspec::Helper::Solaris
 
 describe commands.check_enabled('httpd') do
   it { should eq "svcs -l httpd 2> /dev/null | grep 'enabled      true'" }
@@ -79,7 +79,7 @@ describe commands.check_link('/etc/system-release', '/etc/redhat-release') do
 end
 
 describe commands.check_installed_by_gem('jekyll') do
-  it { should eq 'gem list --local | grep jekyll' }
+  it { should eq 'gem list --local | grep \'^jekyll \'' }
 end
 
 describe commands.check_belonging_group('root', 'wheel') do

data/spec/spec_helper.rb

@@ -6,12 +6,14 @@ PROJECT_ROOT = (Pathname.new(File.dirname(__FILE__)) + '..').expand_path
 Dir[PROJECT_ROOT.join("spec/support/**/*.rb")].each { |file| require(file) }
 
 module Serverspec
-  module SshHelper
-    def do_check(cmd)
-      if cmd =~ /invalid/
-        { :stdout => '', :stderr => '', :exit_code => 1, :exit_signal => nil }
-      else
-        { :stdout => ::RSpec.configuration.stdout, :stderr => '', :exit_code => 0, :exit_signal => nil }
+  module Backend
+    class Ssh
+      def do_check(cmd)
+        if cmd =~ /invalid/
+          { :stdout => '', :stderr => '', :exit_code => 1, :exit_signal => nil }
+        else
+          { :stdout => ::RSpec.configuration.stdout, :stderr => '', :exit_code => 0, :exit_signal => nil }
+        end
       end
     end
   end

metadata

@@ -1,89 +1,90 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: serverspec
-version: !ruby/object:Gem::Version
-  version: 0.1.7
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 21
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
-authors:
+authors: 
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-04-08 00:00:00 +09:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: RSpec tests for your servers provisioned by Puppet, Chef or anything
-  else
-email:
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+description: RSpec tests for your servers provisioned by Puppet, Chef or anything else
+email: 
 - gosukenator@gmail.com
-executables:
+executables: 
 - serverspec-init
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -92,12 +93,24 @@ files:
 - Rakefile
 - bin/serverspec-init
 - lib/serverspec.rb
+- lib/serverspec/backend.rb
+- lib/serverspec/backend/exec.rb
+- lib/serverspec/backend/puppet.rb
+- lib/serverspec/backend/ssh.rb
 - lib/serverspec/commands/base.rb
 - lib/serverspec/commands/debian.rb
 - lib/serverspec/commands/gentoo.rb
 - lib/serverspec/commands/redhat.rb
 - lib/serverspec/commands/solaris.rb
 - lib/serverspec/helper.rb
+- lib/serverspec/helper/debian.rb
+- lib/serverspec/helper/exec.rb
+- lib/serverspec/helper/gentoo.rb
+- lib/serverspec/helper/obsoleted.rb
+- lib/serverspec/helper/puppet.rb
+- lib/serverspec/helper/redhat.rb
+- lib/serverspec/helper/solaris.rb
+- lib/serverspec/helper/ssh.rb
 - lib/serverspec/matchers.rb
 - lib/serverspec/matchers/be_directory.rb
 - lib/serverspec/matchers/be_enabled.rb
@@ -130,32 +143,41 @@ files:
 - spec/solaris/matchers_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_matcher_examples.rb
+has_rdoc: true
 homepage: http://serverspec.org/
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: RSpec tests for your servers provisioned by Puppet, Chef or anything else
-test_files:
+test_files: 
 - spec/debian/commands_spec.rb
 - spec/debian/matchers_spec.rb
 - spec/gentoo/commands_spec.rb