Merge commit 'filiptepper/master'

* commit 'filiptepper/master':
  haml 2.2 dependency
This commit is contained in:
Chris Eppstein 2009-07-08 01:15:42 -07:00
commit 0809dd64dd
4 changed files with 16 additions and 11 deletions

View File

@ -1,6 +1,11 @@
COMPASS CHANGELOG
=================
0.8.6 (July 08, 2009)
---------------------
Haml 2.2 dependency.
0.8.5 (July 06, 2009)
---------------------

View File

@ -2,7 +2,7 @@
Gem::Specification.new do |s|
s.name = %q{compass}
s.version = "0.8.5"
s.version = "0.8.6"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Chris Eppstein"]

View File

@ -46,11 +46,11 @@ css_dir = ask("Where would you like Compass to store your compiled css files? (d
css_dir = "public/stylesheets/compiled" if css_dir.blank?
# define dependencies
gem "haml-edge", :lib => "haml"
gem "haml", :lib => "haml", :version => ">=2.2.0"
gem "chriseppstein-compass", :source => "http://gems.github.com/", :lib => "compass"
# install and unpack
rake "gems:install GEM=haml-edge", :sudo => true
rake "gems:install GEM=haml", :sudo => true
rake "gems:install GEM=chriseppstein-compass", :sudo => true
rake "gems:unpack GEM=chriseppstein-compass"
@ -69,7 +69,7 @@ compass_command << plugin_require if plugin_require
# Require compass during plugin loading
file 'vendor/plugins/compass/init.rb', <<-CODE
# This is here to make sure that the right version of sass gets loaded (haml-edge) by the compass requires.
# This is here to make sure that the right version of sass gets loaded (haml 2.2) by the compass requires.
require 'compass'
CODE

View File

@ -1,9 +1,9 @@
unless defined?(Sass)
require 'rubygems'
begin
gem 'haml-edge','>= 2.1'
gem 'haml','>= 2.2.0'
rescue Exception
$stderr.puts "WARNING: haml-edge gem not found. Trying to find haml on the load path."
$stderr.puts "WARNING: haml 2.2 gem not found. Trying to find haml on the load path."
end
require 'sass'
end