pry 0.11.3 → 0.12.2

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('/')

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

data/lib/pry/commands/gem_search.rb

@@ -31,9 +31,9 @@ class Pry::Command::GemSearch < Pry::ClassCommand
 
 private
   def list_as_string(gems, limit = 10)
-    gems[0..limit-1].map do |gem|
+    gems[0..limit - 1].map do |gem|
       name, version, info = gem.values_at 'name', 'version', 'info'
-      "#{text.bold(name)} #{text.bold('v'+version)} \n#{info}\n\n"
+      "#{bold(name)} #{bold('v' + version)} \n#{info}\n\n"
     end.join
   end
   Pry::Commands.add_command(self)

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}"

data/lib/pry/commands/help.rb

@@ -59,7 +59,7 @@ class Pry
     # @param [Array<Pry::Command>] commands
     # @return [String] The generated help string.
     def help_text_for_commands(name, commands)
-      "#{text.bold(name.capitalize)}\n" << commands.map do |command|
+      "#{bold(name.capitalize)}\n" << commands.map do |command|
         "  #{command.options[:listing].to_s.ljust(18)} #{command.description.capitalize}"
       end.join("\n")
     end
@@ -75,14 +75,14 @@ class Pry
     # @param [Array<Pry::Command>] commands The commands to sort
     # @return [Array<Pry::Command>] commands sorted by listing name.
     def sorted_commands(commands)
-      commands.sort_by{ |command| command.options[:listing].to_s }
+      commands.sort_by { |command| command.options[:listing].to_s }
     end
 
     # Display help for an individual command or group.
     #
     # @param [String] search  The string to search for.
     def display_search(search)
-      if command = command_set.find_command_for_help(search)
+      if (command = command_set.find_command_for_help(search))
         display_command(command)
       else
         display_filtered_search_results(search)

data/lib/pry/commands/hist.rb

@@ -21,13 +21,13 @@ class Pry
 
     def options(opt)
       opt.on :a, :all,    "Display all history"
-      opt.on :H, :head,   "Display the first N items", :optional_argument => true, :as => Integer
-      opt.on :T, :tail,   "Display the last N items", :optional_argument => true, :as => Integer
-      opt.on :s, :show,   "Show the given range of lines", :optional_argument => true, :as => Range
-      opt.on :G, :grep,   "Show lines matching the given pattern", :argument => true, :as => String
+      opt.on :H, :head,   "Display the first N items", optional_argument: true, as: Integer
+      opt.on :T, :tail,   "Display the last N items", optional_argument: true, as: Integer
+      opt.on :s, :show,   "Show the given range of lines", optional_argument: true, as: Range
+      opt.on :G, :grep,   "Show lines matching the given pattern", argument: true, as: String
       opt.on :c, :clear , "Clear the current session's history"
-      opt.on :r, :replay, "Replay a line or range of lines", :argument => true, :as => Range
-      opt.on     :save,   "Save history to a file", :argument => true, :as => Range
+      opt.on :r, :replay, "Replay a line or range of lines", argument: true, as: Range
+      opt.on     :save,   "Save history to a file", argument: true, as: Range
       opt.on :e, :'exclude-pry', "Exclude Pry commands from the history"
       opt.on :n, :'no-numbers',  "Omit line numbers"
     end
@@ -43,7 +43,8 @@ class Pry
         @history = @history.grep(opts[:grep])
       end
 
-      @history = case
+      @history =
+        case
         when opts.present?(:head)
           @history.take_lines(1, opts[:head] || 10)
         when opts.present?(:tail)
@@ -119,7 +120,7 @@ class Pry
       check_for_juxtaposed_replay(replay_sequence)
 
       replay_sequence.lines.each do |line|
-        _pry_.eval line, :generated => true
+        _pry_.eval line, generated: true
       end
     end
 

data/lib/pry/commands/import_set.rb

@@ -10,7 +10,8 @@ class Pry
       Import a Pry command set.
     BANNER
 
-    def process(command_set_name)
+    # TODO: resolve unused parameter.
+    def process(_command_set_name)
       raise CommandError, "Provide a command set name" if command_set.nil?
 
       set = target.eval(arg_string)

data/lib/pry/commands/install_command.rb

@@ -16,21 +16,22 @@ class Pry
       command = find_command(name)
 
       unless command
-        output.puts "Command #{ text.green(name) } is not found"
+        output.puts "Command #{ green(name) } is not found"
         return
       end
 
       if command_dependencies_met?(command.options)
-        output.puts "Dependencies for #{ text.green(name) } are met. Nothing to do"
+        output.puts "Dependencies for #{ green(name) } are met. Nothing to do"
         return
       end
 
-      output.puts "Attempting to install #{ text.green(name) } command..."
+      output.puts "Attempting to install #{ green(name) } command..."
       gems_to_install = Array(command.options[:requires_gem])
 
       gems_to_install.each do |g|
         next if Rubygem.installed?(g)
-        output.puts "Installing #{ text.green(g) } gem..."
+
+        output.puts "Installing #{ green(g) } gem..."
         Rubygem.install(g)
       end
 
@@ -38,14 +39,14 @@ class Pry
         begin
           require g
         rescue LoadError
-          fail_msg = "Required gem #{ text.green(g) } installed but not found."
+          fail_msg = "Required gem #{ green(g) } installed but not found."
           fail_msg += " Aborting command installation\n"
           fail_msg += 'Tips: 1. Check your PATH; 2. Run `bundle update`'
           raise CommandError, fail_msg
         end
       end
 
-      output.puts "Installation of #{ text.green(name) } successful! Type `help #{name}` for information"
+      output.puts "Installation of #{ green(name) } successful! Type `help #{name}` for information"
     end
   end
 

data/lib/pry/commands/list_inspectors.rb

@@ -12,7 +12,7 @@ class Pry::Command::ListInspectors < Pry::ClassCommand
   def process
     output.puts heading("Available inspectors") + "\n"
     inspector_map.each do |name, inspector|
-      output.write "Name: #{text.bold(name)}"
+      output.write "Name: #{bold(name)}"
       output.puts selected_inspector?(inspector) ? selected_text : ""
       output.puts inspector[:description]
       output.puts
@@ -25,7 +25,7 @@ private
   end
 
   def selected_text
-    text.red " (selected) "
+    red " (selected) "
   end
 
   def selected_inspector?(inspector)

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

@@ -3,8 +3,8 @@ require 'pry/commands/ls/interrogatable'
 class Pry
   class Command::Ls < Pry::ClassCommand
     class Constants < Pry::Command::Ls::Formatter
-      DEPRECATED_CONSTANTS = [:Fixnum, :Bignum, :TimeoutError, :NIL, :FALSE, :TRUE]
-      DEPRECATED_CONSTANTS << :JavaPackageModuleTemplate if Pry::Helpers::BaseHelpers.jruby?
+      DEPRECATED_CONSTANTS = [:Data, :Fixnum, :Bignum, :TimeoutError, :NIL, :FALSE, :TRUE]
+      DEPRECATED_CONSTANTS << :JavaPackageModuleTemplate if Helpers::Platform.jruby?
       include Pry::Command::Ls::Interrogatable
 
       def initialize(interrogatee, no_user_opts, opts, _pry_)
@@ -39,7 +39,8 @@ class Pry
             !show_deprecated_constants?
             next
           end
-          if const = (!mod.autoload?(name) && (mod.const_get(name) || true) rescue nil)
+
+          if (const = (!mod.autoload?(name) && (mod.const_get(name) || true) rescue nil))
             if (const < Exception rescue false)
               color(:exception_constant, name)
             elsif (Module === mod.const_get(name) rescue false)
@@ -52,7 +53,6 @@ class Pry
           end
         end
       end
-
     end
   end
 end

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

@@ -12,6 +12,7 @@ class Pry
 
       def write_out
         return false unless correct_opts?
+
         output_self
       end
 
@@ -25,8 +26,9 @@ class Pry
       # Outputs nothing if the section would be empty.
       def output_section(heading, body)
         return '' if body.compact.empty?
+
         fancy_heading = Pry::Helpers::Text.bold(color(:heading, heading))
-        Pry::Helpers.tablify_or_one_line(fancy_heading, body)
+        Pry::Helpers.tablify_or_one_line(fancy_heading, body, @_pry_.config)
       end
 
       def format_value(value)
@@ -44,7 +46,6 @@ class Pry
       def grep
         @grep || proc { |x| x }
       end
-
     end
   end
 end

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

@@ -1,7 +1,6 @@
 class Pry
   class Command::Ls < Pry::ClassCommand
     class Globals < Pry::Command::Ls::Formatter
-
       # Taken from "puts global_variables.inspect".
       BUILTIN_GLOBALS =
         %w($" $$ $* $, $-0 $-F $-I $-K $-W $-a $-d $-i $-l $-p $-v $-w $. $/ $\\
@@ -42,7 +41,6 @@ class Pry
           end
         end
       end
-
     end
   end
 end

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

@@ -1,7 +1,6 @@
 class Pry
   class Command::Ls < Pry::ClassCommand
     class Grep
-
       def initialize(grep_regexp)
         @grep_regexp = grep_regexp
       end
@@ -15,7 +14,6 @@ class Pry
           end
         }
       end
-
     end
   end
 end

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

@@ -33,7 +33,6 @@ class Pry
       def format(type, vars)
         vars.sort_by { |var| var.to_s.downcase }.map { |var| color(type, var) }
       end
-
     end
   end
 end

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

@@ -1,7 +1,6 @@
 class Pry
   class Command::Ls < Pry::ClassCommand
     class LocalNames < Pry::Command::Ls::Formatter
-
       def initialize(no_user_opts, args, _pry_)
         super(_pry_)
         @no_user_opts = no_user_opts
@@ -29,7 +28,6 @@ class Pry
           end
         end
       end
-
     end
   end
 end

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

@@ -1,7 +1,6 @@
 class Pry
   class Command::Ls < Pry::ClassCommand
     class LocalVars < Pry::Command::Ls::Formatter
-
       def initialize(opts, _pry_)
         super(_pry_)
         @default_switch = opts[:locals]
@@ -33,7 +32,6 @@ class Pry
         pad = desired_width + color_escape_padding
         "%-#{pad}s = %s" % [color(:local_var, colorized_lhs), rhs]
       end
-
     end
   end
 end

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

@@ -10,7 +10,6 @@ require 'pry/commands/ls/local_vars'
 
 class Pry
   class Command::Ls < Pry::ClassCommand
-
     class LsEntity
       attr_reader :_pry_
 

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

@@ -4,7 +4,6 @@ require 'pry/commands/ls/interrogatable'
 class Pry
   class Command::Ls < Pry::ClassCommand
     class Methods < Pry::Command::Ls::Formatter
-
       include Pry::Command::Ls::Interrogatable
       include Pry::Command::Ls::MethodsHelper
 
@@ -37,7 +36,6 @@ class Pry
         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
@@ -51,7 +49,6 @@ class Pry
                   end
         lambda { |klass| !ceiling.include?(klass) }
       end
-
     end
   end
 end

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

@@ -14,7 +14,7 @@ module Pry::Command::Ls::MethodsHelper
                 Pry::Method.all_from_obj(@interrogatee)
               end
 
-    if Pry::Helpers::BaseHelpers.jruby? && !@jruby_switch
+    if Pry::Helpers::Platform.jruby? && !@jruby_switch
       methods = trim_jruby_aliases(methods)
     end
 

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

@@ -28,7 +28,6 @@ class Pry
       def correct_opts?
         @no_user_opts && interrogating_a_module?
       end
-
     end
   end
 end