Merge commit 'filiptepper/master'
* commit 'filiptepper/master': haml 2.2 dependency
This commit is contained in:
commit
0809dd64dd
@ -1,6 +1,11 @@
|
|||||||
COMPASS CHANGELOG
|
COMPASS CHANGELOG
|
||||||
=================
|
=================
|
||||||
|
|
||||||
|
0.8.6 (July 08, 2009)
|
||||||
|
---------------------
|
||||||
|
|
||||||
|
Haml 2.2 dependency.
|
||||||
|
|
||||||
0.8.5 (July 06, 2009)
|
0.8.5 (July 06, 2009)
|
||||||
---------------------
|
---------------------
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Gem::Specification.new do |s|
|
Gem::Specification.new do |s|
|
||||||
s.name = %q{compass}
|
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.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
||||||
s.authors = ["Chris Eppstein"]
|
s.authors = ["Chris Eppstein"]
|
||||||
|
@ -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?
|
css_dir = "public/stylesheets/compiled" if css_dir.blank?
|
||||||
|
|
||||||
# define dependencies
|
# 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"
|
gem "chriseppstein-compass", :source => "http://gems.github.com/", :lib => "compass"
|
||||||
|
|
||||||
# install and unpack
|
# 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:install GEM=chriseppstein-compass", :sudo => true
|
||||||
rake "gems:unpack GEM=chriseppstein-compass"
|
rake "gems:unpack GEM=chriseppstein-compass"
|
||||||
|
|
||||||
@ -69,7 +69,7 @@ compass_command << plugin_require if plugin_require
|
|||||||
|
|
||||||
# Require compass during plugin loading
|
# Require compass during plugin loading
|
||||||
file 'vendor/plugins/compass/init.rb', <<-CODE
|
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'
|
require 'compass'
|
||||||
CODE
|
CODE
|
||||||
|
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
unless defined?(Sass)
|
unless defined?(Sass)
|
||||||
require 'rubygems'
|
require 'rubygems'
|
||||||
begin
|
begin
|
||||||
gem 'haml-edge','>= 2.1'
|
gem 'haml','>= 2.2.0'
|
||||||
rescue Exception
|
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
|
end
|
||||||
require 'sass'
|
require 'sass'
|
||||||
end
|
end
|
Loading…
Reference in New Issue
Block a user