pry 0.10.3 → 0.14.2

data/lib/pry/commands/reload_code.rb

@@ -1,62 +1,74 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::ReloadCode < Pry::ClassCommand
-    match 'reload-code'
-    group 'Misc'
-    description 'Reload the source file that contains the specified code object.'
-
-    banner <<-'BANNER'
-      Reload the source file that contains the specified code object.
-
-      e.g reload-code MyClass#my_method    #=> reload a method
-          reload-code MyClass              #=> reload a class
-          reload-code my-command           #=> reload a pry command
-          reload-code self                 #=> reload the current object
-          reload-code                      #=> reload the current file or object
-    BANNER
-
-    def process
-      if !args.empty?
-        reload_object(args.join(" "))
-      elsif internal_binding?(target)
-        reload_object("self")
-      else
-        reload_current_file
+  class Command
+    class ReloadCode < Pry::ClassCommand
+      match 'reload-code'
+      group 'Misc'
+      description 'Reload the source file that contains the specified code object.'
+
+      banner <<-'BANNER'
+        Reload the source file that contains the specified code object.
+
+        e.g reload-code MyClass#my_method    #=> reload a method
+            reload-code MyClass              #=> reload a class
+            reload-code my-command           #=> reload a pry command
+            reload-code self                 #=> reload the current object
+            reload-code                      #=> reload the current file or object
+      BANNER
+
+      def process
+        if !args.empty?
+          reload_object(args.join(" "))
+        elsif internal_binding?(target)
+          reload_object("self")
+        else
+          reload_current_file
+        end
       end
-    end
 
-    private
+      private
 
-    def current_file
-      File.expand_path target.eval("__FILE__")
-    end
+      def current_file
+        file =
+          if target.respond_to?(:source_location)
+            target.source_location.first
+          else
+            target.eval("__FILE__")
+          end
+        File.expand_path file
+      end
 
-    def reload_current_file
-      if !File.exists?(current_file)
-        raise CommandError, "Current file: #{current_file} cannot be found on disk!"
+      def reload_current_file
+        unless File.exist?(current_file)
+          raise CommandError, "Current file: #{current_file} cannot be found on disk!"
+        end
+
+        load current_file
+        output.puts "The current file: #{current_file} was reloaded!"
       end
 
-      load current_file
-      output.puts "The current file: #{current_file} was reloaded!"
-    end
+      def reload_object(identifier)
+        code_object = Pry::CodeObject.lookup(identifier, pry_instance)
+        check_for_reloadability(code_object, identifier)
+        load code_object.source_file
+        output.puts "#{identifier} was reloaded!"
+      end
 
-    def reload_object(identifier)
-      code_object = Pry::CodeObject.lookup(identifier, _pry_)
-      check_for_reloadability(code_object, identifier)
-      load code_object.source_file
-      output.puts "#{identifier} was reloaded!"
-    end
+      def check_for_reloadability(code_object, identifier)
+        if !code_object || !code_object.source_file
+          raise CommandError, "Cannot locate #{identifier}!"
+        end
+
+        return if File.exist?(code_object.source_file)
 
-    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)
         raise CommandError,
-          "Cannot reload #{identifier} as it has no associated file on disk. " \
-          "File found was: #{code_object.source_file}"
+              "Cannot reload #{identifier} as it has no associated file on disk. " \
+              "File found was: #{code_object.source_file}"
       end
     end
-  end
 
-  Pry::Commands.add_command(Pry::Command::ReloadCode)
-  Pry::Commands.alias_command 'reload-method', 'reload-code'
+    Pry::Commands.add_command(Pry::Command::ReloadCode)
+    Pry::Commands.alias_command 'reload-method', 'reload-code'
+  end
 end

data/lib/pry/commands/reset.rb

@@ -1,18 +1,22 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::Reset < Pry::ClassCommand
-    match 'reset'
-    group 'Context'
-    description 'Reset the REPL to a clean state.'
+  class Command
+    class Reset < Pry::ClassCommand
+      match 'reset'
+      group 'Context'
+      description 'Reset the REPL to a clean state.'
 
-    banner <<-'BANNER'
-      Reset the REPL to a clean state.
-    BANNER
+      banner <<-'BANNER'
+        Reset the REPL to a clean state.
+      BANNER
 
-    def process
-      output.puts 'Pry reset.'
-      exec 'pry'
+      def process
+        output.puts 'Pry reset.'
+        exec 'pry'
+      end
     end
-  end
 
-  Pry::Commands.add_command(Pry::Command::Reset)
+    Pry::Commands.add_command(Pry::Command::Reset)
+  end
 end

data/lib/pry/commands/ri.rb

@@ -1,60 +1,75 @@
+# frozen_string_literal: true
+
+require 'stringio'
+
 class Pry
-  class Command::Ri < Pry::ClassCommand
-    match 'ri'
-    group 'Introspection'
-    description 'View ri documentation.'
+  class Command
+    class Ri < Pry::ClassCommand
+      match 'ri'
+      group 'Introspection'
+      description 'View ri documentation.'
 
-    banner <<-'BANNER'
-      Usage: ri [spec]
+      banner <<-'BANNER'
+        Usage: ri [spec]
 
-      View ri documentation. Relies on the "rdoc" gem being installed.
-      See also "show-doc" command.
+        View ri documentation. Relies on the "rdoc" gem being installed.
+        See also "show-doc" command.
 
-      ri Array#each
-    BANNER
+        ri Array#each
+      BANNER
 
-    def process(spec)
-      # Lazily load RI
-      require 'rdoc/ri/driver'
+      def process(spec)
+        unless spec
+          return output.puts(
+            "Please provide a class, module, or method name (e.g: ri Array#push)"
+          )
+        end
 
-      unless defined? RDoc::RI::PryDriver
+        # Lazily load RI
+        require 'rdoc/ri/driver'
 
-        # Subclass RI so that it formats its output nicely, and uses `lesspipe`.
-        subclass = Class.new(RDoc::RI::Driver) # the hard way.
+        unless defined? RDoc::RI::PryDriver
 
-        subclass.class_eval do
-          def initialize(pager, opts)
-            @pager = pager
-            super opts
-          end
-          def page
-            paging_text = StringIO.new
-            yield paging_text
-            @pager.page(paging_text.string)
-          end
+          # Subclass RI so that it formats its output nicely, and uses `lesspipe`.
+          subclass = Class.new(RDoc::RI::Driver) # the hard way.
+
+          subclass.class_eval do
+            def initialize(pager, opts)
+              @pager = pager
+              super opts
+            end
 
-          def formatter(io)
-            if @formatter_klass
-              @formatter_klass.new
-            else
-              RDoc::Markup::ToAnsi.new
+            def page
+              paging_text = StringIO.new
+              yield paging_text
+              @pager.page(paging_text.string)
+            end
+
+            def formatter(_io)
+              if @formatter_klass
+                @formatter_klass.new
+              else
+                RDoc::Markup::ToAnsi.new
+              end
             end
           end
-        end
 
-        RDoc::RI.const_set :PryDriver, subclass   # hook it up!
-      end
+          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
+        # Spin-up an RI insance.
+        ri = RDoc::RI::PryDriver.new(
+          pry_instance.pager, use_stdout: true, interactive: false
+        )
 
-      begin
-        ri.display_names [spec]  # Get the documentation (finally!)
-      rescue RDoc::RI::Driver::NotFoundError => e
-        output.puts "error: '#{e.name}' not found"
+        begin
+          ri.display_names [spec] # Get the documentation (finally!)
+        rescue RDoc::RI::Driver::NotFoundError => e
+          output.puts "error: '#{e.name}' not found"
+        end
       end
     end
-  end
 
-  Pry::Commands.add_command(Pry::Command::Ri)
+    Pry::Commands.add_command(Pry::Command::Ri)
+  end
 end

data/lib/pry/commands/save_file.rb

@@ -1,61 +1,63 @@
-require 'pry/commands/code_collector'
+# frozen_string_literal: true
 
 class Pry
-  class Command::SaveFile < Pry::ClassCommand
-    match 'save-file'
-    group 'Input and Output'
-    description 'Export to a file using content from the REPL.'
+  class Command
+    class SaveFile < Pry::ClassCommand
+      match 'save-file'
+      group 'Input and Output'
+      description 'Export to a file using content from the REPL.'
 
-    banner <<-'BANNER'
-      Usage: save-file [OPTIONS] --to [FILE]
+      banner <<-'BANNER'
+        Usage: save-file [OPTIONS] --to [FILE]
 
-      Export to a file using content from the REPL.
+        Export to a file using content from the REPL.
 
-      save-file my_method --to hello.rb
-      save-file -i 1..10 --to hello.rb --append
-      save-file show-method --to my_command.rb
-      save-file sample_file.rb --lines 2..10 --to output_file.rb
-    BANNER
+        save-file my_method --to hello.rb
+        save-file -i 1..10 --to hello.rb --append
+        save-file show-method --to my_command.rb
+        save-file sample_file.rb --lines 2..10 --to output_file.rb
+      BANNER
 
-    def options(opt)
-      CodeCollector.inject_options(opt)
+      def options(opt)
+        CodeCollector.inject_options(opt)
 
-      opt.on :to=,        "Specify the output file path"
-      opt.on :a, :append, "Append output to file"
-    end
+        opt.on :to=,        "Specify the output file path"
+        opt.on :a, :append, "Append output to file"
+      end
 
-    def process
-      @cc = CodeCollector.new(args, opts, _pry_)
-      raise CommandError, "Found no code to save." if @cc.content.empty?
+      def process
+        @cc = CodeCollector.new(args, opts, pry_instance)
+        raise CommandError, "Found no code to save." if @cc.content.empty?
 
-      if !file_name
-        display_content
-      else
-        save_file
+        if !file_name
+          display_content
+        else
+          save_file
+        end
       end
-    end
 
-    def file_name
-      opts[:to] || nil
-    end
+      def file_name
+        opts[:to] || nil
+      end
 
-    def save_file
-      File.open(file_name, mode) do |f|
-        f.puts @cc.content
+      def save_file
+        File.open(file_name, mode) do |f|
+          f.puts @cc.content
+        end
+        output.puts "#{file_name} successfully saved"
       end
-      output.puts "#{file_name} successfully saved"
-    end
 
-    def display_content
-      output.puts @cc.content
-      output.puts "\n\n--\nPlease use `--to FILE` to export to a file."
-      output.puts "No file saved!\n--"
-    end
+      def display_content
+        output.puts @cc.content
+        output.puts "\n\n--\nPlease use `--to FILE` to export to a file."
+        output.puts "No file saved!\n--"
+      end
 
-    def mode
-      opts.present?(:append) ? "a" : "w"
+      def mode
+        opts.present?(:append) ? "a" : "w"
+      end
     end
-  end
 
-  Pry::Commands.add_command(Pry::Command::SaveFile)
+    Pry::Commands.add_command(Pry::Command::SaveFile)
+  end
 end

data/lib/pry/commands/shell_command.rb

@@ -1,48 +1,75 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::ShellCommand < Pry::ClassCommand
-    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
-
-    banner <<-'BANNER'
-      Usage: .COMMAND_NAME
-
-      All text following a "." is forwarded to the shell.
-
-      .ls -aF
-      .uname
-    BANNER
-
-    def process(cmd)
-      if cmd =~ /^cd\s*(.*)/i
-        process_cd parse_destination($1)
-      else
-        pass_block(cmd)
-        if command_block
-          command_block.call `#{cmd}`
+  class Command
+    class ShellCommand < Pry::ClassCommand
+      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
+
+      banner <<-'BANNER'
+        Usage: .COMMAND_NAME
+
+        All text following a "." is forwarded to the shell.
+
+        .ls -aF
+        .uname
+      BANNER
+
+      def process(cmd)
+        if cmd =~ /^cd\s*(.*)/i
+          process_cd parse_destination(Regexp.last_match(1))
         else
-          _pry_.config.system.call(output, cmd, _pry_)
+          pass_block(cmd)
+          if command_block
+            command_block.call `#{cmd}`
+          else
+            pry_instance.config.system.call(output, cmd, pry_instance)
+          end
         end
       end
-    end
 
-    private
+      private
 
       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)
         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
 
-  Pry::Commands.add_command(Pry::Command::ShellCommand)
+      def cd_path_env
+        Pry::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|
+          return path if File.directory?(path) && path.split(File::SEPARATOR).last == dest
+        end
+
+        nil
+      end
+
+      def special_case_path?(dest)
+        ['.', '..', '-'].include?(dest) || dest =~ /\A[#{File::PATH_SEPARATOR}~]/
+      end
+    end
+
+    Pry::Commands.add_command(Pry::Command::ShellCommand)
+  end
 end

data/lib/pry/commands/shell_mode.rb

@@ -1,25 +1,29 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::ShellMode < Pry::ClassCommand
-    match 'shell-mode'
-    group 'Input and Output'
-    description 'Toggle shell mode. Bring in pwd prompt and file completion.'
+  class Command
+    class ShellMode < Pry::ClassCommand
+      match 'shell-mode'
+      group 'Input and Output'
+      description 'Toggle shell mode. Bring in pwd prompt and file completion.'
+
+      banner <<-'BANNER'
+        Toggle shell mode. Bring in pwd prompt and file completion.
+      BANNER
 
-    banner <<-'BANNER'
-      Toggle shell mode. Bring in pwd prompt and file completion.
-    BANNER
+      def process
+        state.disabled ^= true
 
-    def process
-      case _pry_.prompt
-      when Pry::SHELL_PROMPT
-        _pry_.pop_prompt
-        _pry_.custom_completions = _pry_.config.file_completions
-      else
-        _pry_.push_prompt Pry::SHELL_PROMPT
-        _pry_.custom_completions = _pry_.config.command_completions
+        if state.disabled
+          state.prev_prompt = pry_instance.prompt
+          pry_instance.prompt = Pry::Prompt[:shell]
+        else
+          pry_instance.prompt = state.prev_prompt
+        end
       end
     end
-  end
 
-  Pry::Commands.add_command(Pry::Command::ShellMode)
-  Pry::Commands.alias_command 'file-mode', 'shell-mode'
+    Pry::Commands.add_command(Pry::Command::ShellMode)
+    Pry::Commands.alias_command 'file-mode', 'shell-mode'
+  end
 end