Merge pull request dev-sec#22 from TelekomLabs/update-common

updating common files

Gemfile

@@ -3,5 +3,6 @@
 source 'https://rubygems.org'
 
 gem 'rake'
-gem 'serverspec'
+gem 'serverspec', '~> 2.3.0'
 gem 'rubocop',    '~> 0.23'
+gem 'highline', '~> 1.6.0'

default/serverspec/os_spec.rb

@@ -17,10 +17,6 @@
 
 require 'spec_helper'
 
-RSpec.configure do |c|
-  c.filter_run_excluding skipOn: backend(Serverspec::Commands::Base).check_os[:family]
-end
-
 
 describe command('find / -name \'.rhosts\' | wc -l ') do
   its(:stdout) { should match(/^0/) }

default/serverspec/spec_helper.rb

@@ -22,8 +22,7 @@
   require 'net/ssh'
   require 'highline/import'
 
-  include Serverspec::Helper::Ssh
-  include Serverspec::Helper::DetectOS
+  set :backend, :ssh
 
   RSpec.configure do |c|
 
@@ -42,28 +41,25 @@
     end
 
     if ENV['ASK_LOGIN_USERNAME']
-      user = ask("\nEnter login username: ") { |q| q.echo = false }
+      options[:user] = ask("\nEnter login username: ") { |q| q.echo = false }
     else
-      user = ENV['LOGIN_USERNAME'] || ENV['user'] || Etc.getlogin
+      options[:user] = ENV['LOGIN_USERNAME'] || ENV['user'] || Etc.getlogin
     end
 
-    if user.nil?
+    if options[:user].nil?
       puts 'specify login user env LOGIN_USERNAME= or user='
       exit 1
     end
 
-    c.host  = ENV['TARGET_HOST']
-    options.merge(Net::SSH::Config.for(c.host))
-    c.ssh   = Net::SSH.start(c.host, user, options)
-    c.os    = backend.check_os
+    c.host = ENV['TARGET_HOST']
+    c.ssh_options = options.merge(Net::SSH::Config.for(c.host))
 
   end
 
 else
   require 'serverspec'
 
-  include Serverspec::Helper::Exec
-  include Serverspec::Helper::DetectOS
+  set :backend, :exec
 
   RSpec.configure do |c|
     c.before :all do

default/serverspec/sysctl_spec.rb

@@ -17,10 +17,6 @@
 
 require 'spec_helper'
 
-RSpec.configure do |c|
-  c.filter_run_excluding skipOn: backend(Serverspec::Commands::Base).check_os[:family]
-end
-
 describe 'IP V4 networking' do
 
 
@@ -204,7 +200,7 @@
 
 
   # check if we find the nx flag
-  if command('cat /proc/cpuinfo').return_stdout?(/^flags.*?:.*? nx( .*?)?$/)
+  if command('cat /proc/cpuinfo').stdout =~ /^flags.*?:.*? nx( .*?)?$/
     true
   else
     # if no nx flag is present, we require exec-shield

lockdown/serverspec/os_spec.rb

@@ -17,10 +17,6 @@
 
 require 'spec_helper'
 
-RSpec.configure do |c|
-  c.filter_run_excluding skipOn: backend(Serverspec::Commands::Base).check_os[:family]
-end
-
 
 describe command('find / -name \'.rhosts\' | wc -l ') do
   its(:stdout) { should match(/^0/) }

lockdown/serverspec/spec_helper.rb

@@ -22,8 +22,7 @@
   require 'net/ssh'
   require 'highline/import'
 
-  include Serverspec::Helper::Ssh
-  include Serverspec::Helper::DetectOS
+  set :backend, :ssh
 
   RSpec.configure do |c|
 
@@ -42,28 +41,25 @@
     end
 
     if ENV['ASK_LOGIN_USERNAME']
-      user = ask("\nEnter login username: ") { |q| q.echo = false }
+      options[:user] = ask("\nEnter login username: ") { |q| q.echo = false }
     else
-      user = ENV['LOGIN_USERNAME'] || ENV['user'] || Etc.getlogin
+      options[:user] = ENV['LOGIN_USERNAME'] || ENV['user'] || Etc.getlogin
     end
 
-    if user.nil?
+    if options[:user].nil?
       puts 'specify login user env LOGIN_USERNAME= or user='
       exit 1
     end
 
-    c.host  = ENV['TARGET_HOST']
-    options.merge(Net::SSH::Config.for(c.host))
-    c.ssh   = Net::SSH.start(c.host, user, options)
-    c.os    = backend.check_os
+    c.host = ENV['TARGET_HOST']
+    c.ssh_options = options.merge(Net::SSH::Config.for(c.host))
 
   end
 
 else
   require 'serverspec'
 
-  include Serverspec::Helper::Exec
-  include Serverspec::Helper::DetectOS
+  set :backend, :exec
 
   RSpec.configure do |c|
     c.before :all do

lockdown/serverspec/sysctl_spec.rb

@@ -17,10 +17,6 @@
 
 require 'spec_helper'
 
-RSpec.configure do |c|
-  c.filter_run_excluding skipOn: backend(Serverspec::Commands::Base).check_os[:family]
-end
-
 describe 'IP V4 networking' do