pry 0.9.3 → 0.9.4pre1

data/CHANGELOG

@@ -1,3 +1,14 @@
+*/8/2011 version 0.9.4
+* tempfile should end in .rb (for edit -t)
+* ls output should not be in array format
+* fix history saving (should not save all of Readline::HISTORY, but only what changed)
+* prevent blank lines going to Readline::HISTORY (thanks cirwin!)
+* ensure that cat --ex emulates the `whereami` format - includes line numbers and formatted the same, etc
+* fixed bug #200 ( https://github.com/pry/pry/issues/200 )- string interpolation bug (thanks to ryanf)
+* show-doc and stat now display method visibility (update WIKI)
+* got rid of warnings caused by stricter ruby 1.9.3 rules
+* remove interpolation of command names and fix interpolation error messag (update WIKI) (thanks ryanf!)
+
 */7/2011 version 0.9.3
 * cat --ex (cats 5 lines above and below line in file where exception was raised)
 * edit --ex (edits line in file where exception was raised)

data/CONTRIBUTORS

@@ -0,0 +1,11 @@
+   547	John Mair <jrmair@gmail.com>
+    76	Rob Gleeson <rob@flowof.info>
+    46	Lee Jarvis <lee@jarvis.co>
+    46	Mon ouïe <mon.ouie@gmail.com>
+    18	David Palm <dpalm@elctech.com>
+    13	epitron <chris@ill-logic.com>
+     8	Conrad Irwin <conrad.irwin@gmail.com>
+     6	Ryan Fitzgerald <rwfitzge@gmail.com>
+     2	Eric Christopherson <echristopherson@gmail.com>
+     2	Xavier Shay <xavier@rhnh.net>
+     1	Josh Cheek <josh.cheek@gmail.com>

data/README.markdown

@@ -1,4 +1,4 @@
-![Alt text](http://dl.dropbox.com/u/15761219/pry_horizontal_red.png)
+![Alt text](http://dl.dropbox.com/u/26521875/pry_logo_350.png)
 
 (C) John Mair (banisterfiend) 2011
 
@@ -7,7 +7,7 @@ _Get to the code_
 **Note that JRuby is not yet supported in this release, but will be
   soon.**
 
-[Skip to the website](http://pry.github.com) <br />
+[Skip to the website (recommended)](http://pry.github.com) <br />
 [Skip to the wiki](https://github.com/pry/pry/wiki)
 
 Pry is a powerful alternative to the standard IRB shell for Ruby. It is

data/TODO

@@ -1,3 +1,18 @@
+0.9.4
+* include method visiblity in show-doc and stat output
+* tempfile should end in .rb (for edit -t)
+* ls output should not be in array format
+* exceptions should allow access to previous items in the backtrace
+* input should allow multiple objects which are switched to automatically when EOF is reached on the preceding one
+* pry -r should happen in pry
+* more plugin-related commands in pry - see installed ones, see activated ones, see available on rubygems
+* should also allow plugins be explicitly activated as a command line option
+* should not raise if plugin activation fails (should show warning instead)
+* more documentation on CommandContext, etc and also command helpers
+* fix history saving (should not save all of Readline::HISTORY, but only what changed)
+* prevent blank lines going to Readline::HISTORY
+* ensure that cat --ex emulates the `whereami` format - includes line numbers and formatted the same, etc
+
 0.9.3
 * hist command now excludes last line of input (the command invocation itself)
 * hist now has `history` alias

data/lib/pry.rb

@@ -8,7 +8,6 @@ class Pry
   DEFAULT_HOOKS = {
     :before_session => proc do |out, target|
       # ensure we're actually in a method
-      meth_name = target.eval('__method__')
       file = target.eval('__FILE__')
 
       # /unknown/ for rbx

data/lib/pry/command_context.rb

@@ -10,6 +10,7 @@ class Pry
     attr_accessor :opts
     attr_accessor :command_set
     attr_accessor :command_processor
+    attr_accessor :_pry_
 
     # Run a command from another command.
     # @param [String] command_string The string that invokes the command

data/lib/pry/command_processor.rb

@@ -54,24 +54,17 @@ class Pry
     # @return [Array] The command data and arg string pair
     def command_matched(val, target)
       _, cmd_data = commands.commands.find do |name, data|
-
-        prefix = Regexp.escape(Pry.config.command_prefix)
+        prefix = convert_to_regex(Pry.config.command_prefix)
         prefix = "(?:#{prefix})?" unless data.options[:use_prefix]
 
         command_regex = /^#{prefix}#{convert_to_regex(name)}(?!\S)/
 
-        if data.options[:interpolate]
-          # If interpolation fails then the command cannot be matched,
-          # so early exit.
-          begin
-            interp_val = interpolate_string(val, target)
-          rescue Exception
-            next
+        if command_regex =~ val
+          if data.options[:interpolate]
+            val.replace(interpolate_string(val, target))
+            command_regex =~ val # re-match with the interpolated string
           end
-
-          val.replace interp_val if command_regex =~ interp_val
-        else
-          command_regex =~ val
+          true
         end
       end
 
@@ -128,6 +121,7 @@ class Pry
       context.eval_string = options[:eval_string]
       context.arg_string  = options[:arg_string]
       context.command_set = commands
+      context._pry_ = @pry_instance
 
       context.command_processor = self
 

data/lib/pry/command_set.rb

@@ -227,11 +227,11 @@ class Pry
           output.puts
           help_text = heading("Command List: ") + "\n"
 
-          commands.each do |key, command|
+          help_text << commands.map do |key, command|
             if command.description && !command.description.empty?
-              help_text << "#{command.options[:listing]}".ljust(18) + command.description + "\n"
+              "#{command.options[:listing]}".ljust(18) + command.description
             end
-          end
+          end.compact.sort.join("\n")
 
           stagger_output(help_text)
         else

data/lib/pry/completion.rb

@@ -157,7 +157,7 @@ class Pry
             candidates = []
             ObjectSpace.each_object(Module){|m|
               begin
-                name = m.name
+                name = m.name.to_s
               rescue Exception
                 name = ""
               end

data/lib/pry/default_commands/basic.rb

@@ -8,11 +8,11 @@ class Pry
       end
 
       command "simple-prompt", "Toggle the simple prompt." do
-        case Pry.active_instance.prompt
+        case _pry_.prompt
         when Pry::SIMPLE_PROMPT
-          Pry.active_instance.pop_prompt
+          _pry_.pop_prompt
         else
-          Pry.active_instance.push_prompt Pry::SIMPLE_PROMPT
+          _pry_.push_prompt Pry::SIMPLE_PROMPT
         end
       end
 
@@ -24,7 +24,7 @@ class Pry
         next output.puts "Provide a command set name" if command_set.nil?
 
         set = target.eval(arg_string)
-        Pry.active_instance.commands.import set
+        _pry_.commands.import set
       end
 
       command "reload-method", "Reload the source file that contains the specified method" do |meth_name|
@@ -44,6 +44,10 @@ class Pry
         end
       end
 
+      command "req", "Require file(s) and expand their paths." do |*args|
+        args.each { |file_name| load File.expand_path(file_name) }
+      end
+
       command "reset", "Reset the REPL to a clean state." do
         output.puts "Pry reset."
         exec "pry"

data/lib/pry/default_commands/context.rb

@@ -67,7 +67,7 @@ class Pry
       alias_command "!!@", "exit-all", ""
 
       command "exit-program", "End the current program. Aliases: quit-program, !!!" do
-        Pry.active_instance.save_history if Pry.config.history.should_save
+        Pry.save_history if Pry.config.history.should_save
         exit
       end
 

data/lib/pry/default_commands/documentation.rb

@@ -40,8 +40,9 @@ class Pry
         next output.puts("No documentation found.") if doc.empty?
         doc = process_comment_markup(doc, code_type)
         output.puts make_header(meth, code_type, doc)
+        output.puts "#{text.bold("visibility: ")} #{method_visibility(meth).to_s}"
         if meth.respond_to?(:parameters)
-          output.puts "#{text.bold("signature")}: #{signature_for(meth)}"
+          output.puts "#{text.bold("signature: ")} #{signature_for(meth)}"
           output.puts
         end
         render_output(opts.flood?, false, doc)
@@ -84,6 +85,7 @@ class Pry
         output.puts "--"
         output.puts "Name: " + meth_name
         output.puts "Owner: " + (meth.owner.to_s ? meth.owner.to_s : "Unknown")
+        output.puts "Visibility: " + method_visibility(meth).to_s
         output.puts "Type: " + (meth.is_a?(Method) ? "Bound" : "Unbound")
         output.puts "Arity: " + meth.arity.to_s
 
@@ -156,6 +158,18 @@ class Pry
           end
           "#{meth.name}(#{param_strings.join(", ")})"
         end
+
+        def method_visibility(meth)
+          if meth.owner.public_instance_methods.include? meth.name
+            :public
+          elsif meth.owner.protected_instance_methods.include? meth.name
+            :protected
+          elsif meth.owner.private_instance_methods.include? meth.name
+            :private
+          else
+            :none
+          end
+        end
       end
 
     end

data/lib/pry/default_commands/input.rb

@@ -66,7 +66,7 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
             output.puts opt
           end
 
-          opt.on_noopts { Pry.active_instance.input = StringIO.new(arg_string)  }
+          opt.on_noopts { _pry_.input = StringIO.new(arg_string)  }
         end
 
         if opts.m?
@@ -75,13 +75,13 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
             output.puts "Invalid method name: #{meth_name}."
             next
           end
-          code, code_type = code_and_code_type_for(meth)
+          code, _ = code_and_code_type_for(meth)
           next if !code
 
           range = opts.l? ? one_index_range_or_number(opts[:l]) : (0..-1)
           range = (0..-2) if opts.o?
 
-          Pry.active_instance.input = StringIO.new(Array(code.each_line.to_a[range]).join)
+          _pry_.input = StringIO.new(Array(code.each_line.to_a[range]).join)
         end
 
         if opts.f?
@@ -91,7 +91,7 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
           range = opts.l? ? one_index_range_or_number(opts[:l]) : (0..-1)
           range = (0..-2) if opts.o?
 
-          Pry.active_instance.input = StringIO.new(Array(text_array[range]).join)
+          _pry_.input = StringIO.new(Array(text_array[range]).join)
         end
       end
 
@@ -164,7 +164,7 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
                  :as     => Range,
                  :unless => :grep do |range|
             actions = Array(history[range]).join("\n") + "\n"
-            Pry.active_instance.input = StringIO.new(actions)
+            _pry_.input = StringIO.new(actions)
           end
 
           opt.on "save", "Save history to a file. --save [start..end] output.txt. Pry commands are excluded from saved history.", true, :as => Range

data/lib/pry/default_commands/introspection.rb

@@ -135,7 +135,7 @@ class Pry
           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
+          file_name = Tempfile.new(["tmp", ".rb"]).tap(&:close).path
           line = 0
           should_reload = true
           context = target
@@ -150,11 +150,11 @@ 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
           silence_warnings do
-            context.eval(File.read(file_name))
+            context.eval(File.read(file_name), file_name)
           end
         end
       end
@@ -207,41 +207,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" => :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|
@@ -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().bright_green(filtered_list.join("   "))
                 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("  ")); text << "  " }
+
                                 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,7 +48,7 @@ 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
             next if !ex
@@ -80,27 +80,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}"
+              " =>#{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}"
+          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
@@ -72,7 +73,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
@@ -86,7 +87,7 @@ class Pry
       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
@@ -109,12 +110,12 @@ class Pry
 
         # FIXME! Another JRuby hack
         if Object.const_defined?(:RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
-          simple_pager(text)
+          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
@@ -255,7 +255,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 +290,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 +332,37 @@ class Pry
         code.sub(/\A\s*\/\*.*?\*\/\s*/m, '')
       end
 
+      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
+
       def prompt(message, options="Yn")
         opts      = options.scan(/./)
         optstring = opts.join("/") # case maintained

data/lib/pry/helpers/text.rb

@@ -1,10 +1,10 @@
 class Pry
   module Helpers
 
-    # The methods defined on {Text} are available to custom commands via {Pry::CommandContext#text}.  
+    # The methods defined on {Text} are available to custom commands via {Pry::CommandContext#text}.
     module Text
- 
-      COLORS = 
+
+      COLORS =
       {
         "black"   => 0,
         "red"     => 1,
@@ -18,7 +18,7 @@ class Pry
       }
 
       class << self
-        
+
         COLORS.each_pair do |color, value|
           define_method color do |text|
             Pry.color ? "\033[0;#{30+value}m#{text}\033[0m" : text.to_s
@@ -31,7 +31,7 @@ class Pry
 
         alias_method :grey, :bright_black
         alias_method :gray, :bright_black
-        
+
 
         # Remove any color codes from _text_.
         #
@@ -41,11 +41,11 @@ class Pry
           text.to_s.gsub(/\e\[.*?(\d)+m/ , '')
         end
 
-        # Returns _text_ as bold text for use on a terminal.  
+        # Returns _text_ as bold text for use on a terminal.
         # _Pry.color_ must be true for this method to perform any transformations.
         #
         # @param [String, #to_s] text
-        # @return [String] _text_ 
+        # @return [String] _text_
         def bold text
           Pry.color ? "\e[1m#{text}\e[0m" : text.to_s
         end
@@ -63,15 +63,15 @@ class Pry
         end
 
         # Returns _text_ in a numbered list, beginning at _offset_.
-        # 
+        #
         # @param  [#each_line] text
         # @param  [Fixnum] offset
         # @return [String]
-        def with_line_numbers text, offset
+        def with_line_numbers(text, offset, color=:blue)
           lines = text.each_line.to_a
           lines.each_with_index.map do |line, index|
             adjusted_index = index + offset
-            "#{self.blue adjusted_index}: #{line}"
+            "#{self.send(color, adjusted_index)}: #{line}"
           end.join
         end
       end

data/lib/pry/pry_class.rb

@@ -139,8 +139,33 @@ class Pry
 
   # Load Readline history if required.
   def self.load_history
-    history_file = File.expand_path(Pry.config.history.file)
     Readline::HISTORY.push(*File.readlines(history_file).map(&:chomp)) if File.exists?(history_file)
+    @loaded_history = Readline::HISTORY.to_a
+  end
+
+  # Save new lines of Readline history if required.
+  def self.save_history
+    history_to_save = Readline::HISTORY.to_a
+
+    # Omit any history we read from the file.This check is needed because
+    # `hist --clear` would otherwise cause us to not save history in this
+    # session.
+    if history_to_save[0...@loaded_history.size] == @loaded_history
+      history_to_save = history_to_save[@loaded_history.size..-1]
+    end
+
+    File.open(history_file, 'a') do |f|
+      f.puts history_to_save.join("\n") if history_to_save.size > 0
+    end
+
+    # Update @loaded_history so that future calls to save_history
+    # will do the right thing.
+    @loaded_history = Readline::HISTORY.to_a
+  end
+
+  # Get the full path of the history_path for pry.
+  def self.history_file
+    File.expand_path(Pry.config.history.file)
   end
 
   # @return [Boolean] Whether this is the first time a Pry session has
@@ -180,9 +205,9 @@ class Pry
 
   def self.default_editor_for_platform
     if RUBY_PLATFORM =~ /mswin|mingw/
-      ENV['EDITOR'] ? ENV['EDITOR'] : "notepad"
+      ENV['EDITOR'] || "notepad"
     else
-      ENV['EDITOR'] ? ENV['EDITOR'] : "nano"
+      ENV['EDITOR'] || "nano"
     end
   end
 
@@ -214,7 +239,6 @@ class Pry
     config.history.file = File.expand_path("~/.pry_history")
 
     config.memory_size = 100
-    config.results_pager = true
   end
 
   # Set all the configurable options back to their default values

data/lib/pry/pry_instance.rb

@@ -149,7 +149,7 @@ class Pry
       throw :breakout, break_data
     end
 
-    save_history if Pry.config.history.should_save && finished_top_level_session?
+    Pry.save_history if Pry.config.history.should_save && finished_top_level_session?
 
     return_value
   end
@@ -217,23 +217,18 @@ class Pry
     target.eval("inp = ::Pry.active_instance.instance_eval { @input_array }")
     target.eval("out = ::Pry.active_instance.instance_eval { @output_array }")
 
-    @last_result_is_exception = false
     set_active_instance(target)
 
     code = r(target)
 
-    Pry.line_buffer.push(*code.each_line)
     res = set_last_result(target.eval(code, Pry.eval_path, Pry.current_line), target)
     res
   rescue SystemExit => e
     exit
   rescue Exception => e
-    @last_result_is_exception = true
-    @output_array << e
     set_last_exception(e, target)
   ensure
-    @input_array << code
-    Pry.current_line += code.each_line.count if code
+    update_input_history(code)
   end
 
   # Perform a read.
@@ -319,8 +314,10 @@ class Pry
   # @param [Object] result The result.
   # @param [Binding] target The binding to set `_` on.
   def set_last_result(result, target)
-    Pry.last_result = result
+    @last_result_is_exception = false
     @output_array << result
+
+    Pry.last_result = result
     target.eval("_ = ::Pry.last_result")
   end
 
@@ -336,10 +333,39 @@ class Pry
     ex.backtrace.first =~ /(.*):(\d+)/
     ex.file, ex.line = $1, $2.to_i
 
+    @last_result_is_exception = true
+    @output_array << ex
+
     Pry.last_exception = ex
     target.eval("_ex_ = ::Pry.last_exception")
   end
 
+  # Update Pry's internal state after evalling code.
+  # This method should not need to be invoked directly.
+  # @param [String] code The code we just eval'd
+  def update_input_history(code)
+    # Always push to the @input_array as the @output_array is always pushed to.
+    @input_array << code
+    if code
+      Pry.line_buffer.push(*code.each_line)
+      Pry.current_line += code.each_line.count
+    end
+    if Readline::HISTORY.size > 0
+
+      # all this fluff is to get around annoying bug in libedit on
+      # ruby 1.8.7
+      final_index = -1
+      begin
+        Readline::HISTORY[-1]
+      rescue IndexError
+        final_index = -2
+      end
+      last = Readline::HISTORY[final_index].strip
+      prev = Readline::HISTORY.size > 1 ? Readline::HISTORY[final_index - 1].strip : ''
+      Readline::HISTORY.pop if last && (last.empty? || last == prev)
+    end
+  end
+
   # Set the active instance for a session.
   # This method should not need to be invoked directly.
   # @param [Binding] target The binding to set `_ex_` on.
@@ -389,14 +415,6 @@ class Pry
     !@suppress_output || last_result_is_exception?
   end
 
-  # Save readline history to a file.
-  def save_history
-    history_file = File.expand_path(Pry.config.history.file)
-    File.open(history_file, 'w') do |f|
-      f.write Readline::HISTORY.to_a.join("\n")
-    end
-  end
-
   # Returns the appropriate prompt to use.
   # This method should not need to be invoked directly.
   # @param [Boolean] first_line Whether this is the first line of input

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.3"
+  VERSION = "0.9.4pre1"
 end

data/test/test_command_processor.rb

@@ -18,18 +18,6 @@ describe "Pry::CommandProcessor" do
 
     valid = @command_processor.valid_command? "blah"
     valid.should == false
-
-
-    a = "test-command"
-
-    # not passing in a binding so 'a' shouldn't exist and no command
-    # will be matched
-    valid = @command_processor.valid_command?('#{a}')
-    valid.should == false
-
-    # passing in the optional binding (against which interpolation is performed)
-    valid = @command_processor.valid_command? '#{a}', binding
-    valid.should == true
   end
 
   it 'should correctly match a simple string command' do
@@ -168,88 +156,21 @@ describe "Pry::CommandProcessor" do
     pos.should == sample_text.size
   end
 
-  it 'should correctly match a command whose name is interpolated' do
-    @pry.commands.command("blah") {}
-    a = "bl"
-    b = "ah"
-    command, captures, pos = @command_processor.command_matched '#{a}#{b}', binding
-
-    command.name.should == "blah"
-    captures.should == []
-    pos.should == command.name.length
-  end
-
-  it 'should correctly match a regex command and interpolation should not break the regex' do
-    regex_command_name = /blah(\d)/
-    @pry.commands.command(regex_command_name) {}
-
-    sample_text = "blah5"
-    a = "5"
-    command, captures, pos = @command_processor.command_matched 'blah#{a}', binding
-
-    command.name.should == regex_command_name
-    captures.should == ["5"]
-    pos.should == sample_text.size
-  end
-
-  it 'should NOT match a regex command that is interpolated when :interpolate => false' do
-    regex_command_name = /blah(\d)/
-    @pry.commands.command(regex_command_name, "", :interpolate => false) {}
-
-    sample_text = "blah5"
-    a = "5"
-    command, captures, pos = @command_processor.command_matched 'blah#{a}', binding
-
-    command.should == nil
-  end
-
-  it 'should correctly match a regex command and interpolation should not break the regex where entire regex command is interpolated' do
-    regex_command_name = /blah(\d)/
-    @pry.commands.command(regex_command_name) {}
-
-    sample_text = "blah5"
-    a = "bl"
-    b = "ah"
-    c = "5"
-
-    command, captures, pos = @command_processor.command_matched '#{a}#{b}#{c}', binding
-
-    command.name.should == regex_command_name
-    captures.should == ["5"]
-    pos.should == sample_text.size
-  end
-
-  it 'should NOT match a regex command where entire regex command is interpolated and :interpolate => false' do
-    regex_command_name = /blah(\d)/
-    @pry.commands.command(regex_command_name, "", :interpolate => false) {}
-
-    sample_text = "blah5"
-    a = "bl"
-    b = "ah"
-    c = "5"
-
-    command, captures, pos = @command_processor.command_matched '#{a}#{b}#{c}', binding
-    command.should == nil
-  end
-
-  it 'should NOT match a command whose name is interpolated when :interpolate => false' do
+  it 'should not interpolate commands that have :interpolate => false (interpolate_string should *not* be called)' do
     @pry.commands.command("boast", "", :interpolate => false) {}
-    a = "boa"
-    b = "st"
 
     # remember to use '' instead of "" when testing interpolation or
     # you'll cause yourself incredible confusion
-    command, captures, pos = @command_processor.command_matched '#{a}#{b}', binding
-
-    command.should == nil
+    lambda { @command_processor.command_matched('boast #{c}', binding) }.should.not.raise NameError
   end
 
+  it 'should only execute the contents of an interpolation once' do
+    $obj = 'a'
 
-  it 'commands that have :interpolate => false should not be interpolated (interpolate_string should *not* be called)' do
-    @pry.commands.command("boast", "", :interpolate => false) {}
+    redirect_pry_io(InputTester.new('cat #{$obj.succ!}'), StringIO.new) do
+      Pry.new.rep
+    end
 
-    # remember to use '' instead of "" when testing interpolation or
-    # you'll cause yourself incredible confusion
-    lambda { @command_processor.command_matched('boast #{c}', binding) }.should.not.raise NameError
+    $obj.should == 'b'
   end
 end

data/test/test_command_set.rb

@@ -187,4 +187,37 @@ describe Pry::CommandSet do
     @set.command 'foo', "", :listing => 'bar' do;end
     @set.commands['foo'].options[:listing].should == 'bar'
   end
+
+  it "should provide a 'help' command" do
+    context = Pry::CommandContext.new
+    context.command_set = @set
+    context.output = StringIO.new
+
+    lambda {
+      @set.run_command(context, 'help')
+    }.should.not.raise
+  end
+
+  it "should sort the output of the 'help' command" do
+    @set.command 'foo', "Fooerizes" do; end
+    @set.command 'goo', "Gooerizes" do; end
+    @set.command 'moo', "Mooerizes" do; end
+    @set.command 'boo', "Booerizes" do; end
+
+    context = Pry::CommandContext.new
+    context.command_set = @set
+    context.output = StringIO.new
+
+    @set.run_command(context, 'help')
+
+    doc = context.output.string
+
+    order = [doc.index("boo"),
+             doc.index("foo"),
+             doc.index("goo"),
+             doc.index("help"),
+             doc.index("moo")]
+
+    order.should == order.sort
+  end
 end

data/test/test_completion.rb

@@ -0,0 +1,23 @@
+require 'helper'
+
+describe Pry::InputCompleter do
+
+  before do
+    # The AMQP gem has some classes like this:
+    #  pry(main)> AMQP::Protocol::Test::ContentOk.name
+    #  => :content_ok
+    module SymbolyName
+      def self.name; :symboly_name; end
+    end
+  end
+
+  after do
+    Object.remove_const :SymbolyName
+  end
+
+  it "should not crash if there's a Module that has a symbolic name." do
+    completer = Pry::InputCompleter.build_completion_proc(Pry.binding_for(Object.new))
+    lambda{ completer.call "a.to_s." }.should.not.raise Exception
+  end
+end
+

data/test/test_default_commands/test_input.rb

@@ -321,6 +321,27 @@ describe "Pry::DefaultCommands::Input" do
       str_output.string.each_line.count.should == 4
       str_output.string.should =~ /b\n\d+:.*c\n\d+:.*d/
     end
+
+    it "should not contain duplicated lines" do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("3", "_ += 1", "_ += 1", "hist", "exit-all", :history => @hist), str_output) do
+        pry
+      end
+
+      str_output.string.each_line.grep(/_ \+= 1/).count.should == 1
+    end
+
+    it "should not contain duplicated lines" do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new(":place_holder", "2 + 2", "", "", "3 + 3", "hist", "exit-all", :history => @hist), str_output) do
+        pry
+      end
+
+      a = str_output.string.each_line.to_a.index{|line| line.include?("2 + 2") }
+      b = str_output.string.each_line.to_a.index{|line| line.include?("3 + 3") }
+
+      (a + 1).should == b
+    end
   end
 
 

data/test/test_default_commands/test_introspection.rb

@@ -94,7 +94,7 @@ describe "Pry::DefaultCommands::Introspection" do
 
       it 'should output an instance method\'s source for a method defined inside pry using define_method' do
         str_output = StringIO.new
-        redirect_pry_io(InputTester.new("class A", "define_method(:yup) {}", "end", "end", "show-method A#yup"), str_output) do
+        redirect_pry_io(InputTester.new("class A", "define_method(:yup) {}", "end", "show-method A#yup"), str_output) do
           TOPLEVEL_BINDING.pry
         end
 

data/test/test_pry.rb

@@ -517,7 +517,7 @@ describe Pry do
             $test_interpolation = nil
           end
 
-          # bug fix for https://github.com/banister/pry/issues/170
+          # bug fix for https://github.com/pry/pry/issues/170
           it 'should not choke on complex string interpolation when checking if ruby code is a command' do
             redirect_pry_io(InputTester.new('/#{Regexp.escape(File.expand_path("."))}/'), str_output = StringIO.new) do
               pry

data/test/test_pry_history.rb

@@ -0,0 +1,82 @@
+require 'helper'
+require 'tempfile'
+
+describe Pry do
+
+  before do
+    Readline::HISTORY.shift while Readline::HISTORY.length > 0
+    @hist = Tempfile.new(["tmp", ".pry_history"]).tap(&:close).path
+    File.open(@hist, 'w') {|f| f << "1\n2\n3\n" }
+    @old_hist = Pry.config.history.file
+    Pry.config.history.file = @hist
+    Pry.load_history
+  end
+
+  after do
+    File.unlink @hist
+    Pry.config.history.file = @old_hist
+  end
+
+  describe ".load_history" do
+    it "should read the contents of the file" do
+      Readline::HISTORY.to_a[-2..-1].should === ["2", "3"]
+    end
+  end
+
+  describe ".save_history" do
+    it "should include a trailing newline" do
+      Readline::HISTORY << "4"
+      Pry.save_history
+      File.read(@hist).should =~ /4\n\z/
+    end
+
+    it "should not change anything if history is not changed" do
+      File.open(@hist, 'w') {|f| f << "4\n5\n6\n" }
+      Pry.save_history
+      File.read(@hist).should == "4\n5\n6\n"
+    end
+
+    it "should append new lines to the file" do
+      Readline::HISTORY << "4"
+      Pry.save_history
+      File.read(@hist).should == "1\n2\n3\n4\n"
+    end
+
+    it "should not clobber lines written by other Pry's in the meantime" do
+      Readline::HISTORY << "5"
+      File.open(@hist, 'a') {|f| f << "4\n" }
+      Pry.save_history
+
+      Readline::HISTORY.to_a[-3..-1].should == ["2", "3", "5"]
+      File.read(@hist).should == "1\n2\n3\n4\n5\n"
+    end
+
+    it "should not delete lines from the file if this session's history was cleared" do
+      Readline::HISTORY.pop while Readline::HISTORY.size > 0
+      Pry.save_history
+      File.read(@hist).should == "1\n2\n3\n"
+    end
+
+    it "should save new lines that are added after the history was cleared" do
+      Readline::HISTORY.pop while Readline::HISTORY.size > 0
+      Readline::HISTORY << "4"
+
+      # doing this twice as libedit on 1.8.7 has bugs and sometimes ignores the
+      # first line in history
+      Readline::HISTORY << "4"
+      Pry.save_history
+      File.read(@hist).should =~ /1\n2\n3\n4\n/
+    end
+
+    it "should only append new lines the second time it is saved" do
+      Readline::HISTORY << "4"
+      Pry.save_history
+      File.open(@hist, 'a') {|f| f << "5\n" }
+      Readline::HISTORY << "6"
+      Pry.save_history
+
+      Readline::HISTORY.to_a[-4..-1].should == ["2", "3", "4", "6"]
+      File.read(@hist).should == "1\n2\n3\n4\n5\n6\n"
+    end
+  end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: pry
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.9.3
+  prerelease: 5
+  version: 0.9.4pre1
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-28 00:00:00 Z
+date: 2011-08-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby_parser
@@ -92,6 +92,7 @@ files:
 - .gitignore
 - .yardopts
 - CHANGELOG
+- CONTRIBUTORS
 - LICENSE
 - README.markdown
 - Rakefile
@@ -142,6 +143,7 @@ files:
 - test/test_command_helpers.rb
 - test/test_command_processor.rb
 - test/test_command_set.rb
+- test/test_completion.rb
 - test/test_default_commands.rb
 - test/test_default_commands/test_context.rb
 - test/test_default_commands/test_documentation.rb
@@ -150,6 +152,7 @@ files:
 - test/test_default_commands/test_introspection.rb
 - test/test_history_array.rb
 - test/test_pry.rb
+- test/test_pry_history.rb
 - test/testrc
 - wiki/Customizing-pry.md
 - wiki/Home.md
@@ -170,9 +173,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -185,6 +188,7 @@ test_files:
 - test/test_command_helpers.rb
 - test/test_command_processor.rb
 - test/test_command_set.rb
+- test/test_completion.rb
 - test/test_default_commands.rb
 - test/test_default_commands/test_context.rb
 - test/test_default_commands/test_documentation.rb
@@ -193,4 +197,5 @@ test_files:
 - test/test_default_commands/test_introspection.rb
 - test/test_history_array.rb
 - test/test_pry.rb
+- test/test_pry_history.rb
 - test/testrc