Compass now depends on the haml-edge gem instead of haml.

Rakefile

@@ -44,7 +44,7 @@ begin
     p.url = "http://github.com/chriseppstein/compass"
     p.author = ['Chris Eppstein']
     p.email = "chris@eppsteins.net"
-    p.dependencies = ["haml"]
+    p.dependencies = ["haml-edge"]
     p.has_rdoc = false
   end
  

compass.gemspec

@@ -23,15 +23,15 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
-    if current_version >= 3 then
-      s.add_runtime_dependency(%q<haml>, [">= 0"])
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<haml-edge>, [">= 0"])
       s.add_development_dependency(%q<echoe>, [">= 0"])
     else
-      s.add_dependency(%q<haml>, [">= 0"])
+      s.add_dependency(%q<haml-edge>, [">= 0"])
       s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
-    s.add_dependency(%q<haml>, [">= 0"])
+    s.add_dependency(%q<haml-edge>, [">= 0"])
     s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

lib/compass.rb

@@ -1,5 +1,4 @@
-require 'rubygems'
-require 'sass'
+require File.join(File.dirname(__FILE__), 'compass', 'dependencies')
 
 def assert_sass_version(obj)
   unless obj.respond_to?(:version) && obj.version[:major] == 2 && obj.version[:minor] >= 1

lib/compass/commands/project_base.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-require 'sass'
 require 'fileutils'
 require 'pathname'
 require File.join(File.dirname(__FILE__), 'base')

lib/compass/commands/watch_project.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-require 'sass'
 require 'fileutils'
 require 'pathname'
 require File.join(File.dirname(__FILE__), 'base')

lib/compass/dependencies.rb

@@ -0,0 +1,3 @@
+require 'rubygems'
+gem 'haml-edge','>= 2.1'
+require 'sass'

lib/compass/exec.rb

@@ -1,6 +1,5 @@
+require File.join(Compass.lib_directory, 'compass', 'dependencies')
 require 'optparse'
-require 'rubygems'
-require 'haml'
 require File.join(Compass.lib_directory, 'compass', 'logger')
 require File.join(Compass.lib_directory, 'compass', 'errors')
 require File.join(Compass.lib_directory, 'compass', 'actions')

lib/sass_extensions.rb

@@ -1,4 +1,3 @@
-require 'sass'
 require 'sass/plugin'
 
 module Sass::Script::Functions

test/test_helper.rb

@@ -25,9 +25,6 @@ require 'rubygems' if need_gems
 
 require 'action_controller'
 require 'action_view'
-require 'haml'
-require 'sass'
-require 'sass/plugin'
 
 
 require 'test/unit'