pry 0.10.4-java → 0.11.0-java

data/lib/pry/commands/edit.rb

@@ -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
@@ -72,7 +72,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 +140,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
@@ -153,7 +157,7 @@ class Pry
       case opts[:i]
       when Range
         (_pry_.input_array[opts[:i]] || []).join
-      when Fixnum
+      when Integer
         _pry_.input_array[opts[:i]] || ""
       else
         raise Pry::CommandError, "Not a valid range: #{opts[:i]}"

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/find_method.rb

@@ -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
 

data/lib/pry/commands/gem_open.rb

@@ -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'
+      "#{text.bold(name)} #{text.bold('v'+version)} \n#{info}\n\n"
+    end.join
+  end
+  Pry::Commands.add_command(self)
+end

data/lib/pry/commands/hist.rb

@@ -170,8 +170,8 @@ class Pry
           else
             Pry.history.to_a.last(Pry.history.session_line_count)
           end
-      # The last value in history will be the 'hist' command itself.
-      Pry::Code(h[0..-2])
+
+      Pry::Code(Pry.history.filter(h[0..-2]))
     end
   end
 

data/lib/pry/commands/jump_to.rb

@@ -9,18 +9,18 @@ class Pry
     BANNER
 
     def process(break_level)
-      break_level = break_level.to_i
-      nesting_level = _pry_.binding_stack.size - 1
+      break_level    = break_level.to_i
+      nesting_level  = _pry_.binding_stack.size - 1
+      max_nest_level = nesting_level - 1
 
       case break_level
       when nesting_level
         output.puts "Already at nesting level #{nesting_level}"
-      when (0...nesting_level)
-        _pry_.binding_stack.slice!(break_level + 1, _pry_.binding_stack.size)
-
+      when 0..max_nest_level
+        _pry_.binding_stack = _pry_.binding_stack[0..break_level]
       else
-        max_nest_level = nesting_level - 1
-        output.puts "Invalid nest level. Must be between 0 and #{max_nest_level}. Got #{break_level}."
+        output.puts "Invalid nest level. Must be between 0 and " \
+          "#{max_nest_level}. Got #{break_level}."
       end
     end
   end

data/lib/pry/commands/ls.rb

@@ -61,7 +61,9 @@ class Pry
       " " * 32 <<            "Constants that are pending autoload? are also shown (in yellow)"
       opt.on :i, :ivars,     "Show instance variables (in blue) and class variables (in bright blue)"
       opt.on :G, :grep,      "Filter output by regular expression", :argument => true
-
+      if Object.respond_to?(:deprecate_constant)
+        opt.on :d, :dconstants, "Show deprecated constants"
+      end
       if jruby?
         opt.on :J, "all-java", "Show all the aliases for methods from java (default is to show only prettiest)"
       end

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

@@ -3,15 +3,17 @@ 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?
       include Pry::Command::Ls::Interrogatable
 
-
       def initialize(interrogatee, no_user_opts, opts, _pry_)
         super(_pry_)
         @interrogatee = interrogatee
         @no_user_opts = no_user_opts
         @default_switch = opts[:constants]
         @verbose_switch = opts[:verbose]
+        @dconstants = opts.dconstants?
       end
 
       def correct_opts?
@@ -26,8 +28,17 @@ class Pry
 
       private
 
+      def show_deprecated_constants?
+        @dconstants == true
+      end
+
       def format(mod, constants)
         constants.sort_by(&:downcase).map do |name|
+          if Object.respond_to?(:deprecate_constant) and
+            DEPRECATED_CONSTANTS.include?(name)      and
+            !show_deprecated_constants?
+            next
+          end
           if const = (!mod.autoload?(name) && (mod.const_get(name) || true) rescue nil)
             if (const < Exception rescue false)
               color(:exception_constant, name)

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

@@ -7,6 +7,7 @@ class Pry
       def initialize(_pry_)
         @_pry_ = _pry_
         @target = _pry_.current_context
+        @default_switch = nil
       end
 
       def write_out

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

@@ -19,7 +19,7 @@ module Pry::Command::Ls::JRubyHacks
       m.name.sub(/\A(is|get|set)(?=[A-Z_])/, '').gsub(/[_?=]/, '').downcase
     end
 
-    grouped.map do |key, values|
+    grouped.flat_map do |key, values|
       values = values.sort_by do |m|
         rubbishness(m.name)
       end
@@ -28,7 +28,7 @@ module Pry::Command::Ls::JRubyHacks
       values.select do |x|
         (!found.any? { |y| x == y }) && found << x
       end
-    end.flatten(1)
+    end
   end
 
   # When removing jruby aliases, we want to keep the alias that is

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

@@ -11,6 +11,8 @@ class Pry
         super(_pry_)
         @interrogatee = interrogatee
         @no_user_opts = no_user_opts
+        @ppp_switch = opts[:ppp]
+        @jruby_switch = opts['all-java']
       end
 
       def output_self

data/lib/pry/commands/play.rb

@@ -12,7 +12,7 @@ class Pry
 
       play --lines 149..153   # assumes current context
       play -i 20 --lines 1..3 # assumes lines of the input expression at 20
-      play -o 4               # the output of of an expression at 4
+      play -o 4               # the output of an expression at 4
       play Pry#repl -l 1..-1  # play the contents of Pry#repl method
       play -e 2               # play from specified line until end of valid expression
       play hello.rb           # play a file
@@ -91,7 +91,7 @@ class Pry
     end
 
     def file_content
-      if default_file && File.exists?(default_file)
+      if default_file && File.exist?(default_file)
         @cc.restrict_to_lines(File.read(default_file), @cc.line_range)
       else
         raise CommandError, "File does not exist! File was: #{default_file.inspect}"

data/lib/pry/commands/reload_code.rb

@@ -31,7 +31,7 @@ class Pry
     end
 
     def reload_current_file
-      if !File.exists?(current_file)
+      if !File.exist?(current_file)
         raise CommandError, "Current file: #{current_file} cannot be found on disk!"
       end
 
@@ -49,7 +49,7 @@ class Pry
     def check_for_reloadability(code_object, identifier)
       if !code_object || !code_object.source_file
         raise CommandError, "Cannot locate #{identifier}!"
-      elsif !File.exists?(code_object.source_file)
+      elsif !File.exist?(code_object.source_file)
         raise CommandError,
           "Cannot reload #{identifier} as it has no associated file on disk. " \
           "File found was: #{code_object.source_file}"

data/lib/pry/commands/ri.rb

@@ -14,6 +14,10 @@ class Pry
     BANNER
 
     def process(spec)
+      unless spec
+        return output.puts "Please provide a class, module, or method name (e.g: ri Array#push)"
+      end
+
       # Lazily load RI
       require 'rdoc/ri/driver'
 

data/lib/pry/commands/shell_command.rb

@@ -4,7 +4,7 @@ class Pry
     group 'Input and Output'
     description "All text following a '.' is forwarded to the shell."
     command_options :listing => '.<shell command>', :use_prefix => false,
-      :takes_block => true
+                    :takes_block => true
 
     banner <<-'BANNER'
       Usage: .COMMAND_NAME
@@ -30,18 +30,44 @@ class Pry
 
     private
 
-      def parse_destination(dest)
-        return "~" if dest.empty?
-        return dest unless dest == "-"
-        state.old_pwd || raise(CommandError, "No prior directory available")
-      end
+    def parse_destination(dest)
+      return "~" if dest.empty?
+      return dest unless dest == "-"
+      state.old_pwd || raise(CommandError, "No prior directory available")
+    end
 
-      def process_cd(dest)
+    def process_cd(dest)
+      begin
         state.old_pwd = Dir.pwd
-        Dir.chdir File.expand_path(dest)
+        Dir.chdir(File.expand_path(path_from_cd_path(dest) || dest))
       rescue Errno::ENOENT
         raise CommandError, "No such directory: #{dest}"
       end
+    end
+
+    def cd_path_env
+      ENV['CDPATH']
+    end
+
+    def cd_path_exists?
+      cd_path_env && cd_path_env.length.nonzero?
+    end
+
+    def path_from_cd_path(dest)
+      return if !(dest && cd_path_exists?) || special_case_path?(dest)
+
+      cd_path_env.split(File::PATH_SEPARATOR).each do |path|
+        if File.directory?(path) && path.split(File::SEPARATOR).last == dest
+          return path
+        end
+      end
+
+      return nil
+    end
+
+    def special_case_path?(dest)
+      ['.', '..', '-'].include?(dest) || dest =~ /\A[#{File::PATH_SEPARATOR}~]/
+    end
   end
 
   Pry::Commands.add_command(Pry::Command::ShellCommand)

data/lib/pry/commands/show_info.rb

@@ -22,7 +22,15 @@ class Pry
       raise CommandError, no_definition_message if !code_object
       @original_code_object = code_object
 
-      if show_all_modules?(code_object)
+      if !obj_name && code_object.c_module? && !opts[:all]
+        result = "Warning: You're inside an object, whose class is defined by means\n" +
+                 "         of the C Ruby API. Pry cannot display the information for\n" +
+                 "         this class."
+        if code_object.candidates.any?
+          result += "\n         However, you can view monkey-patches applied to this class.\n" +
+                    "         Just execute the same command with the '--all' switch."
+        end
+      elsif show_all_modules?(code_object)
         # show all monkey patches for a module
 
         result = content_and_headers_for_all_module_candidates(code_object)
@@ -85,7 +93,7 @@ class Pry
     end
 
     def no_definition_message
-      "Couldn't locate a definition for #{obj_name}!"
+      "Couldn't locate a definition for #{obj_name}"
     end
 
     # Generate a header (meta-data information) for all the code

data/lib/pry/commands/watch_expression/expression.rb

@@ -10,7 +10,7 @@ class Pry
       end
 
       def eval!
-        @previous_value = @value
+        @previous_value = value
         @value = Pry::ColorPrinter.pp(target_eval(target, source), "")
       end
 

data/lib/pry/commands/whereami.rb

@@ -159,12 +159,12 @@ class Pry
     end
 
     def class_code
-      return @class_code if @class_code
-
-      mod = @method ? Pry::WrappedModule(@method.owner) : target_class
-
-      idx = mod.candidates.find_index { |v| expand_path(v.source_file) == @file }
-      @class_code = idx && Pry::Code.from_module(mod, idx)
+      @class_code ||=
+        begin
+          mod = @method ? Pry::WrappedModule(@method.owner) : target_class
+          idx = mod.candidates.find_index { |v| expand_path(v.source_file) == @file }
+          idx && Pry::Code.from_module(mod, idx)
+        end
     end
 
     def valid_method?
@@ -193,4 +193,5 @@ class Pry
 
   Pry::Commands.add_command(Pry::Command::Whereami)
   Pry::Commands.alias_command '@', 'whereami'
+  Pry::Commands.alias_command /whereami[!?]+/, 'whereami'
 end

data/lib/pry/config.rb

@@ -1,24 +1,11 @@
-class Pry::Config
+require_relative 'basic_object'
+class Pry::Config < Pry::BasicObject
   require_relative 'config/behavior'
+  require_relative 'config/memoization'
   require_relative 'config/default'
   require_relative 'config/convenience'
   include Pry::Config::Behavior
-
   def self.shortcuts
     Convenience::SHORTCUTS
   end
-
-  #
-  # FIXME
-  # @param [Pry::Hooks] hooks
-  #
-  def hooks=(hooks)
-    if hooks.is_a?(Hash)
-      warn "Hash-based hooks are now deprecated! Use a `Pry::Hooks` object " \
-           "instead! http://rubydoc.info/github/pry/pry/master/Pry/Hooks"
-      self["hooks"] = Pry::Hooks.from_hash(hooks)
-    else
-      self["hooks"] = hooks
-    end
-  end
 end