pry 0.10.4 → 0.14.2

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.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.flatten(1)
-  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,35 +1,37 @@
-class Pry
-  class Command::Ls < Pry::ClassCommand
-    class LocalNames < Pry::Command::Ls::Formatter
+# frozen_string_literal: true
 
-      def initialize(no_user_opts, args, _pry_)
-        super(_pry_)
-        @no_user_opts = no_user_opts
-        @args = args
-        @sticky_locals = _pry_.sticky_locals
-      end
+class Pry
+  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
-
     end
   end
 end

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

@@ -1,39 +1,47 @@
-class Pry
-  class Command::Ls < Pry::ClassCommand
-    class LocalVars < Pry::Command::Ls::Formatter
+# frozen_string_literal: true
 
-      def initialize(opts, _pry_)
-        super(_pry_)
-        @default_switch = opts[:locals]
-        @sticky_locals = _pry_.sticky_locals
-      end
+class Pry
+  class Command
+    class Ls < Pry::ClassCommand
+      class LocalVars < Pry::Command::Ls::Formatter
+        def initialize(opts, pry_instance)
+          super(pry_instance)
+          @default_switch = opts[:locals]
+          @sticky_locals = pry_instance.sticky_locals
+        end
 
-      def output_self
-        name_value_pairs = @target.eval('local_variables').reject { |e|
-          @sticky_locals.keys.include?(e.to_sym)
-        }.map { |name|
-          [name, (@target.eval(name.to_s))]
-        }
-        format(name_value_pairs).join('')
-      end
+        def output_self
+          locals = @target.eval('local_variables').reject do |e|
+            @sticky_locals.key?(e.to_sym)
+          end
+          name_value_pairs = locals.map do |name|
+            [name, @target.eval(name.to_s)]
+          end
+          format(name_value_pairs).join('')
+        end
 
-      private
+        private
 
-      def format(name_value_pairs)
-        name_value_pairs.sort_by { |name, value|
-          value.to_s.size
-        }.reverse.map { |name, value|
-          colorized_assignment_style(name, format_value(value))
-        }
-      end
+        def format(name_value_pairs)
+          sorted = name_value_pairs.sort_by do |_name, value|
+            value.to_s.size
+          end
+          sorted.reverse.map do |name, value|
+            colorized_assignment_style(name, format_value(value))
+          end
+        end
 
-      def colorized_assignment_style(lhs, rhs, desired_width = 7)
-        colorized_lhs = color(:local_var, lhs)
-        color_escape_padding = colorized_lhs.size - lhs.size
-        pad = desired_width + color_escape_padding
-        "%-#{pad}s = %s" % [color(:local_var, colorized_lhs), rhs]
+        def colorized_assignment_style(lhs, rhs, desired_width = 7)
+          colorized_lhs = color(:local_var, lhs)
+          color_escape_padding = colorized_lhs.size - lhs.size
+          pad = desired_width + color_escape_padding
+          Kernel.format(
+            "%-#{pad}<name>s = %<value>s",
+            name: color(:local_var, colorized_lhs),
+            value: rhs
+          )
+        end
       end
-
     end
   end
 end

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

@@ -1,69 +1,64 @@
-require 'pry/commands/ls/grep'
-require 'pry/commands/ls/formatter'
-require 'pry/commands/ls/globals'
-require 'pry/commands/ls/constants'
-require 'pry/commands/ls/methods'
-require 'pry/commands/ls/self_methods'
-require 'pry/commands/ls/instance_vars'
-require 'pry/commands/ls/local_names'
-require 'pry/commands/ls/local_vars'
+# frozen_string_literal: true
 
 class Pry
-  class Command::Ls < Pry::ClassCommand
+  class Command
+    class Ls < Pry::ClassCommand
+      class LsEntity
+        attr_reader :pry_instance
 
-    class LsEntity
-      attr_reader :_pry_
+        def initialize(opts)
+          @interrogatee = opts[:interrogatee]
+          @no_user_opts = opts[:no_user_opts]
+          @opts = opts[:opts]
+          @args = opts[:args]
+          @grep = Grep.new(Regexp.new(opts[:opts][:G] || '.'))
+          @pry_instance = opts.delete(:pry_instance)
+        end
 
-      def initialize(opts)
-        @interrogatee = opts[:interrogatee]
-        @no_user_opts = opts[:no_user_opts]
-        @opts = opts[:opts]
-        @args = opts[:args]
-        @grep = Grep.new(Regexp.new(opts[:opts][:G] || '.'))
-        @_pry_ = opts.delete(:_pry_)
-      end
+        def entities_table
+          entities.map(&:write_out).select { |o| o }.join('')
+        end
 
-      def entities_table
-        entities.map(&:write_out).reject { |o| !o }.join('')
-      end
+        private
 
-      private
+        def grep(entity)
+          entity.tap { |o| o.grep = @grep }
+        end
 
-      def grep(entity)
-        entity.tap { |o| o.grep = @grep }
-      end
+        def globals
+          grep Globals.new(@opts, pry_instance)
+        end
 
-      def globals
-        grep Globals.new(@opts, _pry_)
-      end
+        def constants
+          grep Constants.new(@interrogatee, @no_user_opts, @opts, pry_instance)
+        end
 
-      def constants
-        grep Constants.new(@interrogatee, @no_user_opts, @opts, _pry_)
-      end
+        def methods
+          grep(Methods.new(@interrogatee, @no_user_opts, @opts, pry_instance))
+        end
 
-      def methods
-        grep(Methods.new(@interrogatee, @no_user_opts, @opts, _pry_))
-      end
+        def self_methods
+          grep SelfMethods.new(@interrogatee, @no_user_opts, @opts, pry_instance)
+        end
 
-      def self_methods
-        grep SelfMethods.new(@interrogatee, @no_user_opts, @opts, _pry_)
-      end
+        def instance_vars
+          grep InstanceVars.new(@interrogatee, @no_user_opts, @opts, pry_instance)
+        end
 
-      def instance_vars
-        grep InstanceVars.new(@interrogatee, @no_user_opts, @opts, _pry_)
-      end
+        def local_names
+          grep LocalNames.new(@no_user_opts, @args, pry_instance)
+        end
 
-      def local_names
-        grep LocalNames.new(@no_user_opts, @args, _pry_)
-      end
-
-      def local_vars
-        LocalVars.new(@opts, _pry_)
-      end
+        def local_vars
+          LocalVars.new(@opts, pry_instance)
+        end
 
-      def entities
-        [globals, constants, methods, self_methods, instance_vars, local_names,
-          local_vars]
+        def entities
+          [
+            globals, constants, methods, self_methods, instance_vars, local_names,
+            local_vars
+          ]
+        end
       end
     end
   end

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

@@ -1,57 +1,55 @@
-require 'pry/commands/ls/methods_helper'
-require 'pry/commands/ls/interrogatable'
+# frozen_string_literal: true
 
 class Pry
-  class Command::Ls < Pry::ClassCommand
-    class Methods < Pry::Command::Ls::Formatter
-
-      include Pry::Command::Ls::Interrogatable
-      include Pry::Command::Ls::MethodsHelper
-
-      def initialize(interrogatee, no_user_opts, opts, _pry_)
-        super(_pry_)
-        @interrogatee = interrogatee
-        @no_user_opts = no_user_opts
-        @default_switch = opts[:methods]
-        @instance_methods_switch = opts['instance-methods']
-        @ppp_switch = opts[:ppp]
-        @jruby_switch = opts['all-java']
-        @quiet_switch = opts[:quiet]
-        @verbose_switch = opts[:verbose]
-      end
-
-      def output_self
-        methods = all_methods.group_by(&:owner)
-        # Reverse the resolution order so that the most useful information
-        # appears right by the prompt.
-        resolution_order.take_while(&below_ceiling).reverse.map do |klass|
-          methods_here = (methods[klass] || []).select { |m| grep.regexp[m.name] }
-          heading = "#{ Pry::WrappedModule.new(klass).method_prefix }methods"
-          output_section(heading, format(methods_here))
-        end.join('')
+  class Command
+    class Ls < Pry::ClassCommand
+      class Methods < Pry::Command::Ls::Formatter
+        include Pry::Command::Ls::Interrogatable
+        include Pry::Command::Ls::MethodsHelper
+
+        def initialize(interrogatee, no_user_opts, opts, pry_instance)
+          super(pry_instance)
+          @interrogatee = interrogatee
+          @no_user_opts = no_user_opts
+          @default_switch = opts[:methods]
+          @instance_methods_switch = opts['instance-methods']
+          @ppp_switch = opts[:ppp]
+          @jruby_switch = opts['all-java']
+          @quiet_switch = opts[:quiet]
+          @verbose_switch = opts[:verbose]
+        end
+
+        def output_self
+          methods = all_methods.group_by(&:owner)
+          # Reverse the resolution order so that the most useful information
+          # appears right by the prompt.
+          resolution_order.take_while(&below_ceiling).reverse.map do |klass|
+            methods_here = (methods[klass] || []).select { |m| grep.regexp[m.name] }
+            heading = "#{Pry::WrappedModule.new(klass).method_prefix}methods"
+            output_section(heading, format(methods_here))
+          end.join('')
+        end
+
+        private
+
+        def correct_opts?
+          super || @instance_methods_switch || @ppp_switch || @no_user_opts
+        end
+
+        # Get a lambda that can be used with `take_while` to prevent over-eager
+        # traversal of the Object's ancestry graph.
+        def below_ceiling
+          ceiling = if @quiet_switch
+                      [Pry::Method.safe_send(interrogatee_mod, :ancestors)[1]] +
+                        pry_instance.config.ls.ceiling
+                    elsif @verbose_switch
+                      []
+                    else
+                      pry_instance.config.ls.ceiling.dup
+                    end
+          ->(klass) { !ceiling.include?(klass) }
+        end
       end
-
-      private
-
-      def correct_opts?
-        super || @instance_methods_switch || @ppp_switch || @no_user_opts
-      end
-
-
-      # Get a lambda that can be used with `take_while` to prevent over-eager
-      # traversal of the Object's ancestry graph.
-      def below_ceiling
-        ceiling = if @quiet_switch
-                    [Pry::Method.safe_send(interrogatee_mod, :ancestors)[1]] +
-                      _pry_.config.ls.ceiling
-                  elsif @verbose_switch
-                    []
-                  else
-                    _pry_.config.ls.ceiling.dup
-                  end
-        lambda { |klass| !ceiling.include?(klass) }
-      end
-
     end
   end
 end

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

@@ -1,46 +1,50 @@
-require 'pry/commands/ls/jruby_hacks'
-
-module Pry::Command::Ls::MethodsHelper
-
-  include Pry::Command::Ls::JRubyHacks
-
-  private
-
-  # Get all the methods that we'll want to output.
-  def all_methods(instance_methods = false)
-    methods = if instance_methods || @instance_methods_switch
-                Pry::Method.all_from_class(@interrogatee)
-              else
-                Pry::Method.all_from_obj(@interrogatee)
-              end
-
-    if Pry::Helpers::BaseHelpers.jruby? && !@jruby_switch
-      methods = trim_jruby_aliases(methods)
-    end
-
-    methods.select { |method| @ppp_switch || method.visibility == :public }
-  end
-
-  def resolution_order
-    if @instance_methods_switch
-      Pry::Method.instance_resolution_order(@interrogatee)
-    else
-      Pry::Method.resolution_order(@interrogatee)
-    end
-  end
-
-  def format(methods)
-    methods.sort_by(&:name).map do |method|
-      if method.name == 'method_missing'
-        color(:method_missing, 'method_missing')
-      elsif method.visibility == :private
-        color(:private_method, method.name)
-      elsif method.visibility == :protected
-        color(:protected_method, method.name)
-      else
-        color(:public_method, method.name)
+# frozen_string_literal: true
+
+class Pry
+  class Command
+    class Ls < Pry::ClassCommand
+      module MethodsHelper
+        include Pry::Command::Ls::JRubyHacks
+
+        private
+
+        # Get all the methods that we'll want to output.
+        def all_methods(instance_methods = false)
+          methods = if instance_methods || @instance_methods_switch
+                      Pry::Method.all_from_class(@interrogatee)
+                    else
+                      Pry::Method.all_from_obj(@interrogatee)
+                    end
+
+          if Pry::Helpers::Platform.jruby? && !@jruby_switch
+            methods = trim_jruby_aliases(methods)
+          end
+
+          methods.select { |method| @ppp_switch || method.visibility == :public }
+        end
+
+        def resolution_order
+          if @instance_methods_switch
+            Pry::Method.instance_resolution_order(@interrogatee)
+          else
+            Pry::Method.resolution_order(@interrogatee)
+          end
+        end
+
+        def format(methods)
+          methods.sort_by(&:name).map do |method|
+            if method.name == 'method_missing'
+              color(:method_missing, 'method_missing')
+            elsif method.visibility == :private
+              color(:private_method, method.name)
+            elsif method.visibility == :protected
+              color(:protected_method, method.name)
+            else
+              color(:public_method, method.name)
+            end
+          end
+        end
       end
     end
   end
-
 end

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

@@ -1,32 +1,34 @@
-require 'pry/commands/ls/interrogatable'
-require 'pry/commands/ls/methods_helper'
+# frozen_string_literal: true
 
 class Pry
-  class Command::Ls < Pry::ClassCommand
-    class SelfMethods < Pry::Command::Ls::Formatter
-      include Pry::Command::Ls::Interrogatable
-      include Pry::Command::Ls::MethodsHelper
+  class Command
+    class Ls < Pry::ClassCommand
+      class SelfMethods < Pry::Command::Ls::Formatter
+        include Pry::Command::Ls::Interrogatable
+        include Pry::Command::Ls::MethodsHelper
 
-      def initialize(interrogatee, no_user_opts, opts, _pry_)
-        super(_pry_)
-        @interrogatee = interrogatee
-        @no_user_opts = no_user_opts
-      end
+        def initialize(interrogatee, no_user_opts, opts, pry_instance)
+          super(pry_instance)
+          @interrogatee = interrogatee
+          @no_user_opts = no_user_opts
+          @ppp_switch = opts[:ppp]
+          @jruby_switch = opts['all-java']
+        end
 
-      def output_self
-        methods = all_methods(true).select do |m|
-          m.owner == @interrogatee && grep.regexp[m.name]
+        def output_self
+          methods = all_methods(true).select do |m|
+            m.owner == @interrogatee && grep.regexp[m.name]
+          end
+          heading = "#{Pry::WrappedModule.new(@interrogatee).method_prefix}methods"
+          output_section(heading, format(methods))
         end
-        heading = "#{ Pry::WrappedModule.new(@interrogatee).method_prefix }methods"
-        output_section(heading, format(methods))
-      end
 
-      private
+        private
 
-      def correct_opts?
-        @no_user_opts && interrogating_a_module?
+        def correct_opts?
+          @no_user_opts && interrogating_a_module?
+        end
       end
-
     end
   end
 end