Add a new configuration property to disable sass warnings: disable_wa…

…rnings
twalpole · Nov 15, 2010 · 8e2b5f4 · 8e2b5f4
1 parent 412468d
commit 8e2b5f4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/doc-src/content/tutorials/configuration-reference.markdown b/doc-src/content/tutorials/configuration-reference.markdown
@@ -202,6 +202,13 @@ command line will override the corresponding settings in your configuration file
 		  approach.
 		</td> 
 	</tr> 
+	<tr> 
+		<td style="vertical-align:top;"><code>disable_warnings</code> </td> 
+		<td style="vertical-align:top;">Boolean </td> 
+		<td style="vertical-align:top;">
+		  Set this to true to silence deprecation warnings.
+		</td> 
+	</tr> 
 	<tr> 
 		<td style="vertical-align:top;"><code>sass_options</code> </td> 
 		<td style="vertical-align:top;">Hash </td> 

diff --git a/lib/compass/commands/update_project.rb b/lib/compass/commands/update_project.rb
@@ -47,10 +47,10 @@ def dry_run?
 
       def new_compiler_instance(additional_options = {})
         compiler_opts = Compass.sass_engine_options
-        compiler_opts.merge!(:quiet => options[:quiet],
-                             :force => options[:force],
+        compiler_opts.merge!(:force => options[:force],
                              :sass_files => explicit_sass_files,
                              :dry_run => options[:dry_run])
+        compiler_opts[:quiet] = options[:quiet] if options[:quiet]
         compiler_opts.merge!(additional_options)
         Compass::Compiler.new(working_path,
           Compass.configuration.sass_path,

diff --git a/lib/compass/configuration.rb b/lib/compass/configuration.rb
@@ -36,7 +36,8 @@ def self.attributes_for_directory(dir_name, http_dir_name = dir_name)
       :asset_cache_buster,
       :line_comments,
       :color_output,
-      :preferred_syntax
+      :preferred_syntax,
+      :disable_warnings
     ].flatten
 
   end

diff --git a/lib/compass/configuration/adapters.rb b/lib/compass/configuration/adapters.rb
@@ -46,6 +46,7 @@ def to_sass_engine_options
         engine_opts[:line_comments] = line_comments
         engine_opts[:cache] = cache
         engine_opts[:cache_location] = cache_path
+        engine_opts[:quiet] = disable_warnings if disable_warnings
         engine_opts.merge!(sass_options || {})
       end