serverspec 0.1.6 → 0.1.7

data/lib/serverspec/helper.rb

@@ -2,7 +2,7 @@ require 'etc'
 
 module Serverspec
   module SshHelper
-    def ssh_exec(cmd, opt={})
+    def do_check(cmd, opt={})
       cmd = "sudo #{cmd}" if not RSpec.configuration.ssh.options[:user] == 'root'
       ssh_exec!(cmd)
     end
@@ -41,7 +41,16 @@ module Serverspec
       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

data/lib/serverspec/matchers/be_directory.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_directory do
   match do |actual|
-    ret = ssh_exec(commands.check_directory(actual))
+    ret = do_check(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|
-    ret = ssh_exec(commands.check_enabled(actual))
+    ret = do_check(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|
-    ret = ssh_exec(commands.check_file(actual))
+    ret = do_check(commands.check_file(actual))
     ret[:exit_code] == 0
   end
 end

data/lib/serverspec/matchers/be_group.rb

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

data/lib/serverspec/matchers/be_grouped_into.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_grouped_into do |group|
   match do |file|
-    ret = ssh_exec(commands.check_grouped(file, group))
+    ret = do_check(commands.check_grouped(file, group))
     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|
-    ret = ssh_exec(commands.check_installed(actual))
+    ret = do_check(commands.check_installed(actual))
     ret[:exit_code] == 0
   end
 end

data/lib/serverspec/matchers/be_installed_by_gem.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_installed_by_gem do
   match do |name|
-    ret = ssh_exec(commands.check_installed_by_gem(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}\)/)

data/lib/serverspec/matchers/be_linked_to.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_linked_to do |target|
   match do |link|
-    ret = ssh_exec(commands.check_link(link, target))
+    ret = do_check(commands.check_link(link, target))
     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+/, '')
-    ret = ssh_exec(commands.check_listening(port))
+    ret = do_check(commands.check_listening(port))
     ret[:exit_code] == 0
   end
 end

data/lib/serverspec/matchers/be_mode.rb

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

data/lib/serverspec/matchers/be_owned_by.rb

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

data/lib/serverspec/matchers/be_running.rb

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

data/lib/serverspec/matchers/be_user.rb

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

data/lib/serverspec/matchers/belong_to_group.rb

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

data/lib/serverspec/matchers/contain.rb

@@ -5,7 +5,7 @@ RSpec::Matchers.define :contain do |pattern|
     else
       cmd = commands.check_file_contain_within(file, pattern, @from, @to)
     end
-    ret = ssh_exec(cmd)
+    ret = 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 = ssh_exec(command)
+    ret = do_check(command)
     ret[:stdout] =~ /#{expected}/
   end
 end

data/lib/serverspec/matchers/have_cron_entry.rb

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

data/lib/serverspec/matchers/have_iptables_rule.rb

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

data/lib/serverspec/setup.rb

@@ -3,8 +3,25 @@ require 'fileutils'
 module Serverspec
   class Setup
     def self.run
-      print "Input target host name: "
-      @hostname = gets.chomp
+      prompt = <<-EOF
+Select a backend type:
+
+  1) SSH
+  2) Exec (local)
+
+Select number: 
+EOF
+      print prompt.chop
+      num = gets.to_i - 1
+      puts
+
+      @backend_type = [ 'Ssh', 'Exec' ][num]
+      if @backend_type == 'Ssh'
+        print "Input target host name: "
+        @hostname = gets.chomp
+      else
+        @hostname = 'localhost'
+      end
 
       prompt = <<-EOF
 
@@ -82,8 +99,16 @@ require 'pathname'
 require 'net/ssh'
 
 RSpec.configure do |c|
+  ### include backend helper ###
   ### include os helper ###
-  c.before do
+  ### include backend conf ###
+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
     host  = File.basename(Pathname.new(example.metadata[:location]).dirname)
     if c.host != host
       c.ssh.close if c.ssh
@@ -93,9 +118,9 @@ RSpec.configure do |c|
       c.ssh   = Net::SSH.start(c.host, user, options)
     end
   end
-end
-EOF
-
+")
+          end
+        end
         if not @os_type.nil?
           content.gsub!(/### include os helper ###/, "c.include(Serverspec::#{@os_type}Helper)")
         end

data/lib/serverspec/version.rb

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

data/spec/spec_helper.rb

@@ -7,7 +7,7 @@ Dir[PROJECT_ROOT.join("spec/support/**/*.rb")].each { |file| require(file) }
 
 module Serverspec
   module SshHelper
-    def ssh_exec(cmd)
+    def do_check(cmd)
       if cmd =~ /invalid/
         { :stdout => '', :stderr => '', :exit_code => 1, :exit_signal => nil }
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh