pry 0.12.0 → 0.14.0

data/lib/pry/syntax_highlighter.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'coderay'
+
+class Pry
+  # @api private
+  # @since v0.13.0
+  class SyntaxHighlighter
+    def self.highlight(code, language = :ruby)
+      tokenize(code, language).term
+    end
+
+    def self.tokenize(code, language = :ruby)
+      CodeRay.scan(code, language)
+    end
+
+    def self.keyword_token_color
+      CodeRay::Encoders::Terminal::TOKEN_COLORS[:keyword]
+    end
+
+    # Sets comment token to blue (black by default), so it's more legible.
+    def self.overwrite_coderay_comment_token!
+      CodeRay::Encoders::Terminal::TOKEN_COLORS[:comment][:self] = "\e[1;34m"
+    end
+  end
+end

data/lib/pry/system_command_handler.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class Pry
+  # @api private
+  # @since v0.13.0
+  module SystemCommandHandler
+    class << self
+      def default(output, command, _pry_instance)
+        return if Kernel.system(command)
+
+        output.puts(
+          "Error: there was a problem executing system command: #{command}"
+        )
+      end
+    end
+  end
+end

data/lib/pry/testable.rb

@@ -1,70 +1,68 @@
+# frozen_string_literal: true
+
 # good idea ???
 # if you're testing pry plugin you should require pry by yourself, no?
-require 'pry' if not defined?(Pry)
+require 'pry' unless defined?(Pry)
 
-module Pry::Testable
-  extend self
-  require_relative "testable/pry_tester"
-  require_relative "testable/evalable"
-  require_relative "testable/mockable"
-  require_relative "testable/variables"
-  require_relative "testable/utility"
+class Pry
+  module Testable
+    require_relative "testable/pry_tester"
+    require_relative "testable/evalable"
+    require_relative "testable/mockable"
+    require_relative "testable/variables"
+    require_relative "testable/utility"
 
-  #
-  # When {Pry::Testable} is included into another module or class,
-  # the following modules are also included: {Pry::Testable::Mockable},
-  # {Pry::Testable::Evalable}, {Pry::Testable::Variables}, and
-  # {Pry::Testable::Utility}.
-  #
-  # @note
-  #   Each of the included modules mentioned above may also be used
-  #   standalone or in a pick-and-mix fashion.
-  #
-  # @param [Module] mod
-  #   A class or module.
-  #
-  # @return [void]
-  #
-  def self.included(mod)
-    mod.module_eval do
-      include Pry::Testable::Mockable
-      include Pry::Testable::Evalable
-      include Pry::Testable::Variables
-      include Pry::Testable::Utility
+    #
+    # When {Pry::Testable} is included into another module or class,
+    # the following modules are also included: {Pry::Testable::Mockable},
+    # {Pry::Testable::Evalable}, {Pry::Testable::Variables}, and
+    # {Pry::Testable::Utility}.
+    #
+    # @note
+    #   Each of the included modules mentioned above may also be used
+    #   standalone or in a pick-and-mix fashion.
+    #
+    # @param [Module] mod
+    #   A class or module.
+    #
+    # @return [void]
+    #
+    def self.included(mod)
+      mod.module_eval do
+        include Pry::Testable::Mockable
+        include Pry::Testable::Evalable
+        include Pry::Testable::Variables
+        include Pry::Testable::Utility
+      end
     end
-  end
-
-  TEST_DEFAULTS = {
-    color: false,
-    pager: false,
-    should_load_rc: false,
-    should_load_local_rc: false,
-    correct_indent: false,
-    collison_warning: false,
-    history: {
-      should_load: false,
-      should_save: false
-    }
-  }
-  private_constant :TEST_DEFAULTS
 
-  #
-  # Sets various configuration options that make Pry optimal for a test
-  # environment, see source code for complete details.
-  #
-  # @return [void]
-  #
-  def self.set_testenv_variables
-    Pry.config = Pry::Config.from_hash(TEST_DEFAULTS, Pry::Config::Default.new)
-    Pry.config.hooks = Pry::Hooks.new
-  end
+    #
+    # Sets various configuration options that make Pry optimal for a test
+    # environment, see source code for complete details.
+    #
+    # @return [void]
+    #
+    def self.set_testenv_variables
+      Pry.config = Pry::Config.new.merge(
+        color: false,
+        pager: false,
+        should_load_rc: false,
+        should_load_local_rc: false,
+        correct_indent: false,
+        collision_warning: false,
+        history_save: false,
+        history_load: false,
+        hooks: Pry::Hooks.new
+      )
+    end
 
-  #
-  # Reset the Pry configuration to their default values.
-  #
-  # @return [void]
-  #
-  def self.unset_testenv_variables
-    Pry.config = Pry::Config.from_hash({}, Pry::Config::Default.new)
+    #
+    # Reset the Pry configuration to their default values.
+    #
+    # @return [void]
+    #
+    def self.unset_testenv_variables
+      Pry.config = Pry::Config.new
+    end
   end
 end

data/lib/pry/testable/evalable.rb

@@ -1,15 +1,24 @@
-module Pry::Testable::Evalable
-  def pry_tester(*args, &block)
-    if args.length == 0 || args[0].is_a?(Hash)
-      args.unshift(Pry.toplevel_binding)
-    end
-    Pry::Testable::PryTester.new(*args).tap do |t|
-      t.singleton_class.class_eval(&block) if block
-    end
-  end
+# frozen_string_literal: true
 
-  def pry_eval(*eval_strs)
-    b = String === eval_strs.first ? Pry.toplevel_binding : Pry.binding_for(eval_strs.shift)
-    pry_tester(b).eval(*eval_strs)
+class Pry
+  module Testable
+    module Evalable
+      def pry_tester(*args, &block)
+        args.unshift(Pry.toplevel_binding) if args.empty? || args[0].is_a?(Hash)
+        Pry::Testable::PryTester.new(*args).tap do |t|
+          t.singleton_class.class_eval(&block) if block
+        end
+      end
+
+      def pry_eval(*eval_strs)
+        b =
+          if eval_strs.first.is_a?(String)
+            Pry.toplevel_binding
+          else
+            Pry.binding_for(eval_strs.shift)
+          end
+        pry_tester(b).eval(*eval_strs)
+      end
+    end
   end
 end

data/lib/pry/testable/mockable.rb

@@ -1,14 +1,22 @@
-module Pry::Testable::Mockable
-  def mock_command(cmd, args = [], opts = {})
-    output = StringIO.new
-    pry = Pry.new(output: output)
-    ret = cmd.new(opts.merge(pry_instance: pry, output: output)).call_safely(*args)
-    Struct.new(:output, :return).new(output.string, ret)
-  end
+# frozen_string_literal: true
+
+require 'stringio'
+
+class Pry
+  module Testable
+    module Mockable
+      def mock_command(cmd, args = [], opts = {})
+        output = StringIO.new
+        pry = Pry.new(output: output)
+        ret = cmd.new(opts.merge(pry_instance: pry, output: output)).call_safely(*args)
+        Struct.new(:output, :return).new(output.string, ret)
+      end
 
-  def mock_exception(*mock_backtrace)
-    StandardError.new.tap do |e|
-      e.define_singleton_method(:backtrace) { mock_backtrace }
+      def mock_exception(*mock_backtrace)
+        StandardError.new.tap do |e|
+          e.define_singleton_method(:backtrace) { mock_backtrace }
+        end
+      end
     end
   end
 end

data/lib/pry/testable/pry_tester.rb

@@ -1,73 +1,88 @@
-class Pry::Testable::PryTester
-  extend Pry::Forwardable
-  attr_reader :pry, :out
-  def_delegators :@pry, :eval_string, :eval_string=
+# frozen_string_literal: true
 
-  def initialize(target = TOPLEVEL_BINDING, options = {})
-    @pry = Pry.new(options.merge(target: target))
-    @history = options[:history]
-    @pry.inject_sticky_locals!
-    reset_output
-  end
+require 'stringio'
 
-  def eval(*strs)
-    reset_output
-    result = nil
+class Pry
+  module Testable
+    class PryTester
+      extend Pry::Forwardable
+      attr_reader :pry, :out
+      def_delegators :@pry, :eval_string, :eval_string=
 
-    strs.flatten.each do |str|
-      # Check for space prefix. See #1369.
-      if str !~ /^\s\S/
-        str = "#{str.strip}\n"
+      def initialize(target = TOPLEVEL_BINDING, options = {})
+        @pry = Pry.new(options.merge(target: target))
+        @history = options[:history]
+        @pry.inject_sticky_locals!
+        reset_output
       end
-      @history.push str if @history
 
-      if @pry.process_command(str)
-        result = last_command_result_or_output
-      else
-        result = @pry.evaluate_ruby(str)
+      def eval(*strs)
+        reset_output
+        result = nil
+
+        strs.flatten.each do |str|
+          # Check for space prefix. See #1369.
+          str = "#{str.strip}\n" if str !~ /^\s\S/
+          @history.push str if @history
+
+          result =
+            if @pry.process_command(str)
+              last_command_result_or_output
+            else
+              # Check if this is a multiline paste.
+              begin
+                complete_expr = Pry::Code.complete_expression?(str)
+              rescue SyntaxError => exception
+                @pry.output.puts(
+                  "SyntaxError: #{exception.message.sub(/.*syntax error, */m, '')}"
+                )
+              end
+              @pry.evaluate_ruby(str) if complete_expr
+            end
+        end
+
+        result
       end
-    end
 
-    result
-  end
+      def push(*lines)
+        Array(lines).flatten.each do |line|
+          @pry.eval(line)
+        end
+      end
 
-  def push(*lines)
-    Array(lines).flatten.each do |line|
-      @pry.eval(line)
-    end
-  end
+      def push_binding(context)
+        @pry.push_binding context
+      end
 
-  def push_binding(context)
-    @pry.push_binding context
-  end
+      def last_output
+        @out.string if @out
+      end
 
-  def last_output
-    @out.string if @out
-  end
+      def process_command(command_str)
+        @pry.process_command(command_str) || raise("Not a valid command")
+        last_command_result_or_output
+      end
 
-  def process_command(command_str)
-    @pry.process_command(command_str) or raise "Not a valid command"
-    last_command_result_or_output
-  end
+      def last_command_result
+        result = Pry.current[:pry_cmd_result]
+        result.retval if result
+      end
 
-  def last_command_result
-    result = Pry.current[:pry_cmd_result]
-    result.retval if result
-  end
+      protected
 
-  protected
+      def last_command_result_or_output
+        result = last_command_result
+        if result != Pry::Command::VOID_VALUE
+          result
+        else
+          last_output
+        end
+      end
 
-  def last_command_result_or_output
-    result = last_command_result
-    if result != Pry::Command::VOID_VALUE
-      result
-    else
-      last_output
+      def reset_output
+        @out = StringIO.new
+        @pry.output = @out
+      end
     end
   end
-
-  def reset_output
-    @out = StringIO.new
-    @pry.output = @out
-  end
 end

data/lib/pry/testable/utility.rb

@@ -1,26 +1,34 @@
-module Pry::Testable::Utility
-  #
-  # Creates a Tempfile then unlinks it after the block has yielded.
-  #
-  # @yieldparam [String] file
-  #   The path of the temp file
-  #
-  # @return [void]
-  #
-  def temp_file(ext = '.rb')
-    file = Tempfile.open(['pry', ext])
-    yield file
-  ensure
-    file.close(true) if file
-  end
+# frozen_string_literal: true
 
-  def unindent(*args)
-    Pry::Helpers::CommandHelpers.unindent(*args)
-  end
+require 'tempfile'
+
+class Pry
+  module Testable
+    module Utility
+      #
+      # Creates a Tempfile then unlinks it after the block has yielded.
+      #
+      # @yieldparam [String] file
+      #   The path of the temp file
+      #
+      # @return [void]
+      #
+      def temp_file(ext = '.rb')
+        file = Tempfile.open(['pry', ext])
+        yield file
+      ensure
+        file.close(true) if file
+      end
+
+      def unindent(*args)
+        Pry::Helpers::CommandHelpers.unindent(*args)
+      end
 
-  def inner_scope
-    catch(:inner_scope) do
-      yield -> { throw(:inner_scope, self) }
+      def inner_scope
+        catch(:inner_scope) do
+          yield -> { throw(:inner_scope, self) }
+        end
+      end
     end
   end
 end