pry 0.11.3 → 0.12.0

data/lib/pry/commands/amend_line.rb

@@ -3,7 +3,7 @@ class Pry
     match(/amend-line(?: (-?\d+)(?:\.\.(-?\d+))?)?/)
     group 'Editing'
     description 'Amend a line of input in multi-line mode.'
-    command_options :interpolate => false, :listing => 'amend-line'
+    command_options interpolate: false, listing: 'amend-line'
 
     banner <<-'BANNER'
       Amend a line of input in multi-line mode. `amend-line N`, where the N represents
@@ -19,16 +19,15 @@ class Pry
     def process
       raise CommandError, "No input to amend." if eval_string.empty?
 
-      eval_string.replace amended_input(eval_string)
+      eval_string.replace(amend_input)
       run "fix-indent"
       run "show-input"
     end
 
     private
 
-    # @param [String] string The string to amend.
     # @return [String] A new string with the amendments applied to it.
-    def amended_input(string)
+    def amend_input
       input_array = eval_string.each_line.to_a
 
       if arg_string == "!"

data/lib/pry/commands/bang.rb

@@ -3,7 +3,7 @@ class Pry
     match(/^\s*!\s*$/)
     group 'Editing'
     description 'Clear the input buffer.'
-    command_options :use_prefix => false
+    command_options use_prefix: false
 
     banner <<-'BANNER'
       Clear the input buffer. Useful if the parsing process goes wrong and you get

data/lib/pry/commands/cat.rb

@@ -23,12 +23,12 @@ class Pry
     BANNER
 
     def options(opt)
-      opt.on :ex,        "Show the context of the last exception", :optional_argument => true, :as => Integer
-      opt.on :i, :in,    "Show one or more entries from Pry's expression history", :optional_argument => true, :as => Range, :default => -5..-1
-      opt.on :s, :start, "Starting line (defaults to the first line)", :optional_argument => true, :as => Integer
-      opt.on :e, :end,   "Ending line (defaults to the last line)", :optional_argument => true, :as => Integer
+      opt.on :ex,        "Show the context of the last exception", optional_argument: true, as: Integer
+      opt.on :i, :in,    "Show one or more entries from Pry's expression history", optional_argument: true, as: Range, default: -5..-1
+      opt.on :s, :start, "Starting line (defaults to the first line)", optional_argument: true, as: Integer
+      opt.on :e, :end,   "Ending line (defaults to the last line)", optional_argument: true, as: Integer
       opt.on :l, :'line-numbers', "Show line numbers"
-      opt.on :t, :type,  "The file type for syntax highlighting (e.g., 'ruby' or 'python')", :argument => true, :as => Symbol
+      opt.on :t, :type, "The file type for syntax highlighting (e.g., 'ruby' or 'python')", argument: true, as: Symbol
     end
 
     def process
@@ -36,7 +36,7 @@ class Pry
                when opts.present?(:ex)
                  ExceptionFormatter.new(_pry_.last_exception, _pry_, opts).format
                when opts.present?(:in)
-                 InputExpressionFormatter.new(_pry_.input_array, opts).format
+                 InputExpressionFormatter.new(_pry_.input_ring, opts).format
                else
                  FileFormatter.new(args.first, _pry_, opts).format
                end
@@ -52,6 +52,7 @@ class Pry
       $LOAD_PATH.flat_map do |path|
         Dir[path + '/**/*'].map { |f|
           next if File.directory?(f)
+
           f.sub!(path + '/', '')
         }
       end

data/lib/pry/commands/cat/exception_formatter.rb

@@ -4,6 +4,7 @@ class Pry
       attr_reader :ex
       attr_reader :opts
       attr_reader :_pry_
+      include Pry::Helpers::Text
 
       def initialize(exception, _pry_, opts)
         @ex = exception
@@ -29,11 +30,12 @@ class Pry
       def backtrace_level
         @backtrace_level ||=
           begin
-            bl =  if opts[:ex].nil?
-                    ex.bt_index
-                  else
-                    ex.bt_index = absolute_index_number(opts[:ex], ex.backtrace.size)
-                  end
+            bl =
+              if opts[:ex].nil?
+                ex.bt_index
+              else
+                ex.bt_index = absolute_index_number(opts[:ex], ex.backtrace.size)
+              end
 
             increment_backtrace_level
             bl
@@ -66,13 +68,12 @@ class Pry
 
       def header
         unindent %{
-        #{Helpers::Text.bold 'Exception:'} #{ex.class}: #{ex.message}
+        #{bold 'Exception:'} #{ex.class}: #{ex.message}
         --
-        #{Helpers::Text.bold('From:')} #{backtrace_file} @ line #{backtrace_line} @ #{Helpers::Text.bold("level: #{backtrace_level}")} of backtrace (of #{ex.backtrace.size - 1}).
+        #{bold('From:')} #{backtrace_file} @ line #{backtrace_line} @ #{bold("level: #{backtrace_level}")} of backtrace (of #{ex.backtrace.size - 1}).
 
       }
       end
-
     end
   end
 end

data/lib/pry/commands/cat/input_expression_formatter.rb

@@ -36,7 +36,7 @@ class Pry
       end
 
       def normalized_expression_range
-        absolute_index_range(opts[:i], input_expressions.length)
+        absolute_index_range(opts[:i], input_expressions.count)
       end
     end
   end

data/lib/pry/commands/change_prompt.rb

@@ -4,23 +4,43 @@ class Pry::Command::ChangePrompt < Pry::ClassCommand
   description 'Change the current prompt.'
   command_options argument_required: true
   banner <<-BANNER
-    Usage: change-prompt NAME
+    Usage: change-prompt [OPTIONS] [NAME]
 
-    Change the current prompt. See list-prompts for a list of available
-    prompts.
+    Change the current prompt.
   BANNER
 
+  def options(opt)
+    opt.on(:l, :list, 'List the available prompts')
+  end
+
   def process(prompt)
-    if prompt_map.key?(prompt)
-      _pry_.prompt = prompt_map[prompt][:value]
+    if opts.present?(:l)
+      list_prompts
     else
-      raise Pry::CommandError, "'#{prompt}' isn't a known prompt!"
+      change_prompt(prompt)
     end
   end
 
-private
-  def prompt_map
-    Pry::Prompt::MAP
+  private
+
+  def list_prompts
+    prompts = Pry::Prompt.all.map do |name, prompt|
+      "#{bold(name)}#{red(' (selected)') if _pry_.prompt == prompt[:value]}\n" +
+        prompt[:description]
+    end
+    output.puts(prompts.join("\n"))
   end
+
+  def change_prompt(prompt)
+    if Pry::Prompt.all.key?(prompt)
+      _pry_.prompt = Pry::Prompt.all[prompt][:value]
+    else
+      raise(Pry::CommandError, <<MSG)
+'#{prompt}' isn't a known prompt. Run `change-prompt --list` to see
+the list of known prompts.
+MSG
+    end
+  end
+
   Pry::Commands.add_command(self)
 end

data/lib/pry/commands/clear_screen.rb

@@ -0,0 +1,14 @@
+class Pry::Command::ClearScreen < Pry::ClassCommand
+  match 'clear-screen'
+  group 'Input and Output'
+  description 'Clear the contents of the screen/window Pry is running in.'
+
+  def process
+    if Helpers::Platform.windows?
+      _pry_.config.system.call(_pry_.output, 'cls', _pry_)
+    else
+      _pry_.config.system.call(_pry_.output, 'clear', _pry_)
+    end
+  end
+  Pry::Commands.add_command(self)
+end

data/lib/pry/commands/code_collector.rb

@@ -29,17 +29,17 @@ class Pry
       @output_result_ranges = []
 
       opt.on :l, :lines, "Restrict to a subset of lines. Takes a line number or range",
-                         :optional_argument => true, :as => Range, :default => 1..-1
+                         optional_argument: true, as: Range, default: 1..-1
       opt.on :o, :out,   "Select lines from Pry's output result history. Takes an index or range",
-      :optional_argument => true, :as => Range, :default => -5..-1 do |r|
+      optional_argument: true, as: Range, default: -5..-1 do |r|
         output_result_ranges << (r || (-5..-1))
       end
       opt.on :i, :in,    "Select lines from Pry's input expression history. Takes an index or range",
-      :optional_argument => true, :as => Range, :default => -5..-1 do |r|
+      optional_argument: true, as: Range, default: -5..-1 do |r|
         input_expression_ranges << (r || (-5..-1))
       end
       opt.on :s, :super, "Select the 'super' method. Can be repeated to traverse the ancestors",
-                         :as => :count
+                         as: :count
       opt.on :d, :doc,   "Select lines from the code object's documentation"
     end
 
@@ -74,7 +74,7 @@ class Pry
     #
     # @return [Pry::WrappedModule, Pry::Method, Pry::Command]
     def code_object
-      Pry::CodeObject.lookup(obj_name, _pry_,  :super =>  opts[:super])
+      Pry::CodeObject.lookup(obj_name, _pry_, super: opts[:super])
     end
 
     # Given a string and a range, return the `range` lines of that
@@ -87,22 +87,22 @@ class Pry
       Array(content.lines.to_a[range]).join
     end
 
-    # The selected `_pry_.output_array` as a string, as specified by
+    # The selected `_pry_.output_ring` as a string, as specified by
     # the `-o` switch.
     #
     # @return [String]
     def pry_output_content
-      pry_array_content_as_string(_pry_.output_array, self.class.output_result_ranges) do |v|
+      pry_array_content_as_string(_pry_.output_ring, self.class.output_result_ranges) do |v|
         _pry_.config.gist.inspecter.call(v)
       end
     end
 
-    # The selected `_pry_.input_array` as a string, as specified by
+    # The selected `_pry_.input_ring` as a string, as specified by
     # the `-i` switch.
     #
     # @return [String]
     def pry_input_content
-      pry_array_content_as_string(_pry_.input_array, self.class.input_expression_ranges) { |v| v }
+      pry_array_content_as_string(_pry_.input_ring, self.class.input_expression_ranges) { |v| v }
     end
 
     # The line range passed to `--lines`, converted to a 0-indexed range.

data/lib/pry/commands/easter_eggs.rb

@@ -1,6 +1,6 @@
 class Pry
   Pry::Commands.instance_eval do
-    command "nyan-cat", "", :requires_gem => ["nyancat"] do
+    command "nyan-cat", "", requires_gem: ["nyancat"] do
       run ".nyancat"
     end
 
@@ -86,7 +86,7 @@ TEXT
       prev_color = _pry_.config.color
       _pry_.config.color = true
 
-      picture = unindent <<-'EOS'.gsub(/[[:alpha:]!]/) { |s| text.red(s) }
+      picture = unindent <<-'EOS'.gsub(/[[:alpha:]!]/) { |s| red(s) }
          ____      _______________________
         /    \    |  A         W     G    |
        / O  O \   |   N    I    O   N !   |
@@ -95,7 +95,7 @@ TEXT
         \____/   \________________________|
       EOS
 
-      if windows_ansi?
+      if Helpers::Platform.windows_ansi?
         move_up = proc { |n| "\e[#{n}F" }
       else
         move_up = proc { |n| "\e[#{n}A\e[0G" }

data/lib/pry/commands/edit.rb

@@ -24,12 +24,12 @@ class Pry
 
     def options(opt)
       opt.on :e, :ex,      "Open the file that raised the most recent exception (_ex_.file)",
-                           :optional_argument => true, :as => Integer
+                           optional_argument: true, as: Integer
       opt.on :i, :in,      "Open a temporary file containing the Nth input expression. N may be a range",
-                           :optional_argument => true, :as => Range, :default => -1..-1
+                           optional_argument: true, as: Range, default: -1..-1
       opt.on :t, :temp,    "Open an empty temporary file"
       opt.on :l, :line,    "Jump to this line in the opened file",
-                           :argument => true, :as => Integer
+                           argument: true, as: Integer
       opt.on :n, :"no-reload", "Don't automatically reload the edited file"
       opt.on :c, :current, "Open the current __FILE__ and at __LINE__ (as returned by `whereami`)"
       opt.on :r, :reload,  "Reload the edited code immediately (default for ruby files)"
@@ -65,6 +65,7 @@ class Pry
       silence_warnings do
         eval_string.replace content
       end
+      Pry.history.push(content)
     end
 
     def file_based_exception?
@@ -156,9 +157,9 @@ class Pry
     def input_expression
       case opts[:i]
       when Range
-        (_pry_.input_array[opts[:i]] || []).join
+        (_pry_.input_ring[opts[:i]] || []).join
       when Integer
-        _pry_.input_array[opts[:i]] || ""
+        _pry_.input_ring[opts[:i]] || ""
       else
         raise Pry::CommandError, "Not a valid range: #{opts[:i]}"
       end
@@ -172,7 +173,7 @@ class Pry
       opts.present?(:'no-reload') || _pry_.config.disable_auto_reload
     end
 
-    def reload?(file_name="")
+    def reload?(file_name = "")
       (reloadable? || file_name.end_with?(".rb")) && !never_reload?
     end
 
@@ -185,7 +186,7 @@ class Pry
       when eval_string.strip != ""
         eval_string
       else
-        _pry_.input_array.reverse_each.find { |x| x && x.strip != "" } || ""
+        _pry_.input_ring.to_a.reverse_each.find { |x| x && x.strip != "" } || ""
       end
     end
 

data/lib/pry/commands/exit.rb

@@ -3,7 +3,7 @@ class Pry
     match 'exit'
     group 'Navigating Pry'
     description 'Pop the previous binding.'
-    command_options :keep_retval => true
+    command_options keep_retval: true
 
     banner <<-'BANNER'
       Usage:   exit [OPTIONS] [--help]
@@ -33,6 +33,7 @@ class Pry
 
       # return a user-specified value if given otherwise return the object
       return target.eval(arg_string) unless arg_string.empty?
+
       popped_object
     end
   end

data/lib/pry/commands/find_method.rb

@@ -5,7 +5,7 @@ class Pry
     match 'find-method'
     group 'Context'
     description 'Recursively search for a method within a Class/Module or the current namespace.'
-    command_options :shellwords => false
+    command_options shellwords: false
 
     banner <<-'BANNER'
       Usage: find-method  [-n|-c] METHOD [NAMESPACE]
@@ -31,14 +31,10 @@ class Pry
 
     def process
       return if args.size < 1
-      klass = search_class
 
-      matches = if opts.content?
-        content_search(klass)
-      else
-        name_search(klass)
-      end
+      klass = search_class
 
+      matches = opts.content? ? content_search(klass) : name_search(klass)
       show_search_results(matches)
     end
 
@@ -54,7 +50,7 @@ class Pry
     # @param [Array] matches
     def show_search_results(matches)
       if matches.empty?
-        output.puts text.bold("No Methods Matched")
+        output.puts bold("No Methods Matched")
       else
         print_matches(matches)
       end
@@ -79,7 +75,7 @@ class Pry
     # @param [Array<Method>] matches
     def print_matches(matches)
       grouped = matches.group_by(&:owner)
-      order = grouped.keys.sort_by{ |x| x.name || x.to_s }
+      order = grouped.keys.sort_by { |x| x.name || x.to_s }
 
       order.each do |klass|
         print_matches_for_class(klass, grouped)
@@ -88,7 +84,7 @@ class Pry
 
     # Print matched methods for a class
     def print_matches_for_class(klass, grouped)
-      output.puts text.bold(klass.name)
+      output.puts bold(klass.name)
       grouped[klass].each do |method|
         header = method.name_with_owner
         output.puts header + additional_info(header, method)
@@ -106,7 +102,7 @@ class Pry
     end
 
     def matched_method_lines(header, method)
-      method.source.split(/\n/).select {|x| x =~ pattern }.join("\n#{' ' * header.length}")
+      method.source.split(/\n/).select { |x| x =~ pattern }.join("\n#{' ' * header.length}")
     end
 
     # Run the given block against every constant in the provided namespace.
@@ -115,7 +111,7 @@ class Pry
     # @param [Hash<Module,Boolean>] done The namespaces we've already visited (private)
     # @yieldparam klass Each class/module in the namespace.
     #
-    def recurse_namespace(klass, done={}, &block)
+    def recurse_namespace(klass, done = {}, &block)
       return if !(Module === klass) || done[klass]
 
       done[klass] = true
@@ -124,6 +120,7 @@ class Pry
 
       klass.constants.each do |name|
         next if klass.autoload?(name)
+
         begin
           const = klass.const_get(name)
         rescue RescuableException
@@ -145,12 +142,13 @@ class Pry
     # @return [Array<Method>]
     #
     def search_all_methods(namespace)
-      done = Hash.new{ |h,k| h[k] = {} }
+      done = Hash.new { |h,k| h[k] = {} }
       matches = []
 
       recurse_namespace(namespace) do |klass|
         (Pry::Method.all_from_class(klass) + Pry::Method.all_from_obj(klass)).each do |method|
           next if done[method.owner][method.name]
+
           done[method.owner][method.name] = true
 
           matches << method if yield method

data/lib/pry/commands/gem_cd.rb

@@ -3,7 +3,7 @@ class Pry
     match 'gem-cd'
     group 'Gems'
     description "Change working directory to specified gem's directory."
-    command_options :argument_required => true
+    command_options argument_required: true
 
     banner <<-'BANNER'
       Usage: gem-cd GEM_NAME

data/lib/pry/commands/gem_install.rb

@@ -3,7 +3,7 @@ class Pry
     match 'gem-install'
     group 'Gems'
     description 'Install a gem and refresh the gem cache.'
-    command_options :argument_required => true
+    command_options argument_required: true
 
     banner <<-'BANNER'
       Usage: gem-install GEM_NAME
@@ -20,7 +20,7 @@ class Pry
 
     def process(gem)
       Rubygem.install(gem)
-      output.puts "Gem `#{ text.green(gem) }` installed."
+      output.puts "Gem `#{ green(gem) }` installed."
       require gem
     rescue LoadError
       require_path = gem.split('-').join('/')