pry 0.11.3 → 0.12.0

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/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

@@ -28,7 +28,6 @@ class Pry
       def correct_opts?
         @no_user_opts && interrogating_a_module?
       end
-
     end
   end
 end

data/lib/pry/commands/play.rb

@@ -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))

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/ri.rb

@@ -31,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
@@ -46,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

data/lib/pry/commands/shell_command.rb

@@ -3,8 +3,8 @@ class Pry
     match(/\.(.*)/)
     group 'Input and Output'
     description "All text following a '.' is forwarded to the shell."
-    command_options :listing => '.<shell command>', :use_prefix => false,
-                    :takes_block => true
+    command_options listing: '.<shell command>', use_prefix: false,
+                    takes_block: true
 
     banner <<-'BANNER'
       Usage: .COMMAND_NAME
@@ -33,6 +33,7 @@ class Pry
     def parse_destination(dest)
       return "~" if dest.empty?
       return dest unless dest == "-"
+
       state.old_pwd || raise(CommandError, "No prior directory available")
     end
 

data/lib/pry/commands/shell_mode.rb

@@ -9,13 +9,13 @@ class Pry
     BANNER
 
     def process
-      case _pry_.prompt
-      when Pry::SHELL_PROMPT
-        _pry_.pop_prompt
-        _pry_.custom_completions = _pry_.config.file_completions
+      state.disabled ^= true
+
+      if state.disabled
+        state.prev_prompt = _pry_.prompt
+        _pry_.prompt = Pry::Prompt[:shell][:value]
       else
-        _pry_.push_prompt Pry::SHELL_PROMPT
-        _pry_.custom_completions = _pry_.config.command_completions
+        _pry_.prompt = state.prev_prompt
       end
     end
   end

data/lib/pry/commands/show_doc.rb

@@ -62,19 +62,17 @@ class Pry
     # Which sections to include in the 'header', can toggle: :owner,
     # :signature and visibility.
     def header_options
-      super.merge :signature => true
+      super.merge signature: true
     end
 
     # figure out start line of docs by back-calculating based on
     # number of lines in the comment and the start line of the code_object
     # @return [Fixnum] start line of docs
     def start_line_for(code_object)
-      if code_object.command? || opts.present?(:'base-one')
-         1
-      else
-        code_object.source_line.nil? ? 1 :
-          (code_object.source_line - code_object.doc.lines.count)
-      end
+      return 1 if code_object.command? || opts.present?(:'base-one')
+      return 1 unless code_object.source_line
+
+      code_object.source_line - code_object.doc.lines.count
     end
   end
 

data/lib/pry/commands/show_info.rb

@@ -2,7 +2,7 @@ class Pry
   class Command::ShowInfo < Pry::ClassCommand
     extend Pry::Helpers::BaseHelpers
 
-    command_options :shellwords => false, :interpolate => false
+    command_options shellwords: false, interpolate: false
 
     def initialize(*)
       super
@@ -11,15 +11,16 @@ class Pry
     end
 
     def options(opt)
-      opt.on :s, :super, "Select the 'super' method. Can be repeated to traverse the ancestors", :as => :count
+      opt.on :s, :super, "Select the 'super' method. Can be repeated to traverse the ancestors", as: :count
       opt.on :l, "line-numbers", "Show line numbers"
       opt.on :b, "base-one", "Show line numbers but start numbering at 1 (useful for `amend-line` and `play` commands)"
-      opt.on :a, :all,  "Show all definitions and monkeypatches of the module/class"
+      opt.on :a, :all, "Show all definitions and monkeypatches of the module/class"
     end
 
     def process
-      code_object = Pry::CodeObject.lookup(obj_name, _pry_, :super => opts[:super])
+      code_object = Pry::CodeObject.lookup(obj_name, _pry_, super: opts[:super])
       raise CommandError, no_definition_message if !code_object
+
       @original_code_object = code_object
 
       if !obj_name && code_object.c_module? && !opts[:all]
@@ -80,7 +81,7 @@ class Pry
       mod.number_of_candidates.times do |v|
         candidate = mod.candidate(v)
         begin
-          result << "\nCandidate #{v+1}/#{mod.number_of_candidates}: #{candidate.source_file} @ line #{candidate.source_line}:\n"
+          result << "\nCandidate #{v + 1}/#{mod.number_of_candidates}: #{candidate.source_file} @ line #{candidate.source_line}:\n"
           content = content_for(candidate)
 
           result << "Number of lines: #{content.lines.count}\n\n" << content
@@ -100,11 +101,17 @@ class Pry
     # object types: methods, modules, commands, procs...
     def header(code_object)
       file_name, line_num = file_and_line_for(code_object)
-      h = "\n#{Pry::Helpers::Text.bold('From:')} #{file_name} "
+      content = content_for(code_object)
+
+      h = "\n#{bold('From:')} #{file_name} "
       h << code_object_header(code_object, line_num)
-      h << "\n#{Pry::Helpers::Text.bold('Number of lines:')} " <<
-        "#{content_for(code_object).lines.count}\n\n"
-      h << Helpers::Text.bold('** Warning:') << " Cannot find code for #{@original_code_object.nonblank_name}. Showing superclass #{code_object.nonblank_name} instead. **\n\n" if @used_super
+      h << "\n#{bold('Number of lines:')} " << "#{content.lines.count}\n\n"
+      h << bold('** Warning:') << " Cannot find code for #{@original_code_object.nonblank_name}. Showing superclass #{code_object.nonblank_name} instead. **\n\n" if @used_super
+
+      if content.lines.none?
+        h << bold('** Warning:') << " Cannot find code for '#{code_object.name}' (source_location is nil)"
+      end
+
       h
     end
 
@@ -133,11 +140,11 @@ class Pry
     def module_header(code_object, line_num)
       h = ""
       h << "@ line #{line_num}:\n"
-      h << text.bold(code_object.module? ? "Module" : "Class")
-      h << " #{text.bold('name:')} #{code_object.nonblank_name}"
+      h << bold(code_object.module? ? "Module" : "Class")
+      h << " #{bold('name:')} #{code_object.nonblank_name}"
 
       if code_object.number_of_candidates > 1
-        h << (text.bold("\nNumber of monkeypatches: ") << code_object.number_of_candidates.to_s)
+        h << (bold("\nNumber of monkeypatches: ") << code_object.number_of_candidates.to_s)
         h << ". Use the `-a` option to display all available monkeypatches"
       end
       h
@@ -145,17 +152,17 @@ class Pry
 
     def method_sections(code_object)
       {
-        :owner => "\n#{text.bold("Owner:")} #{code_object.owner || "N/A"}\n",
-        :visibility => "#{text.bold("Visibility:")} #{code_object.visibility}",
-        :signature => "\n#{text.bold("Signature:")} #{code_object.signature}"
+        owner: "\n#{bold("Owner:")} #{code_object.owner || "N/A"}\n",
+        visibility: "#{bold("Visibility:")} #{code_object.visibility}",
+        signature: "\n#{bold("Signature:")} #{code_object.signature}"
       }.merge(header_options) { |key, old, new| (new && old).to_s }
     end
 
     def header_options
       {
-        :owner => true,
-        :visibility => true,
-        :signature => nil
+        owner: true,
+        visibility: true,
+        signature: nil
       }
     end
 

data/lib/pry/commands/show_source.rb

@@ -39,8 +39,11 @@ class Pry
 
     # The source for code_object prepared for display.
     def content_for(code_object)
-      Code.new(code_object.source, start_line_for(code_object)).
-        with_line_numbers(use_line_numbers?).highlighted
+      code = Code.new(
+        code_object.source || [],
+        start_line_for(code_object)
+      )
+      code.with_line_numbers(use_line_numbers?).highlighted
     end
   end
 

data/lib/pry/commands/stat.rb

@@ -3,7 +3,7 @@ class Pry
     match 'stat'
     group 'Introspection'
     description 'View method information and set _file_ and _dir_ locals.'
-    command_options :shellwords => false
+    command_options shellwords: false
 
     banner <<-'BANNER'
         Usage: stat [OPTIONS] [METH]

data/lib/pry/commands/watch_expression.rb

@@ -5,7 +5,7 @@ class Pry
     match 'watch'
     group 'Context'
     description 'Watch the value of an expression and print a notification whenever it changes.'
-    command_options :use_prefix => false
+    command_options use_prefix: false
 
     banner <<-'BANNER'
       Usage: watch [EXPRESSION]
@@ -29,7 +29,7 @@ class Pry
     def options(opt)
       opt.on :d, :delete,
         "Delete the watch expression with the given index. If no index is given; clear all watch expressions.",
-        :optional_argument => true, :as => Integer
+        optional_argument: true, as: Integer
       opt.on :l, :list,
         "Show all current watch expressions and their values.  Calling watch with no expressions or options will also show the watch expressions."
     end
@@ -54,8 +54,8 @@ class Pry
 
     def delete(index)
       if index
-        output.puts "Deleting watch expression ##{index}: #{expressions[index-1]}"
-        expressions.delete_at(index-1)
+        output.puts "Deleting watch expression ##{index}: #{expressions[index - 1]}"
+        expressions.delete_at(index - 1)
       else
         output.puts "Deleting all watched expressions"
         expressions.clear
@@ -70,7 +70,7 @@ class Pry
           pager.puts "Listing all watched expressions:"
           pager.puts ""
           expressions.each_with_index do |expr, index|
-            pager.print text.with_line_numbers(expr.to_s, index+1)
+            pager.print with_line_numbers(expr.to_s, index + 1)
           end
           pager.puts ""
         end
@@ -81,12 +81,14 @@ class Pry
       expressions.each do |expr|
         expr.eval!
         if expr.changed?
-          output.puts "#{text.blue "watch"}: #{expr.to_s}"
+          output.puts "#{blue "watch"}: #{expr}"
         end
       end
     end
 
-    def add_expression(arguments)
+    # TODO: fix arguments.
+    # https://github.com/pry/pry/commit/b031df2f2f5850ee6e9018f33d35f3485a9b0423
+    def add_expression(_arguments)
       expressions << Expression.new(_pry_, target, arg_string)
       output.puts "Watching #{Code.new(arg_string).highlighted}"
     end

data/lib/pry/commands/whereami.rb

@@ -1,6 +1,5 @@
 class Pry
   class Command::Whereami < Pry::ClassCommand
-
     def initialize(*)
       super
 
@@ -94,7 +93,7 @@ class Pry
 
       set_file_and_dir_locals(@file)
 
-      out = "\n#{text.bold('From:')} #{location}:\n\n" <<
+      out = "\n#{bold('From:')} #{location}:\n\n" <<
         code.with_line_numbers(use_line_numbers?).with_marker(marker).highlighted << "\n"
 
       _pry_.pager.page out
@@ -154,8 +153,9 @@ class Pry
     # or it returns the class of `target_self` if `target_self` is not a class.
     # @return [Pry::WrappedModule]
     def target_class
-      target_self.is_a?(Module) ? Pry::WrappedModule(target_self) :
-        Pry::WrappedModule(target_self.class)
+      return Pry::WrappedModule(target_self) if target_self.is_a?(Module)
+
+      Pry::WrappedModule(target_self.class)
     end
 
     def class_code