pry 0.12.2 → 0.13.0

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

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

@@ -1,49 +1,55 @@
-module Pry::Command::Ls::JRubyHacks
+# frozen_string_literal: true
 
-  private
+class Pry
+  class Command
+    class Ls < Pry::ClassCommand
+      module JRubyHacks
+        private
 
-  # JRuby creates lots of aliases for methods imported from java in an attempt
-  # to make life easier for ruby programmers.  (e.g. getFooBar becomes
-  # get_foo_bar and foo_bar, and maybe foo_bar? if it returns a Boolean). The
-  # full transformations are in the assignAliases method of:
-  # https://github.com/jruby/jruby/blob/master/src/org/jruby/javasupport/JavaClass.java
-  #
-  # This has the unfortunate side-effect of making the output of ls even more
-  # incredibly verbose than it normally would be for these objects; and so we
-  # filter out all but the nicest of these aliases here.
-  #
-  # TODO: This is a little bit vague, better heuristics could be used.
-  #       JRuby also has a lot of scala-specific logic, which we don't copy.
-  def trim_jruby_aliases(methods)
-    grouped = methods.group_by do |m|
-      m.name.sub(/\A(is|get|set)(?=[A-Z_])/, '').gsub(/[_?=]/, '').downcase
-    end
+        # JRuby creates lots of aliases for methods imported from java in an attempt
+        # to make life easier for ruby programmers.  (e.g. getFooBar becomes
+        # get_foo_bar and foo_bar, and maybe foo_bar? if it returns a Boolean). The
+        # full transformations are in the assignAliases method of:
+        # https://github.com/jruby/jruby/blob/master/src/org/jruby/javasupport/JavaClass.java
+        #
+        # This has the unfortunate side-effect of making the output of ls even more
+        # incredibly verbose than it normally would be for these objects; and so we
+        # filter out all but the nicest of these aliases here.
+        #
+        # TODO: This is a little bit vague, better heuristics could be used.
+        #       JRuby also has a lot of scala-specific logic, which we don't copy.
+        def trim_jruby_aliases(methods)
+          grouped = methods.group_by do |m|
+            m.name.sub(/\A(is|get|set)(?=[A-Z_])/, '').gsub(/[_?=]/, '').downcase
+          end
 
-    grouped.flat_map do |key, values|
-      values = values.sort_by do |m|
-        rubbishness(m.name)
-      end
+          grouped.flat_map do |_key, values|
+            values = values.sort_by do |m|
+              rubbishness(m.name)
+            end
 
-      found = []
-      values.select do |x|
-        (!found.any? { |y| x == y }) && found << x
-      end
-    end
-  end
+            found = []
+            values.select do |x|
+              (found.none? { |y| x == y }) && found << x
+            end
+          end
+        end
 
-  # When removing jruby aliases, we want to keep the alias that is
-  # "least rubbish" according to this metric.
-  def rubbishness(name)
-    name.each_char.map { |x|
-      case x
-      when /[A-Z]/
-        1
-      when '?', '=', '!'
-        -2
-      else
-        0
+        # When removing jruby aliases, we want to keep the alias that is
+        # "least rubbish" according to this metric.
+        def rubbishness(name)
+          name.each_char.map do |x|
+            case x
+            when /[A-Z]/
+              1
+            when '?', '=', '!'
+              -2
+            else
+              0
+            end
+          end.inject(&:+) + (name.size / 100.0)
+        end
       end
-    }.inject(&:+) + (name.size / 100.0)
+    end
   end
-
 end

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

@@ -1,30 +1,34 @@
+# frozen_string_literal: true
+
 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
-        @args = args
-        @sticky_locals = _pry_.sticky_locals
-      end
+  class Command
+    class Ls < Pry::ClassCommand
+      class LocalNames < Pry::Command::Ls::Formatter
+        def initialize(no_user_opts, args, pry_instance)
+          super(pry_instance)
+          @no_user_opts = no_user_opts
+          @args = args
+          @sticky_locals = pry_instance.sticky_locals
+        end
 
-      def correct_opts?
-        super || (@no_user_opts && @args.empty?)
-      end
+        def correct_opts?
+          super || (@no_user_opts && @args.empty?)
+        end
 
-      def output_self
-        local_vars = grep.regexp[@target.eval('local_variables')]
-        output_section('locals', format(local_vars))
-      end
+        def output_self
+          local_vars = grep.regexp[@target.eval('local_variables')]
+          output_section('locals', format(local_vars))
+        end
 
-      private
+        private
 
-      def format(locals)
-        locals.sort_by(&:downcase).map do |name|
-          if @sticky_locals.include?(name.to_sym)
-            color(:pry_var, name)
-          else
-            color(:local_var, name)
+        def format(locals)
+          locals.sort_by(&:downcase).map do |name|
+            if @sticky_locals.include?(name.to_sym)
+              color(:pry_var, name)
+            else
+              color(:local_var, name)
+            end
           end
         end
       end