github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A little less noise during installation.

Browse Source
This commit is contained in:
Chris Eppstein 2010-10-30 17:51:00 -07:00
parent 4ba6e57106
commit a154d2e5cf
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/compass/actions.rb
View File

@ -18,7 +18,7 @@ module Compass
def directory(dir, options = nil) def directory(dir, options = nil)
options ||= self.options if self.respond_to?(:options) options ||= self.options if self.respond_to?(:options)
if File.exists?(dir) && File.directory?(dir) if File.exists?(dir) && File.directory?(dir)
logger.record :exists, basename(dir) unless options[:quiet] # logger.record :exists, basename(dir) unless options[:quiet]
elsif File.exists?(dir) elsif File.exists?(dir)
msg = "#{basename(dir)} already exists and is not a directory." msg = "#{basename(dir)} already exists and is not a directory."
raise Compass::FilesystemConflict.new(msg) raise Compass::FilesystemConflict.new(msg)

1
lib/compass/compiler.rb
View File

@ -98,7 +98,6 @@ module Compass
# Compile one Sass file # Compile one Sass file
def compile(sass_filename, css_filename) def compile(sass_filename, css_filename)
logger.record :compile, basename(sass_filename) unless options[:quiet]
css_content = logger.red do css_content = logger.red do
engine(sass_filename, css_filename).render engine(sass_filename, css_filename).render
end end

2
lib/compass/installers/base.rb
View File

@ -84,7 +84,7 @@ module Compass
to = targetize(install_location_for_stylesheet(to, options)) to = targetize(install_location_for_stylesheet(to, options))
contents = File.new(from).read contents = File.new(from).read
if preferred_syntax.to_s != from[-4..-1] if preferred_syntax.to_s != from[-4..-1]
logger.record :convert, basename(from) # logger.record :convert, basename(from)
tree = Sass::Engine.new(contents, Compass.sass_engine_options.merge(:syntax => from[-4..-1].intern)).to_tree tree = Sass::Engine.new(contents, Compass.sass_engine_options.merge(:syntax => from[-4..-1].intern)).to_tree
contents = tree.send("to_#{preferred_syntax}") contents = tree.send("to_#{preferred_syntax}")
to[-4..-1] = preferred_syntax.to_s to[-4..-1] = preferred_syntax.to_s