serverspec 0.5.5 → 0.5.6

data/lib/serverspec/backend/exec.rb

@@ -185,6 +185,8 @@ module Serverspec
           'Solaris'
         elsif run_command('uname -s')[:stdout] =~ /Darwin/i
           'Darwin'
+        else
+          'Base'
         end
       end
 

data/lib/serverspec/helper/detect_os.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Helper
     module DetectOS
       def commands
-        os = RSpec.configuration.os || 'Base'
+        os = backend(Serverspec::Commands::Base).check_os
         self.class.const_get('Serverspec').const_get('Commands').const_get(os).new
       end
     end

data/lib/serverspec/helper/exec.rb

@@ -2,6 +2,9 @@ module Serverspec
   module Helper
     module Exec
       def backend(commands_object=nil)
+        if commands_object.nil? && ! respond_to?(:commands)
+          commands_object = Serverspec::Commands::Base.new
+        end
         instance = Serverspec::Backend::Exec.instance
         instance.set_commands(commands_object || commands)
         instance

data/lib/serverspec/helper/ssh.rb

@@ -2,6 +2,9 @@ module Serverspec
   module Helper
     module Ssh
       def backend(commands_object=nil)
+        if ! respond_to?(:commands)
+          commands_object = Serverspec::Commands::Base.new
+        end
         instance = Serverspec::Backend::Ssh.instance
         instance.set_commands(commands_object || commands)
         instance

data/lib/serverspec/setup.rb

@@ -124,7 +124,6 @@ EOF
       user    = options[:user] || Etc.getlogin
       ### include vagrant conf ###
       c.ssh   = Net::SSH.start(c.host, user, options)
-      c.os    = backend.check_os
     end
   end")
             if @vagrant
@@ -149,7 +148,6 @@ EOF
             end
             when 'Exec'
               content.gsub!(/### include backend conf ###/, "c.before :all do
-    c.os = backend.check_os
   end")
             when 'Puppet'
               content.gsub!(/### include requirements ###/, "require 'puppet'\nrequire 'serverspec/backend/puppet'

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

data/spec/helpers/attributes_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
-require 'serverspec/helper/base'
 
-include Serverspec::Helper::Base
 include Serverspec::Helper::Attributes
 
 describe 'Attributes Helper' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors: