pry 0.12.2 → 0.13.0

data/lib/pry/commands/play.rb

@@ -1,102 +1,113 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::Play < Pry::ClassCommand
-    match 'play'
-    group 'Editing'
-    description 'Playback a string variable, method, line, or file as input.'
-
-    banner <<-'BANNER'
-      Usage: play [OPTIONS] [--help]
-
-      The play command enables you to replay code from files and methods as if they
-      were entered directly in the Pry REPL.
-
-      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 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
-      play Rakefile -l 5      # play line 5 of a file
-      play -d hi              # play documentation of hi method
-      play hi --open          # play hi method and leave it open
-
-      https://github.com/pry/pry/wiki/User-Input#wiki-Play
-    BANNER
-
-    def options(opt)
-      CodeCollector.inject_options(opt)
-
-      opt.on :open, 'Plays the selected content except the last line. Useful' \
-                    ' for replaying methods and leaving the method definition' \
-                    ' "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 :p, :print, 'Prints executed code'
-    end
+  class Command
+    class Play < Pry::ClassCommand
+      match 'play'
+      group 'Editing'
+      description 'Playback a string variable, method, line, or file as input.'
+
+      banner <<-'BANNER'
+        Usage: play [OPTIONS] [--help]
+
+        The play command enables you to replay code from files and methods as if they
+        were entered directly in the Pry REPL.
+
+        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 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
+        play Rakefile -l 5      # play line 5 of a file
+        play -d hi              # play documentation of hi method
+        play hi --open          # play hi method and leave it open
+
+        https://github.com/pry/pry/wiki/User-Input#wiki-Play
+      BANNER
+
+      def options(opt)
+        CodeCollector.inject_options(opt)
+
+        opt.on :open, 'Plays the selected content except the last line. Useful' \
+                      ' for replaying methods and leaving the method definition' \
+                      ' "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 :p, :print, 'Prints executed code'
+      end
 
-    def process
-      @cc = CodeCollector.new(args, opts, _pry_)
+      def process
+        @cc = CodeCollector.new(args, opts, pry_instance)
 
-      perform_play
-      show_input
-    end
+        perform_play
+        show_input
+      end
 
-    def perform_play
-      eval_string << content_after_options
-      run "fix-indent"
-    end
+      def perform_play
+        eval_string << content_after_options
+        run "fix-indent"
+      end
+
+      def show_input
+        return unless opts.present?(:print)
+        return unless Pry::Code.complete_expression?(eval_string)
 
-    def show_input
-      if opts.present?(:print) or !Pry::Code.complete_expression?(eval_string)
-        run "show-input"
+        run 'show-input'
       end
-    end
 
-    def content_after_options
-      if opts.present?(:open)
-        restrict_to_lines(content, (0..-2))
-      elsif opts.present?(:expression)
-        content_at_expression
-      else
-        content
+      def content_after_options
+        if opts.present?(:open)
+          restrict_to_lines(content, (0..-2))
+        elsif opts.present?(:expression)
+          content_at_expression
+        else
+          content
+        end
       end
-    end
 
-    def content_at_expression
-      code_object.expression_at(opts[:expression])
-    end
+      def content_at_expression
+        code_object.expression_at(opts[:expression])
+      end
 
-    def code_object
-      Pry::Code.new(content)
-    end
+      def code_object
+        Pry::Code.new(content)
+      end
 
-    def should_use_default_file?
-      !args.first && !opts.present?(:in) && !opts.present?(:out)
-    end
+      def should_use_default_file?
+        !args.first && !opts.present?(:in) && !opts.present?(:out)
+      end
 
-    def content
-      if should_use_default_file?
-        file_content
-      else
-        @cc.content
+      def content
+        if should_use_default_file?
+          file_content
+        else
+          @cc.content
+        end
       end
-    end
 
-    # The file to play from when no code object is specified.
-    # e.g `play --lines 4..10`
-    def default_file
-      target.eval("__FILE__") && File.expand_path(target.eval("__FILE__"))
-    end
+      # The file to play from when no code object is specified.
+      # e.g `play --lines 4..10`
+      def default_file
+        file =
+          if target.respond_to?(:source_location)
+            target.source_location.first
+          else
+            target.eval("__FILE__")
+          end
+        file && File.expand_path(file)
+      end
+
+      def file_content
+        if !default_file || !File.exist?(default_file)
+          raise CommandError, "File does not exist! File was: #{default_file.inspect}"
+        end
 
-    def file_content
-      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}"
       end
     end
-  end
 
-  Pry::Commands.add_command(Pry::Command::Play)
+    Pry::Commands.add_command(Pry::Command::Play)
+  end
 end

data/lib/pry/commands/pry_backtrace.rb

@@ -1,25 +1,32 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::PryBacktrace < Pry::ClassCommand
-    match 'pry-backtrace'
-    group 'Context'
-    description 'Show the backtrace for the Pry session.'
+  class Command
+    class PryBacktrace < Pry::ClassCommand
+      match 'pry-backtrace'
+      group 'Context'
+      description 'Show the backtrace for the Pry session.'
 
-    banner <<-BANNER
-      Usage: pry-backtrace [OPTIONS] [--help]
+      banner <<-BANNER
+        Usage: pry-backtrace [OPTIONS] [--help]
 
-      Show the backtrace for the position in the code where Pry was started. This can
-      be used to infer the behavior of the program immediately before it entered Pry,
-      just like the backtrace property of an exception.
+        Show the backtrace for the position in the code where Pry was started. This can
+        be used to infer the behavior of the program immediately before it entered Pry,
+        just like the backtrace property of an exception.
 
-      NOTE: if you are looking for the backtrace of the most recent exception raised,
-      just type: `_ex_.backtrace` instead.
-      See: https://github.com/pry/pry/wiki/Special-Locals
-    BANNER
+        NOTE: if you are looking for the backtrace of the most recent exception raised,
+        just type: `_ex_.backtrace` instead.
+        See: https://github.com/pry/pry/wiki/Special-Locals
+      BANNER
 
-    def process
-      _pry_.pager.page bold('Backtrace:') << "\n--\n" << _pry_.backtrace.join("\n")
+      def process
+        text = bold('Backtrace:')
+        text << "\n--\n"
+        text << pry_instance.backtrace.join("\n")
+        pry_instance.pager.page(text)
+      end
     end
-  end
 
-  Pry::Commands.add_command(Pry::Command::PryBacktrace)
+    Pry::Commands.add_command(Pry::Command::PryBacktrace)
+  end
 end

data/lib/pry/commands/pry_version.rb

@@ -1,17 +1,21 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::Version < Pry::ClassCommand
-    match 'pry-version'
-    group 'Misc'
-    description 'Show Pry version.'
+  class Command
+    class Version < Pry::ClassCommand
+      match 'pry-version'
+      group 'Misc'
+      description 'Show Pry version.'
 
-    banner <<-'BANNER'
-      Show Pry version.
-    BANNER
+      banner <<-'BANNER'
+        Show Pry version.
+      BANNER
 
-    def process
-      output.puts "Pry version: #{Pry::VERSION} on Ruby #{RUBY_VERSION}."
+      def process
+        output.puts "Pry version: #{Pry::VERSION} on Ruby #{RUBY_VERSION}."
+      end
     end
-  end
 
-  Pry::Commands.add_command(Pry::Command::Version)
+    Pry::Commands.add_command(Pry::Command::Version)
+  end
 end

data/lib/pry/commands/raise_up.rb

@@ -1,33 +1,38 @@
+# frozen_string_literal: true
+
 class Pry
   # N.B. using a regular expresion here so that "raise-up 'foo'" does the right thing.
-  class Command::RaiseUp < Pry::ClassCommand
-    match(/raise-up(!?\b.*)/)
-    group 'Context'
-    description 'Raise an exception out of the current pry instance.'
-    command_options listing: 'raise-up'
+  class Command
+    class RaiseUp < Pry::ClassCommand
+      match(/raise-up(!?\b.*)/)
+      group 'Context'
+      description 'Raise an exception out of the current pry instance.'
+      command_options listing: 'raise-up'
 
-    banner <<-BANNER
-      Raise up, like exit, allows you to quit pry. Instead of returning a value
-      however, it raises an exception. If you don't provide the exception to be
-      raised, it will use the most recent exception (in pry `_ex_`).
+      banner <<-BANNER
+        Raise up, like exit, allows you to quit pry. Instead of returning a value
+        however, it raises an exception. If you don't provide the exception to be
+        raised, it will use the most recent exception (in pry `_ex_`).
 
-      When called as raise-up! (with an exclamation mark), this command raises the
-      exception through any nested prys you have created by "cd"ing into objects.
+        When called as raise-up! (with an exclamation mark), this command raises the
+        exception through any nested prys you have created by "cd"ing into objects.
 
-      raise-up "get-me-out-of-here"
+        raise-up "get-me-out-of-here"
 
-      # This is equivalent to the command above.
-      raise "get-me-out-of-here"
-      raise-up
-    BANNER
+        # This is equivalent to the command above.
+        raise "get-me-out-of-here"
+        raise-up
+      BANNER
 
-    def process
-      return _pry.pager.page help if captures[0] =~ /(-h|--help)\b/
+      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]}")
+        # Handle 'raise-up', 'raise-up "foo"', 'raise-up RuntimeError, 'farble'
+        # in a rubyesque manner
+        target.eval("pry_instance.raise_up#{captures[0]}")
+      end
     end
-  end
 
-  Pry::Commands.add_command(Pry::Command::RaiseUp)
+    Pry::Commands.add_command(Pry::Command::RaiseUp)
+  end
 end

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.exist?(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.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}"
+              "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