Merge pull request #222 from scelis/fix/prefer-formatter-in-args

Always prefer the formatter passed in

1 files changed, 10 insertions, 4 deletions

diff --git a/lib/twine/runner.rb b/lib/twine/runner.rb
index cd21e15..fab6d18 100644
--- a/lib/twine/runner.rb
+++ b/lib/twine/runner.rb
@@ -69,8 +69,11 @@ module Twine
         end
       end
 
-      formatter_for_directory = find_formatter { |f| f.can_handle_directory?(@options[:output_path]) }
-      formatter = formatter_for_format(@options[:format]) || formatter_for_directory
+      if @options[:format]
+        formatter = formatter_for_format(@options[:format])
+      else
+        formatter = find_formatter { |f| f.can_handle_directory?(@options[:output_path]) }
+      end
       
       unless formatter
         raise Twine::Error.new "Could not determine format given the contents of #{@options[:output_path]}"
@@ -312,8 +315,11 @@ module Twine
     end
 
     def prepare_read_write(path, lang)
-      formatter_for_path = find_formatter { |f| f.extension == File.extname(path) }
-      formatter = formatter_for_format(@options[:format]) || formatter_for_path
+      if @options[:format]
+        formatter = formatter_for_format(@options[:format])
+      else
+        formatter = find_formatter { |f| f.extension == File.extname(path) }
+      end
       
       unless formatter
         raise Twine::Error.new "Unable to determine format of #{path}"