Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Separate command line options from the interpolations

  • Loading branch information...
commit 5f52d894c15b309cd97e48d7e482be5bd634d990 1 parent d15d8d8
Jon Yurek jyurek authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/paperclip/helpers.rb
4 lib/paperclip/helpers.rb
View
@@ -22,13 +22,13 @@ def interpolates key, &block
#
# :swallow_stderr -> Set to true if you don't care what happens on STDERR.
#
- def run(cmd, arguments = "", local_options = {})
+ def run(cmd, arguments = "", interpolation_values = {}, local_options = {})
command_path = options[:command_path]
Cocaine::CommandLine.path = [Cocaine::CommandLine.path, command_path].flatten.compact.uniq
if logging? && (options[:log_command] || local_options[:log_command])
local_options = local_options.merge(:logger => logger)
end
- Cocaine::CommandLine.new(cmd, arguments, local_options).run(local_options)
+ Cocaine::CommandLine.new(cmd, arguments, local_options).run(interpolation_values)
end
# Find all instances of the given Active Record model +klass+ with attachment +name+.
Please sign in to comment.
Something went wrong with that request. Please try again.