pry 0.12.2 → 0.14.1

data/lib/pry/commands/import_set.rb

@@ -1,23 +1,27 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::ImportSet < Pry::ClassCommand
-    match 'import-set'
-    group 'Commands'
-    # TODO: Provide a better description with examples and a general conception
-    # of this command.
-    description 'Import a Pry command set.'
+  class Command
+    class ImportSet < Pry::ClassCommand
+      match 'import-set'
+      group 'Commands'
+      # TODO: Provide a better description with examples and a general conception
+      # of this command.
+      description 'Import a Pry command set.'
 
-    banner <<-'BANNER'
-      Import a Pry command set.
-    BANNER
+      banner <<-'BANNER'
+        Import a Pry command set.
+      BANNER
 
-    # TODO: resolve unused parameter.
-    def process(_command_set_name)
-      raise CommandError, "Provide a command set name" if command_set.nil?
+      # 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)
-      _pry_.commands.import set
+        set = target.eval(arg_string)
+        pry_instance.commands.import set
+      end
     end
-  end
 
-  Pry::Commands.add_command(Pry::Command::ImportSet)
+    Pry::Commands.add_command(Pry::Command::ImportSet)
+  end
 end

data/lib/pry/commands/jump_to.rb

@@ -1,29 +1,33 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::JumpTo < Pry::ClassCommand
-    match 'jump-to'
-    group 'Navigating Pry'
-    description 'Jump to a binding further up the stack.'
+  class Command
+    class JumpTo < Pry::ClassCommand
+      match 'jump-to'
+      group 'Navigating Pry'
+      description 'Jump to a binding further up the stack.'
 
-    banner <<-'BANNER'
-      Jump to a binding further up the stack, popping all bindings below.
-    BANNER
+      banner <<-'BANNER'
+        Jump to a binding further up the stack, popping all bindings below.
+      BANNER
 
-    def process(break_level)
-      break_level    = break_level.to_i
-      nesting_level  = _pry_.binding_stack.size - 1
-      max_nest_level = nesting_level - 1
+      def process(break_level)
+        break_level    = break_level.to_i
+        nesting_level  = pry_instance.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..max_nest_level
-        _pry_.binding_stack = _pry_.binding_stack[0..break_level]
-      else
-        output.puts "Invalid nest level. Must be between 0 and " \
-          "#{max_nest_level}. Got #{break_level}."
+        case break_level
+        when nesting_level
+          output.puts "Already at nesting level #{nesting_level}"
+        when 0..max_nest_level
+          pry_instance.binding_stack = pry_instance.binding_stack[0..break_level]
+        else
+          output.puts "Invalid nest level. Must be between 0 and " \
+            "#{max_nest_level}. Got #{break_level}."
+        end
       end
     end
-  end
 
-  Pry::Commands.add_command(Pry::Command::JumpTo)
+    Pry::Commands.add_command(Pry::Command::JumpTo)
+  end
 end

data/lib/pry/commands/list_inspectors.rb

@@ -1,35 +1,42 @@
-class Pry::Command::ListInspectors < Pry::ClassCommand
-  match 'list-inspectors'
-  group 'Input and Output'
-  description 'List the inspector procs available for use.'
-  banner <<-BANNER
-    Usage: list-inspectors
+# frozen_string_literal: true
 
-    List the inspector procs available to print return values. You can use
-    change-inspector to switch between them.
-  BANNER
+class Pry
+  class Command
+    class ListInspectors < Pry::ClassCommand
+      match 'list-inspectors'
+      group 'Input and Output'
+      description 'List the inspector procs available for use.'
+      banner <<-BANNER
+        Usage: list-inspectors
 
-  def process
-    output.puts heading("Available inspectors") + "\n"
-    inspector_map.each do |name, inspector|
-      output.write "Name: #{bold(name)}"
-      output.puts selected_inspector?(inspector) ? selected_text : ""
-      output.puts inspector[:description]
-      output.puts
-    end
-  end
+        List the inspector procs available to print return values. You can use
+        change-inspector to switch between them.
+      BANNER
 
-private
-  def inspector_map
-    Pry::Inspector::MAP
-  end
+      def process
+        output.puts heading("Available inspectors") + "\n"
+        inspector_map.each do |name, inspector|
+          output.write "Name: #{bold(name)}"
+          output.puts selected_inspector?(inspector) ? selected_text : ""
+          output.puts inspector[:description]
+          output.puts
+        end
+      end
 
-  def selected_text
-    red " (selected) "
-  end
+      private
 
-  def selected_inspector?(inspector)
-    _pry_.print == inspector[:value]
+      def inspector_map
+        Pry::Inspector::MAP
+      end
+
+      def selected_text
+        red " (selected) "
+      end
+
+      def selected_inspector?(inspector)
+        pry_instance.print == inspector[:value]
+      end
+      Pry::Commands.add_command(self)
+    end
   end
-  Pry::Commands.add_command(self)
 end

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

@@ -1,55 +1,72 @@
-require 'pry/commands/ls/interrogatable'
+# frozen_string_literal: true
 
 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
+  class Command
+    class Ls < Pry::ClassCommand
+      class Constants < Pry::Command::Ls::Formatter
+        DEPRECATED_CONSTANTS = [
+          :Data, :Fixnum, :Bignum, :TimeoutError, :NIL, :FALSE, :TRUE
+        ].tap do |constants|
+          constants << :JavaPackageModuleTemplate if Helpers::Platform.jruby?
+        end
+        include Pry::Command::Ls::Interrogatable
 
-      def correct_opts?
-        super || (@no_user_opts && interrogating_a_module?)
-      end
+        def initialize(interrogatee, no_user_opts, opts, pry_instance)
+          super(pry_instance)
+          @interrogatee = interrogatee
+          @no_user_opts = no_user_opts
+          @default_switch = opts[:constants]
+          @verbose_switch = opts[:verbose]
+          @dconstants = opts.dconstants?
+        end
 
-      def output_self
-        mod = interrogatee_mod
-        constants = WrappedModule.new(mod).constants(@verbose_switch)
-        output_section('constants', grep.regexp[format(mod, constants)])
-      end
+        def correct_opts?
+          super || (@no_user_opts && interrogating_a_module?)
+        end
 
-      private
+        def output_self
+          mod = interrogatee_mod
+          constants = WrappedModule.new(mod).constants(@verbose_switch)
+          output_section('constants', grep.regexp[format(mod, constants)])
+        end
 
-      def show_deprecated_constants?
-        @dconstants == true
-      end
+        private
 
-      def format(mod, constants)
-        constants.sort_by(&:downcase).map do |name|
-          if Object.respond_to?(:deprecate_constant) and
-            DEPRECATED_CONSTANTS.include?(name)      and
-            !show_deprecated_constants?
-            next
-          end
+        def show_deprecated_constants?
+          @dconstants == true
+        end
+
+        def format(mod, constants)
+          constants.sort_by(&:downcase).map do |name|
+            if Object.respond_to?(:deprecate_constant) &&
+               DEPRECATED_CONSTANTS.include?(name) &&
+               !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)
-              color(:class_constant, name)
+            if (const = (begin
+                           !mod.autoload?(name) && (mod.const_get(name) || true)
+                         rescue StandardError
+                           nil
+                         end))
+              if begin
+                   const < Exception
+                 rescue StandardError
+                   false
+                 end
+                color(:exception_constant, name)
+              elsif begin
+                      mod.const_get(name).is_a?(Module)
+                    rescue StandardError
+                      false
+                    end
+                color(:class_constant, name)
+              else
+                color(:constant, name)
+              end
             else
-              color(:constant, name)
+              color(:unloaded_constant, name)
             end
-          else
-            color(:unloaded_constant, name)
           end
         end
       end

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

@@ -1,50 +1,54 @@
-class Pry
-  class Command::Ls < Pry::ClassCommand
-    class Formatter
-      attr_writer :grep
-      attr_reader :_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
-
-      private
-
-      def color(type, str)
-        Pry::Helpers::Text.send _pry_.config.ls["#{type}_color"], str
-      end
-
-      # Add a new section to the output.
-      # Outputs nothing if the section would be empty.
-      def output_section(heading, body)
-        return '' if body.compact.empty?
+# frozen_string_literal: true
 
-        fancy_heading = Pry::Helpers::Text.bold(color(:heading, heading))
-        Pry::Helpers.tablify_or_one_line(fancy_heading, body, @_pry_.config)
-      end
-
-      def format_value(value)
-        Pry::ColorPrinter.pp(value, '')
-      end
-
-      def correct_opts?
-        @default_switch
-      end
-
-      def output_self
-        raise NotImplementedError
-      end
-
-      def grep
-        @grep || proc { |x| x }
+class Pry
+  class Command
+    class Ls < Pry::ClassCommand
+      class Formatter
+        attr_writer :grep
+        attr_reader :pry_instance
+
+        def initialize(pry_instance)
+          @pry_instance = pry_instance
+          @target = pry_instance.current_context
+          @default_switch = nil
+        end
+
+        def write_out
+          return false unless correct_opts?
+
+          output_self
+        end
+
+        private
+
+        def color(type, str)
+          Pry::Helpers::Text.send pry_instance.config.ls.send("#{type}_color"), str
+        end
+
+        # Add a new section to the output.
+        # 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_instance)
+        end
+
+        def format_value(value)
+          Pry::ColorPrinter.pp(value, ''.dup)
+        end
+
+        def correct_opts?
+          @default_switch
+        end
+
+        def output_self
+          raise NotImplementedError
+        end
+
+        def grep
+          @grep || proc { |x| x }
+        end
       end
     end
   end

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

@@ -1,43 +1,47 @@
+# frozen_string_literal: true
+
 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 $. $/ $\\
-           $: $; $< $= $> $0 $ARGV $CONSOLE $DEBUG $DEFAULT_INPUT $DEFAULT_OUTPUT
-           $FIELD_SEPARATOR $FILENAME $FS $IGNORECASE $INPUT_LINE_NUMBER
-           $INPUT_RECORD_SEPARATOR $KCODE $LOADED_FEATURES $LOAD_PATH $NR $OFS
-           $ORS $OUTPUT_FIELD_SEPARATOR $OUTPUT_RECORD_SEPARATOR $PID $PROCESS_ID
-           $PROGRAM_NAME $RS $VERBOSE $deferr $defout $stderr $stdin $stdout)
+  class Command
+    class 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 $. $/ $\\
+             $: $; $< $= $> $0 $ARGV $CONSOLE $DEBUG $DEFAULT_INPUT $DEFAULT_OUTPUT
+             $FIELD_SEPARATOR $FILENAME $FS $IGNORECASE $INPUT_LINE_NUMBER
+             $INPUT_RECORD_SEPARATOR $KCODE $LOADED_FEATURES $LOAD_PATH $NR $OFS
+             $ORS $OUTPUT_FIELD_SEPARATOR $OUTPUT_RECORD_SEPARATOR $PID $PROCESS_ID
+             $PROGRAM_NAME $RS $VERBOSE $deferr $defout $stderr $stdin $stdout].freeze
 
-      # `$SAFE` and `$?` are thread-local, the exception stuff only works in a
-      # rescue clause, everything else is basically a local variable with a `$`
-      # in its name.
-      PSEUDO_GLOBALS =
-        %w($! $' $& $` $@ $? $+ $_ $~ $1 $2 $3 $4 $5 $6 $7 $8 $9
-           $CHILD_STATUS $SAFE $ERROR_INFO $ERROR_POSITION $LAST_MATCH_INFO
-           $LAST_PAREN_MATCH $LAST_READ_LINE $MATCH $POSTMATCH $PREMATCH)
+        # `$SAFE` and `$?` are thread-local, the exception stuff only works in a
+        # rescue clause, everything else is basically a local variable with a `$`
+        # in its name.
+        PSEUDO_GLOBALS =
+          %w[$! $' $& $` $@ $? $+ $_ $~ $1 $2 $3 $4 $5 $6 $7 $8 $9
+             $CHILD_STATUS $SAFE $ERROR_INFO $ERROR_POSITION $LAST_MATCH_INFO
+             $LAST_PAREN_MATCH $LAST_READ_LINE $MATCH $POSTMATCH $PREMATCH].freeze
 
-      def initialize(opts, _pry_)
-        super(_pry_)
-        @default_switch = opts[:globals]
-      end
+        def initialize(opts, pry_instance)
+          super(pry_instance)
+          @default_switch = opts[:globals]
+        end
 
-      def output_self
-        variables = format(@target.eval('global_variables'))
-        output_section('global variables', grep.regexp[variables])
-      end
+        def output_self
+          variables = format(@target.eval('global_variables'))
+          output_section('global variables', grep.regexp[variables])
+        end
 
-      private
+        private
 
-      def format(globals)
-        globals.map(&:to_s).sort_by(&:downcase).map do |name|
-          if PSEUDO_GLOBALS.include?(name)
-            color(:pseudo_global, name)
-          elsif BUILTIN_GLOBALS.include?(name)
-            color(:builtin_global, name)
-          else
-            color(:global_var, name)
+        def format(globals)
+          globals.map(&:to_s).sort_by(&:downcase).map do |name|
+            if PSEUDO_GLOBALS.include?(name)
+              color(:pseudo_global, name)
+            elsif BUILTIN_GLOBALS.include?(name)
+              color(:builtin_global, name)
+            else
+              color(:global_var, name)
+            end
           end
         end
       end

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

@@ -1,18 +1,22 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::Ls < Pry::ClassCommand
-    class Grep
-      def initialize(grep_regexp)
-        @grep_regexp = grep_regexp
-      end
+  class Command
+    class Ls < Pry::ClassCommand
+      class Grep
+        def initialize(grep_regexp)
+          @grep_regexp = grep_regexp
+        end
 
-      def regexp
-        proc { |x|
-          if x.instance_of?(Array)
-            x.grep(@grep_regexp)
-          else
-            x =~ @grep_regexp
-          end
-        }
+        def regexp
+          proc { |x|
+            if x.instance_of?(Array)
+              x.grep(@grep_regexp)
+            else
+              x =~ @grep_regexp
+            end
+          }
+        end
       end
     end
   end

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

@@ -1,37 +1,39 @@
-require 'pry/commands/ls/interrogatable'
+# frozen_string_literal: true
 
 class Pry
-  class Command::Ls < Pry::ClassCommand
-    class InstanceVars < Pry::Command::Ls::Formatter
-      include Pry::Command::Ls::Interrogatable
+  class Command
+    class Ls < Pry::ClassCommand
+      class InstanceVars < Pry::Command::Ls::Formatter
+        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[:ivars]
-      end
+        def initialize(interrogatee, no_user_opts, opts, pry_instance)
+          super(pry_instance)
+          @interrogatee = interrogatee
+          @no_user_opts = no_user_opts
+          @default_switch = opts[:ivars]
+        end
 
-      def correct_opts?
-        super || @no_user_opts
-      end
+        def correct_opts?
+          super || @no_user_opts
+        end
 
-      def output_self
-        ivars = if Object === @interrogatee
-                  Pry::Method.safe_send(@interrogatee, :instance_variables)
-                else
-                  [] #TODO: BasicObject support
-                end
-        kvars = Pry::Method.safe_send(interrogatee_mod, :class_variables)
-        ivars_out = output_section('instance variables', format(:instance_var, ivars))
-        kvars_out = output_section('class variables', format(:class_var, kvars))
-        ivars_out + kvars_out
-      end
+        def output_self
+          ivars = if Object === @interrogatee # rubocop:disable Style/CaseEquality
+                    Pry::Method.safe_send(@interrogatee, :instance_variables)
+                  else
+                    [] # TODO: BasicObject support
+                  end
+          kvars = Pry::Method.safe_send(interrogatee_mod, :class_variables)
+          ivars_out = output_section('instance variables', format(:instance_var, ivars))
+          kvars_out = output_section('class variables', format(:class_var, kvars))
+          ivars_out + kvars_out
+        end
 
-      private
+        private
 
-      def format(type, vars)
-        vars.sort_by { |var| var.to_s.downcase }.map { |var| color(type, var) }
+        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/interrogatable.rb

@@ -1,18 +1,24 @@
-module Pry::Command::Ls::Interrogatable
+# frozen_string_literal: true
 
-  private
+class Pry
+  class Command
+    class Ls < Pry::ClassCommand
+      module Interrogatable
+        private
 
-  def interrogating_a_module?
-    Module === @interrogatee
-  end
+        def interrogating_a_module?
+          Module === @interrogatee # rubocop:disable Style/CaseEquality
+        end
 
-  def interrogatee_mod
-    if interrogating_a_module?
-      @interrogatee
-    else
-      singleton = Pry::Method.singleton_class_of(@interrogatee)
-      singleton.ancestors.grep(::Class).reject { |c| c == singleton }.first
+        def interrogatee_mod
+          if interrogating_a_module?
+            @interrogatee
+          else
+            singleton = Pry::Method.singleton_class_of(@interrogatee)
+            singleton.ancestors.grep(::Class).reject { |c| c == singleton }.first
+          end
+        end
+      end
     end
   end
-
 end