pry 0.9.0pre3-java → 0.9.4pre2-java

data/lib/pry/default_commands/ls.rb

@@ -3,6 +3,41 @@ class Pry
 
     Ls = Pry::CommandSet.new do
 
+      helpers do
+        def should_trim?(target, options)
+          if target.eval('self').is_a? Module
+            options[:e] || target.eval('self') >= Object
+          else
+            options[:e]
+          end
+        end
+
+        def trim_methods(target, options, visibility)
+          if should_trim?(target, options)
+            []
+          else
+            Object.send("#{visibility}_instance_methods")
+          end
+        end
+
+        def ls_color_map
+          {
+            "local variables" => :bright_red,
+            "instance variables" => :bright_blue,
+            "class variables" => :blue,
+            "global variables" => :bright_magenta,
+            "just singleton methods" => :green,
+            "public methods" => :green,
+            "private methods" => :green,
+            "protected methods" => :green,
+            "public instance methods" => :bright_green,
+            "private instance methods" => :bright_green,
+            "protected instance methods" => :bright_green,
+            "constants" => :red
+          }
+        end
+      end
+
       command "ls", "Show the list of vars and methods in the current scope. Type `ls --help` for more info." do |*args|
         options = {}
         # Set target local to the default -- note that we can set a different target for
@@ -59,10 +94,14 @@ Shows local and instance variables by default.
             options[:j] = true
           end
 
-          opts.on("-s", "--super", "Include superclass entries (relevant to constant and methods options).") do
+          opts.on("-s", "--super", "Include superclass entries excluding Object (relevant to constant and methods options).") do
             options[:s] = true
           end
 
+          opts.on("-e", "--everything", "Include superclass entries including Object (must be combined with -s switch).") do
+            options[:e] = true
+          end
+
           opts.on("-a", "--all", "Display all types of entries.") do
             options[:a] = true
           end
@@ -126,19 +165,19 @@ Shows local and instance variables by default.
 
                               info["global variables"] = [Array(target.eval("global_variables")).sort, i += 1] if options[:g] || options[:a]
 
-                              info["public methods"] = [Array(target.eval("public_methods(#{options[:s]})")).uniq.sort, i += 1] if (options[:m] && options[:P]) || options[:a]
+                              info["public methods"] = [Array(target.eval("public_methods(#{options[:s]})")).uniq.sort - trim_methods(target, options, :public), i += 1] if (options[:m] && options[:P]) || options[:a]
 
-                              info["protected methods"] = [Array(target.eval("protected_methods(#{options[:s]})")).sort, i += 1] if (options[:m] && options[:r]) || options[:a]
+                              info["protected methods"] = [Array(target.eval("protected_methods(#{options[:s]})")).sort - trim_methods(target, options, :protected), i += 1] if (options[:m] && options[:r]) || options[:a]
 
-                              info["private methods"] = [Array(target.eval("private_methods(#{options[:s]})")).sort, i += 1] if (options[:m] && options[:p]) || options[:a]
+                              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, i += 1] if target_self.is_a?(Module) && ((options[:M] && options[:P]) || 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])
 
-                              info["protected instance methods"] = [Array(target.eval("protected_instance_methods(#{options[:s]})")).uniq.sort, i += 1] if target_self.is_a?(Module) && ((options[:M] && options[:r]) || options[:a])
+                              info["protected instance methods"] = [Array(target.eval("protected_instance_methods(#{options[:s]})")).uniq.sort - trim_methods(target, options, :protected), i += 1] if target_self.is_a?(Module) && ((options[:M] && options[:r]) || options[:a])
 
-                              info["private instance methods"] = [Array(target.eval("private_instance_methods(#{options[:s]})")).uniq.sort, i += 1] if target_self.is_a?(Module) && ((options[:M] && options[:p]) || options[:a])
+                              info["private instance methods"] = [Array(target.eval("private_instance_methods(#{options[:s]})")).uniq.sort - trim_methods(target, options, :private), i += 1] if target_self.is_a?(Module) && ((options[:M] && options[:p]) || options[:a])
 
                               # dealing with 1.8/1.9 compatibility issues :/
                               csuper = options[:s]
@@ -159,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().bright_green(filtered_list.join("   "))
                 text << "\n\n"
               end
             end
@@ -176,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("  ")); text << "  " }
+
                                 if !options[:f]
                                   stagger_output(text)
                                 else

data/lib/pry/default_commands/shell.rb

@@ -3,7 +3,7 @@ class Pry
 
     Shell = Pry::CommandSet.new do
 
-      command(/\.(.*)/, "All text following a '.' is forwarded to the shell.", :listing => ".<shell command>") do |cmd|
+      command(/\.(.*)/, "All text following a '.' is forwarded to the shell.", :listing => ".<shell command>", :use_prefix => false) do |cmd|
         if cmd =~ /^cd\s+(.+)/i
           dest = $1
           begin
@@ -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
 
@@ -37,6 +37,7 @@ class Pry
       command "cat", "Show output of file FILE. Type `cat --help` for more information." do |*args|
         start_line = 0
         end_line = -1
+        file_name = nil
 
         opts = Slop.parse!(args) do |opt|
           opt.on :s, :start, "Start line (defaults to start of file)Line 1 is the first line.", true, :as => Integer do |line|
@@ -47,6 +48,20 @@ class Pry
             end_line = line - 1
           end
 
+          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
+            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
+            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."
           opt.on :t, :type, "The specific file type for syntax higlighting (e.g ruby, python)", true, :as => Symbol
           opt.on :f, :flood, "Do not use a pager to view text longer than one screen."
@@ -57,21 +72,50 @@ class Pry
 
         next if opts.help?
 
-        file_name = args.shift
+        if opts.ex?
+          next output.puts "No Exception or Exception has no associated file." if file_name.nil?
+          next output.puts "Cannot cat exceptions raised in REPL." if Pry.eval_path == file_name
+        else
+          file_name = args.shift
+        end
+
         if !file_name
           output.puts "Must provide a file name."
           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 Pry.color
-          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}"
+            else
+              "   #{line}"
+            end
+          end.join
+
+          # 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/experimental.rb

@@ -3,7 +3,6 @@ class Pry
 
     Experimental = Pry::CommandSet.new do
 
-
       command "reload-method", "Reload the source specifically for a method", :requires_gem => "method_reload" do |meth_name|
         if (meth = get_method_object(meth_name, target, {})).nil?
           output.puts "Invalid method name: #{meth_name}."
@@ -12,37 +11,6 @@ class Pry
 
         meth.reload
       end
-
-      command "play", "Play a string as input" do |*args|
-        Slop.parse!(args) do |opt|
-          opt.banner "Usage: play-method [--replay START..END] [--clear] [--grep PATTERN] [--help]\n"
-
-          opt.on :l, :lines, 'The line (or range of lines) to replay.', true, :as => Range
-          opt.on :m, :method, 'Play a method.', true do |meth_name|
-            if (meth = get_method_object(meth_name, target, {})).nil?
-              output.puts "Invalid method name: #{meth_name}."
-              next
-            end
-            code, code_type = code_and_code_type_for(meth)
-            next if !code
-
-            range = opt.l? ? opt[:l] : (0..-1)
-
-            Pry.active_instance.input = StringIO.new(code[range])
-          end
-
-          opt.on :f, "file", 'The line (or range of lines) to replay.', true do |file_name|
-            text = File.read File.expand_path(file_name)
-            range = opt.l? ? opt[:l] : (0..-1)
-
-            Pry.active_instance.input = StringIO.new(text[range])
-          end
-
-          opt.on :h, :help, "This message." do
-            output.puts opt
-          end
-        end
-      end
     end
   end
 end

data/lib/pry/extended_commands/user_command_api.rb

@@ -3,11 +3,11 @@ class Pry
 
     UserCommandAPI = Pry::CommandSet.new do
 
-      command "define-command", "To honor Mon-Ouie" do |arg|
+      command "define-command", "Define a command in the session, use same syntax as `command` method for command API" do |arg|
         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)
@@ -63,8 +65,16 @@ class Pry
         end
       end
 
+      def colorize_code(code)
+        if Pry.color
+          CodeRay.scan(code, :ruby).term
+        else
+          code
+        end
+      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
@@ -77,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
@@ -93,20 +113,20 @@ class Pry
       # Try to use `less` for paging, if it fails then use
       # simple_pager. Also do not page if Pry.pager is falsey
       # FIXME! Another JRuby hack
-      def stagger_output(text)
+      def stagger_output(text, output=output())
         if text.lines.count < page_size || !Pry.pager
           output.puts text
           return
         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
 

data/lib/pry/helpers/command_helpers.rb

@@ -15,9 +15,9 @@ class Pry
       end
 
       # if start_line is not false then add line numbers starting with start_line
-      def render_output(should_flood, start_line, text)
+      def render_output(should_flood, start_line, text, color=:blue)
         if start_line
-          text = Pry::Helpers::Text.with_line_numbers text, start_line
+          text = Pry::Helpers::Text.with_line_numbers text, start_line, color
         end
 
         if should_flood
@@ -40,11 +40,14 @@ class Pry
       end
 
       ########### RBX HELPERS #############
+      def is_core_rbx_path?(path)
+        rbx? &&
+          path.start_with?("kernel")
+      end
+
       def rbx_core?(meth)
-        defined?(RUBY_ENGINE) &&
-          RUBY_ENGINE =~ /rbx/ &&
           meth.source_location &&
-          meth.source_location.first.start_with?("kernel")
+          is_core_rbx_path?(meth.source_location.first)
       end
 
       def rvm_ruby?(path)
@@ -70,6 +73,28 @@ class Pry
         end
       end
 
+      def rbx_convert_path_to_full(path)
+        if rvm_ruby?(Rubinius::BIN_PATH)
+          rbx_rvm_convert_path_to_full(path)
+        else
+          rbx_std_convert_path_to_full(path)
+        end
+      end
+
+      def rbx_rvm_convert_path_to_full(path)
+          ruby_name = File.dirname(Rubinius::BIN_PATH).split("/").last
+          source_path = File.join(File.dirname(File.dirname(File.dirname(Rubinius::BIN_PATH))),  "src", ruby_name)
+        file_name = File.join(source_path, path)
+        raise "Cannot find rbx core source" if !File.exists?(file_name)
+        file_name
+      end
+
+      def rbx_std_convert_path_to_full(path)
+        file_name = File.join(Rubinius::BIN_PATH, "..", path)
+        raise "Cannot find rbx core source" if !File.exists?(file_name)
+        file_name
+      end
+
       def rbx_core_path_line_for(meth)
         if rvm_ruby?(Rubinius::BIN_PATH)
           rvm_rbx_core_path_line_for(meth)
@@ -79,21 +104,14 @@ class Pry
       end
 
       def std_rbx_core_path_line_for(meth)
-        file_name = File.join(Rubinius::BIN_PATH, "..", meth.source_location.first)
-        raise "Cannot find rbx core source" if !File.exists?(file_name)
-
+        file_name  = rbx_std_convert_path_to_full(meth.source_location.first)
         start_line = meth.source_location.last
 
         [file_name, start_line]
       end
 
       def rvm_rbx_core_path_line_for(meth)
-        ruby_name = File.dirname(Rubinius::BIN_PATH).split("/").last
-        source_path = File.join(File.dirname(File.dirname(File.dirname(Rubinius::BIN_PATH))),  "src", ruby_name)
-
-        file_name = File.join(source_path, meth.source_location.first)
-        raise "Cannot find rbx core source" if !File.exists?(file_name)
-
+        file_name  = rbx_rvm_convert_path_to_full(meth.source_location.first)
         start_line = meth.source_location.last
 
         [file_name, start_line]
@@ -255,7 +273,11 @@ class Pry
         end
 
         language_detected = file_type if file_type
-        CodeRay.scan(contents, language_detected).term
+        if Pry.color
+          CodeRay.scan(contents, language_detected).term
+        else
+          contents
+        end
       end
 
       # convert negative line numbers to positive by wrapping around
@@ -286,7 +308,7 @@ class Pry
 
       def process_yardoc_tag(comment, tag)
         in_tag_block = nil
-        output = comment.lines.map do |v|
+        comment.lines.map do |v|
           if in_tag_block && v !~ /^\S/
             Pry::Helpers::Text.strip_color Pry::Helpers::Text.strip_color(v)
           elsif in_tag_block
@@ -328,6 +350,43 @@ class Pry
         code.sub(/\A\s*\/\*.*?\*\/\s*/m, '')
       end
 
+      def invoke_editor(file, line)
+        if Pry.config.editor.respond_to?(:call)
+          editor_invocation = Pry.config.editor.call(file, line)
+        else
+          editor_invocation = "#{Pry.config.editor} #{start_line_syntax_for_editor(file, line)}"
+        end
+
+        if jruby?
+          require 'spoon'
+          pid = Spoon.spawnp(*editor_invocation.split)
+          Process.waitpid(pid)
+        else
+          run ".#{editor_invocation}"
+        end
+      end
+
+      def start_line_syntax_for_editor(file_name, line_number)
+        file_name = file_name.gsub(/\//, '\\') if RUBY_PLATFORM =~ /mswin|mingw/
+
+        case Pry.config.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
+
       def prompt(message, options="Yn")
         opts      = options.scan(/./)
         optstring = opts.join("/") # case maintained