better tool instantiation

cogent · Nov 18, 2009 · 7edfcf1 · 7edfcf1
1 parent 8723d07
commit 7edfcf1
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/lib/rvideo/tools/abstract_tool.rb b/lib/rvideo/tools/abstract_tool.rb
@@ -8,10 +8,13 @@ class AbstractTool
       def self.assign(cmd, options = {})
         tool_name = cmd.split(" ").first
         begin
-          tool = "RVideo::Tools::#{tool_name.underscore.classify}".constantize.send(:new, cmd, options)
-        # rescue NameError, /uninitialized constant/
-          # raise TranscoderError::UnknownTool, "The recipe tried to use the '#{tool_name}' tool, which does not exist."
-        rescue => e
+          tool_class_name = tool_name.underscore.classify
+          tool = RVideo::Tools.const_get(tool_class_name).new(cmd, options)
+        rescue NameError => e
+          raise TranscoderError::UnknownTool,
+            "The recipe tried to use #{tool_name.inspect}, " +
+            "which expands to #{tool_class_name.inspect}, which does not exist. \n#{e.message}"
+        rescue Object => e
           RVideo.logger.info e.message
           RVideo.logger.info e.backtrace.join("\n")
           raise e