pry 0.10.4 → 0.12.2

data/lib/pry/commands/help.rb

@@ -59,7 +59,7 @@ class Pry
     # @param [Array<Pry::Command>] commands
     # @return [String] The generated help string.
     def help_text_for_commands(name, commands)
-      "#{text.bold(name.capitalize)}\n" << commands.map do |command|
+      "#{bold(name.capitalize)}\n" << commands.map do |command|
         "  #{command.options[:listing].to_s.ljust(18)} #{command.description.capitalize}"
       end.join("\n")
     end
@@ -75,14 +75,14 @@ class Pry
     # @param [Array<Pry::Command>] commands The commands to sort
     # @return [Array<Pry::Command>] commands sorted by listing name.
     def sorted_commands(commands)
-      commands.sort_by{ |command| command.options[:listing].to_s }
+      commands.sort_by { |command| command.options[:listing].to_s }
     end
 
     # Display help for an individual command or group.
     #
     # @param [String] search  The string to search for.
     def display_search(search)
-      if command = command_set.find_command_for_help(search)
+      if (command = command_set.find_command_for_help(search))
         display_command(command)
       else
         display_filtered_search_results(search)

data/lib/pry/commands/hist.rb

@@ -21,13 +21,13 @@ class Pry
 
     def options(opt)
       opt.on :a, :all,    "Display all history"
-      opt.on :H, :head,   "Display the first N items", :optional_argument => true, :as => Integer
-      opt.on :T, :tail,   "Display the last N items", :optional_argument => true, :as => Integer
-      opt.on :s, :show,   "Show the given range of lines", :optional_argument => true, :as => Range
-      opt.on :G, :grep,   "Show lines matching the given pattern", :argument => true, :as => String
+      opt.on :H, :head,   "Display the first N items", optional_argument: true, as: Integer
+      opt.on :T, :tail,   "Display the last N items", optional_argument: true, as: Integer
+      opt.on :s, :show,   "Show the given range of lines", optional_argument: true, as: Range
+      opt.on :G, :grep,   "Show lines matching the given pattern", argument: true, as: String
       opt.on :c, :clear , "Clear the current session's history"
-      opt.on :r, :replay, "Replay a line or range of lines", :argument => true, :as => Range
-      opt.on     :save,   "Save history to a file", :argument => true, :as => Range
+      opt.on :r, :replay, "Replay a line or range of lines", argument: true, as: Range
+      opt.on     :save,   "Save history to a file", argument: true, as: Range
       opt.on :e, :'exclude-pry', "Exclude Pry commands from the history"
       opt.on :n, :'no-numbers',  "Omit line numbers"
     end
@@ -43,7 +43,8 @@ class Pry
         @history = @history.grep(opts[:grep])
       end
 
-      @history = case
+      @history =
+        case
         when opts.present?(:head)
           @history.take_lines(1, opts[:head] || 10)
         when opts.present?(:tail)
@@ -119,7 +120,7 @@ class Pry
       check_for_juxtaposed_replay(replay_sequence)
 
       replay_sequence.lines.each do |line|
-        _pry_.eval line, :generated => true
+        _pry_.eval line, generated: true
       end
     end
 
@@ -170,8 +171,8 @@ class Pry
           else
             Pry.history.to_a.last(Pry.history.session_line_count)
           end
-      # The last value in history will be the 'hist' command itself.
-      Pry::Code(h[0..-2])
+
+      Pry::Code(Pry.history.filter(h[0..-2]))
     end
   end
 

data/lib/pry/commands/import_set.rb

@@ -10,7 +10,8 @@ class Pry
       Import a Pry command set.
     BANNER
 
-    def process(command_set_name)
+    # TODO: resolve unused parameter.
+    def process(_command_set_name)
       raise CommandError, "Provide a command set name" if command_set.nil?
 
       set = target.eval(arg_string)

data/lib/pry/commands/install_command.rb

@@ -16,21 +16,22 @@ class Pry
       command = find_command(name)
 
       unless command
-        output.puts "Command #{ text.green(name) } is not found"
+        output.puts "Command #{ green(name) } is not found"
         return
       end
 
       if command_dependencies_met?(command.options)
-        output.puts "Dependencies for #{ text.green(name) } are met. Nothing to do"
+        output.puts "Dependencies for #{ green(name) } are met. Nothing to do"
         return
       end
 
-      output.puts "Attempting to install #{ text.green(name) } command..."
+      output.puts "Attempting to install #{ green(name) } command..."
       gems_to_install = Array(command.options[:requires_gem])
 
       gems_to_install.each do |g|
         next if Rubygem.installed?(g)
-        output.puts "Installing #{ text.green(g) } gem..."
+
+        output.puts "Installing #{ green(g) } gem..."
         Rubygem.install(g)
       end
 
@@ -38,14 +39,14 @@ class Pry
         begin
           require g
         rescue LoadError
-          fail_msg = "Required gem #{ text.green(g) } installed but not found."
+          fail_msg = "Required gem #{ green(g) } installed but not found."
           fail_msg += " Aborting command installation\n"
           fail_msg += 'Tips: 1. Check your PATH; 2. Run `bundle update`'
           raise CommandError, fail_msg
         end
       end
 
-      output.puts "Installation of #{ text.green(name) } successful! Type `help #{name}` for information"
+      output.puts "Installation of #{ green(name) } successful! Type `help #{name}` for information"
     end
   end
 

data/lib/pry/commands/jump_to.rb

@@ -9,18 +9,18 @@ class Pry
     BANNER
 
     def process(break_level)
-      break_level = break_level.to_i
-      nesting_level = _pry_.binding_stack.size - 1
+      break_level    = break_level.to_i
+      nesting_level  = _pry_.binding_stack.size - 1
+      max_nest_level = nesting_level - 1
 
       case break_level
       when nesting_level
         output.puts "Already at nesting level #{nesting_level}"
-      when (0...nesting_level)
-        _pry_.binding_stack.slice!(break_level + 1, _pry_.binding_stack.size)
-
+      when 0..max_nest_level
+        _pry_.binding_stack = _pry_.binding_stack[0..break_level]
       else
-        max_nest_level = nesting_level - 1
-        output.puts "Invalid nest level. Must be between 0 and #{max_nest_level}. Got #{break_level}."
+        output.puts "Invalid nest level. Must be between 0 and " \
+          "#{max_nest_level}. Got #{break_level}."
       end
     end
   end

data/lib/pry/commands/list_inspectors.rb

@@ -12,7 +12,7 @@ class Pry::Command::ListInspectors < Pry::ClassCommand
   def process
     output.puts heading("Available inspectors") + "\n"
     inspector_map.each do |name, inspector|
-      output.write "Name: #{text.bold(name)}"
+      output.write "Name: #{bold(name)}"
       output.puts selected_inspector?(inspector) ? selected_text : ""
       output.puts inspector[:description]
       output.puts
@@ -25,7 +25,7 @@ private
   end
 
   def selected_text
-    text.red " (selected) "
+    red " (selected) "
   end
 
   def selected_inspector?(inspector)

data/lib/pry/commands/ls/constants.rb

@@ -3,15 +3,17 @@ require 'pry/commands/ls/interrogatable'
 class Pry
   class Command::Ls < Pry::ClassCommand
     class Constants < Pry::Command::Ls::Formatter
+      DEPRECATED_CONSTANTS = [:Data, :Fixnum, :Bignum, :TimeoutError, :NIL, :FALSE, :TRUE]
+      DEPRECATED_CONSTANTS << :JavaPackageModuleTemplate if Helpers::Platform.jruby?
       include Pry::Command::Ls::Interrogatable
 
-
       def initialize(interrogatee, no_user_opts, opts, _pry_)
         super(_pry_)
         @interrogatee = interrogatee
         @no_user_opts = no_user_opts
         @default_switch = opts[:constants]
         @verbose_switch = opts[:verbose]
+        @dconstants = opts.dconstants?
       end
 
       def correct_opts?
@@ -26,9 +28,19 @@ class Pry
 
       private
 
+      def show_deprecated_constants?
+        @dconstants == true
+      end
+
       def format(mod, constants)
         constants.sort_by(&:downcase).map do |name|
-          if const = (!mod.autoload?(name) && (mod.const_get(name) || true) rescue nil)
+          if Object.respond_to?(:deprecate_constant) and
+            DEPRECATED_CONSTANTS.include?(name)      and
+            !show_deprecated_constants?
+            next
+          end
+
+          if (const = (!mod.autoload?(name) && (mod.const_get(name) || true) rescue nil))
             if (const < Exception rescue false)
               color(:exception_constant, name)
             elsif (Module === mod.const_get(name) rescue false)
@@ -41,7 +53,6 @@ class Pry
           end
         end
       end
-
     end
   end
 end

data/lib/pry/commands/ls/formatter.rb

@@ -7,10 +7,12 @@ class Pry
       def initialize(_pry_)
         @_pry_ = _pry_
         @target = _pry_.current_context
+        @default_switch = nil
       end
 
       def write_out
         return false unless correct_opts?
+
         output_self
       end
 
@@ -24,8 +26,9 @@ class Pry
       # Outputs nothing if the section would be empty.
       def output_section(heading, body)
         return '' if body.compact.empty?
+
         fancy_heading = Pry::Helpers::Text.bold(color(:heading, heading))
-        Pry::Helpers.tablify_or_one_line(fancy_heading, body)
+        Pry::Helpers.tablify_or_one_line(fancy_heading, body, @_pry_.config)
       end
 
       def format_value(value)
@@ -43,7 +46,6 @@ class Pry
       def grep
         @grep || proc { |x| x }
       end
-
     end
   end
 end

data/lib/pry/commands/ls/globals.rb

@@ -1,7 +1,6 @@
 class Pry
   class Command::Ls < Pry::ClassCommand
     class Globals < Pry::Command::Ls::Formatter
-
       # Taken from "puts global_variables.inspect".
       BUILTIN_GLOBALS =
         %w($" $$ $* $, $-0 $-F $-I $-K $-W $-a $-d $-i $-l $-p $-v $-w $. $/ $\\
@@ -42,7 +41,6 @@ class Pry
           end
         end
       end
-
     end
   end
 end

data/lib/pry/commands/ls/grep.rb

@@ -1,7 +1,6 @@
 class Pry
   class Command::Ls < Pry::ClassCommand
     class Grep
-
       def initialize(grep_regexp)
         @grep_regexp = grep_regexp
       end
@@ -15,7 +14,6 @@ class Pry
           end
         }
       end
-
     end
   end
 end

data/lib/pry/commands/ls/instance_vars.rb

@@ -33,7 +33,6 @@ class Pry
       def format(type, vars)
         vars.sort_by { |var| var.to_s.downcase }.map { |var| color(type, var) }
       end
-
     end
   end
 end

data/lib/pry/commands/ls/jruby_hacks.rb

@@ -19,7 +19,7 @@ module Pry::Command::Ls::JRubyHacks
       m.name.sub(/\A(is|get|set)(?=[A-Z_])/, '').gsub(/[_?=]/, '').downcase
     end
 
-    grouped.map do |key, values|
+    grouped.flat_map do |key, values|
       values = values.sort_by do |m|
         rubbishness(m.name)
       end
@@ -28,7 +28,7 @@ module Pry::Command::Ls::JRubyHacks
       values.select do |x|
         (!found.any? { |y| x == y }) && found << x
       end
-    end.flatten(1)
+    end
   end
 
   # When removing jruby aliases, we want to keep the alias that is

data/lib/pry/commands/ls/local_names.rb

@@ -1,7 +1,6 @@
 class Pry
   class Command::Ls < Pry::ClassCommand
     class LocalNames < Pry::Command::Ls::Formatter
-
       def initialize(no_user_opts, args, _pry_)
         super(_pry_)
         @no_user_opts = no_user_opts
@@ -29,7 +28,6 @@ class Pry
           end
         end
       end
-
     end
   end
 end

data/lib/pry/commands/ls/local_vars.rb

@@ -1,7 +1,6 @@
 class Pry
   class Command::Ls < Pry::ClassCommand
     class LocalVars < Pry::Command::Ls::Formatter
-
       def initialize(opts, _pry_)
         super(_pry_)
         @default_switch = opts[:locals]
@@ -33,7 +32,6 @@ class Pry
         pad = desired_width + color_escape_padding
         "%-#{pad}s = %s" % [color(:local_var, colorized_lhs), rhs]
       end
-
     end
   end
 end

data/lib/pry/commands/ls/ls_entity.rb

@@ -10,7 +10,6 @@ require 'pry/commands/ls/local_vars'
 
 class Pry
   class Command::Ls < Pry::ClassCommand
-
     class LsEntity
       attr_reader :_pry_
 

data/lib/pry/commands/ls/methods.rb

@@ -4,7 +4,6 @@ require 'pry/commands/ls/interrogatable'
 class Pry
   class Command::Ls < Pry::ClassCommand
     class Methods < Pry::Command::Ls::Formatter
-
       include Pry::Command::Ls::Interrogatable
       include Pry::Command::Ls::MethodsHelper
 
@@ -37,7 +36,6 @@ class Pry
         super || @instance_methods_switch || @ppp_switch || @no_user_opts
       end
 
-
       # Get a lambda that can be used with `take_while` to prevent over-eager
       # traversal of the Object's ancestry graph.
       def below_ceiling
@@ -51,7 +49,6 @@ class Pry
                   end
         lambda { |klass| !ceiling.include?(klass) }
       end
-
     end
   end
 end

data/lib/pry/commands/ls/methods_helper.rb

@@ -14,7 +14,7 @@ module Pry::Command::Ls::MethodsHelper
                 Pry::Method.all_from_obj(@interrogatee)
               end
 
-    if Pry::Helpers::BaseHelpers.jruby? && !@jruby_switch
+    if Pry::Helpers::Platform.jruby? && !@jruby_switch
       methods = trim_jruby_aliases(methods)
     end
 

data/lib/pry/commands/ls/self_methods.rb

@@ -11,6 +11,8 @@ class Pry
         super(_pry_)
         @interrogatee = interrogatee
         @no_user_opts = no_user_opts
+        @ppp_switch = opts[:ppp]
+        @jruby_switch = opts['all-java']
       end
 
       def output_self
@@ -26,7 +28,6 @@ class Pry
       def correct_opts?
         @no_user_opts && interrogating_a_module?
       end
-
     end
   end
 end

data/lib/pry/commands/ls.rb

@@ -2,31 +2,30 @@ require 'pry/commands/ls/ls_entity'
 class Pry
   class Command::Ls < Pry::ClassCommand
     DEFAULT_OPTIONS = {
-      :heading_color            => :bright_blue,
-      :public_method_color      => :default,
-      :private_method_color     => :blue,
-      :protected_method_color   => :blue,
-      :method_missing_color     => :bright_red,
-      :local_var_color          => :yellow,
-      :pry_var_color            => :default,     # e.g. _, _pry_, _file_
-      :instance_var_color       => :blue,        # e.g. @foo
-      :class_var_color          => :bright_blue, # e.g. @@foo
-      :global_var_color         => :default,     # e.g. $CODERAY_DEBUG, $eventmachine_library
-      :builtin_global_color     => :cyan,        # e.g. $stdin, $-w, $PID
-      :pseudo_global_color      => :cyan,        # e.g. $~, $1..$9, $LAST_MATCH_INFO
-      :constant_color           => :default,     # e.g. VERSION, ARGF
-      :class_constant_color     => :blue,        # e.g. Object, Kernel
-      :exception_constant_color => :magenta,     # e.g. Exception, RuntimeError
-      :unloaded_constant_color  => :yellow,      # Any constant that is still in .autoload? state
-      :separator                => "  ",
-      :ceiling                  => [Object, Module, Class]
+      heading_color: :bright_blue,
+      public_method_color: :default,
+      private_method_color: :blue,
+      protected_method_color: :blue,
+      method_missing_color: :bright_red,
+      local_var_color: :yellow,
+      pry_var_color: :default, # e.g. _, _pry_, _file_
+      instance_var_color: :blue, # e.g. @foo
+      class_var_color: :bright_blue, # e.g. @@foo
+      global_var_color: :default, # e.g. $CODERAY_DEBUG, $eventmachine_library
+      builtin_global_color: :cyan, # e.g. $stdin, $-w, $PID
+      pseudo_global_color: :cyan, # e.g. $~, $1..$9, $LAST_MATCH_INFO
+      constant_color: :default, # e.g. VERSION, ARGF
+      class_constant_color: :blue, # e.g. Object, Kernel
+      exception_constant_color: :magenta, # e.g. Exception, RuntimeError
+      unloaded_constant_color: :yellow, # Any constant that is still in .autoload? state
+      separator: "  ",
+      ceiling: [Object, Module, Class]
     }
 
-
     match 'ls'
     group 'Context'
     description 'Show the list of vars and methods in the current scope.'
-    command_options :shellwords => false, :interpolate => false
+    command_options shellwords: false, interpolate: false
 
     banner <<-'BANNER'
       Usage: ls [-m|-M|-p|-pM] [-q|-v] [-c|-i] [Object]
@@ -48,9 +47,8 @@ class Pry
       Also check out `find-method` command (run `help find-method`).
     BANNER
 
-
     def options(opt)
-      opt.on :m, :methods,   "Show public methods defined on the Object"
+      opt.on :m, :methods, "Show public methods defined on the Object"
       opt.on :M, "instance-methods", "Show public methods defined in a Module or Class"
       opt.on :p, :ppp,       "Show public, protected (in yellow) and private (in green) methods"
       opt.on :q, :quiet,     "Show only methods defined on object.singleton_class and object.class"
@@ -60,9 +58,11 @@ class Pry
       opt.on :c, :constants, "Show constants, highlighting classes (in blue), and exceptions (in purple).\n" <<
       " " * 32 <<            "Constants that are pending autoload? are also shown (in yellow)"
       opt.on :i, :ivars,     "Show instance variables (in blue) and class variables (in bright blue)"
-      opt.on :G, :grep,      "Filter output by regular expression", :argument => true
-
-      if jruby?
+      opt.on :G, :grep,      "Filter output by regular expression", argument: true
+      if Object.respond_to?(:deprecate_constant)
+        opt.on :d, :dconstants, "Show deprecated constants"
+      end
+      if Helpers::Platform.jruby?
         opt.on :J, "all-java", "Show all the aliases for methods from java (default is to show only prettiest)"
       end
     end
@@ -78,11 +78,11 @@ class Pry
       @interrogatee = args.empty? ? target_self : target.eval(args.join(' '))
       raise_errors_if_arguments_are_weird
       ls_entity = LsEntity.new({
-        :interrogatee => @interrogatee,
-        :no_user_opts => no_user_opts?,
-        :opts => opts,
-        :args => args,
-        :_pry_ => _pry_
+        interrogatee: @interrogatee,
+        no_user_opts: no_user_opts?,
+        opts: opts,
+        args: args,
+        _pry_: _pry_
       })
 
       _pry_.pager.page ls_entity.entities_table
@@ -107,7 +107,6 @@ class Pry
         raise Pry::CommandError, message if opts.present?(option) && invalid_expr
       end
     end
-
   end
 
   Pry::Commands.add_command(Pry::Command::Ls)

data/lib/pry/commands/play.rb

@@ -12,7 +12,7 @@ class Pry
 
       play --lines 149..153   # assumes current context
       play -i 20 --lines 1..3 # assumes lines of the input expression at 20
-      play -o 4               # the output of of an expression at 4
+      play -o 4               # the output of an expression at 4
       play Pry#repl -l 1..-1  # play the contents of Pry#repl method
       play -e 2               # play from specified line until end of valid expression
       play hello.rb           # play a file
@@ -31,7 +31,7 @@ class Pry
                     ' "open". `amend-line` can then be used to' \
                     ' modify the method.'
 
-      opt.on :e, :expression=, 'Executes until end of valid expression', :as => Integer
+      opt.on :e, :expression=, 'Executes until end of valid expression', as: Integer
       opt.on :p, :print, 'Prints executed code'
     end
 
@@ -53,7 +53,6 @@ class Pry
       end
     end
 
-
     def content_after_options
       if opts.present?(:open)
         restrict_to_lines(content, (0..-2))
@@ -91,7 +90,7 @@ class Pry
     end
 
     def file_content
-      if default_file && File.exists?(default_file)
+      if default_file && File.exist?(default_file)
         @cc.restrict_to_lines(File.read(default_file), @cc.line_range)
       else
         raise CommandError, "File does not exist! File was: #{default_file.inspect}"

data/lib/pry/commands/pry_backtrace.rb

@@ -17,7 +17,7 @@ class Pry
     BANNER
 
     def process
-      _pry_.pager.page text.bold('Backtrace:') << "\n--\n" << _pry_.backtrace.join("\n")
+      _pry_.pager.page bold('Backtrace:') << "\n--\n" << _pry_.backtrace.join("\n")
     end
   end
 

data/lib/pry/commands/raise_up.rb

@@ -4,7 +4,7 @@ class Pry
     match(/raise-up(!?\b.*)/)
     group 'Context'
     description 'Raise an exception out of the current pry instance.'
-    command_options :listing => 'raise-up'
+    command_options listing: 'raise-up'
 
     banner <<-BANNER
       Raise up, like exit, allows you to quit pry. Instead of returning a value
@@ -23,6 +23,7 @@ class Pry
 
     def process
       return _pry.pager.page help if captures[0] =~ /(-h|--help)\b/
+
       # Handle 'raise-up', 'raise-up "foo"', 'raise-up RuntimeError, 'farble' in a rubyesque manner
       target.eval("_pry_.raise_up#{captures[0]}")
     end

data/lib/pry/commands/reload_code.rb

@@ -31,7 +31,7 @@ class Pry
     end
 
     def reload_current_file
-      if !File.exists?(current_file)
+      if !File.exist?(current_file)
         raise CommandError, "Current file: #{current_file} cannot be found on disk!"
       end
 
@@ -49,7 +49,7 @@ class Pry
     def check_for_reloadability(code_object, identifier)
       if !code_object || !code_object.source_file
         raise CommandError, "Cannot locate #{identifier}!"
-      elsif !File.exists?(code_object.source_file)
+      elsif !File.exist?(code_object.source_file)
         raise CommandError,
           "Cannot reload #{identifier} as it has no associated file on disk. " \
           "File found was: #{code_object.source_file}"

data/lib/pry/commands/ri.rb

@@ -14,6 +14,10 @@ class Pry
     BANNER
 
     def process(spec)
+      unless spec
+        return output.puts "Please provide a class, module, or method name (e.g: ri Array#push)"
+      end
+
       # Lazily load RI
       require 'rdoc/ri/driver'
 
@@ -27,13 +31,14 @@ class Pry
             @pager = pager
             super opts
           end
+
           def page
             paging_text = StringIO.new
             yield paging_text
             @pager.page(paging_text.string)
           end
 
-          def formatter(io)
+          def formatter(_io)
             if @formatter_klass
               @formatter_klass.new
             else
@@ -42,14 +47,14 @@ class Pry
           end
         end
 
-        RDoc::RI.const_set :PryDriver, subclass   # hook it up!
+        RDoc::RI.const_set :PryDriver, subclass # hook it up!
       end
 
       # Spin-up an RI insance.
-      ri = RDoc::RI::PryDriver.new _pry_.pager, :use_stdout => true, :interactive => false
+      ri = RDoc::RI::PryDriver.new _pry_.pager, use_stdout: true, interactive: false
 
       begin
-        ri.display_names [spec]  # Get the documentation (finally!)
+        ri.display_names [spec] # Get the documentation (finally!)
       rescue RDoc::RI::Driver::NotFoundError => e
         output.puts "error: '#{e.name}' not found"
       end