pry 0.11.3 → 0.12.2

data/lib/pry/repl.rb

@@ -49,7 +49,7 @@ class Pry
 
       # Clear the line before starting Pry. This fixes issue #566.
       if pry.config.correct_indent
-        Kernel.print Pry::Helpers::BaseHelpers.windows_ansi? ? "\e[0F" : "\e[0G"
+        Kernel.print(Helpers::Platform.windows_ansi? ? "\e[0F" : "\e[0G")
       end
     end
 
@@ -106,8 +106,9 @@ class Pry
 
         if output.tty? && pry.config.correct_indent && Pry::Helpers::BaseHelpers.use_ansi_codes?
           output.print @indent.correct_indentation(
-            current_prompt, indented_val,
-            original_val.length - indented_val.length
+            current_prompt,
+            indented_val,
+            calculate_overhang(current_prompt, original_val, indented_val)
           )
           output.flush
         end
@@ -218,15 +219,43 @@ class Pry
     #   % pry | tee log
     def piping?
       return false unless $stdout.respond_to?(:tty?)
-      !$stdout.tty? && $stdin.tty? && !Pry::Helpers::BaseHelpers.windows?
+
+      !$stdout.tty? && $stdin.tty? && !Helpers::Platform.windows?
     end
 
     # @return [void]
     def set_readline_output
       return if @readline_output
+
       if piping?
         @readline_output = (Readline.output = Pry.config.output)
       end
     end
+
+    # Calculates correct overhang for current line. Supports vi Readline
+    # mode and its indicators such as "(ins)" or "(cmd)".
+    #
+    # @return [Integer]
+    # @note This doesn't calculate overhang for Readline's emacs mode with an
+    #   indicator because emacs is the default mode and it doesn't use
+    #   indicators in 99% of cases.
+    def calculate_overhang(current_prompt, original_val, indented_val)
+      overhang = original_val.length - indented_val.length
+
+      if readline_available? && Readline.respond_to?(:vi_editing_mode?)
+        begin
+          # rb-readline doesn't support this method:
+          # https://github.com/ConnorAtherton/rb-readline/issues/152
+          if Readline.vi_editing_mode?
+            overhang += current_prompt.length - indented_val.length
+          end
+        rescue NotImplementedError
+          # VI editing mode is unsupported on JRuby.
+          # https://github.com/pry/pry/issues/1840
+          nil
+        end
+      end
+      [0, overhang].max
+    end
   end
 end

data/lib/pry/repl_file_loader.rb

@@ -1,5 +1,4 @@
 class Pry
-
   # A class to manage the loading of files through the REPL loop.
   # This is an interesting trick as it processes your file as if it
   # was user input in an interactive session. As a result, all Pry
@@ -42,7 +41,7 @@ class Pry
       end
 
       content.lines.each do |line|
-        break unless _pry_.eval line, :generated => true
+        break unless _pry_.eval line, generated: true
       end
 
       unless _pry_.eval_string.empty?

data/lib/pry/ring.rb

@@ -0,0 +1,84 @@
+class Pry
+  # A ring is a thread-safe fixed-capacity array to which you can only add
+  # elements. Older entries are overwritten as you add new elements, so that the
+  # ring can never contain more than `max_size` elemens.
+  #
+  # @example
+  #   ring = Pry::Ring.new(3)
+  #   ring << 1 << 2 << 3
+  #   ring.to_a #=> [1, 2, 3]
+  #   ring << 4
+  #   ring.to_a #=> [2, 3, 4]
+  #
+  #   ring[0] #=> 2
+  #   ring[-1] #=> 4
+  #   ring.clear
+  #   ring[0] #=> nil
+  #
+  # @api public
+  # @since v0.12.0
+  class Ring
+    # @return [Integer] maximum buffer size
+    attr_reader :max_size
+
+    # @return [Integer] how many objects were added during the lifetime of the
+    #   ring
+    attr_reader :count
+    alias size count
+
+    # @param [Integer] max_size Maximum buffer size. The buffer will start
+    #   overwriting elements once its reaches its maximum capacity
+    def initialize(max_size)
+      @max_size = max_size
+      @mutex = Mutex.new
+      clear
+    end
+
+    # Push `value` to the current index.
+    #
+    # @param [Object] value
+    # @return [self]
+    def <<(value)
+      @mutex.synchronize do
+        @buffer[count % max_size] = value
+        @count += 1
+        self
+      end
+    end
+
+    # Read the value stored at `index`.
+    #
+    # @param [Integer, Range] index The element (if Integer) or elements
+    #   (if Range) associated with `index`
+    # @return [Object, Array<Object>, nil] element(s) at `index`, `nil` if none
+    #   exist
+    def [](index)
+      @mutex.synchronize do
+        return @buffer[(count + index) % max_size] if index.is_a?(Integer)
+        return @buffer[index] if count <= max_size
+
+        # Swap parts of array when the array turns page and starts overwriting
+        # from the beginning, then apply the range.
+        last_part = @buffer.slice([index.end, max_size - 1].min, count % max_size)
+        (last_part + (@buffer - last_part))[index]
+      end
+    end
+
+    # @return [Array<Object>] the buffer as unwinded array
+    def to_a
+      return @buffer.dup if count <= max_size
+
+      last_part = @buffer.slice(count % max_size, @buffer.size)
+      last_part + (@buffer - last_part)
+    end
+
+    # Clear the buffer and reset count.
+    # @return [void]
+    def clear
+      @mutex.synchronize do
+        @buffer = []
+        @count = 0
+      end
+    end
+  end
+end

data/lib/pry/rubygem.rb

@@ -23,7 +23,7 @@ class Pry
                   Gem.source_index.find_name(name)
                 end
 
-        first_spec = specs.sort_by{ |spec| Gem::Version.new(spec.version) }.last
+        first_spec = specs.sort_by { |spec| Gem::Version.new(spec.version) }.last
 
         first_spec or raise CommandError, "Gem `#{name}` not found"
       end
@@ -34,9 +34,9 @@ class Pry
       # @return [Array<Gem::Specification>]
       def list(pattern = /.*/)
         if Gem::Specification.respond_to?(:each)
-          Gem::Specification.select{|spec| spec.name =~ pattern }
+          Gem::Specification.select { |spec| spec.name =~ pattern }
         else
-          Gem.source_index.gems.values.select{|spec| spec.name =~ pattern }
+          Gem.source_index.gems.values.select { |spec| spec.name =~ pattern }
         end
       end
 
@@ -67,14 +67,14 @@ class Pry
                       else
                         Gem.user_dir
                       end
-        installer = Gem::DependencyInstaller.new(:install_dir => destination)
+        installer = Gem::DependencyInstaller.new(install_dir: destination)
         installer.install(name)
       rescue Errno::EACCES
         raise CommandError,
-          "Insufficient permissions to install #{ Pry::Helpers::Text.green(name) }."
+          "Insufficient permissions to install #{green(name)}."
       rescue Gem::GemNotFoundException
         raise CommandError,
-          "Gem #{ Pry::Helpers::Text.green(name) } not found. Aborting installation."
+          "Gem #{green(name)} not found. Aborting installation."
       else
         Gem.refresh
       end

data/lib/pry/slop/commands.rb

@@ -133,13 +133,13 @@ class Pry::Slop
     #
     # Returns the original Array of items with options removed.
     def parse!(items = ARGV)
-      if opts = commands[items[0].to_s]
+      if (opts = commands[items[0].to_s])
         @triggered_command = items.shift
         execute_arguments! items
         opts.parse! items
         execute_global_opts! items
       else
-        if opts = commands['default']
+        if (opts = commands['default'])
           opts.parse! items
         else
           if config[:strict] && items[0]
@@ -187,10 +187,9 @@ class Pry::Slop
 
     # Returns nothing.
     def execute_global_opts!(items)
-      if global_opts = commands['global']
+      if (global_opts = commands['global'])
         global_opts.parse! items
       end
     end
-
   end
 end

data/lib/pry/slop/option.rb

@@ -1,20 +1,19 @@
 class Pry::Slop
   class Option
-
     # The default Hash of configuration options this class uses.
     DEFAULT_OPTIONS = {
-      :argument => false,
-      :optional_argument => false,
-      :tail => false,
-      :default => nil,
-      :callback => nil,
-      :delimiter => ',',
-      :limit => 0,
-      :match => nil,
-      :optional => true,
-      :required => false,
-      :as => String,
-      :autocreated => false
+      argument: false,
+      optional_argument: false,
+      tail: false,
+      default: nil,
+      callback: nil,
+      delimiter: ',',
+      limit: 0,
+      match: nil,
+      optional: true,
+      required: false,
+      as: String,
+      autocreated: false
     }
 
     attr_reader :short, :long, :description, :config, :types
@@ -41,12 +40,12 @@ class Pry::Slop
       @value = nil
 
       @types = {
-        :string  => proc { |v| v.to_s },
-        :symbol  => proc { |v| v.to_sym },
-        :integer => proc { |v| value_to_integer(v) },
-        :float   => proc { |v| value_to_float(v) },
-        :range   => proc { |v| value_to_range(v) },
-        :count   => proc { |v| @count }
+        string: proc { |v| v.to_s },
+        symbol: proc { |v| v.to_sym },
+        integer: proc { |v| value_to_integer(v) },
+        float: proc { |v| value_to_float(v) },
+        range: proc { |v| value_to_range(v) },
+        count: proc { |v| @count }
       }
 
       if long && long.size > @slop.config[:longest_flag]
@@ -114,7 +113,7 @@ class Pry::Slop
       if type.respond_to?(:call)
         type.call(value)
       else
-        if callable = types[type.to_s.downcase.to_sym]
+        if (callable = types[type.to_s.downcase.to_sym])
           callable.call(value)
         else
           value
@@ -203,6 +202,5 @@ class Pry::Slop
         end
       end
     end
-
   end
 end

data/lib/pry/slop.rb

@@ -24,19 +24,18 @@ class Pry::Slop
 
   # Returns a default Hash of configuration options this Slop instance uses.
   DEFAULT_OPTIONS = {
-    :strict => false,
-    :help => false,
-    :banner => nil,
-    :ignore_case => false,
-    :autocreate => false,
-    :arguments => false,
-    :optional_arguments => false,
-    :multiple_switches => true,
-    :longest_flag => 0
+    strict: false,
+    help: false,
+    banner: nil,
+    ignore_case: false,
+    autocreate: false,
+    arguments: false,
+    optional_arguments: false,
+    multiple_switches: true,
+    longest_flag: 0
   }
 
   class << self
-
     # items  - The Array of items to extract options from (default: ARGV).
     # config - The Hash of configuration options to send to Slop.new().
     # block  - An optional block used to add options.
@@ -106,7 +105,6 @@ class Pry::Slop
 
       opts
     end
-
   end
 
   # The Hash of configuration options for this Slop instance.
@@ -135,7 +133,7 @@ class Pry::Slop
     end
 
     if config[:help]
-      on('-h', '--help', 'Display this help message.', :tail => true) do
+      on('-h', '--help', 'Display this help message.', tail: true) do
         $stderr.puts help
       end
     end
@@ -217,7 +215,7 @@ class Pry::Slop
       return items
     end
 
-    if cmd = @commands[items[0]]
+    if (cmd = @commands[items[0]])
       return cmd.parse! items[1..-1]
     end
 
@@ -332,7 +330,7 @@ class Pry::Slop
   # Override this method so we can check if an option? method exists.
   #
   # Returns true if this option key exists in our list of options.
-  def respond_to_missing?(method_name, include_all=false)
+  def respond_to_missing?(method_name, include_all = false)
     options.any? { |o| o.key == method_name.to_s.chop } || super
   end
 
@@ -464,7 +462,8 @@ class Pry::Slop
   #
   # Returns nothing.
   def process_item(items, index, &block)
-    return unless item = items[index]
+    return unless (item = items[index])
+
     option, argument = extract_option(item) if item.start_with?('-')
 
     if option
@@ -514,6 +513,7 @@ class Pry::Slop
       if config[:multiple_switches] && strict?
         raise InvalidOptionError, "Unknown option -#{item}"
       end
+
       return
     end
 
@@ -544,7 +544,8 @@ class Pry::Slop
   def execute_multiple_switches(option, argument, index)
     execute_option(option, nil, index)
     argument.split('').each do |key|
-      next unless opt = fetch_option(key)
+      next unless (opt = fetch_option(key))
+
       opt.count += 1
       execute_option(opt, nil, index, key)
     end
@@ -657,5 +658,4 @@ class Pry::Slop
       "  #{cmd}#{' ' * (padding - cmd.size)}   #{opts.description}"
     end.join("\n")
   end
-
 end

data/lib/pry/terminal.rb

@@ -41,7 +41,7 @@ class Pry::Terminal
     end
 
     def screen_size_according_to_io_console
-      return if Pry::Helpers::BaseHelpers.jruby?
+      return if Pry::Helpers::Platform.jruby?
 
       begin
         require 'io/console'
@@ -77,6 +77,7 @@ class Pry::Terminal
 
     def screen_size_according_to_ansicon_env
       return unless ENV['ANSICON'] =~ /\((.*)x(.*)\)/
+
       size = [$2, $1]
       size if nonzero_column?(size)
     end

data/lib/pry/testable/mockable.rb

@@ -1,8 +1,8 @@
 module Pry::Testable::Mockable
-  def mock_command(cmd, args=[], opts={})
+  def mock_command(cmd, args = [], opts = {})
     output = StringIO.new
     pry = Pry.new(output: output)
-    ret = cmd.new(opts.merge(pry_instance: pry, :output => output)).call_safely(*args)
+    ret = cmd.new(opts.merge(pry_instance: pry, output: output)).call_safely(*args)
     Struct.new(:output, :return).new(output.string, ret)
   end
 

data/lib/pry/testable/pry_tester.rb

@@ -4,7 +4,7 @@ class Pry::Testable::PryTester
   def_delegators :@pry, :eval_string, :eval_string=
 
   def initialize(target = TOPLEVEL_BINDING, options = {})
-    @pry = Pry.new(options.merge(:target => target))
+    @pry = Pry.new(options.merge(target: target))
     @history = options[:history]
     @pry.inject_sticky_locals!
     reset_output

data/lib/pry/testable/utility.rb

@@ -7,7 +7,7 @@ module Pry::Testable::Utility
   #
   # @return [void]
   #
-  def temp_file(ext='.rb')
+  def temp_file(ext = '.rb')
     file = Tempfile.open(['pry', ext])
     yield file
   ensure
@@ -20,7 +20,7 @@ module Pry::Testable::Utility
 
   def inner_scope
     catch(:inner_scope) do
-      yield ->{ throw(:inner_scope, self) }
+      yield -> { throw(:inner_scope, self) }
     end
   end
 end

data/lib/pry/testable/variables.rb

@@ -8,7 +8,7 @@ module Pry::Testable::Variables
   #   Foo # => NameError
   #   Bar # => NameError
   #
-  # @param [Array<Symbol>] *names
+  # @param [Array<Symbol>] names
   #   An array of constant names that be defined by a block,
   #   and removed by this method afterwards.
   #

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.11.3"
+  VERSION = '0.12.2'.freeze
 end

data/lib/pry/wrapped_module/candidate.rb

@@ -2,7 +2,6 @@ require 'pry/helpers/documentation_helpers'
 
 class Pry
   class WrappedModule
-
     # This class represents a single candidate for a module/class definition.
     # It provides access to the source, documentation, line and file
     # for a monkeypatch (reopening) of a class/module.
@@ -64,6 +63,7 @@ class Pry
       # @return [String] The documentation for the candidate.
       def doc
         return nil if file.nil?
+
         @doc ||= get_comment_content(Pry::Code.from_file(file).comment_describing(line))
       end
 
@@ -76,7 +76,7 @@ class Pry
         file, line = first_method_source_location
         return nil if !file.is_a?(String)
 
-        @source_location = [file,  first_line_of_module_definition(file, line)]
+        @source_location = [file, first_line_of_module_definition(file, line)]
       rescue Pry::RescuableException
         nil
       end

data/lib/pry/wrapped_module.rb

@@ -26,7 +26,7 @@ class Pry
     # @return [Module, nil] The module or `nil` (if conversion failed).
     # @example
     #   Pry::WrappedModule.from_str("Pry::Code")
-    def self.from_str(mod_name, target=TOPLEVEL_BINDING)
+    def self.from_str(mod_name, target = TOPLEVEL_BINDING)
       if safe_to_evaluate?(mod_name, target)
         Pry::WrappedModule.new(target.eval(mod_name))
       else
@@ -49,6 +49,7 @@ class Pry
       def safe_to_evaluate?(str, target)
         return true if str.strip == "self"
         return false if str =~ /%/
+
         kind = target.eval("defined?(#{str})")
         kind =~ /variable|constant/
       end
@@ -58,6 +59,7 @@ class Pry
     # @param [Module] mod
     def initialize(mod)
       raise ArgumentError, "Tried to initialize a WrappedModule with a non-module #{mod.inspect}" unless ::Module === mod
+
       @wrapped = mod
       @memoized_candidates = []
       @host_file_lines = nil
@@ -109,10 +111,6 @@ class Pry
     def singleton_class?
       if Pry::Method.safe_send(wrapped, :respond_to?, :singleton_class?)
         Pry::Method.safe_send(wrapped, :singleton_class?)
-      elsif defined?(Rubinius)
-        # https://github.com/rubinius/rubinius/commit/2e71722dba53d1a92c54d5e3968d64d1042486fe singleton_class? added 30 Jul 2014
-        # https://github.com/rubinius/rubinius/commit/4310f6b2ef3c8fc88135affe697db4e29e4621c4 has been around since 2011
-        !!Rubinius::Type.singleton_class_object(wrapped)
       else
         wrapped != Pry::Method.safe_send(wrapped, :ancestors).first
       end
@@ -138,10 +136,10 @@ class Pry
     def singleton_instance
       raise ArgumentError, "tried to get instance of non singleton class" unless singleton_class?
 
-      if Helpers::BaseHelpers.jruby?
+      if Helpers::Platform.jruby?
         wrapped.to_java.attached
       else
-        @singleton_instance ||= ObjectSpace.each_object(wrapped).detect{ |x| (class << x; self; end) == wrapped }
+        @singleton_instance ||= ObjectSpace.each_object(wrapped).detect { |x| (class << x; self; end) == wrapped }
       end
     end
 
@@ -150,7 +148,7 @@ class Pry
       wrapped.send(method_name, *args, &block)
     end
 
-    def respond_to?(method_name, include_all=false)
+    def respond_to?(method_name, include_all = false)
       super || wrapped.respond_to?(method_name, include_all)
     end
 
@@ -253,7 +251,7 @@ class Pry
                  y.yield candidate(num)
                end
              end
-      Pry::Helpers::BaseHelpers.jruby_19? ? enum.to_a : enum
+      Helpers::Platform.jruby_19? ? enum.to_a : enum
     end
 
     # @return [Boolean] Whether YARD docs are available for this module.
@@ -267,7 +265,7 @@ class Pry
     #   When `self` is a `Module` then return the
     #   nth ancestor, otherwise (in the case of classes) return the
     #   nth ancestor that is a class.
-    def super(times=1)
+    def super(times = 1)
       return self if times.zero?
 
       if wrapped.is_a?(Class)
@@ -302,7 +300,7 @@ class Pry
     #   speed up source code extraction.
     def method_candidates
       @method_candidates ||= all_source_locations_by_popularity.map do |group|
-        methods_sorted_by_source_line  = group.last.sort_by(&:source_line)
+        methods_sorted_by_source_line = group.last.sort_by(&:source_line)
         [methods_sorted_by_source_line.first, methods_sorted_by_source_line.last]
       end
     end
@@ -315,7 +313,7 @@ class Pry
       @all_source_locations_by_popularity = ims.group_by { |v| Array(v.source_location).first }.
         sort_by do |path, methods|
           expanded = File.expand_path(path)
-          load_order = $LOADED_FEATURES.index{ |file| expanded.end_with?(file) }
+          load_order = $LOADED_FEATURES.index { |file| expanded.end_with?(file) }
 
           [-methods.size, load_order || (1.0 / 0.0)]
         end
@@ -323,16 +321,16 @@ class Pry
 
     # We only want methods that have a non-nil `source_location`. We also
     # skip some spooky internal methods.
-    # (i.e we skip `__class_init__` because it's an odd rbx specific thing that causes tests to fail.)
+    #
     # @return [Array<Pry::Method>]
     def all_relevant_methods_for(mod)
       methods = all_methods_for(mod).select(&:source_location).
-        reject{ |x| x.name == '__class_init__' || method_defined_by_forwardable_module?(x) }
+        reject { |x| method_defined_by_forwardable_module?(x) }
 
       return methods unless methods.empty?
 
       safe_send(mod, :constants).flat_map do |const_name|
-        if const = nested_module?(mod, const_name)
+        if (const = nested_module?(mod, const_name))
           all_relevant_methods_for(const)
         else
           []
@@ -349,9 +347,11 @@ class Pry
 
     def nested_module?(parent, name)
       return if safe_send(parent, :autoload?, name)
+
       child = safe_send(parent, :const_get, name)
       return unless Module === child
       return unless safe_send(child, :name) == "#{safe_send(parent, :name)}::#{name}"
+
       child
     end