From 84c49ae2b882f62e8b1fe21e40655638f2fe6a3f Mon Sep 17 00:00:00 2001 From: Chris Lowder Date: Tue, 17 Jan 2012 14:59:57 +0000 Subject: [PATCH] Attempt to require the custom export class. --- lib/foreman/cli.rb | 3 +++ spec/foreman/cli_spec.rb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/foreman/cli.rb b/lib/foreman/cli.rb index d94205b..81aa59a 100644 --- a/lib/foreman/cli.rb +++ b/lib/foreman/cli.rb @@ -47,10 +47,13 @@ class Foreman::CLI < Thor check_procfile! begin + require "foreman/export/#{ format.tr('-', '_') }" classy_format = classify(format) formatter = constantize("Foreman::Export::#{ classy_format }") rescue NameError => ex error "Unknown export format: #{format} (no class Foreman::Export::#{ classy_format })." + rescue LoadError => ex + error "Unknown export format: #{format} (unable to load file 'foreman/export/#{ format.tr('-', '_') }')." end formatter.new(engine, options).export(location) diff --git a/spec/foreman/cli_spec.rb b/spec/foreman/cli_spec.rb index ebe783c..2800437 100644 --- a/spec/foreman/cli_spec.rb +++ b/spec/foreman/cli_spec.rb @@ -51,7 +51,7 @@ describe "Foreman::CLI", :fakefs do describe "with an invalid formatter" do it "prints an error" do - mock_error(subject, "Unknown export format: invalidformatter.") do + mock_error(subject, "Unknown export format: invalidformatter (unable to load file 'foreman/export/invalidformatter').") do subject.export("invalidformatter") end end