pry 0.9.12.6 → 0.10.0.pre2

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

@@ -1,31 +1,32 @@
 class Pry
   class Command::Cat
     class FileFormatter < AbstractFormatter
-      attr_accessor :file_with_embedded_line
-      attr_accessor :opts
-      attr_accessor :_pry_
+      attr_reader :file_with_embedded_line
+      attr_reader :opts
+      attr_reader :_pry_
 
       def initialize(file_with_embedded_line, _pry_, opts)
         @file_with_embedded_line = file_with_embedded_line
         @opts = opts
         @_pry_ = _pry_
+        @code_from_file = Pry::Code.from_file(file_name)
       end
 
       def format
         raise CommandError, "Must provide a filename, --in, or --ex." if !file_with_embedded_line
 
         set_file_and_dir_locals(file_name, _pry_, _pry_.current_context)
-        decorate(Pry::Code.from_file(file_name))
+        decorate(@code_from_file)
       end
 
-      private
-
       def file_and_line
-        file_name, line_num = file_with_embedded_line.split(':')
+        file_name, line_num = file_with_embedded_line.split(/:(?!\/|\\)/)
 
-        [File.expand_path(file_name), line_num ? line_num.to_i : nil]
+        [file_name, line_num ? line_num.to_i : nil]
       end
 
+      private
+
       def file_name
         file_and_line.first
       end
@@ -35,7 +36,7 @@ class Pry
       end
 
       def code_window_size
-        Pry.config.default_window_size || 7
+        _pry_.config.default_window_size || 7
       end
 
       def decorate(content)
@@ -47,36 +48,18 @@ class Pry
       end
 
       def detect_code_type_from_file(file_name)
-        name, ext = File.basename(file_name).split('.', 2)
+        code_type = @code_from_file.code_type
 
-        if ext
-          case ext
-          when "py"
-            :python
-          when "rb", "gemspec", "rakefile", "ru", "pryrc", "irbrc"
-            :ruby
-          when "js"
-            return :javascript
-          when "yml", "prytheme"
-            :yaml
-          when "groovy"
-            :groovy
-          when "c"
-            :c
-          when "cpp"
-            :cpp
-          when "java"
-            :java
-          else
-            :text
-          end
-        else
+        if code_type == :unknown
+          name, ext = File.basename(file_name).split('.', 2)
           case name
           when "Rakefile", "Gemfile"
             :ruby
           else
             :text
           end
+        else
+          code_type
         end
       end
     end

data/lib/pry/commands/cd.rb

@@ -9,7 +9,7 @@ class Pry
 
       Move into new context (object or scope). As in UNIX shells use `cd ..` to go
       back, `cd /` to return to Pry top-level and `cd -` to toggle between last two
-      scopes. Complex syntax (e.g `cd ../@x/y`) also supported.
+      scopes. Complex syntax (e.g `cd ../@x/@y`) also supported.
 
       cd @x
       cd ..
@@ -21,8 +21,19 @@ class Pry
 
     def process
       state.old_stack ||= []
-      stack, state.old_stack = context_from_object_path(arg_string, _pry_, state.old_stack)
-      _pry_.binding_stack = stack if stack
+
+      if arg_string.strip == "-"
+        unless state.old_stack.empty?
+          _pry_.binding_stack, state.old_stack = state.old_stack, _pry_.binding_stack
+        end
+      else
+        stack = ObjectPath.new(arg_string, _pry_.binding_stack).resolve
+
+        if stack && stack != _pry_.binding_stack
+          state.old_stack = _pry_.binding_stack
+          _pry_.binding_stack = stack
+        end
+      end
     end
   end
 

data/lib/pry/commands/change_inspector.rb

@@ -0,0 +1,27 @@
+class Pry::Command::ChangeInspector < Pry::ClassCommand
+  match 'change-inspector'
+  group 'Input and Output'
+  description 'Change the current inspector proc.'
+  command_options argument_required: true
+  banner <<-BANNER
+    Usage: change-inspector NAME
+
+    Change the proc used to print return values. See list-inspectors for a list
+    of available procs and a short description of what each one does.
+  BANNER
+
+  def process(inspector)
+    if inspector_map.key?(inspector)
+      _pry_.print = inspector_map[inspector][:value]
+      output.puts "Switched to the '#{inspector}' inspector!"
+    else
+      raise Pry::CommandError, "'#{inspector}' isn't a known inspector!"
+    end
+  end
+
+private
+  def inspector_map
+    Pry::Inspector::MAP
+  end
+  Pry::Commands.add_command(self)
+end

data/lib/pry/commands/change_prompt.rb

@@ -0,0 +1,26 @@
+class Pry::Command::ChangePrompt < Pry::ClassCommand
+  match 'change-prompt'
+  group 'Input and Output'
+  description 'Change the current prompt.'
+  command_options argument_required: true
+  banner <<-BANNER
+    Usage: change-prompt NAME
+
+    Change the current prompt. See list-prompts for a list of available
+    prompts.
+  BANNER
+
+  def process(prompt)
+    if prompt_map.key?(prompt)
+      _pry_.prompt = prompt_map[prompt][:value]
+    else
+      raise Pry::CommandError, "'#{prompt}' isn't a known prompt!"
+    end
+  end
+
+private
+  def prompt_map
+    Pry::Prompt::MAP
+  end
+  Pry::Commands.add_command(self)
+end

data/lib/pry/commands/code_collector.rb

@@ -2,9 +2,9 @@ class Pry
   class Command::CodeCollector
     include Helpers::CommandHelpers
 
-    attr_accessor :args
-    attr_accessor :opts
-    attr_accessor :_pry_
+    attr_reader :args
+    attr_reader :opts
+    attr_reader :_pry_
 
     # The name of the explicitly given file (if any).
     attr_accessor :file
@@ -91,7 +91,7 @@ class Pry
     # @return [String]
     def pry_output_content
       pry_array_content_as_string(_pry_.output_array, self.class.output_result_ranges) do |v|
-        Pry.config.gist.inspecter.call(v)
+        _pry_.config.gist.inspecter.call(v)
       end
     end
 

data/lib/pry/commands/easter_eggs.rb

@@ -83,8 +83,8 @@ TEXT
     end
 
     command "test-ansi", "" do
-      prev_color = Pry.color
-      Pry.color = true
+      prev_color = _pry_.config.color
+      _pry_.config.color = true
 
       picture = unindent <<-'EOS'.gsub(/[[:alpha:]!]/) { |s| text.red(s) }
          ____      _______________________
@@ -106,7 +106,7 @@ TEXT
       output.puts "\n" * 6
       output.puts "** ENV['TERM'] is #{ENV['TERM']} **\n\n"
 
-      Pry.color = prev_color
+      _pry_.config.color = prev_color
     end
   end
 end

data/lib/pry/commands/edit.rb

@@ -1,6 +1,5 @@
 class Pry
   class Command::Edit < Pry::ClassCommand
-    require 'pry/commands/edit/method_patcher'
     require 'pry/commands/edit/exception_patcher'
     require 'pry/commands/edit/file_and_line_locator'
 
@@ -13,7 +12,7 @@ class Pry
 
       Open a text editor. When no FILE is given, edits the pry input buffer.
       When a method/module/command is given, the code is opened in an editor.
-      Ensure `Pry.config.editor` is set to your editor of choice.
+      Ensure `Pry.config.editor` or `_pry_.config.editor` is set to your editor of choice.
 
       edit sample.rb                edit -p MyClass#my_method
       edit sample.rb --line 105     edit MyClass
@@ -31,7 +30,7 @@ class Pry
       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
-      opt.on :n, :"no-reload", "Don't automatically reload the edited code"
+      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)"
       opt.on :p, :patch,   "Instead of editing the object's file, try to edit in a tempfile and apply as a monkey patch"
@@ -61,12 +60,10 @@ class Pry
     end
 
     def repl_edit
-      content = Pry::Editor.edit_tempfile_with_content(initial_temp_file_content,
+      content = Pry::Editor.new(_pry_).edit_tempfile_with_content(initial_temp_file_content,
                                                        initial_temp_file_content.lines.count)
-      if repl_reload?
-        silence_warnings do
-          eval_string.replace content
-        end
+      silence_warnings do
+        eval_string.replace content
       end
     end
 
@@ -83,7 +80,7 @@ class Pry
         ExceptionPatcher.new(_pry_, state, file_and_line_for_current_exception).perform_patch
       else
         if code_object.is_a?(Pry::Method)
-          MethodPatcher.new(_pry_, code_object).perform_patch
+          code_object.redefine Pry::Editor.new(_pry_).edit_tempfile_with_content(code_object.source)
         else
           raise NotImplementedError, "Cannot yet patch #{code_object} objects!"
         end
@@ -119,12 +116,12 @@ class Pry
 
       ensure_file_name_is_valid(file_name)
 
-      Pry::Editor.invoke_editor(file_name, line, reload?(file_name))
+      Pry::Editor.new(_pry_).invoke_editor(file_name, line, reload?(file_name))
       set_file_and_dir_locals(file_name)
 
       if reload?(file_name)
         silence_warnings do
-          TOPLEVEL_BINDING.eval(File.read(file_name), file_name)
+          load file_name
         end
       end
     end
@@ -168,12 +165,7 @@ class Pry
     end
 
     def never_reload?
-      opts.present?(:'no-reload') || Pry.config.disable_auto_reload
-    end
-
-    # conditions much less strict than for reload? (which is for file-based reloads)
-    def repl_reload?
-      !never_reload?
+      opts.present?(:'no-reload') || _pry_.config.disable_auto_reload
     end
 
     def reload?(file_name="")
@@ -194,13 +186,9 @@ class Pry
     end
 
     def probably_a_file?(str)
-      [".rb", ".c", ".py", ".yml", ".gemspec"].include? File.extname(str) ||
+      [".rb", ".c", ".py", ".yml", ".gemspec"].include?(File.extname(str)) ||
         str =~ /\/|\\/
     end
-
-    def complete(search)
-      super + Bond::Rc.files(search.split(" ").last || '')
-    end
   end
 
   Pry::Commands.add_command(Pry::Command::Edit)

data/lib/pry/commands/edit/exception_patcher.rb

@@ -13,10 +13,10 @@ class Pry
 
       # perform the patch
       def perform_patch
-        file_name, line = file_and_line
+        file_name, _ = file_and_line
         lines = state.dynamical_ex_file || File.read(file_name)
 
-        source = Pry::Editor.edit_tempfile_with_content(lines)
+        source = Pry::Editor.new(_pry_).edit_tempfile_with_content(lines)
         _pry_.evaluate_ruby source
         state.dynamical_ex_file = source.split("\n")
       end

data/lib/pry/commands/edit/file_and_line_locator.rb

@@ -21,8 +21,6 @@ class Pry
           raise CommandError, "Exception has no associated file." if file_name.nil?
           raise CommandError, "Cannot edit exceptions raised in REPL." if Pry.eval_path == file_name
 
-          file_name = RbxPath.convert_path_to_full(file_name) if RbxPath.is_core_path?(file_name)
-
           [file_name, line]
         end
 

data/lib/pry/commands/exit_program.rb

@@ -13,7 +13,6 @@ class Pry
     BANNER
 
     def process
-      Pry.save_history if Pry.config.history.should_save
       Kernel.exit target.eval(arg_string).to_i
     end
   end

data/lib/pry/commands/find_method.rb

@@ -6,8 +6,6 @@ class Pry
     group 'Context'
     description 'Recursively search for a method within a Class/Module or the current namespace.'
     command_options :shellwords => false
-    command_options :requires_gem => 'ruby18_source_location' if mri_18?
-
 
     banner <<-'BANNER'
       Usage: find-method  [-n|-c] METHOD [NAMESPACE]
@@ -26,13 +24,9 @@ class Pry
       find-method -c 'output.puts' Pry
     BANNER
 
-    def setup
-      require 'ruby18_source_location' if mri_18?
-    end
-
-    def options(opti)
-      opti.on :n, :name,    "Search for a method by name"
-      opti.on :c, :content, "Search for a method based on content in Regex form"
+    def options(opt)
+      opt.on :n, :name,    "Search for a method by name"
+      opt.on :c, :content, "Search for a method based on content in Regex form"
     end
 
     def process
@@ -82,7 +76,7 @@ class Pry
 
     # pretty-print a list of matching methods.
     #
-    # @param Array[Method]
+    # @param [Array<Method>] matches
     def print_matches(matches)
       grouped = matches.group_by(&:owner)
       order = grouped.keys.sort_by{ |x| x.name || x.to_s }
@@ -105,7 +99,7 @@ class Pry
     # if `-c` was not given
     def additional_info(header, method)
       if opts.content?
-        ": " + colorize_code(matched_method_lines(header, method))
+        ": " << colorize_code(matched_method_lines(header, method))
       else
         ""
       end
@@ -117,9 +111,9 @@ class Pry
 
     # Run the given block against every constant in the provided namespace.
     #
-    # @param Module  The namespace in which to start the search.
-    # @param Hash[Module,Boolean]  The namespaces we've already visited (private)
-    # @yieldparam klazz  Each class/module in the namespace.
+    # @param [Module] klass The namespace in which to start the search.
+    # @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)
       return if !(Module === klass) || done[klass]
@@ -145,10 +139,10 @@ class Pry
 
     # Gather all the methods in a namespace that pass the given block.
     #
-    # @param Module  The namespace in which to search.
-    # @yieldparam Method  The method to test
-    # @yieldreturn Boolean
-    # @return Array[Method]
+    # @param [Module] namespace The namespace in which to search.
+    # @yieldparam [Method] method The method to test
+    # @yieldreturn [Boolean]
+    # @return [Array<Method>]
     #
     def search_all_methods(namespace)
       done = Hash.new{ |h,k| h[k] = {} }
@@ -169,8 +163,8 @@ class Pry
     # Search for all methods with a name that matches the given regex
     # within a namespace.
     #
-    # @param Module  The namespace to search
-    # @return Array[Method]
+    # @param [Module] namespace The namespace to search
+    # @return [Array<Method>]
     #
     def name_search(namespace)
       search_all_methods(namespace) do |meth|
@@ -181,8 +175,8 @@ class Pry
     # Search for all methods who's implementation matches the given regex
     # within a namespace.
     #
-    # @param Module  The namespace to search
-    # @return Array[Method]
+    # @param [Module] namespace The namespace to search
+    # @return [Array<Method>]
     #
     def content_search(namespace)
       search_all_methods(namespace) do |meth|

data/lib/pry/commands/gem_install.rb

@@ -8,8 +8,8 @@ class Pry
     banner <<-'BANNER'
       Usage: gem-install GEM_NAME
 
-      Installs the given gem and refreshes the gem cache so that you can immediately
-      'require GEM_FILE'.
+      Installs the given gem, refreshes the gem cache, and requires the gem for you
+      based on a best guess from the gem name.
 
       gem-install pry-stack_explorer
     BANNER
@@ -22,6 +22,9 @@ class Pry
       Rubygem.install(gem)
       output.puts "Gem `#{ text.green(gem) }` installed."
       require gem
+    rescue LoadError
+      require_path = gem.split('-').join('/')
+      require require_path
     end
   end