pry 0.9.3pre1-i386-mswin32 → 0.9.4-i386-mswin32

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
@@ -39,12 +39,25 @@ class Pry
         end
       end
 
+      # Open a temp file and yield it to the block, closing it after
+      # @return [String] The path of the temp file
+      def temp_file
+        file = Tempfile.new(["tmp", ".rb"])
+        yield file
+        file.path
+      ensure
+        file.close
+      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 +83,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 +114,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]
@@ -111,7 +139,13 @@ class Pry
         when :ruby
           if meth.source_location.first == Pry.eval_path
             start_line = meth.source_location.last
-            p = Pry.new(:input => StringIO.new(Pry.line_buffer[start_line..-1].join)).r(target)
+
+            # FIXME this line below needs to be refactored, WAY too
+            # much of a hack. We pass nothing to prompt because if
+            # prompt uses #inspect (or #pretty_inspect) on the context
+            # it can hang the session if the object being inspected on
+            # is enormous see: https://github.com/pry/pry/issues/245
+            p = Pry.new(:input => StringIO.new(Pry.line_buffer[start_line..-1].join), :prompt => proc {""}, :hooks => {}).r(target)
             code = strip_leading_whitespace(p)
           else
             if rbx_core?(meth)
@@ -255,7 +289,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 +324,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 +366,50 @@ 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?
+          begin
+            require 'spoon'
+            pid = Spoon.spawnp(*editor_invocation.split)
+            Process.waitpid(pid)
+          rescue FFI::NotFoundError
+            run ".#{editor_invocation}"
+          end
+        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/
+
+        # special case 0th line
+        return file_name if line_number <= 0
+
+        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

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,16 @@ 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
+          max_width = (offset + lines.count).to_s.length
           lines.each_with_index.map do |line, index|
-            adjusted_index = index + offset
-            "#{self.blue adjusted_index}: #{line}"
+            adjusted_index = (index + offset).to_s.rjust(max_width)
+            "#{self.send(color, adjusted_index)}: #{line}"
           end.join
         end
       end

data/lib/pry/history.rb

@@ -0,0 +1,61 @@
+class Pry
+  # The History class is responsible for maintaining the user's input history, both
+  # internally and within Readline::HISTORY.
+  class History
+    def initialize
+      @history = []
+      @saved_lines = 0
+    end
+
+    # Loads a file's contents into the input history.
+    # @param [String] filename
+    # @return [Integer] The number of lines loaded
+    def load(filename)
+      File.foreach(filename) do |line|
+        Readline::HISTORY << line.chomp
+        @history << line.chomp
+      end
+      @saved_lines = @history.length
+    end
+
+    # Appends input history from this session to a file.
+    # @param [String] filename
+    # @return [Integer] The number of lines saved
+    def save(filename)
+      history_to_save = @history[@saved_lines..-1]
+      File.open(filename, 'a') do |f|
+        history_to_save.each { |ln| f.puts ln }
+      end
+      @saved_lines = @history.length
+      history_to_save.length
+    end
+
+    # Adds a line to the input history, ignoring blank and duplicate lines.
+    # @param [String] line
+    # @return [String] The same line that was passed in
+    def push(line)
+      unless line.empty? || (@history.last && line.strip == @history.last.strip)
+        Readline::HISTORY << line
+        @history << line
+      end
+      line
+    end
+    alias << push
+
+    # Clears all history. Anything the user entered before this point won't be
+    # saved, but anything they put in afterwards will still be appended to the
+    # history file on exit.
+    def clear
+      Readline::HISTORY.shift until Readline::HISTORY.empty?
+      @history = []
+      @saved_lines = 0
+    end
+
+    # Returns an Array containing all stored history.
+    # @return [Array<String>] An Array containing all lines of history loaded
+    #   or entered by the user in the current session.
+    def to_a
+      @history.dup
+    end
+  end
+end

data/lib/pry/plugins.rb

@@ -1,9 +1,17 @@
 class Pry
   class PluginManager
     PRY_PLUGIN_PREFIX = /^pry-/
-    PluginNotFound = Class.new(LoadError)
 
-    MessageSink = Object.new.tap { |o| def o.method_missing(*args) end }
+    # Placeholder when no associated gem found, displays warning
+    class NoPlugin
+      def initialize(name)
+        @name = name
+      end
+
+      def method_missing(*args)
+        $stderr.puts "Warning: The plugin '#{@name}' was not found! (no gem found)"
+      end
+    end
 
     class Plugin
       attr_accessor :name, :gem_name, :enabled, :spec, :active
@@ -12,22 +20,25 @@ class Pry
         @name, @gem_name, @enabled, @spec = name, gem_name, enabled, spec
       end
 
-      # Disable a plugin.
+      # Disable a plugin. (prevents plugin from being loaded, cannot
+      # disable an already activated plugin)
       def disable!
         self.enabled = false
       end
 
-      # Enable a plugin.
+      # Enable a plugin. (does not load it immediately but puts on
+      # 'white list' to be loaded)
       def enable!
         self.enabled = true
       end
 
-      # Activate the plugin (require the gem).
+      # Activate the plugin (require the gem - enables/loads the
+      # plugin immediately at point of call, even if plugin is disabled)
       def activate!
         begin
-          require gem_name
+          require gem_name if !active?
         rescue LoadError
-          $stderr.puts "Warning: The plugin '#{gem_name}' was not found!"
+          $stderr.puts "Warning: The plugin '#{gem_name}' was not found! (gem found but could not be loaded)"
         end
         self.active = true
         self.enabled = true
@@ -55,7 +66,7 @@ class Pry
     # @return [Hash] A hash with all plugin names (minus the 'pry-') as
     #   keys and Plugin objects as values.
     def plugins
-      h = Pry.config.plugins.strict_loading ? {} : Hash.new { MessageSink }
+      h = Hash.new { |_, key| NoPlugin.new(key) }
       @plugins.each do |plugin|
         h[plugin.name] = plugin
       end

data/lib/pry/pry_class.rb

@@ -18,26 +18,6 @@ class Pry
       def_delegators delagatee, *names.map { |v| "#{v}=" }
     end
 
-    # Get nesting data.
-    # This method should not need to be accessed directly.
-    # @return [Array] The unparsed nesting information.
-    attr_reader :nesting
-
-    # Get last value evaluated by Pry.
-    # This method should not need to be accessed directly.
-    # @return [Object] The last result.
-    attr_accessor :last_result
-
-    # Get last exception raised.
-    # This method should not need to be accessed directly.
-    # @return [Exception] The last exception.
-    attr_accessor :last_exception
-
-    # Get the active Pry instance that manages the active Pry session.
-    # This method should not need to be accessed directly.
-    # @return [Pry] The active Pry instance.
-    attr_accessor :active_instance
-
     # Get/Set the Proc that defines extra Readline completions (on top
     # of the ones defined for IRB).
     # @return [Proc] The Proc that defines extra Readline completions (on top
@@ -45,10 +25,6 @@ class Pry
     #   Pry.custom_completions = proc { Dir.entries('.') }
     attr_accessor :custom_completions
 
-    # Value returned by last executed Pry command.
-    # @return [Object] The command value
-    attr_accessor :cmd_ret_value
-
     # @return [Fixnum] The current input line.
     attr_accessor :current_line
 
@@ -62,9 +38,15 @@ class Pry
     # @return [OpenStruct] Return Pry's config object.
     attr_accessor :config
 
+    # @return [History] Return Pry's line history object.
+    attr_accessor :history
+
     # @return [Boolean] Whether Pry was activated from the command line.
     attr_accessor :cli
 
+    # @return [Fixnum] The number of active Pry sessions.
+    attr_accessor :active_sessions
+
     # plugin forwardables
     def_delegators :@plugin_manager, :plugins, :load_plugins, :locate_plugins
 
@@ -113,34 +95,40 @@ class Pry
     new(options).repl(target)
   end
 
-  # A custom version of `Kernel#pretty_inspect`.
-  # This method should not need to be accessed directly.
-  # @param obj The object to view.
-  # @return [String] The string representation of `obj`.
-  def self.view(obj)
-    obj.pretty_inspect
-
-  rescue NoMethodError
-    "unknown"
-  end
-
   # A version of `Pry.view` that clips the output to `max_size` chars.
   # In case of > `max_size` chars the `#<Object...> notation is used.
   # @param obj The object to view.
   # @param max_size The maximum number of chars before clipping occurs.
   # @return [String] The string representation of `obj`.
-  def self.view_clip(obj, max_size=60)
-    if obj.inspect.size < max_size
+  def self.view_clip(obj, max_length = 60)
+    if obj.kind_of?(Module) && obj.name.to_s != "" && obj.name.to_s.length <= max_length
+      obj.name.to_s
+    elsif TOPLEVEL_BINDING.eval('self') == obj
+      # special case for 'main' object :)
+      obj.inspect
+    elsif [String, Numeric, Symbol, nil, true, false].any? { |v| v === obj } && obj.inspect.length <= max_length
       obj.inspect
     else
-      "#<#{obj.class}:%#x>" % (obj.object_id << 1)
+      "#<#{obj.class}>"#:%x>"# % (obj.object_id << 1)
     end
+
+  rescue RescuableException
+    "unknown"
   end
 
   # 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)
+    Pry.history.load(history_file) if File.exists?(history_file)
+  end
+
+  # Save new lines of Readline history if required.
+  def self.save_history
+    Pry.history.save(history_file)
+  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
@@ -175,14 +163,14 @@ class Pry
 
     output = options[:show_output] ? options[:output] : StringIO.new
 
-    Pry.new(:output => output, :input => StringIO.new(command_string), :commands => options[:commands]).rep(options[:context])
+    Pry.new(:output => output, :input => StringIO.new(command_string), :commands => options[:commands], :prompt => proc {""}, :hooks => {}).rep(options[:context])
   end
 
   def self.default_editor_for_platform
     if RUBY_PLATFORM =~ /mswin|mingw/
-      ENV['EDITOR'] ? ENV['EDITOR'] : "notepad"
+      ENV['VISUAL'] || ENV['EDITOR'] || "notepad"
     else
-      ENV['EDITOR'] ? ENV['EDITOR'] : "nano"
+      ENV['VISUAL'] || ENV['EDITOR'] || "nano"
     end
   end
 
@@ -203,7 +191,6 @@ class Pry
 
     config.plugins ||= OpenStruct.new
     config.plugins.enabled = true
-    config.plugins.strict_loading = true
 
     config.requires ||= []
     config.should_load_requires = true
@@ -213,8 +200,20 @@ class Pry
     config.history.should_load = true
     config.history.file = File.expand_path("~/.pry_history")
 
+    config.control_d_handler = DEFAULT_CONTROL_D_HANDLER
+
     config.memory_size = 100
-    config.results_pager = true
+
+    Pry.config.ls ||= OpenStruct.new
+    Pry.config.ls.local_var_color = :bright_red
+    Pry.config.ls.instance_var_color = :bright_blue
+    Pry.config.ls.class_var_color = :blue
+    Pry.config.ls.global_var_color = :bright_magenta
+    Pry.config.ls.method_color = :green
+    Pry.config.ls.instance_method_color = :bright_green
+    Pry.config.ls.constant_color = :yellow
+
+    Pry.config.ls.separator = "  "
   end
 
   # Set all the configurable options back to their default values
@@ -225,32 +224,22 @@ class Pry
 
     self.custom_completions = DEFAULT_CUSTOM_COMPLETIONS
     self.cli = false
-    self.current_line = 0
-    self.line_buffer = []
+    self.current_line = 1
+    self.line_buffer = [""]
     self.eval_path = "(pry)"
+    self.active_sessions = 0
   end
 
   # Basic initialization.
   def self.init
     @plugin_manager ||= PluginManager.new
-
     self.config ||= Config.new
+    self.history ||= History.new
+
     reset_defaults
     locate_plugins
   end
 
-  @nesting = []
-  def @nesting.level
-    last.is_a?(Array) ? last.first : nil
-  end
-
-  # Return all active Pry sessions.
-  # @return [Array<Pry>] Active Pry sessions.
-  def self.sessions
-    # last element in nesting array is the pry instance
-    nesting.map(&:last)
-  end
-
   # Return a `Binding` object for `target` or return `target` if it is
   # already a `Binding`.
   # In the case where `target` is top-level then return `TOPLEVEL_BINDING`