Compass now depends on the haml-edge gem instead of haml.
This commit is contained in:
parent
f108fe5303
commit
84f657027a
2
Rakefile
2
Rakefile
@ -44,7 +44,7 @@ begin
|
|||||||
p.url = "http://github.com/chriseppstein/compass"
|
p.url = "http://github.com/chriseppstein/compass"
|
||||||
p.author = ['Chris Eppstein']
|
p.author = ['Chris Eppstein']
|
||||||
p.email = "chris@eppsteins.net"
|
p.email = "chris@eppsteins.net"
|
||||||
p.dependencies = ["haml"]
|
p.dependencies = ["haml-edge"]
|
||||||
p.has_rdoc = false
|
p.has_rdoc = false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -23,15 +23,15 @@ Gem::Specification.new do |s|
|
|||||||
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
|
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
|
||||||
s.specification_version = 2
|
s.specification_version = 2
|
||||||
|
|
||||||
if current_version >= 3 then
|
if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
|
||||||
s.add_runtime_dependency(%q<haml>, [">= 0"])
|
s.add_runtime_dependency(%q<haml-edge>, [">= 0"])
|
||||||
s.add_development_dependency(%q<echoe>, [">= 0"])
|
s.add_development_dependency(%q<echoe>, [">= 0"])
|
||||||
else
|
else
|
||||||
s.add_dependency(%q<haml>, [">= 0"])
|
s.add_dependency(%q<haml-edge>, [">= 0"])
|
||||||
s.add_dependency(%q<echoe>, [">= 0"])
|
s.add_dependency(%q<echoe>, [">= 0"])
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
s.add_dependency(%q<haml>, [">= 0"])
|
s.add_dependency(%q<haml-edge>, [">= 0"])
|
||||||
s.add_dependency(%q<echoe>, [">= 0"])
|
s.add_dependency(%q<echoe>, [">= 0"])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
require 'rubygems'
|
require File.join(File.dirname(__FILE__), 'compass', 'dependencies')
|
||||||
require 'sass'
|
|
||||||
|
|
||||||
def assert_sass_version(obj)
|
def assert_sass_version(obj)
|
||||||
unless obj.respond_to?(:version) && obj.version[:major] == 2 && obj.version[:minor] >= 1
|
unless obj.respond_to?(:version) && obj.version[:major] == 2 && obj.version[:minor] >= 1
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
require 'rubygems'
|
|
||||||
require 'sass'
|
|
||||||
require 'fileutils'
|
require 'fileutils'
|
||||||
require 'pathname'
|
require 'pathname'
|
||||||
require File.join(File.dirname(__FILE__), 'base')
|
require File.join(File.dirname(__FILE__), 'base')
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
require 'rubygems'
|
|
||||||
require 'sass'
|
|
||||||
require 'fileutils'
|
require 'fileutils'
|
||||||
require 'pathname'
|
require 'pathname'
|
||||||
require File.join(File.dirname(__FILE__), 'base')
|
require File.join(File.dirname(__FILE__), 'base')
|
||||||
|
3
lib/compass/dependencies.rb
Normal file
3
lib/compass/dependencies.rb
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
require 'rubygems'
|
||||||
|
gem 'haml-edge','>= 2.1'
|
||||||
|
require 'sass'
|
@ -1,6 +1,5 @@
|
|||||||
|
require File.join(Compass.lib_directory, 'compass', 'dependencies')
|
||||||
require 'optparse'
|
require 'optparse'
|
||||||
require 'rubygems'
|
|
||||||
require 'haml'
|
|
||||||
require File.join(Compass.lib_directory, 'compass', 'logger')
|
require File.join(Compass.lib_directory, 'compass', 'logger')
|
||||||
require File.join(Compass.lib_directory, 'compass', 'errors')
|
require File.join(Compass.lib_directory, 'compass', 'errors')
|
||||||
require File.join(Compass.lib_directory, 'compass', 'actions')
|
require File.join(Compass.lib_directory, 'compass', 'actions')
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
require 'sass'
|
|
||||||
require 'sass/plugin'
|
require 'sass/plugin'
|
||||||
|
|
||||||
module Sass::Script::Functions
|
module Sass::Script::Functions
|
||||||
|
@ -25,9 +25,6 @@ require 'rubygems' if need_gems
|
|||||||
|
|
||||||
require 'action_controller'
|
require 'action_controller'
|
||||||
require 'action_view'
|
require 'action_view'
|
||||||
require 'haml'
|
|
||||||
require 'sass'
|
|
||||||
require 'sass/plugin'
|
|
||||||
|
|
||||||
|
|
||||||
require 'test/unit'
|
require 'test/unit'
|
||||||
|
Loading…
Reference in New Issue
Block a user