From 9f1b8f515b01d447fdee6f584eb129fef0c3f34c Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Sun, 12 Sep 2010 10:34:00 -0700
Subject: [PATCH] Use the new Sass gem now.

---
 Gemfile                     | 2 +-
 compass.gemspec             | 4 +++-
 lib/compass/dependencies.rb | 9 ++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 637572f8..849f6314 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source :rubygems
+bf9d3d5..34bbb29source :rubygems
 
 gem "compass", :path => "."
 gem "cucumber"
diff --git a/compass.gemspec b/compass.gemspec
index 557852d4..7078ca0c 100644
--- a/compass.gemspec
+++ b/compass.gemspec
@@ -7,7 +7,7 @@ Gem::Specification.new do |gemspec|
   gemspec.date = "#{Time.now.year}-#{Time.now.month}-#{Time.now.day}" # Automatically update for each build
   gemspec.description = "Compass is a Sass-based Stylesheet Framework that streamlines the creation and maintainance of CSS."
   gemspec.homepage = "http://compass-style.org"
-  gemspec.authors = ["Chris Eppstein", "Eric A. Meyer", "Brandon Mathis"]
+  gemspec.authors = ["Chris Eppstein", "Eric A. Meyer", "Brandon Mathis", "Nico Hagenburger"]
   gemspec.email = "chris@eppsteins.net"
   gemspec.default_executable = "compass"
   gemspec.executables = %w(compass)
@@ -15,7 +15,9 @@ Gem::Specification.new do |gemspec|
   gemspec.require_paths = %w(lib)
   gemspec.rubygems_version = "1.3.5"
   gemspec.summary = %q{A Real Stylesheet Framework}
+
   gemspec.add_dependency('sass', '~> 3.1')
+
   gemspec.files = %w(README.markdown LICENSE.markdown VERSION.yml Rakefile)
   gemspec.files += Dir.glob("bin/*")
   gemspec.files += Dir.glob("examples/**/*.*")
diff --git a/lib/compass/dependencies.rb b/lib/compass/dependencies.rb
index 5c697b3c..d25e3ee0 100644
--- a/lib/compass/dependencies.rb
+++ b/lib/compass/dependencies.rb
@@ -2,5 +2,12 @@ begin
   require 'sass'
 rescue LoadError
   require 'rubygems'
-  require 'sass'
+  begin
+    require 'sass'
+  rescue LoadError
+    puts "Unable to load Sass. Please install it with one of the following commands:"
+    puts "  gem install sass --pre"
+    puts "  gem install haml"
+    raise
+  end
 end