Merge pull request #2011 from pry/color-printer-refactoring

config: factor out color printer proc to ColorPrinter

5 files changed, 20 insertions, 10 deletions

diff --git a/lib/pry.rb b/lib/pry.rb
index 5bbbb9b5..4596ed2c 100644
--- a/lib/pry.rb
+++ b/lib/pry.rb
@@ -20,6 +20,7 @@ require 'pry/command_set'
 require 'pry/syntax_highlighter'
 require 'pry/editor'
 require 'pry/history'
+require 'pry/color_printer'
 
 Pry::Commands = Pry::CommandSet.new unless defined?(Pry::Commands)
 
@@ -48,7 +49,6 @@ require 'pry/config'
 require 'pry/pry_class'
 require 'pry/pry_instance'
 require 'pry/inspector'
-require 'pry/color_printer'
 require 'pry/pager'
 require 'pry/terminal'
 require 'pry/indent'
diff --git a/lib/pry/color_printer.rb b/lib/pry/color_printer.rb
index b339351a..0487c956 100644
--- a/lib/pry/color_printer.rb
+++ b/lib/pry/color_printer.rb
@@ -6,6 +6,13 @@ class Pry
   class ColorPrinter < ::PP
     Pry::SyntaxHighlighter.overwrite_coderay_comment_token!
 
+    def self.default(_output, value, pry_instance)
+      pry_instance.pager.open do |pager|
+        pager.print pry_instance.config.output_prefix
+        pp(value, pager, Pry::Terminal.width! - 1)
+      end
+    end
+
     def self.pp(obj, output = $DEFAULT_OUTPUT, max_width = 79)
       queue = ColorPrinter.new(output, max_width, "\n")
       queue.guard_inspect_key { queue.pp(obj) }
diff --git a/lib/pry/config.rb b/lib/pry/config.rb
index 77e8373a..6b7e4fcf 100644
--- a/lib/pry/config.rb
+++ b/lib/pry/config.rb
@@ -16,14 +16,7 @@ class Pry
         prompt_name: Pry::Prompt::DEFAULT_NAME,
         prompt: Pry::Prompt[:default],
         prompt_safe_contexts: Pry::Prompt::SAFE_CONTEXTS,
-
-        print: proc do |_output, value, pry_instance|
-          pry_instance.pager.open do |pager|
-            pager.print pry_instance.config.output_prefix
-            Pry::ColorPrinter.pp(value, pager, Pry::Terminal.width! - 1)
-          end
-        end,
-
+        print: Pry::ColorPrinter.method(:default),
         quiet: false,
 
         # Will only show the first line of the backtrace
diff --git a/lib/pry/config/behavior.rb b/lib/pry/config/behavior.rb
index 937a5d35..1fb51f99 100644
--- a/lib/pry/config/behavior.rb
+++ b/lib/pry/config/behavior.rb
@@ -40,7 +40,7 @@ class Pry
       ASSIGNMENT = "=".freeze
 
       NODUP = [
-        TrueClass, FalseClass, NilClass, Symbol, Numeric, Module, Proc,
+        TrueClass, FalseClass, NilClass, Symbol, Numeric, Module, Proc, Method,
         Pry::Prompt, Pry::Config::Lazy
       ].freeze
 
diff --git a/spec/color_printer_spec.rb b/spec/color_printer_spec.rb
index 13b2acf6..8347a348 100644
--- a/spec/color_printer_spec.rb
+++ b/spec/color_printer_spec.rb
@@ -1,6 +1,16 @@
 RSpec.describe Pry::ColorPrinter do
   let(:output) { StringIO.new }
 
+  describe ".default" do
+    let(:output) { StringIO.new }
+    let(:pry_instance) { Pry.new(output: output) }
+
+    it "prints output prefix with value" do
+      described_class.default(StringIO.new, 'foo', pry_instance)
+      expect(output.string).to eq("=> \"foo\"\n")
+    end
+  end
+
   describe ".pp" do
     context "when no exception is raised in #inspect" do
       let(:healthy_class) do