Fix Guard related errors.

Conflicts:

	Gemfile

Gemfile

@@ -5,9 +5,8 @@ gemspec
 gem 'refinerycms', '~> 2.0.0'
 
 group :development, :test do
-  require 'rbconfig'
-
   gem 'refinerycms-testing', '~> 2.0.0'
+  gem 'guard-rspec', '~> 0.6.0'
 
   platforms :jruby do
     gem 'activerecord-jdbcsqlite3-adapter'
@@ -29,13 +28,14 @@ group :development, :test do
   end
 
   platforms :ruby do
-    gem 'spork', '0.9.0.rc9'
+    gem 'spork', '~> 0.9.0.rc'
     gem 'guard-spork'
 
     unless ENV['TRAVIS']
+      require 'rbconfig'
       if RbConfig::CONFIG['target_os'] =~ /darwin/i
         gem 'rb-fsevent', '>= 0.3.9'
-        gem 'growl',      '~> 1.0.3'
+        gem 'ruby_gntp'
       end
       if RbConfig::CONFIG['target_os'] =~ /linux/i
         gem 'rb-inotify', '>= 0.5.1'
@@ -47,8 +47,9 @@ group :development, :test do
 
   platforms :jruby do
     unless ENV['TRAVIS']
+      require 'rbconfig'
       if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'growl',      '~> 1.0.3'
+        gem 'ruby_gntp'
       end
       if RbConfig::CONFIG['target_os'] =~ /linux/i
         gem 'rb-inotify', '>= 0.5.1'

Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', :version => 2, :cli => "--format Fuubar --color --drb" do
+guard 'rspec', :version => 2, :cli => "--color" do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
   watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }