Make command line error handling more generic

lib/paperclip/content_type_detector.rb

@@ -52,7 +52,8 @@ module Paperclip
       type = begin
       type = begin
         # On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
         # On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
         Paperclip.run("file", "-b --mime :file", :file => @filename)
         Paperclip.run("file", "-b --mime :file", :file => @filename)
-      rescue Cocaine::CommandNotFoundError => e
+      rescue Cocaine::CommandLineError => e
+        Paperclip.log("Error while determining content type: #{e}")
         SENSIBLE_DEFAULT
         SENSIBLE_DEFAULT
       end
       end
 
 

test/content_type_detector_test.rb

@@ -31,16 +31,8 @@ class ContentTypeDetectorTest < Test::Unit::TestCase
       assert_equal "application/octet-stream", Paperclip::ContentTypeDetector.new(@filename).detect
       assert_equal "application/octet-stream", Paperclip::ContentTypeDetector.new(@filename).detect
     end
     end
 
 
-    should 'let errors raise if something blows up' do
-      Paperclip.stubs(:run).raises(Cocaine::CommandLineError.new)
-      @filename = "/path/to/something"
-      assert_raises(Cocaine::CommandLineError) do
-        Paperclip::ContentTypeDetector.new(@filename).detect
-      end
-    end
-
     should 'return a sensible default when the file command is missing' do
     should 'return a sensible default when the file command is missing' do
-      Paperclip.stubs(:run).raises(Cocaine::CommandNotFoundError.new)
+      Paperclip.stubs(:run).raises(Cocaine::CommandLineError.new)
       @filename = "/path/to/something"
       @filename = "/path/to/something"
       assert_equal "application/octet-stream", Paperclip::ContentTypeDetector.new(@filename).detect
       assert_equal "application/octet-stream", Paperclip::ContentTypeDetector.new(@filename).detect
     end
     end