Use correct_indent not auto_indent...

Prior to this change, when auto_indent was set to true for some tests,
the green dots would be cleared half-way through.

We should probably re-consider these options, but it seems useful to
explicitly disable ANSI code rewriting during specs while leaving
indentation mutating read lines (before this change, there was a bug
in REPL that did not manifest because auto_indent was false).

lib/pry/repl.rb

@@ -33,7 +33,7 @@ class Pry
       pry.exec_hook :before_session, pry.output, pry.current_binding, pry
       # Clear the line before starting Pry. This fixes the issue discussed here:
       # https://github.com/pry/pry/issues/566
-      if Pry.config.auto_indent
+      if Pry.config.correct_indent
         Kernel.print Pry::Helpers::BaseHelpers.windows_ansi? ? "\e[0F" : "\e[0G"
       end
     end
@@ -80,13 +80,13 @@ class Pry
       # This is only for ruby-1.9; other versions of ruby do not let you send Interrupt
       # from within Readline.
       rescue Interrupt
-        return :control_c
+        val = :control_c
       end
 
-      # return nil for EOF
-      return unless val
+      # return nil for EOF, :no_more_input for error, or :control_c for <ctrl+c>
+      return val unless String === val
 
-      if Pry.config.auto_indent && !input.is_a?(StringIO)
+      if Pry.config.auto_indent
         original_val = "#{indentation}#{val}"
         indented_val = @indent.indent(val)
 

lib/pry/test/helper.rb

@@ -14,7 +14,7 @@ class << Pry
     Pry.config.should_load_plugins = false
     Pry.config.history.should_load = false
     Pry.config.history.should_save = false
-    Pry.config.auto_indent         = false
+    Pry.config.correct_indent      = false
     Pry.config.hooks               = Pry::Hooks.new
     Pry.config.collision_warning   = false
   end

spec/pry_repl_spec.rb

@@ -1,14 +1,6 @@
 require 'helper'
 
 describe "The whole thing" do
-  before do
-    Pry.config.auto_indent = true
-  end
-
-  after do
-    Pry.config.auto_indent = false
-  end
-
   it "should let you run commands in the middle of multiline expressions" do
     ReplTester.start do
       input  'def a'