pry 0.11.3 → 0.12.2

data/lib/pry/input_completer.rb

@@ -34,7 +34,7 @@ class Pry::InputCompleter
                    "yield" ]
 
   Operators = [
-               "%", "&", "*", "**", "+",  "-",  "/",
+               "%", "&", "*", "**", "+", "-", "/",
                "<", "<<", "<=", "<=>", "==", "===", "=~", ">", ">=", ">>",
                "[]", "[]=", "^", "!", "!=", "!~"
               ]
@@ -92,7 +92,7 @@ class Pry::InputCompleter
       when SYMBOL_REGEXP # Symbol
         if Symbol.respond_to?(:all_symbols)
           sym        = Regexp.quote($1)
-          candidates = Symbol.all_symbols.collect{|s| ":" << s.id2name}
+          candidates = Symbol.all_symbols.collect { |s| ":" << s.id2name }
           candidates.grep(/^#{sym}/)
         else
           []
@@ -100,7 +100,7 @@ class Pry::InputCompleter
       when TOPLEVEL_LOOKUP_REGEXP # Absolute Constant or class methods
         receiver = $1
         candidates = Object.constants.collect(&:to_s)
-        candidates.grep(/^#{receiver}/).collect{|e| "::" << e}
+        candidates.grep(/^#{receiver}/).collect { |e| "::" << e }
       when CONSTANT_REGEXP # Constant
         message = $1
         begin
@@ -120,7 +120,7 @@ class Pry::InputCompleter
         rescue Pry::RescuableException
           candidates = []
         end
-        candidates.grep(/^#{message}/).collect{|e| receiver + "::" + e}
+        candidates.grep(/^#{message}/).collect { |e| receiver + "::" + e }
       when SYMBOL_METHOD_CALL_REGEXP # method call on a Symbol
         receiver = $1
         message = Regexp.quote($2)
@@ -167,10 +167,12 @@ class Pry::InputCompleter
           end
         else
           # func1.func2
+          require 'set'
           candidates = Set.new
           to_ignore = ignored_modules
-          ObjectSpace.each_object(Module){|m|
+          ObjectSpace.each_object(Module) { |m|
             next if (to_ignore.include?(m) rescue true)
+
             # jruby doesn't always provide #instance_methods() on each
             # object.
             if m.respond_to?(:instance_methods)
@@ -195,7 +197,7 @@ class Pry::InputCompleter
         if eval("respond_to?(:class_variables)", bind)
           candidates += eval("class_variables", bind).collect(&:to_s)
         end
-        candidates = (candidates|ReservedWords|custom_completions).grep(/^#{Regexp.quote(input)}/)
+        candidates = (candidates | ReservedWords | custom_completions).grep(/^#{Regexp.quote(input)}/)
         candidates.collect(&path)
       end
     rescue Pry::RescuableException
@@ -220,7 +222,8 @@ class Pry::InputCompleter
   # path is a proc that takes an input and builds a full path.
   def build_path(input)
     # check to see if the input is a regex
-    return proc {|i| i.to_s }, input if input[/\/\./]
+    return proc { |i| i.to_s }, input if input[/\/\./]
+
     trailing_slash = input.end_with?('/')
     contexts = input.chomp('/').split(/\//)
     input = contexts[-1]
@@ -241,6 +244,7 @@ class Pry::InputCompleter
 
     scanner = lambda do |m|
       next if s.include?(m) # IRB::ExtendCommandBundle::EXCB recurses.
+
       s << m
       m.constants(false).each do |c|
         value = m.const_get(c)
@@ -251,6 +255,7 @@ class Pry::InputCompleter
     # FIXME: Add Pry here as well?
     [:IRB, :SLex, :RubyLex, :RubyToken].each do |module_name|
       next unless Object.const_defined?(module_name)
+
       scanner.call(Object.const_get(module_name))
     end
 

data/lib/pry/input_lock.rb

@@ -1,5 +1,3 @@
-require 'thread'
-
 class Pry
   # There is one InputLock per input (such as STDIN) as two REPLs on the same
   # input makes things delirious. InputLock serializes accesses to the input so

data/lib/pry/last_exception.rb

@@ -23,7 +23,7 @@ class Pry::LastException < BasicObject
     end
   end
 
-  def respond_to_missing?(name, include_all=false)
+  def respond_to_missing?(name, include_all = false)
     @e.respond_to?(name, include_all)
   end
 

data/lib/pry/method/disowned.rb

@@ -20,7 +20,7 @@ class Pry
       #
       # @param [Object] receiver
       # @param [String] method_name
-      def initialize(receiver, method_name, binding=nil)
+      def initialize(receiver, method_name)
         @receiver, @name = receiver, method_name
         @method = nil
       end
@@ -47,6 +47,7 @@ class Pry
       # Raise a more useful error message instead of trying to forward to nil.
       def method_missing(meth_name, *args, &block)
         raise "Cannot call '#{meth_name}' on an undef'd method." if method(:name).respond_to?(meth_name)
+
         Object.instance_method(:method_missing).bind(self).call(meth_name, *args, &block)
       end
     end

data/lib/pry/method/patcher.rb

@@ -94,7 +94,7 @@ class Pry
       def wrap_for_owner(source)
         Pry.current[:pry_owner] = method.owner
         owner_source = definition_for_owner(source)
-        visibility_fix = "#{method.visibility.to_s} #{method.name.to_sym.inspect}"
+        visibility_fix = "#{method.visibility} #{method.name.to_sym.inspect}"
         "Pry.current[:pry_owner].class_eval do; #{owner_source}\n#{visibility_fix}\nend"
       end
 
@@ -113,7 +113,7 @@ class Pry
       def wrap_for_nesting(source)
         nesting = Pry::Code.from_file(method.source_file).nesting_at(method.source_line)
 
-        (nesting + [source] + nesting.map{ "end" } + [""]).join(";")
+        (nesting + [source] + nesting.map { "end" } + [""]).join(";")
       rescue Pry::Indent::UnparseableNestingError
         source
       end

data/lib/pry/method/weird_method_locator.rb

@@ -1,6 +1,5 @@
 class Pry
   class Method
-
     # This class is responsible for locating the *real* `Pry::Method`
     # object captured by a binding.
     #
@@ -16,7 +15,6 @@ class Pry
     # Pry::Method and return it, or return nil if we fail.
     class WeirdMethodLocator
       class << self
-
         # Whether the given method object matches the associated binding.
         # If the method object does not match the binding, then it's
         # most likely not the method captured by the binding, and we
@@ -67,7 +65,7 @@ class Pry
 
       def skip_superclass_search?
         target_mod = @target.eval('self').class
-        target_mod.ancestors.take_while {|mod| mod != target_mod }.any?
+        target_mod.ancestors.take_while { |mod| mod != target_mod }.any?
       end
 
       def normal_method?(method)
@@ -100,8 +98,7 @@ class Pry
       # __FILE__ and __LINE__ the binding is at, we can hope to disambiguate these cases.
       #
       # This obviously won't work if the source is unavaiable for some reason, or if both
-      # methods have the same __FILE__ and __LINE__, or if we're in rbx where b.eval('__LINE__')
-      # is broken.
+      # methods have the same __FILE__ and __LINE__.
       #
       # @return [Pry::Method, nil] The Pry::Method representing the
       #   superclass method.
@@ -110,6 +107,7 @@ class Pry
         if skip_superclass_search?
           return guess
         end
+
         while guess
           # needs rescue if this is a Disowned method or a C method or something...
           # TODO: Fix up the exception handling so we don't need a bare rescue
@@ -122,9 +120,9 @@ class Pry
           end
         end
 
-        # Uhoh... none of the methods in the chain had the right __FILE__ and __LINE__
-        # This may be caused by rbx https://github.com/rubinius/rubinius/issues/953,
-        # or other unknown circumstances (TODO: we should warn the user when this happens)
+        # Uhoh... none of the methods in the chain had the right `__FILE__` and
+        # `__LINE__` due to unknown circumstances.
+        # TODO: we should warn the user when this happens.
         nil
       end
 
@@ -136,6 +134,7 @@ class Pry
       #   renamed method
       def find_renamed_method
         return if !valid_file?(target_file)
+
         alias_name = all_methods_for(target_self).find do |v|
           expanded_source_location(target_self.method(v).source_location) == renamed_method_source_location
         end

data/lib/pry/method.rb

@@ -39,7 +39,7 @@ class Pry
       #   contain any context.
       # @return [Pry::Method, nil] A `Pry::Method` instance containing the requested
       #   method, or `nil` if name is `nil` or no method could be located matching the parameters.
-      def from_str(name, target=TOPLEVEL_BINDING, options={})
+      def from_str(name, target = TOPLEVEL_BINDING, options = {})
         if name.nil?
           nil
         elsif name.to_s =~ /(.+)\#(\S+)\Z/
@@ -56,8 +56,8 @@ class Pry
         elsif options[:methods]
           from_obj(target.eval("self"), name, target)
         else
-          from_str(name, target, :instance => true) or
-            from_str(name, target, :methods => true)
+          from_str(name, target, instance: true) or
+            from_str(name, target, methods: true)
         end
 
       rescue Pry::RescuableException
@@ -101,7 +101,7 @@ class Pry
       # @param [Symbol] method_type The type of method: :method or :instance_method
       # @param [Binding] target The binding where the method is looked up.
       # @return [Method, UnboundMethod] The 'refined' method object.
-      def lookup_method_via_binding(obj, method_name, method_type, target=TOPLEVEL_BINDING)
+      def lookup_method_via_binding(obj, method_name, method_type, target = TOPLEVEL_BINDING)
         Pry.current[:obj] = obj
         Pry.current[:name] = method_name
         receiver = obj.is_a?(Module) ? "Module" : "Kernel"
@@ -118,7 +118,7 @@ class Pry
       # @param [String] name
       # @param [Binding] target The binding where the method is looked up.
       # @return [Pry::Method, nil]
-      def from_class(klass, name, target=TOPLEVEL_BINDING)
+      def from_class(klass, name, target = TOPLEVEL_BINDING)
         new(lookup_method_via_binding(klass, name, :instance_method, target)) rescue nil
       end
       alias from_module from_class
@@ -131,7 +131,7 @@ class Pry
       # @param [String] name
       # @param [Binding] target The binding where the method is looked up.
       # @return [Pry::Method, nil]
-      def from_obj(obj, name, target=TOPLEVEL_BINDING)
+      def from_obj(obj, name, target = TOPLEVEL_BINDING)
         new(lookup_method_via_binding(obj, name, :method, target)) rescue nil
       end
 
@@ -139,10 +139,10 @@ class Pry
       # @param [Class,Module] klass
       # @param [Boolean] include_super Whether to include methods from ancestors.
       # @return [Array[Pry::Method]]
-      def all_from_class(klass, include_super=true)
+      def all_from_class(klass, include_super = true)
         %w(public protected private).flat_map do |visibility|
           safe_send(klass, :"#{visibility}_instance_methods", include_super).map do |method_name|
-            new(safe_send(klass, :instance_method, method_name), :visibility => visibility.to_sym)
+            new(safe_send(klass, :instance_method, method_name), visibility: visibility.to_sym)
           end
         end
       end
@@ -157,7 +157,7 @@ class Pry
       #
       # @return [Array[Pry::Method]]
       #
-      def all_from_obj(obj, include_super=true)
+      def all_from_obj(obj, include_super = true)
         all_from_class(singleton_class_of(obj), include_super)
       end
 
@@ -166,7 +166,7 @@ class Pry
       #  please use {all_from_obj} instead.
       #  the `method_type` argument is ignored.
       #
-      def all_from_common(obj, method_type = nil, include_super=true)
+      def all_from_common(obj, _method_type = nil, include_super = true)
         all_from_obj(obj, include_super)
       end
 
@@ -233,7 +233,7 @@ class Pry
     # @param [::Method, UnboundMethod, Proc] method
     # @param [Hash] known_info Can be used to pre-cache expensive to compute stuff.
     # @return [Pry::Method]
-    def initialize(method, known_info={})
+    def initialize(method, known_info = {})
       @method = method
       @visibility = known_info[:visibility]
     end
@@ -298,7 +298,8 @@ class Pry
     # @return [String, nil] The documentation for the method, or `nil` if it's
     #   unavailable.
     def doc
-      @doc ||= case source_type
+      @doc ||=
+        case source_type
         when :c
           info = pry_doc_info
           info.docstring if info
@@ -317,7 +318,7 @@ class Pry
     #   `nil` if the filename is unavailable.
     def source_file
       if source_location.nil?
-        if !rbx? and source_type == :c
+        if source_type == :c
           info = pry_doc_info
           info.file if info
         end
@@ -354,20 +355,24 @@ class Pry
 
     # @return [String] A representation of the method's signature, including its
     #   name and parameters. Optional and "rest" parameters are marked with `*`
-    #   and block parameters with `&`. If the parameter names are unavailable,
-    #   they're given numbered names instead.
+    #   and block parameters with `&`. Keyword arguments are shown with `:`
+    #   If the parameter names are unavailable, they're given numbered names instead.
     #   Paraphrased from `awesome_print` gem.
     def signature
       if respond_to?(:parameters)
-        args = parameters.inject([]) do |arr, (typ, nam)|
-          nam ||= (typ == :block ? 'block' : "arg#{arr.size + 1}")
-          arr << case typ
-                 when :req   then nam.to_s
-                 when :opt   then "#{nam}=?"
-                 when :rest  then "*#{nam}"
-                 when :block then "&#{nam}"
-                 else '?'
-                 end
+        args = parameters.inject([]) do |args_array, (arg_type, name)|
+          name ||= (arg_type == :block ? 'block' : "arg#{args_array.size + 1}")
+          args_array.push(
+            case arg_type
+            when :req    then name.to_s
+            when :opt    then "#{name}=?"
+            when :rest   then "*#{name}"
+            when :block  then "&#{name}"
+            when :key    then "#{name}:?"
+            when :keyreq then "#{name}:"
+            else '?'
+            end
+          )
         end
       else
         args = (1..arity.abs).map { |i| "arg#{i}" }
@@ -379,7 +384,7 @@ class Pry
 
     # @return [Pry::Method, nil] The wrapped method that is called when you
     #   use "super" in the body of this method.
-    def super(times=1)
+    def super(times = 1)
       if UnboundMethod === @method
         sup = super_using_ancestors(Pry::Method.instance_resolution_order(owner), times)
       else
@@ -393,6 +398,7 @@ class Pry
     #   before any aliasing, or `nil` if it can't be determined.
     def original_name
       return nil if source_type != :ruby
+
       method_name_from_first_line(source.lines.first)
     end
 
@@ -461,7 +467,7 @@ class Pry
 
     # @param [String, Symbol] method_name
     # @return [Boolean]
-    def respond_to?(method_name, include_all=false)
+    def respond_to?(method_name, include_all = false)
       super or @method.respond_to?(method_name, include_all)
     end
 
@@ -483,7 +489,7 @@ class Pry
         Pry::MethodInfo.info_for(@method) or raise CommandError, "Cannot locate this method: #{name}. (source_location returns nil)"
       else
         fail_msg = "Cannot locate this method: #{name}."
-        if mri?
+        if Helpers::Platform.mri?
           fail_msg += " Invoke the 'gem-install pry-doc' Pry command to get access to Ruby Core documentation.\n"
         end
         raise CommandError, fail_msg
@@ -492,7 +498,7 @@ class Pry
 
     # @param [Class, Module] ancestors The ancestors to investigate
     # @return [Method] The unwrapped super-method
-    def super_using_ancestors(ancestors, times=1)
+    def super_using_ancestors(ancestors, times = 1)
       next_owner = self.owner
       times.times do
         i = ancestors.index(next_owner) + 1
@@ -529,9 +535,9 @@ class Pry
     end
 
     def ruby_source
-      # clone of MethodSource.source_helper that knows to use our
-      # hacked version of source_location for rbx core methods, and
-      # our input buffer for methods defined in (pry)
+      # Clone of `MethodSource.source_helper` that knows to use our
+      # hacked version of `source_location` for our input buffer for methods
+      # defined in `(pry)`.
       file, line = *source_location
       raise SourceNotFoundError, "Could not locate source for #{name_with_owner}!" unless file
 

data/lib/pry/object_path.rb

@@ -28,7 +28,7 @@ class Pry
       stack   = @current_stack.dup
 
       begin
-        next_segment  = ""
+        next_segment = ""
 
         loop do
           # Scan for as long as we don't see a slash
@@ -74,9 +74,10 @@ class Pry
         "Exception: #{err.inspect}"
       ].join("\n")
 
-      raise CommandError.new(msg).tap { |e|
-        e.set_backtrace err.backtrace
-      }
+      command_error = CommandError.new(msg)
+      command_error.set_backtrace(err.backtrace)
+
+      raise command_error
     end
   end
 end

data/lib/pry/output.rb

@@ -8,8 +8,9 @@ class Pry::Output
 
   def puts(*objs)
     return print "\n" if objs.empty?
+
     objs.each do |obj|
-      if ary = Array.try_convert(obj)
+      if (ary = Array.try_convert(obj))
         puts(*ary)
       else
         print "#{obj.to_s.chomp}\n"
@@ -35,7 +36,7 @@ class Pry::Output
     @boxed_io.__send__(name, *args, &block)
   end
 
-  def respond_to_missing?(m, include_all=false)
+  def respond_to_missing?(m, include_all = false)
     @boxed_io.respond_to?(m, include_all)
   end