Merge pull request #95 from matsuo/detect-darwin

Detect Darwin for beginning to support OS X.

lib/serverspec.rb

@@ -13,12 +13,14 @@
 require 'serverspec/commands/debian'
 require 'serverspec/commands/gentoo'
 require 'serverspec/commands/solaris'
+require 'serverspec/commands/darwin'
 
 RSpec.configure do |c|
   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::Solaris, :os => :solaris)
+  c.include(Serverspec::Helper::Darwin,  :os => :darwin)
   c.add_setting :os,            :default => nil
   c.add_setting :host,          :default => nil
   c.add_setting :ssh,           :default => nil

lib/serverspec/backend/exec.rb

@@ -156,6 +156,8 @@ def check_os
           'Gentoo'
         elsif run_command('uname -s')[:stdout] =~ /SunOS/i
           'Solaris'
+        elsif run_command('uname -s')[:stdout] =~ /Darwin/i
+          'Darwin'
         end
       end
 

lib/serverspec/commands/darwin.rb

@@ -0,0 +1,9 @@
+require 'shellwords'
+
+module Serverspec
+  module Commands
+    class Darwin < Base
+      class NotImplementedError < Exception; end
+    end
+  end
+end

lib/serverspec/helper.rb

@@ -10,6 +10,7 @@
 require 'serverspec/helper/debian'
 require 'serverspec/helper/gentoo'
 require 'serverspec/helper/solaris'
+require 'serverspec/helper/darwin'
 require 'serverspec/helper/detect_os'
 
 # Obsoleted helpers

lib/serverspec/helper/darwin.rb

@@ -0,0 +1,9 @@
+module Serverspec
+  module Helper
+    module Darwin
+      def commands
+        Serverspec::Commands::Darin.new
+      end
+    end
+  end
+end

lib/serverspec/helper/obsoleted.rb

@@ -59,4 +59,16 @@ def self.included(mod)
       exit 1
     end
   end
+  module DarwinHelper
+    def self.included(mod)
+      puts
+      puts "**************************************************************"
+      puts "Serverspec::DarwinHelper in spec/spec_helper.rb is deprecated."
+      puts "Use Serverspec::Helper::Darwin instead."
+      puts "Or remove spec/spec_helper.rb and run severspec-init again."
+      puts "**************************************************************"
+      puts
+      exit 1
+    end
+  end
 end