Fix a bug and some broken tests.

This commit is contained in:
Chris Eppstein 2010-09-03 16:21:53 -07:00
parent ee276ee7ea
commit dbb88965a6
2 changed files with 2 additions and 5 deletions

View File

@ -79,7 +79,6 @@ Feature: Command Line
When I initialize a project using: compass init rails --sass-dir app/stylesheets --css-dir public/stylesheets/compiled
Then a config file config/compass.rb is reported created
Then a config file config/compass.rb is created
And a sass file config/initializers/compass.rb is created
And a sass file app/stylesheets/screen.scss is created
And a sass file app/stylesheets/print.scss is created
And a sass file app/stylesheets/ie.scss is created
@ -182,6 +181,7 @@ Feature: Command Line
| install |
| interactive |
| stats |
| unpack |
| validate |
| version |

View File

@ -11,6 +11,7 @@ module Compass
self.logger = options.delete(:logger)
self.options = options
self.options[:cache_location] ||= determine_cache_location
Compass.configure_sass_plugin!
end
def determine_cache_location
@ -40,7 +41,6 @@ module Compass
# Returns the sass file that needs to be compiled, if any.
def out_of_date?
Compass.configure_sass_plugin! unless Compass.sass_plugin_configured?
sass_files.zip(css_files).each do |sass_filename, css_filename|
return sass_filename if Sass::Plugin.send(:stylesheet_needs_update?, css_filename, sass_filename)
end
@ -72,9 +72,6 @@ module Compass
options[:force] = true
end
# We use the Sass::Plugin to check dependencies so we have configure it.
Compass.configure_sass_plugin! unless Compass.sass_plugin_configured?
# Make sure the target directories exist
target_directories.each {|dir| directory dir}