pry 0.9.3pre1-i386-mingw32 → 0.9.4-i386-mingw32

data/lib/pry/default_commands/introspection.rb

@@ -9,7 +9,7 @@ class Pry
         target = target()
 
         opts = Slop.parse!(args) do |opt|
-          opt.banner "Usage: show-method [OPTIONS] [METH]\n" \
+          opt.banner "Usage: show-method [OPTIONS] [METH 1] [METH 2] [METH N]\n" \
                      "Show the source for method METH. Tries instance methods first and then methods by default.\n" \
                      "e.g: show-method hello_method"
 
@@ -29,30 +29,33 @@ class Pry
 
         next if opts.help?
 
-        meth_name = args.shift
-        if (meth = get_method_object(meth_name, target, opts.to_hash(true))).nil?
-          output.puts "Invalid method name: #{meth_name}. Type `show-method --help` for help"
-          next
-        end
+        args = [nil] if args.empty?
+        args.each do |method_name|
+          meth_name = method_name
+          if (meth = get_method_object(meth_name, target, opts.to_hash(true))).nil?
+            output.puts "Invalid method name: #{meth_name}. Type `show-method --help` for help"
+            next
+          end
 
-        code, code_type = code_and_code_type_for(meth)
-        next if !code
+          code, code_type = code_and_code_type_for(meth)
+          next if !code
 
-        output.puts make_header(meth, code_type, code)
-        if Pry.color
-          code = CodeRay.scan(code, code_type).term
-        end
+          output.puts make_header(meth, code_type, code)
+          if Pry.color
+            code = CodeRay.scan(code, code_type).term
+          end
 
-        start_line = false
-        if opts.l?
-          start_line = meth.source_location ? meth.source_location.last : 1
-        end
+          start_line = false
+          if opts.l?
+            start_line = meth.source_location ? meth.source_location.last : 1
+          end
 
-        start_line = opts.b? ? 1 : start_line
+          start_line = opts.b? ? 1 : start_line
 
 
-        render_output(opts.flood?, start_line, code)
-        code
+          render_output(opts.flood?, start_line, code)
+          code
+        end
       end
 
       alias_command "show-source", "show-method", ""
@@ -108,13 +111,14 @@ class Pry
       command "edit", "Invoke the default editor on a file. Type `edit --help` for more info" do |*args|
         opts = Slop.parse!(args) do |opt|
           opt.banner "Usage: edit [OPTIONS] [FILE]\n" \
-                      "Edit the method FILE in an editor.\n" \
-                      "Ensure #{text.bold("Pry.editor")} is set to your editor of choice.\n" \
+                      "Edit the method FILE in an editor.\nWhen no file given, opens editor with contents of input buffer and evals after closing." \
+                      "\nEnsure #{text.bold("Pry.config.editor")} is set to your editor of choice.\n" \
                       "e.g: edit sample.rb"
 
           opt.on :r, "reload", "Eval file content after editing (evals at top level)"
-          opt.on :ex, "Open an editor at the line and file that generated the most recent Exception."
-          opt.on :t, "temp", "Open a temporary file in an editor and eval it in current context after closing."
+          opt.on :n, "no-reload", "Do not automatically reload the file after editing (only applies to --ex and -t)."
+          opt.on :ex, "Open an editor at the line and file that generated the most recent Exception, reloads file after editing."
+          opt.on :t, "temp", "Open a temporary file in an editor with contents of input buffer and eval it in current context after closing (same as `edit` with no args)"
           opt.on :p, "play", "Use the pry `play` command to eval the file content after editing."
           opt.on :l, "line", "Specify line number to jump to in file", true, :as => Integer
           opt.on :h, :help, "This message." do
@@ -123,26 +127,37 @@ class Pry
         end
         next if opts.h?
 
-        # the context the file will be eval'd in after closing
-        context = TOPLEVEL_BINDING
-        should_reload = opts[:r]
+        should_reload_at_top_level = opts[:r]
+        should_reload_locally      = false
 
         if opts.ex?
-          next output.puts "No Exception found." if Pry.last_exception.nil?
+          next output.puts "No Exception found." if _pry_.last_exception.nil?
+
+          if is_core_rbx_path?(_pry_.last_exception.file)
+            file_name = rbx_convert_path_to_full(_pry_.last_exception.file)
+          else
+            file_name = _pry_.last_exception.file
+          end
 
-          file_name = Pry.last_exception.file
-          line = Pry.last_exception.line
+          line = _pry_.last_exception.line
           next output.puts "Exception has no associated file." if file_name.nil?
           next output.puts "Cannot edit exceptions raised in REPL." if Pry.eval_path == file_name
-        elsif opts.t?
-          file_name = Tempfile.new("tmp").tap(&:close).path
-          line = 0
-          should_reload = true
-          context = target
+
+          should_reload_at_top_level = opts[:n] ? false : true
+
+        elsif opts.t? || args.first.nil?
+          file_name = temp_file do |f|
+            f.puts eval_string  if !eval_string.empty?
+          end
+          line = eval_string.lines.count + 1
+          should_reload_locally = opts[:n] ? false : true
         else
-          next output.puts("Need to specify a file.") if !args.first
-          file_name = File.expand_path(args.first)
-          line = opts[:l].to_i
+          # break up into file:line
+          /(:(\d+))?$/ =~ File.expand_path(args.first)
+
+          # $` is pre-match
+          file_name, line = [$`, $2]
+          line = line ? line.to_i : opts[:l].to_i
         end
 
         invoke_editor(file_name, line)
@@ -150,11 +165,15 @@ class Pry
 
         if opts[:p]
           silence_warnings do
-            Pry.active_instance.input = StringIO.new(File.readlines(file_name).join)
+            _pry_.input = StringIO.new(File.readlines(file_name).join)
           end
-        elsif should_reload
+        elsif should_reload_locally
           silence_warnings do
-            context.eval(File.read(file_name))
+            eval_string.replace(File.read(file_name))
+          end
+        elsif should_reload_at_top_level
+          silence_warnings do
+            TOPLEVEL_BINDING.eval(File.read(file_name), file_name)
           end
         end
       end
@@ -165,7 +184,7 @@ class Pry
         opts = Slop.parse!(args) do |opt|
           opt.banner "Usage: edit-method [OPTIONS] [METH]\n" \
                       "Edit the method METH in an editor.\n" \
-                      "Ensure #{text.bold("Pry.editor")} is set to your editor of choice.\n" \
+                      "Ensure #{text.bold("Pry.config.editor")} is set to your editor of choice.\n" \
                       "e.g: edit-method hello_method"
 
           opt.on :M, "instance-methods", "Operate on instance methods."
@@ -188,7 +207,7 @@ class Pry
           next
         end
 
-        next output.puts "Error: No editor set!\nEnsure that #{text.bold("Pry.editor")} is set to your editor of choice." if !Pry.editor
+        next output.puts "Error: No editor set!\nEnsure that #{text.bold("Pry.config.editor")} is set to your editor of choice." if !Pry.config.editor
 
         if is_a_c_method?(meth)
           output.puts "Error: Can't edit a C method."
@@ -207,41 +226,6 @@ class Pry
         end
       end
 
-      helpers do
-
-        def invoke_editor(file, line)
-          if Pry.editor.respond_to?(:call)
-            editor_invocation = Pry.editor.call(file, line)
-          else
-            editor_invocation = "#{Pry.editor} #{start_line_syntax_for_editor(file, line)}"
-          end
-
-          run ".#{editor_invocation}"
-        end
-
-        def start_line_syntax_for_editor(file_name, line_number)
-          file_name = file_name.gsub(/\//, '\\') if RUBY_PLATFORM =~ /mswin|mingw/
-
-          case Pry.editor
-          when /^[gm]?vi/, /^emacs/, /^nano/, /^pico/, /^gedit/, /^kate/
-            "+#{line_number} #{file_name}"
-          when /^mate/, /^geany/
-            "-l #{line_number} #{file_name}"
-          when /^uedit32/
-            "#{file_name}/#{line_number}"
-          when /^jedit/
-            "#{file_name} +line:#{line_number}"
-          else
-            if RUBY_PLATFORM =~ /mswin|mingw/
-              "#{file_name}"
-            else
-              "+#{line_number} #{file_name}"
-            end
-          end
-        end
-
-      end
-
     end
   end
 end

data/lib/pry/default_commands/ls.rb

@@ -19,6 +19,23 @@ class Pry
             Object.send("#{visibility}_instance_methods")
           end
         end
+
+        def ls_color_map
+          {
+            "local variables" => Pry.config.ls.local_var_color,
+            "instance variables" => Pry.config.ls.instance_var_color,
+            "class variables" => Pry.config.ls.class_var_color,
+            "global variables" => Pry.config.ls.global_var_color,
+            "just singleton methods" => Pry.config.ls.method_color,
+            "public methods" => Pry.config.ls.method_color,
+            "private methods" => Pry.config.ls.method_color,
+            "protected methods" => Pry.config.ls.method_color,
+            "public instance methods" => Pry.config.ls.instance_method_color,
+            "private instance methods" => Pry.config.ls.instance_method_color,
+            "protected instance methods" => Pry.config.ls.instance_method_color,
+            "constants" => Pry.config.ls.constant_color
+          }
+        end
       end
 
       command "ls", "Show the list of vars and methods in the current scope. Type `ls --help` for more info." do |*args|
@@ -154,7 +171,7 @@ Shows local and instance variables by default.
 
                               info["private methods"] = [Array(target.eval("private_methods(#{options[:s]})")).sort - trim_methods(target, options, :private), i += 1] if (options[:m] && options[:p]) || options[:a]
 
-                              info["just singleton methods"] = [Array(target.eval("methods(#{options[:s]})")).sort, i += 1] if (options[:m] && options[:j]) || options[:a]
+                              info["just singleton methods"] = [Array(target.eval("methods(#{options[:s]})")).sort, i += 1] if (options[:m] && options[:j]) && !options[:a]
 
                               info["public instance methods"] = [Array(target.eval("public_instance_methods(#{options[:s]})")).uniq.sort - trim_methods(target, options, :public), i += 1] if target_self.is_a?(Module) && ((options[:M] && options[:P]) || options[:a])
 
@@ -181,11 +198,7 @@ Shows local and instance variables by default.
               if !v.first.empty?
                 text <<  "#{k}:\n--\n"
                 filtered_list = v.first.grep options[:grep]
-                if Pry.color
-                  text << CodeRay.scan(Pry.view(filtered_list), :ruby).term + "\n"
-                else
-                  text << Pry.view(filtered_list) + "\n"
-                end
+                text << text().send(ls_color_map[k], (filtered_list.join(Pry.config.ls.separator)))
                 text << "\n\n"
               end
             end
@@ -198,14 +211,9 @@ Shows local and instance variables by default.
 
                                 # plain
                               else
-                                list = info.values.sort_by(&:last).map(&:first).inject(&:+)
-                                list = list.grep(options[:grep]) if list
-                                list.uniq! if list
-                                if Pry.color
-                                  text << CodeRay.scan(list.inspect, :ruby).term + "\n"
-                                else
-                                  text <<  list.inspect + "\n"
-                                end
+                                list = info.sort_by { |k, v| v.last }.map { |k, v| [k, [v.first.grep(options[:grep])], v.last] }
+                                list = list.each { |k, v| text << text().send(ls_color_map[k], v.first.join(Pry.config.ls.separator)); text << Pry.config.ls.separator }
+
                                 if !options[:f]
                                   stagger_output(text)
                                 else

data/lib/pry/default_commands/shell.rb

@@ -20,15 +20,15 @@ class Pry
       end
 
       command "shell-mode", "Toggle shell mode. Bring in pwd prompt and file completion." do
-        case Pry.active_instance.prompt
+        case _pry_.prompt
         when Pry::SHELL_PROMPT
-          Pry.active_instance.pop_prompt
-          Pry.active_instance.custom_completions = Pry::DEFAULT_CUSTOM_COMPLETIONS
+          _pry_.pop_prompt
+          _pry_.custom_completions = Pry::DEFAULT_CUSTOM_COMPLETIONS
         else
-          Pry.active_instance.push_prompt Pry::SHELL_PROMPT
-          Pry.active_instance.custom_completions = Pry::FILE_COMPLETIONS
+          _pry_.push_prompt Pry::SHELL_PROMPT
+          _pry_.custom_completions = Pry::FILE_COMPLETIONS
           Readline.completion_proc = Pry::InputCompleter.build_completion_proc target,
-          Pry.active_instance.instance_eval(&Pry::FILE_COMPLETIONS)
+          _pry_.instance_eval(&Pry::FILE_COMPLETIONS)
         end
       end
 
@@ -48,14 +48,18 @@ class Pry
             end_line = line - 1
           end
 
-          opt.on :ex, "Show a window of N lines around last exception (defaults to 5).", :optional => true, :as => Integer do |window_size|
+          opt.on :ex, "Show a window of N lines either side of the last exception (defaults to 5).", :optional => true, :as => Integer do |window_size|
             window_size ||= 5
-            ex = Pry.last_exception
+            ex = _pry_.last_exception
             next if !ex
             start_line = (ex.line - 1) - window_size
             start_line = start_line < 0 ? 0 : start_line
             end_line = (ex.line - 1) + window_size
-            file_name = ex.file
+            if is_core_rbx_path?(ex.file)
+              file_name = rbx_convert_path_to_full(ex.file)
+            else
+              file_name = ex.file
+            end
           end
 
           opt.on :l, "line-numbers", "Show line numbers."
@@ -80,27 +84,38 @@ class Pry
           next
         end
 
-        contents, normalized_start_line, _ = read_between_the_lines(file_name, start_line, end_line)
+        contents, _, _ = read_between_the_lines(file_name, start_line, end_line)
+        contents = syntax_highlight_by_file_type_or_specified(contents, file_name, opts[:type])
+
+        if opts.l?
+          contents = text.with_line_numbers contents, start_line + 1
+        end
 
         # add the arrow pointing to line that caused the exception
         if opts.ex?
+          contents = text.with_line_numbers contents, start_line + 1, :bright_red
+
           contents = contents.lines.each_with_index.map do |line, idx|
             l = idx + start_line
-            if l == (Pry.last_exception.line - 1)
-              "=> #{line}"
+            if l == (_pry_.last_exception.line - 1)
+              " =>#{line}"
             else
               "   #{line}"
             end
           end.join
-        end
 
-        if Pry.color
-          contents = syntax_highlight_by_file_type_or_specified(contents, file_name, opts[:type])
+          # header for exceptions
+          output.puts "\n#{Pry::Helpers::Text.bold('Exception:')} #{_pry_.last_exception.class}: #{_pry_.last_exception.message}\n--"
+          output.puts "#{Pry::Helpers::Text.bold('From:')} #{file_name} @ line #{_pry_.last_exception.line}\n\n"
         end
 
         set_file_and_dir_locals(file_name)
-        render_output(opts.flood?, opts.l? ? normalized_start_line + 1 : false, contents)
-        contents
+
+        if opts.f?
+          output.puts contents
+        else
+          stagger_output(contents)
+        end
       end
     end
 

data/lib/pry/extended_commands/user_command_api.rb

@@ -7,7 +7,7 @@ class Pry
         next output.puts("Provide an arg!") if arg.nil?
 
         prime_string = "command #{arg_string}\n"
-        command_string = Pry.active_instance.r(target, prime_string)
+        command_string = _pry_.r(target, prime_string)
 
         eval_string.replace <<-HERE
           _pry_.commands.instance_eval do
@@ -17,6 +17,37 @@ class Pry
 
       end
 
+      command "reload-command", "Reload a command. reload-command CMD_NAME CMD_SET" do |command_name, set_name|
+        next output.puts "Must provide command name" if command_name.nil?
+        next output.puts "Must provide command set name" if set_name.nil?
+
+        cmd = Pry.config.commands.commands[command_name]
+        file_name = cmd.block.source_location.first
+
+        silence_warnings do
+          load file_name
+        end
+        Pry.config.commands.import target.eval(set_name)
+        _pry_.commands.import target.eval(set_name)
+        set_file_and_dir_locals(file_name)
+      end
+
+      command "edit-command", "Edit a command. edit-command CMD_NAME CMD_SET" do |command_name, set_name|
+        next output.puts "Must provide command name" if command_name.nil?
+        next output.puts "Must provide a command set name" if set_name.nil?
+
+        cmd = Pry.config.commands.commands[command_name]
+        file_name = cmd.block.source_location.first
+
+        invoke_editor(*cmd.block.source_location)
+        silence_warnings do
+          load file_name
+        end
+        Pry.config.commands.import target.eval(set_name)
+        _pry_.commands.import target.eval(set_name)
+        set_file_and_dir_locals(file_name)
+      end
+
     end
   end
 end

data/lib/pry/helpers/base_helpers.rb

@@ -2,6 +2,7 @@ class Pry
   module Helpers
 
     module BaseHelpers
+
       module_function
 
       def silence_warnings
@@ -35,10 +36,11 @@ class Pry
 
       def set_file_and_dir_locals(file_name)
         return if !target
-        $_file_temp = File.expand_path(file_name)
-        $_dir_temp =  File.dirname($_file_temp)
-        target.eval("_file_ = $_file_temp")
-        target.eval("_dir_ = $_dir_temp")
+        _pry_.last_file = File.expand_path(file_name)
+        _pry_.inject_local("_file_", _pry_.last_file, target)
+
+        _pry_.last_dir = File.dirname(_pry_.last_file)
+        _pry_.inject_local("_dir_", _pry_.last_dir, target)
       end
 
       def stub_proc(name, options)
@@ -72,7 +74,7 @@ class Pry
       end
 
       def highlight(string, regexp, highlight_color=:bright_yellow)
-        highlighted = string.gsub(regexp) { |match| "<#{highlight_color}>#{match}</#{highlight_color}>" }
+        string.gsub(regexp) { |match| "<#{highlight_color}>#{match}</#{highlight_color}>" }
       end
 
       # formatting
@@ -85,8 +87,18 @@ class Pry
         27
       end
 
+      # are we on Jruby platform?
+      def jruby?
+        defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
+      end
+
+      # are we on rbx platform?
+      def rbx?
+       defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /rbx/
+      end
+
       # a simple pager for systems without `less`. A la windows.
-      def simple_pager(text)
+      def simple_pager(text, output=output())
         text_array = text.lines.to_a
         text_array.each_slice(page_size) do |chunk|
           output.puts chunk.join
@@ -108,13 +120,13 @@ class Pry
         end
 
         # FIXME! Another JRuby hack
-        if Object.const_defined?(:RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
-          simple_pager(text)
+        if jruby?
+          simple_pager(text, output)
         else
           lesspipe { |less| less.puts text }
         end
       rescue Errno::ENOENT
-        simple_pager(text)
+        simple_pager(text, output)
       rescue Errno::EPIPE
       end