pry 0.10.4 → 0.12.2

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
@@ -30,18 +30,45 @@ class Pry
 
     private
 
-      def parse_destination(dest)
-        return "~" if dest.empty?
-        return dest unless dest == "-"
-        state.old_pwd || raise(CommandError, "No prior directory available")
-      end
+    def parse_destination(dest)
+      return "~" if dest.empty?
+      return dest unless dest == "-"
+
+      state.old_pwd || raise(CommandError, "No prior directory available")
+    end
 
-      def process_cd(dest)
+    def process_cd(dest)
+      begin
         state.old_pwd = Dir.pwd
-        Dir.chdir File.expand_path(dest)
+        Dir.chdir(File.expand_path(path_from_cd_path(dest) || dest))
       rescue Errno::ENOENT
         raise CommandError, "No such directory: #{dest}"
       end
+    end
+
+    def cd_path_env
+      ENV['CDPATH']
+    end
+
+    def cd_path_exists?
+      cd_path_env && cd_path_env.length.nonzero?
+    end
+
+    def path_from_cd_path(dest)
+      return if !(dest && cd_path_exists?) || special_case_path?(dest)
+
+      cd_path_env.split(File::PATH_SEPARATOR).each do |path|
+        if File.directory?(path) && path.split(File::SEPARATOR).last == dest
+          return path
+        end
+      end
+
+      return nil
+    end
+
+    def special_case_path?(dest)
+      ['.', '..', '-'].include?(dest) || dest =~ /\A[#{File::PATH_SEPARATOR}~]/
+    end
   end
 
   Pry::Commands.add_command(Pry::Command::ShellCommand)

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,18 +11,27 @@ 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 show_all_modules?(code_object)
+      if !obj_name && code_object.c_module? && !opts[:all]
+        result = "Warning: You're inside an object, whose class is defined by means\n" +
+                 "         of the C Ruby API. Pry cannot display the information for\n" +
+                 "         this class."
+        if code_object.candidates.any?
+          result += "\n         However, you can view monkey-patches applied to this class.\n" +
+                    "         Just execute the same command with the '--all' switch."
+        end
+      elsif show_all_modules?(code_object)
         # show all monkey patches for a module
 
         result = content_and_headers_for_all_module_candidates(code_object)
@@ -72,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
@@ -85,18 +94,24 @@ class Pry
     end
 
     def no_definition_message
-      "Couldn't locate a definition for #{obj_name}!"
+      "Couldn't locate a definition for #{obj_name}"
     end
 
     # Generate a header (meta-data information) for all the code
     # 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
 
@@ -125,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
@@ -137,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/expression.rb

@@ -10,7 +10,7 @@ class Pry
       end
 
       def eval!
-        @previous_value = @value
+        @previous_value = value
         @value = Pry::ColorPrinter.pp(target_eval(target, source), "")
       end
 

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,17 +153,18 @@ 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
-      return @class_code if @class_code
-
-      mod = @method ? Pry::WrappedModule(@method.owner) : target_class
-
-      idx = mod.candidates.find_index { |v| expand_path(v.source_file) == @file }
-      @class_code = idx && Pry::Code.from_module(mod, idx)
+      @class_code ||=
+        begin
+          mod = @method ? Pry::WrappedModule(@method.owner) : target_class
+          idx = mod.candidates.find_index { |v| expand_path(v.source_file) == @file }
+          idx && Pry::Code.from_module(mod, idx)
+        end
     end
 
     def valid_method?
@@ -193,4 +193,5 @@ class Pry
 
   Pry::Commands.add_command(Pry::Command::Whereami)
   Pry::Commands.alias_command '@', 'whereami'
+  Pry::Commands.alias_command(/whereami[!?]+/, 'whereami')
 end

data/lib/pry/commands/wtf.rb

@@ -3,7 +3,7 @@ class Pry
     match(/wtf([?!]*)/)
     group 'Context'
     description 'Show the backtrace of the most recent exception.'
-    options :listing => 'wtf?'
+    options listing: 'wtf?'
 
     banner <<-'BANNER'
       Usage: wtf[?|!]
@@ -26,12 +26,25 @@ class Pry
     def process
       raise Pry::CommandError, "No most-recent exception" unless exception
 
-      output.puts "#{text.bold('Exception:')} #{exception.class}: #{exception}\n--"
+      output.puts "#{bold('Exception:')} #{exception.class}: #{exception}\n--"
       if opts.verbose?
         output.puts with_line_numbers(backtrace)
       else
         output.puts with_line_numbers(backtrace.first(size_of_backtrace))
       end
+
+      if exception.respond_to? :cause
+        cause = exception.cause
+        while cause
+          output.puts "#{text.bold('Caused by:')} #{cause.class}: #{cause}\n--"
+          if opts.verbose?
+            output.puts with_line_numbers(cause.backtrace)
+          else
+            output.puts with_line_numbers(cause.backtrace.first(size_of_backtrace))
+          end
+          cause = cause.cause
+        end
+      end
     end
 
     private