pry 0.11.3 → 0.12.0

data/lib/pry/config/convenience.rb

@@ -1,25 +1,28 @@
-module Pry::Config::Convenience
-  SHORTCUTS = [
-               :input,
-               :output,
-               :commands,
-               :print,
-               :exception_handler,
-               :hooks,
-               :color,
-               :pager,
-               :editor,
-               :memory_size,
-               :extra_sticky_locals
-              ]
+class Pry
+  class Config < Pry::BasicObject
+    module Convenience
+      SHORTCUTS = [
+        :input,
+        :output,
+        :commands,
+        :print,
+        :exception_handler,
+        :hooks,
+        :color,
+        :pager,
+        :editor,
+        :memory_size,
+        :extra_sticky_locals
+      ]
 
-
-  def config_shortcut(*names)
-    names.each do |name|
-      reader = name
-      setter = "#{name}="
-      define_method(reader) { config.public_send(name) }
-      define_method(setter) { |value| config.public_send(setter, value) }
+      def config_shortcut(*names)
+        names.each do |name|
+          reader = name
+          setter = "#{name}="
+          define_method(reader) { config.public_send(name) }
+          define_method(setter) { |value| config.public_send(setter, value) }
+        end
+      end
     end
   end
 end

data/lib/pry/config/default.rb

@@ -1,149 +1,159 @@
-class Pry::Config::Default
-  include Pry::Config::Behavior
-  include Pry::Config::Memoization
+class Pry
+  class Config < Pry::BasicObject
+    class Default
+      include Config::Behavior
+      include Config::Memoization
 
-  def_memoized({
-    input: proc {
-      lazy_readline
-    },
-    output: proc {
-      $stdout.tap { |out| out.sync = true }
-    },
-    commands: proc {
-      Pry::Commands
-    },
-    prompt_name: proc {
-      Pry::DEFAULT_PROMPT_NAME
-    },
-    prompt: proc {
-      Pry::DEFAULT_PROMPT
-    },
-    prompt_safe_objects: proc {
-      Pry::DEFAULT_PROMPT_SAFE_OBJECTS
-    },
-    print: proc {
-      Pry::DEFAULT_PRINT
-    },
-    quiet: proc {
-      false
-    },
-    exception_handler: proc {
-      Pry::DEFAULT_EXCEPTION_HANDLER
-    },
-    exception_whitelist: proc {
-      Pry::DEFAULT_EXCEPTION_WHITELIST
-    },
-    hooks: proc {
-      Pry::DEFAULT_HOOKS
-    },
-    pager: proc {
-      true
-    },
-    system: proc {
-      Pry::DEFAULT_SYSTEM
-    },
-    color: proc {
-      Pry::Helpers::BaseHelpers.use_ansi_codes?
-    },
-    default_window_size: proc {
-      5
-    },
-    editor: proc {
-      Pry.default_editor_for_platform
-    }, # TODO: Pry::Platform.editor
-    should_load_rc: proc {
-      true
-    },
-    should_load_local_rc: proc {
-      true
-    },
-    should_trap_interrupts: proc {
-      Pry::Platform.jruby?
-    },
-    disable_auto_reload: proc {
-      false
-    },
-    command_prefix: proc {
-      ""
-    },
-    auto_indent: proc {
-      Pry::Helpers::BaseHelpers.use_ansi_codes?
-    },
-    correct_indent: proc {
-      true
-    },
-    collision_warning: proc {
-      false
-    },
-    output_prefix: proc {
-      "=> "
-    },
-    requires: proc {
-      []
-    },
-    should_load_requires: proc {
-      true
-    },
-    should_load_plugins: proc {
-      true
-    },
-    windows_console_warning: proc {
-      true
-    },
-    control_d_handler: proc {
-      Pry::DEFAULT_CONTROL_D_HANDLER
-    },
-    memory_size: proc {
-      100
-    },
-    extra_sticky_locals: proc {
-      {}
-    },
-    command_completions: proc {
-      proc { commands.keys }
-    },
-    file_completions: proc {
-      proc { Dir["."] }
-    },
-    ls: proc {
-      Pry::Config.from_hash(Pry::Command::Ls::DEFAULT_OPTIONS)
-    },
-    completer: proc {
-      require "pry/input_completer"
-      Pry::InputCompleter
-    },
-    gist: proc {
-      Pry::Config.from_hash({inspecter: proc(&:pretty_inspect)}, nil)
-    },
-    history: proc {
-      Pry::Config.from_hash({should_save: true, should_load: true}, nil).tap do |history|
-        history.file = File.expand_path("~/.pry_history") rescue nil
-        if history.file.nil?
-          self.should_load_rc = false
-          history.should_save = false
-          history.should_load = false
-        end
+      def_memoized({
+        input: proc {
+          lazy_readline
+        },
+        output: proc {
+          $stdout.tap { |out| out.sync = true }
+        },
+        commands: proc {
+          Pry::Commands
+        },
+        prompt_name: proc {
+          Pry::Prompt::DEFAULT_NAME
+        },
+        prompt: proc {
+          Pry::Prompt[:default][:value]
+        },
+        prompt_safe_contexts: proc {
+          Pry::Prompt::SAFE_CONTEXTS
+        },
+        print: proc {
+          Pry::DEFAULT_PRINT
+        },
+        quiet: proc {
+          false
+        },
+        exception_handler: proc {
+          Pry::DEFAULT_EXCEPTION_HANDLER
+        },
+        exception_whitelist: proc {
+          Pry::DEFAULT_EXCEPTION_WHITELIST
+        },
+        hooks: proc {
+          Pry::DEFAULT_HOOKS
+        },
+        pager: proc {
+          true
+        },
+        system: proc {
+          Pry::DEFAULT_SYSTEM
+        },
+        color: proc {
+          Pry::Helpers::BaseHelpers.use_ansi_codes?
+        },
+        default_window_size: proc {
+          5
+        },
+        editor: proc {
+          Pry.default_editor_for_platform
+        },
+        should_load_rc: proc {
+          true
+        },
+        should_load_local_rc: proc {
+          true
+        },
+        should_trap_interrupts: proc {
+          Pry::Helpers::Platform.jruby?
+        },
+        disable_auto_reload: proc {
+          false
+        },
+        command_prefix: proc {
+          ""
+        },
+        auto_indent: proc {
+          Pry::Helpers::BaseHelpers.use_ansi_codes?
+        },
+        correct_indent: proc {
+          true
+        },
+        collision_warning: proc {
+          false
+        },
+        output_prefix: proc {
+          "=> "
+        },
+        requires: proc {
+          []
+        },
+        should_load_requires: proc {
+          true
+        },
+        should_load_plugins: proc {
+          true
+        },
+        windows_console_warning: proc {
+          true
+        },
+        control_d_handler: proc {
+          Pry::DEFAULT_CONTROL_D_HANDLER
+        },
+        memory_size: proc {
+          100
+        },
+        extra_sticky_locals: proc {
+          {}
+        },
+        command_completions: proc {
+          proc { commands.keys }
+        },
+        file_completions: proc {
+          proc { Dir["."] }
+        },
+        ls: proc {
+          Pry::Config.from_hash(Pry::Command::Ls::DEFAULT_OPTIONS)
+        },
+        completer: proc {
+          require "pry/input_completer"
+          Pry::InputCompleter
+        },
+        gist: proc {
+          Pry::Config.from_hash({inspecter: proc(&:pretty_inspect)}, nil)
+        },
+        history: proc {
+          Pry::Config.from_hash({should_save: true, should_load: true}, nil).tap do |history|
+            history_file =
+              if File.exist?(File.expand_path('~/.pry_history'))
+                '~/.pry_history'
+              elsif ENV.key?('XDG_DATA_HOME') && ENV['XDG_DATA_HOME'] != ''
+                # See XDG Base Directory Specification at
+                # https://standards.freedesktop.org/basedir-spec/basedir-spec-0.8.html
+                ENV['XDG_DATA_HOME'] + '/pry/pry_history'
+              else
+                '~/.local/share/pry/pry_history'
+              end
+            history.file = File.expand_path(history_file)
+          end
+        },
+        exec_string: proc {
+          ""
+        }
+      })
+
+      def initialize
+        super(nil)
       end
-    },
-    exec_string: proc {
-      ""
-    }
-  })
 
-  def initialize
-    super(nil)
-  end
+      private
 
-  private
-  def lazy_readline
-    require 'readline'
-    Readline
-  rescue LoadError
-    warn "Sorry, you can't use Pry without Readline or a compatible library."
-    warn "Possible solutions:"
-    warn " * Rebuild Ruby with Readline support using `--with-readline`"
-    warn " * Use the rb-readline gem, which is a pure-Ruby port of Readline"
-    warn " * Use the pry-coolline gem, a pure-ruby alternative to Readline"
-    raise
+      def lazy_readline
+        require 'readline'
+        Readline
+      rescue LoadError
+        warn "Sorry, you can't use Pry without Readline or a compatible library."
+        warn "Possible solutions:"
+        warn " * Rebuild Ruby with Readline support using `--with-readline`"
+        warn " * Use the rb-readline gem, which is a pure-Ruby port of Readline"
+        warn " * Use the pry-coolline gem, a pure-ruby alternative to Readline"
+        raise
+      end
+    end
   end
 end

data/lib/pry/config/memoization.rb

@@ -1,44 +1,48 @@
-module Pry::Config::Memoization
-  MEMOIZED_METHODS = Hash.new {|h,k| h[k] = [] }
+class Pry
+  class Config < Pry::BasicObject
+    module Memoization
+      MEMOIZED_METHODS = Hash.new { |h,k| h[k] = [] }
 
-  module ClassMethods
-    #
-    # Defines one or more methods who return a constant value after being
-    # called once.
-    #
-    # @example
-    #   class Foo
-    #     include Pry::Config::Memoization
-    #     def_memoized({
-    #       foo: proc {1+10},
-    #       bar: proc{"aaa"<<"a"}
-    #     })
-    #   end
-    #
-    # @param [{String => Proc}] method_table
-    #
-    # @return [void]
-    #
-    def def_memoized(method_table)
-      method_table.each do |method_name, method|
-        define_method(method_name) do
-          method_table[method_name] = instance_eval(&method) if method_table[method_name].equal? method
-          method_table[method_name]
+      module ClassMethods
+        #
+        # Defines one or more methods who return a constant value after being
+        # called once.
+        #
+        # @example
+        #   class Foo
+        #     include Pry::Config::Memoization
+        #     def_memoized({
+        #       foo: proc {1+10},
+        #       bar: proc{"aaa"<<"a"}
+        #     })
+        #   end
+        #
+        # @param [{String => Proc}] method_table
+        #
+        # @return [void]
+        #
+        def def_memoized(method_table)
+          method_table.each do |method_name, method|
+            define_method(method_name) do
+              method_table[method_name] = instance_eval(&method) if method_table[method_name].equal? method
+              method_table[method_name]
+            end
+          end
+          MEMOIZED_METHODS[self] |= method_table.keys
         end
       end
-      MEMOIZED_METHODS[self] |= method_table.keys
-    end
-  end
 
-  def self.included(mod)
-    mod.extend(ClassMethods)
-  end
+      def self.included(mod)
+        mod.extend(ClassMethods)
+      end
 
-  #
-  # @return [Array<Symbol>]
-  #   Returns the names of methods that have been defined by {ClassMethods#def_memoized}.
-  #
-  def memoized_methods
-    MEMOIZED_METHODS[self.class]
+      #
+      # @return [Array<Symbol>]
+      #   Returns the names of methods that have been defined by {ClassMethods#def_memoized}.
+      #
+      def memoized_methods
+        MEMOIZED_METHODS[self.class]
+      end
+    end
   end
 end

data/lib/pry/core_extensions.rb

@@ -38,7 +38,7 @@ class Object
   #   end
   #   my_method()
   # @see Pry.start
-  def pry(object=nil, hash={})
+  def pry(object = nil, hash = {})
     if object.nil? || Hash === object
       Pry.start(self, object || {})
     else
@@ -81,12 +81,13 @@ class Object
       # This fixes the following two spec failures, at https://travis-ci.org/pry/pry/jobs/274470002
       # 1) ./spec/pry_spec.rb:360:in `block in (root)'
       # 2) ./spec/pry_spec.rb:366:in `block in (root)'
-      return class_eval {binding} if Pry::Helpers::BaseHelpers.jruby? and self.name == nil
+      return class_eval { binding } if Pry::Helpers::Platform.jruby? and self.name == nil
+
       # class_eval sets both self and the default definee to this class.
       return class_eval("binding")
     end
 
-    unless respond_to?(:__pry__)
+    unless self.class.method_defined?(:__pry__)
       # The easiest way to check whether an object has a working singleton class
       # is to try and define a method on it. (just checking for the presence of
       # the singleton class gives false positives for `true` and `false`).