From 531c90a1a4e8b545439aa7403f88128c03093bf9 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Wed, 22 Apr 2009 12:50:18 -0700 Subject: [PATCH] [Command Line] Respect the -q (quiet) option during compilation. Set the quiet option when watching a project for changes. --- lib/compass/actions.rb | 6 +++--- lib/compass/commands/update_project.rb | 2 +- lib/compass/exec.rb | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/compass/actions.rb b/lib/compass/actions.rb index 91e34442..ab70f576 100644 --- a/lib/compass/actions.rb +++ b/lib/compass/actions.rb @@ -18,7 +18,7 @@ module Compass def directory(dir, options = nil) options ||= self.options if self.respond_to?(:options) if File.exists?(dir) && File.directory?(dir) - logger.record :exists, basename(dir) + logger.record :exists, basename(dir) unless options[:quiet] elsif File.exists?(dir) msg = "#{basename(dir)} already exists and is not a directory." raise Compass::FilesystemConflict.new(msg) @@ -58,7 +58,7 @@ module Compass # Compile one Sass file def compile(sass_filename, css_filename, options) if Sass::Plugin.exact_stylesheet_needs_update?(css_filename, sass_filename) - logger.record :compile, basename(sass_filename) + logger.record :compile, basename(sass_filename) unless options[:quiet] engine = ::Sass::Engine.new(open(sass_filename).read, :filename => sass_filename, :line_comments => options[:line_comments], @@ -68,7 +68,7 @@ module Compass css_content = engine.render write_file(css_filename, css_content, options.merge(:force => true)) else - logger.record :unchanged, basename(sass_filename) + logger.record :unchanged, basename(sass_filename) unless options[:quiet] end end diff --git a/lib/compass/commands/update_project.rb b/lib/compass/commands/update_project.rb index a42046e9..f346cffe 100644 --- a/lib/compass/commands/update_project.rb +++ b/lib/compass/commands/update_project.rb @@ -14,7 +14,7 @@ module Compass Compass::Compiler.new(working_path, projectize(Compass.configuration.sass_dir), projectize(Compass.configuration.css_dir), - Compass.sass_engine_options).run + Compass.sass_engine_options.merge(:quiet => options[:quiet])).run end end diff --git a/lib/compass/exec.rb b/lib/compass/exec.rb index 7207fd26..d37f766b 100644 --- a/lib/compass/exec.rb +++ b/lib/compass/exec.rb @@ -98,6 +98,7 @@ END opts.on('-w', '--watch', :NONE, 'Monitor the current project for changes and update') do self.options[:command] = :watch_project + self.options[:quiet] = true end opts.on('--sass-dir SRC_DIR', "The source directory where you keep your sass stylesheets.") do |sass_dir|