Use Cocaine 0.4.0's new API

Gemfile.lock

@@ -5,7 +5,7 @@ PATH
       activemodel (>= 3.0.0)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
       activesupport (>= 3.0.0)
-      cocaine (>= 0.0.2)
+      cocaine (~> 0.4.0)
       mime-types
       mime-types
 
 
 GEM
 GEM
@@ -62,7 +62,7 @@ GEM
       xpath (~> 0.1.4)
       xpath (~> 0.1.4)
     childprocess (0.3.2)
     childprocess (0.3.2)
       ffi (~> 1.0.6)
       ffi (~> 1.0.6)
-    cocaine (0.2.1)
+    cocaine (0.4.0)
     coderay (1.0.6)
     coderay (1.0.6)
     cucumber (1.2.1)
     cucumber (1.2.1)
       builder (>= 2.1.2)
       builder (>= 2.1.2)

lib/paperclip/helpers.rb

@@ -28,7 +28,7 @@ module Paperclip
       if logging? && (options[:log_command] || local_options[:log_command])
       if logging? && (options[:log_command] || local_options[:log_command])
         local_options = local_options.merge(:logger => logger)
         local_options = local_options.merge(:logger => logger)
       end
       end
-      Cocaine::CommandLine.new(cmd, arguments, local_options).run
+      Cocaine::CommandLine.new(cmd, arguments, local_options).run(local_options)
     end
     end
 
 
     # Find all instances of the given Active Record model +klass+ with attachment +name+.
     # Find all instances of the given Active Record model +klass+ with attachment +name+.

paperclip.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency('activerecord', '>= 3.0.0')
   s.add_dependency('activerecord', '>= 3.0.0')
   s.add_dependency('activemodel', '>= 3.0.0')
   s.add_dependency('activemodel', '>= 3.0.0')
   s.add_dependency('activesupport', '>= 3.0.0')
   s.add_dependency('activesupport', '>= 3.0.0')
-  s.add_dependency('cocaine', '>= 0.0.2')
+  s.add_dependency('cocaine', '~> 0.4.0')
   s.add_dependency('mime-types')
   s.add_dependency('mime-types')
 
 
   s.add_development_dependency('shoulda')
   s.add_development_dependency('shoulda')