Merge pull request #452 from serverspec/dont-call-backend-directly

Fix according to mizzy/specinfra#163

Rakefile

@@ -9,7 +9,7 @@ if defined?(RSpec)
   task :spec => 'spec:all'
 
   namespace :spec do
-    task :all => [ 'spec:type:all', 'spec:helper', 'spec:unit' ]
+    task :all => [ 'spec:type:all', 'spec:helper' ]
 
     namespace :type do
       oses = Dir.glob('spec/type/*').map {|d| File.basename(d)}
@@ -26,9 +26,5 @@ if defined?(RSpec)
     RSpec::Core::RakeTask.new(:helper) do |t|
         t.pattern = "spec/helper/*_spec.rb"
     end
-
-    RSpec::Core::RakeTask.new(:unit) do |t|
-        t.pattern = "spec/unit/*_spec.rb"
-    end
   end
 end

lib/serverspec/setup.rb

@@ -13,7 +13,7 @@ def self.run
         ask_windows_backend
       end
 
-      if @backend_type == 'Ssh'
+      if @backend_type == 'ssh'
         print 'Vagrant instance y/n: '
         @vagrant = $stdin.gets.chomp
         if @vagrant =~ (/(true|t|yes|y|1)$/i)
@@ -72,7 +72,7 @@ def self.ask_unix_backend
       num = $stdin.gets.to_i - 1
       puts
 
-      @backend_type = ['Ssh', 'Exec'][num] || 'Exec'
+      @backend_type = ['ssh', 'exec'][num] || 'exec'
     end
 
     def self.ask_windows_backend
@@ -88,7 +88,7 @@ def self.ask_windows_backend
       num = $stdin.gets.to_i - 1
       puts
 
-      @backend_type = ['WinRM', 'Cmd'][num] || 'Exec'
+      @backend_type = ['winrm', 'cmd'][num] || 'exec'
     end
 
     def self.safe_create_spec
@@ -241,22 +241,19 @@ def self.auto_vagrant_configuration
     def self.spec_helper_template
       template = <<-'EOF'
 require 'serverspec'
-<% if @backend_type == 'Ssh' -%>
+<% if @backend_type == 'ssh' -%>
 require 'net/ssh'
 <% end -%>
 <%- if @vagrant -%>
 require 'tempfile'
 <% end -%>
-<% if @backend_type == 'WinRM' -%>
+<% if @backend_type == 'winrm' -%>
 require 'winrm'
 <% end -%>
 
-include Specinfra::Helper::<%= @backend_type %>
-<% if @os_type != 'UN*X' -%>
-include Specinfra::Helper::Windows
-<% end -%>
+set :backend, :<%= @backend_type %>
 
-<% if @os_type == 'UN*X' && @backend_type == 'Ssh' -%>
+<% if @os_type == 'UN*X' && @backend_type == 'ssh' -%>
 if ENV['ASK_SUDO_PASSWORD']
   begin
     require 'highline/import'
@@ -268,7 +265,7 @@ def self.spec_helper_template
   set :sudo_password, ENV['SUDO_PASSWORD']
 end
 
-<%- if @backend_type == 'Ssh' -%>
+<%- if @backend_type == 'ssh' -%>
 host = ENV['TARGET_HOST']
 
 <%- if @vagrant -%>
@@ -298,7 +295,7 @@ def self.spec_helper_template
 # Set PATH
 # set :path, '/sbin:/usr/local/sbin:$PATH'
 
-<% if @backend_type == 'WinRM'-%>
+<% if @backend_type == 'winrm'-%>
 user = <username>
 pass = <password>
 endpoint = "http://<hostname>:5985/wsman"

spec/spec_helper.rb

@@ -2,7 +2,7 @@
 require 'pathname'
 require 'rspec/mocks/standalone'
 
-include Specinfra::Helper::Exec
+set :backend, :exec
 
 PROJECT_ROOT = (Pathname.new(File.dirname(__FILE__)) + '..').expand_path
 

spec/type/windows/command_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
-
+set :backend, :cmd
 set :os, :family => 'windows'
 
 describe command('test_cmd /test/path/file') do

spec/type/windows/feature_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

spec/type/windows/file_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

spec/type/windows/group_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

spec/type/windows/host_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 set :os, :family => 'windows'
 
 describe host('127.0.0.1') do

spec/type/windows/hot_fix_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

spec/type/windows/iis_app_pool_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

spec/type/windows/iis_webisite_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

spec/type/windows/package_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

spec/type/windows/port_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

spec/type/windows/registry_key_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 set :os, :family => 'windows'
 
 describe windows_registry_key('PATH/TO/THE_KEY') do

spec/type/windows/scheduled_task_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

spec/type/windows/service_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

spec/type/windows/user_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'