serverspec 0.11.5 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d0e94326e10e8838a093f4a2c1933fc19234e22
-  data.tar.gz: e4611fc653f06aad2bafa91be2e24b4830944915
+  metadata.gz: 752400de68f58e7d7e2605e2d7249e19c7e9031f
+  data.tar.gz: ad2e694640b507b888251fc6e34af0df35164f1a
 SHA512:
-  metadata.gz: 81186006639054360b2fab02607e8f663efa81363db6a575dd1eeede8729291a40afb2bb4184a9c7754e5e941dd2ca0ec3db71c20d1c5030542698fa4593ad04
-  data.tar.gz: b51ce84ca5748afcc2f657cab24b57d4a4a034033910dfce8a835d02ee2021ec5a1f13a48dc76fecdec1b1fc9985f045c895a1d90cb675fdfa5f22d9b9f996d7
+  metadata.gz: c9d8eb41562f89d01e9a3d13c482b213b05dbf8f8bcfa78da00c3890cb08b1443652c151fae61e81f71cdb2487f77c2ec6b175fd02f78b145f899f582dc2a7ce
+  data.tar.gz: 0ee62224c780f3e79f0152bcb382d4141435cde8accbd12f3e52511d73a2d70c0bd5762caeb8cfac7eda16458a63264524e3bf4ce79fd811b9e08f7683ff0dfb

data/Rakefile

@@ -6,7 +6,7 @@ task :spec => 'spec:all'
 namespace :spec do
   oses = %w( darwin debian gentoo plamo redhat aix solaris solaris10 solaris11 smartos windows freebsd)
 
-  task :all => [ oses.map {|os| "spec:#{os}" }, :helpers, :exec, :ssh, :cmd, :winrm, :powershell ].flatten
+  task :all => [ oses.map {|os| "spec:#{os}" }, :exec, :ssh, :cmd, :winrm, :powershell ].flatten
 
   oses.each do |os|
     RSpec::Core::RakeTask.new(os.to_sym) do |t|
@@ -14,10 +14,6 @@ namespace :spec do
     end
   end
 
-  RSpec::Core::RakeTask.new(:helpers) do |t|
-    t.pattern = "spec/helpers/*_spec.rb"
-  end
-
   [:exec, :ssh, :cmd, :winrm, :powershell].each do |backend|
     RSpec::Core::RakeTask.new(backend) do |t|
       t.pattern = "spec/backend/#{backend.to_s}/*_spec.rb"

data/lib/serverspec.rb

@@ -1,8 +1,8 @@
 require 'rubygems'
 require 'rspec'
+require 'specinfra'
 require 'serverspec/version'
 require 'serverspec/matchers'
-require 'serverspec/backend'
 require 'serverspec/helper'
 require 'serverspec/setup'
 require 'serverspec/subject'
@@ -20,43 +20,9 @@ require 'serverspec/commands/smartos'
 require 'serverspec/commands/darwin'
 require 'serverspec/commands/windows'
 require 'serverspec/commands/freebsd'
-require 'serverspec/configuration'
 require 'rspec/core/formatters/base_formatter'
 
-include Serverspec
-
-module Serverspec
-  class << self
-    def configuration
-      Serverspec::Configuration
-    end
-  end
-end
-
-RSpec.configure do |c|
-  c.include(Serverspec::Helper::Configuration)
-  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::Plamo,    :os => :plamo)
-  c.include(Serverspec::Helper::AIX,	   :os => :aix)
-  c.include(Serverspec::Helper::Solaris,   :os => :solaris)
-  c.include(Serverspec::Helper::Solaris10, :os => :solaris10)
-  c.include(Serverspec::Helper::Solaris11, :os => :solaris11)
-  c.include(Serverspec::Helper::SmartOS,   :os => :smartos)
-  c.include(Serverspec::Helper::Darwin,    :os => :darwin)
-  c.include(Serverspec::Helper::Windows,   :os => :windows)
-  c.include(Serverspec::Helper::FreeBSD,   :os => :freebsd)
-  c.add_setting :os,            :default => nil
-  c.add_setting :host,          :default => nil
-  c.add_setting :ssh,           :default => nil
-  c.add_setting :sudo_password, :default => nil
-  c.add_setting :winrm,         :default => nil
-  Serverspec.configuration.defaults.each { |k, v| c.add_setting k, :default => v }
-  c.before :each do
-    backend.set_example(example)
-  end
-end
+SPEC_TYPE = 'Serverspec'
 
 module RSpec
   module Core

data/lib/serverspec/helper.rb

@@ -1,37 +1,7 @@
-require 'etc'
-
-# Backend helpers
-require 'serverspec/helper/ssh'
-require 'serverspec/helper/exec'
-require 'serverspec/helper/cmd'
-require 'serverspec/helper/winrm'
-require 'serverspec/helper/puppet'
-
-# Command helpers
-require 'serverspec/helper/redhat'
-require 'serverspec/helper/debian'
-require 'serverspec/helper/gentoo'
-require 'serverspec/helper/plamo'
-require 'serverspec/helper/aix'
-require 'serverspec/helper/solaris'
-require 'serverspec/helper/solaris10'
-require 'serverspec/helper/solaris11'
-require 'serverspec/helper/smartos'
-require 'serverspec/helper/darwin'
-require 'serverspec/helper/windows'
-require 'serverspec/helper/freebsd'
-require 'serverspec/helper/detect_os'
-
-# Attributes helper
-require 'serverspec/helper/attributes'
-include Serverspec::Helper::Attributes
-
-# Properties helper
-require 'serverspec/helper/properties'
-include Serverspec::Helper::Properties
+require 'serverspec/helper/os'
+require 'serverspec/helper/backend'
 
 # Subject type helper
 require 'serverspec/helper/type'
 include Serverspec::Helper::Type
 
-require 'serverspec/helper/configuration'

data/lib/serverspec/helper/backend.rb

@@ -0,0 +1,11 @@
+module Serverspec
+  module Helper
+    ['Exec', 'Ssh', 'Cmd', 'WinRM'].each do |backend|
+      eval <<-EOF
+        module #{backend}
+          include self.class.const_get('SpecInfra').const_get('Helper').const_get('#{backend}')
+        end
+      EOF
+    end
+  end
+end

data/lib/serverspec/helper/os.rb

@@ -0,0 +1,25 @@
+module Serverspec
+  module Helper
+    [
+     'DetectOS',
+     'AIX',
+     'Darwin',
+     'Debian',
+     'FreeBSD',
+     'Gentoo',
+     'Plamo',
+     'RedHat',
+     'SmartOS',
+     'Solaris',
+     'Solaris10',
+     'Solaris11',
+     'Windows',
+    ].each do |os|
+      eval <<-EOF
+        module #{os}
+          include self.class.const_get('SpecInfra').const_get('Helper').const_get('#{os}')
+        end
+      EOF
+    end
+  end
+end

data/lib/serverspec/setup.rb

@@ -224,11 +224,11 @@ require 'net/ssh'
 require 'winrm'
 <% end -%>
 
-include Serverspec::Helper::<%= @backend_type %>
+include SpecInfra::Helper::<%= @backend_type %>
 <% if @os_type == 'UN*X' -%>
-include Serverspec::Helper::DetectOS
+include SpecInfra::Helper::DetectOS
 <% else  -%>
-include Serverspec::Helper::Windows
+include SpecInfra::Helper::Windows
 <% end -%>
 
 <% if @os_type == 'UN*X' -%>

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.11.5"
+  VERSION = "0.12.0"
 end

data/serverspec.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "net-ssh"
   spec.add_runtime_dependency "rspec", ">= 2.13.0"
   spec.add_runtime_dependency "highline"
+  spec.add_runtime_dependency "specinfra", ">= 0.0.2"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

data/spec/aix/command_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+include SpecInfra::Helper::AIX
 
 describe command('cat /etc/resolv.conf') do
   let(:stdout) { "nameserver 127.0.0.1\r\n" }

data/spec/aix/cron_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+include SpecInfra::Helper::AIX
 
 describe cron do
   it { should have_entry '* * * * * /usr/local/bin/batch.sh' }

data/spec/aix/default_gateway_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+include SpecInfra::Helper::AIX
 
 describe default_gateway do
   let(:stdout) { "default via 192.168.1.1 dev eth1 \r\n" }

data/spec/aix/file_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+include SpecInfra::Helper::AIX
 
 describe file('/etc/ssh/sshd_config') do
   it { should be_file }

data/spec/aix/group_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+include SpecInfra::Helper::AIX
 
 describe group('root') do
   it { should exist }

data/spec/aix/host_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+include SpecInfra::Helper::AIX
 
 describe host('127.0.0.1') do
   it { should be_resolvable }

data/spec/aix/package_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+include SpecInfra::Helper::AIX
 
 describe package('httpd') do
   it { should be_installed }

data/spec/aix/php_config_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+include SpecInfra::Helper::AIX
 
 describe php_config('default_mimetype') do
   let(:stdout) { 'text/html' }

data/spec/aix/port_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+include SpecInfra::Helper::AIX
 
 describe port(80) do
   it { should be_listening }

data/spec/aix/routing_table_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+include SpecInfra::Helper::AIX
 
 describe routing_table do
   let(:stdout) { "192.168.100.0/24 dev eth1  proto kernel  scope link  src 192.168.100.10 \r\ndefault via 192.168.100.1 dev eth0 \r\n" }

data/spec/aix/service_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+include SpecInfra::Helper::AIX
 
 describe service('sshd') do
   it { should be_enabled }

data/spec/aix/user_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::AIX
+include SpecInfra::Helper::AIX
 
 describe user('root') do
   it { should exist }

data/spec/backend/cmd/configuration_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 require 'support/powershell_command_runner'
 
-include Serverspec::Helper::Cmd
-include Serverspec::Helper::Windows
+include SpecInfra::Helper::Cmd
+include SpecInfra::Helper::Windows
 
 describe "Cmd" do
   it_behaves_like "a powershell command runner"

data/spec/backend/exec/build_command_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Exec
+include SpecInfra::Helper::Exec
 
 describe 'build command with path' do
   before :each do

data/spec/backend/exec/configuration_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
-require 'serverspec/helper/base'
-include Serverspec::Helper::RedHat
-include Serverspec::Helper::Exec
+include SpecInfra::Helper::RedHat
+include SpecInfra::Helper::Exec
 
 describe 'configurations are not set' do
   context file('/etc/passwd') do

data/spec/backend/powershell/script_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Backend::PowerShell::ScriptHelper
+include SpecInfra::Backend::PowerShell::ScriptHelper
 
 describe 'build command with path' do
   before :each do
@@ -26,7 +26,7 @@ end
 
 describe 'add pre-command' do
   before :each do
-    Serverspec.configuration.pre_command = 'test_pre_command'
+    SpecInfra.configuration.pre_command = 'test_pre_command'
   end
 
   it "should add the test for pre_command before the command" do
@@ -65,7 +65,7 @@ eof
   end
 
   after :each do
-    Serverspec.configuration.pre_command = nil
+    SpecInfra.configuration.pre_command = nil
   end
 end
 
@@ -101,4 +101,4 @@ eof
   context 'simple command' do
     create_script('test command').should == 'test command'
   end
-end
+end

data/spec/backend/ssh/build_command_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Ssh
+include SpecInfra::Helper::Ssh
 
 ssh = double
 

data/spec/backend/ssh/configuration_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
-require 'serverspec/helper/base'
-include Serverspec::Helper::RedHat
-include Serverspec::Helper::Ssh
+include SpecInfra::Helper::RedHat
+include SpecInfra::Helper::Ssh
 
 ssh = double
 

data/spec/backend/winrm/configuration_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 require 'support/powershell_command_runner'
 
-include Serverspec::Helper::WinRM
-include Serverspec::Helper::Windows
+include SpecInfra::Helper::WinRM
+include SpecInfra::Helper::Windows
 
 describe "WinRM" do
   it_behaves_like "a powershell command runner"

data/spec/darwin/command_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Darwin
+include SpecInfra::Helper::Darwin
 
 describe command('cat /etc/resolv.conf') do
   let(:stdout) { "nameserver 127.0.0.1\r\n" }

data/spec/darwin/cron_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Darwin
+include SpecInfra::Helper::Darwin
 
 describe cron do
   it { should have_entry '* * * * * /usr/local/bin/batch.sh' }

data/spec/darwin/default_gateway_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Darwin
+include SpecInfra::Helper::Darwin
 
 describe default_gateway do
   let(:stdout) { "default via 192.168.1.1 dev eth1 \r\n" }

data/spec/darwin/file_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Darwin
+include SpecInfra::Helper::Darwin
 
 describe file('/etc/ssh/sshd_config') do
   it { should be_file }