serverspec 0.2.14 → 0.2.15

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 
 rvm:
+  - 1.8.7
   - 1.9.3
   - 2.0.0
 

data/lib/serverspec.rb

@@ -5,6 +5,8 @@ require 'serverspec/matchers'
 require 'serverspec/backend'
 require 'serverspec/helper'
 require 'serverspec/setup'
+require 'serverspec/filter'
+require 'serverspec/subject'
 require 'serverspec/commands/base'
 require 'serverspec/commands/redhat'
 require 'serverspec/commands/debian'
@@ -12,7 +14,6 @@ require 'serverspec/commands/gentoo'
 require 'serverspec/commands/solaris'
 
 RSpec.configure do |c|
-  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)
@@ -21,4 +22,11 @@ RSpec.configure do |c|
   c.add_setting :host,          :default => nil
   c.add_setting :ssh,           :default => nil
   c.add_setting :sudo_password, :default => nil
+  c.before :each do
+    if subject == 'value'
+      def subject
+        Serverspec::Filter.filter_subject example
+      end
+    end
+  end
 end

data/lib/serverspec/filter.rb

@@ -0,0 +1,19 @@
+module Serverspec
+  class Filter
+    def self.filter_subject example
+      description_args = example.metadata[:example_group][:example_group][:description_args].join(' ')
+
+      # Linux kernel parameters
+      %w( abi crypto debug dev fs kernel net sunrpc vm ).each do |param|
+        if description_args.match(/^#{param}\./)
+          ret = backend(Serverspec::Commands::Base).do_check("sysctl -q -n #{description_args}")
+          subject = Serverspec::Subject.new
+          subject.value(ret[:stdout].strip.to_i)
+          return subject
+        end
+      end
+
+      example.metadata[:example_group][:description_args].join(' ')
+    end
+  end
+end

data/lib/serverspec/setup.rb

@@ -24,25 +24,6 @@ EOF
         @hostname = 'localhost'
       end
 
-      prompt = <<-EOF
-
-Select OS type of target host:
-
-  1) Auto Detect
-  2) Red Hat
-  3) Debian
-  4) Gentoo
-  5) Solaris
-
-Select number: 
-EOF
-
-      print prompt.chop
-      num = gets.to_i - 1
-      puts
-
-      @os_type = [ 'DetectOS', 'RedHat', 'Debian', 'Gentoo', 'Solaris' ][num]
-
       [ 'spec', "spec/#{@hostname}" ].each { |dir| safe_mkdir(dir) }
       safe_create_spec
       safe_create_spec_helper
@@ -100,6 +81,9 @@ require 'serverspec'
 require 'pathname'
 ### include requirements ###
 
+### include backend helper ###
+include Serverspec::Helper::DetectOS
+
 RSpec.configure do |c|
   if ENV['ASK_SUDO_PASSWORD']
     require 'highline/import'
@@ -107,19 +91,23 @@ RSpec.configure do |c|
   else
     c.sudo_password = ENV['SUDO_PASSWORD']
   end
-  ### include backend helper ###
-  ### include os helper ###
   ### include backend conf ###
 end
 EOF
 
         if not @backend_type.nil?
-          content.gsub!(/### include backend helper ###/, "c.include(Serverspec::Helper::#{@backend_type})")
+          content.gsub!(/### include backend helper ###/, "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)
+              content.gsub!(/### include backend conf ###/, "c.before :all do
+    block = self.class.metadata[:example_group_block]
+    if RUBY_VERSION.start_with?('1.8')
+      file = block.to_s.match(/.*@(.*):[0-9]+>/)[1]
+    else
+      file = block.source_location.first
+    end
+    host  = File.basename(Pathname.new(file).dirname)
     if c.host != host
       c.ssh.close if c.ssh
       c.host  = host
@@ -130,7 +118,7 @@ EOF
     end
   end")
             when 'Exec'
-              content.gsub!(/### include backend conf ###/, "c.before do
+              content.gsub!(/### include backend conf ###/, "c.before :all do
     c.os = backend(Serverspec::Commands::Base).check_os
   end")
             when 'Puppet'
@@ -138,9 +126,6 @@ EOF
 ")
           end
         end
-        if not @os_type.nil?
-          content.gsub!(/### include os helper ###/, "c.include(Serverspec::Helper::#{@os_type})")
-        end
 
       if File.exists? 'spec/spec_helper.rb'
         old_content = File.read('spec/spec_helper.rb')

data/lib/serverspec/subject.rb

@@ -0,0 +1,12 @@
+module Serverspec
+  class Subject
+    def value v=nil
+      if v.nil?
+        @value
+      else
+        @value = v
+        self
+      end
+    end
+  end
+end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.2.14"
+  VERSION = "0.2.15"
 end

data/spec/debian/matchers_spec.rb

@@ -57,4 +57,6 @@ describe 'Serverspec matchers of Debian family', :os => :debian do
 
   it_behaves_like 'support return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
   it_behaves_like 'support return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
+
+  it_behaves_like 'support linux kernel parameter checking', 'net.ipv4.tcp_syncookies'
 end

data/spec/gentoo/matchers_spec.rb

@@ -58,4 +58,6 @@ describe 'Serverspec matchers of Gentoo family', :os => :gentoo do
 
   it_behaves_like 'support return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
   it_behaves_like 'support return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
+
+  it_behaves_like 'support linux kernel parameter checking', 'net.ipv4.tcp_syncookies'
 end

data/spec/redhat/matchers_spec.rb

@@ -63,4 +63,6 @@ describe 'Serverspec matchers of Red Hat family', :os => :redhat do
 
   it_behaves_like 'support return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
   it_behaves_like 'support return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
+
+  it_behaves_like 'support linux kernel parameter checking', 'net.ipv4.tcp_syncookies'
 end

data/spec/spec_helper.rb

@@ -1,13 +1,15 @@
 require 'serverspec'
 require 'pathname'
 
+include Serverspec::Helper::Exec
+
 PROJECT_ROOT = (Pathname.new(File.dirname(__FILE__)) + '..').expand_path
 
 Dir[PROJECT_ROOT.join("spec/support/**/*.rb")].each { |file| require(file) }
 
 module Serverspec
   module Backend
-    class Ssh
+    class Exec
       def do_check(cmd)
         if cmd =~ /invalid/
           {

data/spec/support/shared_matcher_examples.rb

@@ -790,3 +790,21 @@ shared_examples_for 'support return_stderr matcher with regexp' do |command, con
     end
   end
 end
+
+shared_examples_for 'support linux kernel parameter checking' do |param|
+  describe 'linux kernel parameter' do
+    before :all do
+      RSpec.configure do |c|
+        c.stdout = "1\n"
+      end
+    end
+
+    context param do
+      its(:value) { should eq 1 }
+    end
+
+    context param do
+      its(:value) { should_not eq 0 }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-27 00:00:00.000000000 Z
+date: 2013-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -117,6 +117,7 @@ files:
 - lib/serverspec/commands/gentoo.rb
 - lib/serverspec/commands/redhat.rb
 - lib/serverspec/commands/solaris.rb
+- lib/serverspec/filter.rb
 - lib/serverspec/helper.rb
 - lib/serverspec/helper/debian.rb
 - lib/serverspec/helper/detect_os.rb
@@ -161,6 +162,7 @@ files:
 - lib/serverspec/matchers/return_stderr.rb
 - lib/serverspec/matchers/return_stdout.rb
 - lib/serverspec/setup.rb
+- lib/serverspec/subject.rb
 - lib/serverspec/version.rb
 - serverspec.gemspec
 - spec/debian/commands_spec.rb