pry 0.10.4 → 0.12.2

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
 
@@ -51,28 +51,30 @@ class Pry
     #
     # @return [String]
     def content
-      return @content if @content
-      raise CommandError, "Only one of --out, --in, --doc and CODE_OBJECT may be specified." if bad_option_combination?
+      @content ||=
+        begin
+          raise CommandError, "Only one of --out, --in, --doc and CODE_OBJECT may be specified." if bad_option_combination?
 
-      content = case
-                when opts.present?(:o)
-                  pry_output_content
-                when opts.present?(:i)
-                  pry_input_content
-                when opts.present?(:d)
-                  code_object_doc
-                else
-                  code_object_source_or_file
-                end
+          content = case
+                    when opts.present?(:o)
+                      pry_output_content
+                    when opts.present?(:i)
+                      pry_input_content
+                    when opts.present?(:d)
+                      code_object_doc
+                    else
+                      code_object_source_or_file
+                    end
 
-      @content ||= restrict_to_lines(content, line_range)
+          restrict_to_lines(content, line_range)
+        end
     end
 
     # The code object
     #
     # @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
@@ -85,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.
@@ -141,7 +143,7 @@ class Pry
     end
 
     def file_content
-      if File.exists?(obj_name)
+      if File.exist?(obj_name)
         # Set the file accessor.
         self.file = obj_name
         File.read(obj_name)

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
 
@@ -10,17 +10,17 @@ class Pry
     end
 
     command "get-naked", "" do
-      text = %{
+      txt = %{
   --
   We dont have to take our clothes off to have a good time.
   We could dance & party all night And drink some cherry wine.
   -- Jermaine Stewart }
-      output.puts text
-      text
+      output.puts txt
+      txt
     end
 
     command "east-coker", "" do
-      text = %{
+      txt = %{
   --
   Now the light falls
   Across the open field, leaving the deep lane
@@ -34,12 +34,12 @@ class Pry
   Wait for the early owl.
                 -- T.S Eliot
           }
-      output.puts text
-      text
+      output.puts txt
+      txt
     end
 
     command "cohen-poem", "" do
-      text = %{
+      txt = %{
   --
   When this American woman,
   whose thighs are bound in casual red cloth,
@@ -57,8 +57,8 @@ class Pry
   they are lost for hours.
                 -- Leonard Cohen
               }
-      output.puts text
-      text
+      output.puts txt
+      txt
     end
 
     command "pessoa-poem", "" do
@@ -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/file_and_line_locator.rb

@@ -7,7 +7,7 @@ class Pry
         end
 
         def from_code_object(code_object, filename_argument)
-          if File.exists?(code_object.source_file.to_s)
+          if File.exist?(code_object.source_file.to_s)
             [code_object.source_file, code_object.source_line]
           else
             raise CommandError, "Cannot find a file for #{filename_argument}!"

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)"
@@ -46,7 +46,7 @@ class Pry
         # code defined in pry, eval'd within pry.
         repl_edit
       elsif runtime_patch?
-        # patch code without persisting changes
+        # patch code without persisting changes, implies future changes are patches
         apply_runtime_patch
       else
         # code stored in actual files, eval'd at top-level
@@ -65,6 +65,7 @@ class Pry
       silence_warnings do
         eval_string.replace content
       end
+      Pry.history.push(content)
     end
 
     def file_based_exception?
@@ -72,7 +73,7 @@ class Pry
     end
 
     def runtime_patch?
-       !file_based_exception? && (opts.present?(:patch) || pry_method?(code_object))
+       !file_based_exception? && (opts.present?(:patch) || previously_patched?(code_object) || pry_method?(code_object))
     end
 
     def apply_runtime_patch
@@ -140,6 +141,10 @@ class Pry
         code_object.pry_method?
     end
 
+    def previously_patched?(code_object)
+      code_object.is_a?(Pry::Method) && Pry::Method::Patcher.code_for(code_object.source_location.first)
+    end
+
     def patch_exception?
       opts.present?(:ex) && opts.present?(:patch)
     end
@@ -152,9 +157,9 @@ class Pry
     def input_expression
       case opts[:i]
       when Range
-        (_pry_.input_array[opts[:i]] || []).join
-      when Fixnum
-        _pry_.input_array[opts[:i]] || ""
+        (_pry_.input_ring[opts[:i]] || []).join
+      when Integer
+        _pry_.input_ring[opts[:i]] || ""
       else
         raise Pry::CommandError, "Not a valid range: #{opts[:i]}"
       end
@@ -168,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
 
@@ -181,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]
@@ -20,7 +20,7 @@ class Pry
       find-method re Pry
 
       # Find all methods that contain the code:
-      # output.puts inside the Pry namepsace.
+      # output.puts inside the Pry namespace.
       find-method -c 'output.puts' Pry
     BANNER
 
@@ -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('/')

data/lib/pry/commands/gem_list.rb

@@ -21,10 +21,10 @@ class Pry
         end
 
         versions = specs.each_with_index.map do |spec, index|
-          index == 0 ? text.bright_green(spec.version.to_s) : text.green(spec.version.to_s)
+          index == 0 ? bright_green(spec.version.to_s) : green(spec.version.to_s)
         end
 
-        output.puts "#{text.default gem} (#{versions.join ', '})"
+        output.puts "#{default gem} (#{versions.join ', '})"
       end
     end
   end

data/lib/pry/commands/gem_open.rb

@@ -3,7 +3,7 @@ class Pry
     match 'gem-open'
     group 'Gems'
     description 'Opens the working directory of the gem in your editor.'
-    command_options :argument_required => true
+    command_options argument_required: true
 
     banner <<-'BANNER'
       Usage: gem-open GEM_NAME
@@ -16,7 +16,7 @@ class Pry
 
     def process(gem)
       Dir.chdir(Rubygem.spec(gem).full_gem_path) do
-        Pry::Editor.invoke_editor(".", 0, false)
+        Pry::Editor.new(_pry_).invoke_editor(".", 0, false)
       end
     end
 

data/lib/pry/commands/gem_readme.rb

@@ -0,0 +1,25 @@
+class Pry::Command::GemReadme < Pry::ClassCommand
+  match 'gem-readme'
+  description 'Show the readme bundled with a rubygem'
+  group 'Gems'
+  command_options argument_required: true
+  banner <<-BANNER
+    gem-readme gem
+    Show the readme bundled with a rubygem
+  BANNER
+
+  def process(name)
+    spec = Gem::Specification.find_by_name(name)
+    glob = File.join(spec.full_gem_path, 'README*')
+    readme = Dir[glob][0]
+    if File.exist?(readme.to_s)
+      _pry_.pager.page File.read(readme)
+    else
+      raise Pry::CommandError, "Gem '#{name}' doesn't appear to have a README"
+    end
+  rescue Gem::LoadError
+    raise Pry::CommandError, "Gem '#{name}' wasn't found. Are you sure it is installed?"
+  end
+
+  Pry::Commands.add_command(self)
+end

data/lib/pry/commands/gem_search.rb

@@ -0,0 +1,40 @@
+class Pry::Command::GemSearch < Pry::ClassCommand
+  match 'gem-search'
+  description 'Search for a gem with the rubygems.org JSON API'
+  group 'Gems'
+  command_options argument_required: true
+  banner <<-BANNER
+    gem-search [options] gem
+    Search for a gem with the rubygems.org HTTP API
+  BANNER
+
+  API_ENDPOINT = 'https://rubygems.org/api/v1/search.json'
+
+  def setup
+    require 'json' unless defined?(JSON)
+    require 'net/http' unless defined?(Net::HTTP)
+  end
+
+  def options(opt)
+    opt.on :l, :limit, 'Limit the number of results (max: 30)',
+      default: 10,
+      as: Integer,
+      argument: true
+  end
+
+  def process(str)
+    uri = URI.parse(API_ENDPOINT)
+    uri.query = URI.encode_www_form(query: str)
+    gems = JSON.load Net::HTTP.get(uri)
+    _pry_.pager.page list_as_string(gems, opts[:limit])
+  end
+
+private
+  def list_as_string(gems, limit = 10)
+    gems[0..limit - 1].map do |gem|
+      name, version, info = gem.values_at 'name', 'version', 'info'
+      "#{bold(name)} #{bold('v' + version)} \n#{info}\n\n"
+    end.join
+  end
+  Pry::Commands.add_command(self)
+end

data/lib/pry/commands/gem_stats.rb

@@ -0,0 +1,83 @@
+class Pry::Command::GemStat < Pry::ClassCommand
+  require 'json'
+  require 'net/http'
+  STAT_HOST = "rubygems.org"
+  STAT_PORT = 443
+  STAT_PATH = "/api/v1/gems/%s.json"
+  FAIL_WHALE = <<-FAILWHALE
+W     W      W
+W        W  W     W
+              '.  W
+  .-""-._     \ \.--|
+ /       "-..__) .-'
+|     _         /
+\'-.__,   .__.,'
+ `'----'._\--'
+VVVVVVVVVVVVVVVVVVVVV
+FAILWHALE
+
+  match 'gem-stat'
+  description 'Show the statistics of a gem (requires internet connection)'
+  group 'Gems'
+  command_options argument_required: true
+  banner <<-BANNER
+    gem-stats name
+
+    Show the statistics of a gem.
+    Requires an internet connection.
+  BANNER
+
+  def process(name)
+    client = Net::HTTP.start STAT_HOST, STAT_PORT, use_ssl: true
+    res = client.get STAT_PATH % URI.encode_www_form_component(name)
+    case res
+    when Net::HTTPOK
+      _pry_.pager.page format_gem(JSON.parse(res.body))
+    when Net::HTTPServiceUnavailable
+      _pry_.pager.page <<-FAILURE
+#{bright_blue(FAIL_WHALE)}
+#{bright_red('Ruby On Rails')}
+#{bright_red('Net::HTTPServiceUnavailable')}
+      FAILURE
+    else
+      raise Pry::CommandError, "Bad response (#{res.class})"
+    end
+  ensure
+    client.finish if client
+  end
+
+  private
+  def format_gem(h)
+    h = Pry::Config.from_hash(h, nil)
+    format_str = unindent <<-FORMAT
+    %{name} %{version}
+    --
+    Total Downloads   : %{downloads}
+    Version Downloads : %{version_downloads}
+
+    #{red('Dependencies')} (runtime)
+    --
+    %{rdependencies}
+
+    #{red('Dependencies')} (development)
+    %{ddependencies}
+    FORMAT
+    format_str % {name: green(h.name),
+                  version: bold("v#{h.version}"),
+                  downloads: h.downloads,
+                  version_downloads: h.version_downloads,
+                  rdependencies: format_dependencies(h.dependencies.runtime),
+                  ddependencies: format_dependencies(h.dependencies.development)}
+  end
+
+  def format_dependencies(rdeps)
+    return bold('None') if rdeps.empty?
+
+    with_line_numbers(
+      rdeps.map { |h| "#{h['name']} (#{h['requirements']})" }.join("\n"),
+      1,
+      :bold
+    )
+  end
+  Pry::Commands.add_command(self)
+end

data/lib/pry/commands/gist.rb

@@ -3,7 +3,7 @@ class Pry
     match 'gist'
     group 'Misc'
     description 'Upload code, docs, history to https://gist.github.com/.'
-    command_options :requires_gem => "gist"
+    command_options requires_gem: "gist"
 
     banner <<-'BANNER'
       Usage: gist [OPTIONS] [--help]
@@ -22,12 +22,13 @@ class Pry
     def options(opt)
       CodeCollector.inject_options(opt)
       opt.on :login, "Authenticate the gist gem with GitHub"
-      opt.on :p, :public, "Create a public gist (default: false)", :default => false
-      opt.on :clip, "Copy the selected content to clipboard instead, do NOT gist it", :default => false
+      opt.on :p, :public, "Create a public gist (default: false)", default: false
+      opt.on :clip, "Copy the selected content to clipboard instead, do NOT gist it", default: false
     end
 
     def process
       return ::Gist.login! if opts.present?(:login)
+
       cc = CodeCollector.new(args, opts, _pry_)
 
       if cc.content =~ /\A\s*\z/
@@ -52,13 +53,13 @@ class Pry
     def input_content
       content = ""
       CodeCollector.input_expression_ranges.each do |range|
-        input_expressions = _pry_.input_array[range] || []
+        input_expressions = _pry_.input_ring[range] || []
         Array(input_expressions).each_with_index do |code, index|
           corrected_index = index + range.first
           if code && code != ""
             content << code
             if code !~ /;\Z/
-              content << "#{comment_expression_result_for_gist(_pry_.config.gist.inspecter.call(_pry_.output_array[corrected_index]))}"
+              content << "#{comment_expression_result_for_gist(_pry_.config.gist.inspecter.call(_pry_.output_ring[corrected_index]))}"
             end
           end
         end
@@ -81,7 +82,7 @@ class Pry
     end
 
     def gist_content(content, filename)
-      response = ::Gist.gist(content, :filename => filename || "pry_gist.rb", :public => !!opts[:p])
+      response = ::Gist.gist(content, filename: filename || "pry_gist.rb", public: !!opts[:p])
       if response
         url = response['html_url']
         message = "Gist created at URL #{url}"