diff --git a/lib/que/command_line_interface.rb b/lib/que/command_line_interface.rb index 7e9f2e67..7d39d03d 100644 --- a/lib/que/command_line_interface.rb +++ b/lib/que/command_line_interface.rb @@ -196,12 +196,7 @@ def parse( end args.each do |file| - begin - require file - rescue LoadError => e - output.puts "Could not load file '#{file}': #{e}" - return 1 - end + require File.expand_path(file) end Que.logger ||= Logger.new(STDOUT) diff --git a/spec/que/command_line_interface_spec.rb b/spec/que/command_line_interface_spec.rb index 7ee69c31..63af2c88 100644 --- a/spec/que/command_line_interface_spec.rb +++ b/spec/que/command_line_interface_spec.rb @@ -121,7 +121,7 @@ def write_file it "should infer the default require file if it exists" do filename = write_file - assert_successful_invocation "", default_require_file: "./#{filename}.rb" + assert_successful_invocation "", default_require_file: "#{filename}.rb" assert_equal( {filename => true}, @@ -161,10 +161,7 @@ def write_file it "should raise an error if any of the files don't exist" do name = write_file - code = execute "./#{name} ./nonexistent_file" - assert_equal 1, code - - assert_equal ["Could not load file './nonexistent_file': cannot load such file -- ./nonexistent_file"], output.messages + assert_raises(LoadError) { execute "#{name} ./nonexistent_file" } assert_equal( {name => true},