From 231385035926fd4b437912e90bd60507ac7ee301 Mon Sep 17 00:00:00 2001
From: Lee Hambley <lee.hambley@gmail.com>
Date: Sun, 1 Nov 2015 22:58:33 +0100
Subject: [PATCH] Revert "New API for setting+configuring formatter:
 use_format"

---
 lib/sshkit/configuration.rb     | 34 +++++----------------------------
 test/unit/test_configuration.rb | 22 ---------------------
 2 files changed, 5 insertions(+), 51 deletions(-)

diff --git a/lib/sshkit/configuration.rb b/lib/sshkit/configuration.rb
index 6f47757a..701e4cc7 100644
--- a/lib/sshkit/configuration.rb
+++ b/lib/sshkit/configuration.rb
@@ -6,7 +6,7 @@ class Configuration
     attr_writer :output, :backend, :default_env
 
     def output
-      @output ||= use_format(:pretty)
+      @output ||= formatter(:pretty)
     end
 
     def deprecation_logger
@@ -34,29 +34,8 @@ def output_verbosity=(verbosity)
       @output_verbosity = logger(verbosity)
     end
 
-    # TODO: deprecate in favor of `use_format`
     def format=(format)
-      use_format(format)
-    end
-
-    # Tell SSHKit to use the specified `formatter` for stdout. The formatter
-    # can be the name of a built-in SSHKit formatter, like `:pretty`, a
-    # formatter class, like `SSHKit::Formatter::Pretty`, or a custom formatter
-    # class you've written yourself.
-    #
-    # Additional arguments will be passed to the formatter's constructor.
-    #
-    # Example:
-    #
-    #   config.use_format(:pretty)
-    #
-    # Is equivalent to:
-    #
-    #   config.output = SSHKit::Formatter::Pretty.new($stdout)
-    #
-    def use_format(formatter, *args)
-      klass = formatter.is_a?(Class) ? formatter : formatter_class(formatter)
-      self.output = klass.new($stdout, *args)
+      self.output = formatter(format)
     end
 
     def command_map
@@ -73,13 +52,10 @@ def logger(verbosity)
       verbosity.is_a?(Integer) ? verbosity : Logger.const_get(verbosity.upcase)
     end
 
-    def formatter_class(symbol)
-      name = symbol.to_s.downcase
-      found = SSHKit::Formatter.constants.find do |const|
-        const.to_s.downcase == name
+    def formatter(format)
+      SSHKit::Formatter.constants.each do |const|
+        return SSHKit::Formatter.const_get(const).new($stdout) if const.downcase.eql?(format.downcase)
       end
-      fail NameError, 'Unrecognized SSHKit::Formatter "#{symbol}"' if found.nil?
-      SSHKit::Formatter.const_get(found)
     end
 
   end
diff --git a/test/unit/test_configuration.rb b/test/unit/test_configuration.rb
index 9ec545df..e6dda09f 100644
--- a/test/unit/test_configuration.rb
+++ b/test/unit/test_configuration.rb
@@ -78,28 +78,6 @@ def test_setting_formatter_types
       end
     end
 
-    def test_prohibits_unknown_formatter_type_with_exception
-      assert_raises(NameError) do
-        SSHKit.config.format = :doesnotexist
-      end
-    end
-
-    def test_options_can_be_provided_to_formatter
-      SSHKit.config.use_format(TestFormatter, :color => false)
-      formatter = SSHKit.config.output
-      assert_instance_of(TestFormatter, formatter)
-      assert_equal($stdout, formatter.output)
-      assert_equal({ :color => false }, formatter.options)
-    end
-
-    class TestFormatter
-      attr_accessor :output, :options
-
-      def initialize(output, options={})
-        @output = output
-        @options = options
-      end
-    end
   end
 
 end