Silence ALL the STDERR warnings!

thoughtbot · Mar 30, 2012 · d61ddd5 · d61ddd5
1 parent 51bb0f9
commit d61ddd5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/lib/paperclip/geometry.rb b/lib/paperclip/geometry.rb
@@ -24,7 +24,9 @@ def self.from_file file
       file_path = file.respond_to?(:path) ? file.path : file
       raise(Errors::NotIdentifiedByImageMagickError.new("Cannot find the geometry of a file with a blank name")) if file_path.blank?
       geometry = begin
-                   Paperclip.run("identify", "-format %wx%h :file", :file => "#{file_path}[0]")
+                   silence_stream(STDERR) do
+                     Paperclip.run("identify", "-format %wx%h :file", :file => "#{file_path}[0]")
+                   end
                  rescue Cocaine::ExitStatusError
                    ""
                  rescue Cocaine::CommandNotFoundError => e

diff --git a/lib/paperclip/thumbnail.rb b/lib/paperclip/thumbnail.rb
@@ -44,7 +44,6 @@ def initialize(file, options = {}, attachment = nil)
 
       @current_format      = File.extname(@file.path)
       @basename            = File.basename(@file.path, @current_format)
-
     end
 
     # Returns true if the +target_geometry+ is meant to crop.

diff --git a/test/helper.rb b/test/helper.rb
@@ -28,13 +28,6 @@
 
 ROOT = Pathname(File.expand_path(File.join(File.dirname(__FILE__), '..')))
 
-def silence_warnings
-  old_verbose, $VERBOSE = $VERBOSE, nil
-  yield
-ensure
-  $VERBOSE = old_verbose
-end
-
 class Test::Unit::TestCase
   def setup
     silence_warnings do

diff --git a/test/integration_test.rb b/test/integration_test.rb
@@ -40,12 +40,16 @@ class IntegrationTest < Test::Unit::TestCase
 
       should "not raise an error" do
         assert_nothing_raised do
-          @dummy.avatar.reprocess!
+          silence_stream(STDERR) do
+            @dummy.avatar.reprocess!
+          end
         end
       end
 
       should "return false" do
-        assert ! @dummy.avatar.reprocess!
+        silence_stream(STDERR) do
+          assert !@dummy.avatar.reprocess!
+        end
       end
 
       teardown { File.chmod(0644, @dummy.avatar.path) }

diff --git a/test/thumbnail_test.rb b/test/thumbnail_test.rb
@@ -78,7 +78,9 @@ class ThumbnailTest < Test::Unit::TestCase
         begin
           ENV['PATH'] = ''
           assert_raises(Paperclip::Errors::CommandNotFoundError) do
-            @thumb.make
+            silence_stream(STDERR) do
+              @thumb.make
+            end
           end
         ensure
           ENV['PATH'] = old_path
@@ -155,7 +157,9 @@ class ThumbnailTest < Test::Unit::TestCase
 
         should "error when trying to create the thumbnail" do
           assert_raises(Paperclip::Error) do
-            @thumb.make
+            silence_stream(STDERR) do
+              @thumb.make
+            end
           end
         end
       end
@@ -195,7 +199,9 @@ class ThumbnailTest < Test::Unit::TestCase
 
         should "error when trying to create the thumbnail" do
           assert_raises(Paperclip::Error) do
-            @thumb.make
+            silence_stream(STDERR) do
+              @thumb.make
+            end
           end
         end
 
@@ -204,7 +210,9 @@ class ThumbnailTest < Test::Unit::TestCase
           begin
             ENV['PATH'] = ''
             assert_raises(Paperclip::Errors::CommandNotFoundError) do
-              @thumb.make
+              silence_stream(STDERR) do
+                @thumb.make
+              end
             end
           ensure
             ENV['PATH'] = old_path