pry 0.8.0pre5-i386-mingw32 → 0.8.0pre7-i386-mingw32

data/Rakefile

@@ -35,7 +35,7 @@ end
 
 desc "run pry"
 task :pry do
-  require "#{direc}/lib/pry.rb"
+  require "#{direc}/lib/pry"
   binding.pry
 end
 

data/bin/pry

@@ -68,6 +68,13 @@ end.parse!
 # invoked via cli
 Pry.cli = true
 
+class Pry::Commands
+  command "reset", "Reset the REPL to a clean state." do
+    output.puts "Pry reset."
+    exec("pry")
+  end
+end
+
 # load ~/.pryrc, if not suppressed with -f option
 Pry.should_load_rc = false if !options[:loadrc]
 

data/lib/pry/command_base.rb

@@ -131,19 +131,17 @@ class Pry
     
     command "help", "This menu." do |cmd|
       command_info = opts[:commands]
-      param = cmd
 
-      if !param
-        output.puts "Command list:"
-        output.puts "--"
+      if !cmd
+        output.puts "Command list:\n--"
         command_info.each do |k, data|
           output.puts "#{k}".ljust(18) + data[:description] if !data[:description].empty?
         end
       else
-        if command_info[param]
-          output.puts command_info[param][:description]
+        if command_info[cmd]
+          output.puts command_info[cmd][:description]
         else
-          output.puts "No info for command: #{param}"
+          output.puts "No info for command: #{cmd}"
         end
       end
     end

data/lib/pry/command_helpers.rb

@@ -0,0 +1,291 @@
+class Pry
+  class Commands < CommandBase
+    module CommandHelpers 
+
+      private
+
+      def try_to_load_pry_doc
+
+        # YARD crashes on rbx, so do not require it 
+        if !Object.const_defined?(:RUBY_ENGINE) || RUBY_ENGINE !~ /rbx/
+          require "pry-doc"
+        end
+      rescue LoadError
+      end
+      
+      def meth_name_from_binding(b)
+        meth_name = b.eval('__method__')
+        if [:__script__, nil, :__binding__, :__binding_impl__].include?(meth_name)
+          nil
+        else
+          meth_name
+        end
+      end
+
+      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_ = $_file_temp")
+      end
+
+      # a simple pager for systems without `less`. A la windows.
+      def simple_pager(text)
+        page_size = 22
+        text_array = text.lines.to_a
+        text_array.each_slice(page_size) do |chunk|
+          output.puts chunk.join
+          break if chunk.size < page_size
+          if text_array.size > page_size
+            output.puts "\n<page break> --- Press enter to continue ( q<enter> to break ) --- <page break>" 
+            break if $stdin.gets.chomp == "q"
+          end
+        end
+      end
+      
+      # Try to use `less` for paging, if it fails then use simple_pager
+      def stagger_output(text)
+        lesspipe { |less| less.puts text }
+      rescue Exception
+        simple_pager(text)
+      end
+      
+      def add_line_numbers(lines, start_line)
+        line_array = lines.each_line.to_a
+        line_array.each_with_index.map do |line, idx|
+          adjusted_index = idx + start_line
+          if Pry.color
+            cindex = CodeRay.scan("#{adjusted_index}", :ruby).term
+            "#{cindex}: #{line}"
+          else
+            "#{idx}: #{line}"
+          end
+        end.join
+      end
+
+      # only add line numbers if start_line is not false
+      # if start_line is not false then add line numbers starting with start_line
+      def render_output(should_flood, start_line, doc)
+        if start_line
+          doc = add_line_numbers(doc, start_line)
+        end
+
+        if should_flood
+          output.puts doc
+        else
+          stagger_output(doc)
+        end
+      end
+
+      def check_for_dynamically_defined_method(meth)
+        file, _ = meth.source_location
+        if file =~ /(\(.*\))|<.*>/
+          raise "Cannot retrieve source for dynamically defined method."
+        end
+      end
+
+      def remove_first_word(text)
+        text.split.drop(1).join(' ')
+      end
+
+      def get_method_object(meth_name, target, options)
+        if !meth_name
+          return nil
+        end
+        
+        if options[:M]
+          target.eval("instance_method(:#{meth_name})")
+        elsif options[:m]
+          target.eval("method(:#{meth_name})")
+        else
+          begin
+            target.eval("instance_method(:#{meth_name})")
+          rescue
+            begin
+              target.eval("method(:#{meth_name})")
+            rescue
+              return nil
+            end
+          end
+        end
+      end
+      
+      def make_header(meth, code_type, content)
+        file, line = meth.source_location
+        num_lines = "Number of lines: #{content.each_line.count}"
+        case code_type
+        when :ruby
+          "\nFrom #{file} @ line #{line}:\n#{num_lines}\n\n"
+        else
+          "\nFrom Ruby Core (C Method):\n#{num_lines}\n\n"
+        end
+      end
+
+      def is_a_c_method?(meth)
+        meth.source_location.nil?
+      end
+
+      def should_use_pry_doc?(meth)
+        Pry.has_pry_doc && is_a_c_method?(meth)
+      end
+      
+      def code_type_for(meth)
+        # only C methods
+        if should_use_pry_doc?(meth)
+          info = Pry::MethodInfo.info_for(meth) 
+          if info && info.source
+            code_type = :c
+          else
+            output.puts "Cannot find C method: #{meth.name}"
+            code_type = nil
+          end
+        else
+          if is_a_c_method?(meth)
+            output.puts "Cannot locate this method: #{meth.name}. Try `gem install pry-doc` to get access to Ruby Core documentation."
+            code_type = nil
+          else
+            check_for_dynamically_defined_method(meth)
+            code_type = :ruby
+          end
+        end
+        code_type
+      end
+      
+      def file_map
+        {
+          [".c", ".h"] => :c,
+          [".cpp", ".hpp", ".cc", ".h", "cxx"] => :cpp,
+          [".rb", "Rakefile"] => :ruby,
+          ".py" => :python,
+          ".diff" => :diff,
+          ".css" => :css,
+          ".html" => :html,
+          [".yaml", ".yml"] => :yaml,
+          ".xml" => :xml,
+          ".php" => :php,
+          ".js" => :javascript,
+          ".java" => :java,
+          ".rhtml" => :rhtml,
+          ".json" => :json
+        }
+      end
+      
+      def syntax_highlight_by_file_type_or_specified(contents, file_name, file_type)
+        _, language_detected = file_map.find do |k, v|
+          Array(k).any? do |matcher|
+            matcher == File.extname(file_name) || matcher == File.basename(file_name)
+          end
+        end
+
+        language_detected = file_type if file_type
+        CodeRay.scan(contents, language_detected).term
+      end
+
+      # convert negative line numbers to positive by wrapping around
+      # last line (as per array indexing with negative numbers)
+      def normalized_line_number(line_number, total_lines)
+        line_number < 0 ? line_number + total_lines : line_number
+      end
+      
+      # returns the file content between the lines and the normalized
+      # start and end line numbers.
+      def read_between_the_lines(file_name, start_line, end_line)
+        content = File.read(File.expand_path(file_name))
+        lines_array = content.each_line.to_a
+
+        [lines_array[start_line..end_line].join, normalized_line_number(start_line, lines_array.size),
+         normalized_line_number(end_line, lines_array.size)]
+      end
+
+      # documentation related helpers
+      def strip_color_codes(str)
+        str.gsub(/\e\[.*?(\d)+m/, '')
+      end
+
+      def process_rdoc(comment, code_type)
+        comment = comment.dup
+        comment.gsub(/<code>(?:\s*\n)?(.*?)\s*<\/code>/m) { Pry.color ? CodeRay.scan($1, code_type).term : $1 }.
+          gsub(/<em>(?:\s*\n)?(.*?)\s*<\/em>/m) { Pry.color ? "\e[32m#{$1}\e[0m": $1 }.
+          gsub(/<i>(?:\s*\n)?(.*?)\s*<\/i>/m) { Pry.color ? "\e[34m#{$1}\e[0m" : $1 }.
+          gsub(/\B\+(\w*?)\+\B/)  { Pry.color ? "\e[32m#{$1}\e[0m": $1 }.
+          gsub(/((?:^[ \t]+.+(?:\n+|\Z))+)/)  { Pry.color ? CodeRay.scan($1, code_type).term : $1 }.
+          gsub(/`(?:\s*\n)?(.*?)\s*`/) { Pry.color ? CodeRay.scan($1, code_type).term : $1 }
+      end
+
+      def process_yardoc_tag(comment, tag)
+        in_tag_block = nil
+        output = comment.lines.map do |v|
+          if in_tag_block && v !~ /^\S/
+            strip_color_codes(strip_color_codes(v))
+          elsif in_tag_block
+            in_tag_block = false
+            v
+          else
+            in_tag_block = true if v =~ /^@#{tag}/
+            v
+          end
+        end.join
+      end
+
+      def process_yardoc(comment)
+        yard_tags = ["param", "return", "option", "yield", "attr", "attr_reader", "attr_writer",
+                     "deprecate", "example"]
+        (yard_tags - ["example"]).inject(comment) { |a, v| process_yardoc_tag(a, v) }.
+          gsub(/^@(#{yard_tags.join("|")})/) { Pry.color ? "\e[33m#{$1}\e[0m": $1 }
+      end
+
+      def process_comment_markup(comment, code_type)
+        process_yardoc process_rdoc(comment, code_type)
+      end
+
+      # strip leading whitespace but preserve indentation
+      def strip_leading_whitespace(text)
+        return text if text.empty?
+        leading_spaces = text.lines.first[/^(\s+)/, 1]
+        text.gsub(/^#{leading_spaces}/, '')
+      end
+
+      def strip_leading_hash_and_whitespace_from_ruby_comments(comment)
+        comment = comment.dup
+        comment.gsub!(/\A\#+?$/, '')
+        comment.gsub!(/^\s*#/, '')
+        strip_leading_whitespace(comment)
+      end
+
+      def strip_comments_from_c_code(code)
+        code.sub /\A\s*\/\*.*?\*\/\s*/m, ''
+      end
+
+      # thanks to epitron for this method
+      def lesspipe(*args)
+        if args.any? and args.last.is_a?(Hash)
+          options = args.pop
+        else
+          options = {}
+        end
+        
+        output = args.first if args.any?
+        
+        params = []
+        params << "-R" unless options[:color] == false
+        params << "-S" unless options[:wrap] == true
+        params << "-F" unless options[:always] == true
+        if options[:tail] == true
+          params << "+\\>"
+          $stderr.puts "Seeking to end of stream..."
+        end
+        params << "-X"
+        
+        IO.popen("less #{params * ' '}", "w") do |less|
+          if output
+            less.puts output
+          else
+            yield less
+          end
+        end
+      end      
+
+    end
+  end
+end

data/lib/pry/commands.rb

@@ -4,115 +4,15 @@ require "optparse"
 require "method_source"
 require "#{direc}/command_base"
 require "#{direc}/pry_instance"
-
-begin
-
-  # YARD crashes on rbx, so do not require it 
-  if !Object.const_defined?(:RUBY_ENGINE) || RUBY_ENGINE !~ /rbx/
-    require "pry-doc"
-  end
-rescue LoadError
-end
+require "#{direc}/command_helpers"
 
 class Pry
 
   # Default commands used by Pry.
   class Commands < CommandBase
+    extend CommandHelpers
 
-    # We make this a lambda to avoid documenting it
-    meth_name_from_binding = lambda do |b|
-      meth_name = b.eval('__method__')
-
-      # :__script__ for rubinius
-      if [:__script__, nil, :__binding__, :__binding_impl__].include?(meth_name)
-        nil
-      else
-        meth_name
-      end
-    end
-
-    set_file_and_dir_locals = lambda do |file_name|
-      return if !target
-      FILE_TEMP = File.expand_path(file_name)
-      DIR_TEMP = File.dirname(FILE_TEMP)
-      target.eval("_file_ = Pry::Commands::FILE_TEMP")
-      target.eval("_dir_ = Pry::Commands::DIR_TEMP")
-      remove_const(:FILE_TEMP)
-      remove_const(:DIR_TEMP)
-    end
-
-    check_for_dynamically_defined_method = lambda do |meth|
-      file, _ = meth.source_location
-      if file =~ /(\(.*\))|<.*>/
-        raise "Cannot retrieve source for dynamically defined method."
-      end
-    end
-
-    remove_first_word = lambda do |text|
-      text.split.drop(1).join(' ')
-    end
-
-    get_method_object = lambda do |meth_name, target, options|
-      if !meth_name
-        return nil
-      end
-
-      if options[:M]
-        target.eval("instance_method(:#{meth_name})")
-      elsif options[:m]
-        target.eval("method(:#{meth_name})")
-      else
-        begin
-          target.eval("instance_method(:#{meth_name})")
-        rescue
-          begin
-            target.eval("method(:#{meth_name})")
-          rescue
-            return nil
-          end
-        end
-      end
-    end
-
-    make_header = lambda do |meth, code_type|
-      file, line = meth.source_location
-      header = case code_type
-               when :ruby
-                 "--\nFrom #{file} @ line #{line}:\n--"
-               else
-                 "--\nFrom Ruby Core (C Method):\n--"
-               end
-    end
-
-    is_a_c_method = lambda do |meth|
-      meth.source_location.nil?
-    end
-
-    should_use_pry_doc = lambda do |meth|
-      Pry.has_pry_doc && is_a_c_method.call(meth)
-    end
-    
-    code_type_for = lambda do |meth|
-      # only C methods
-      if should_use_pry_doc.call(meth)
-        info = Pry::MethodInfo.info_for(meth) 
-        if info && info.source
-          code_type = :c
-        else
-          output.puts "Cannot find C method: #{meth.name}"
-          code_type = nil
-        end
-      else
-        if is_a_c_method.call(meth)
-          output.puts "Cannot locate this method: #{meth.name}. Try `gem install pry-doc` to get access to Ruby Core documentation."
-          code_type = nil
-        else
-          check_for_dynamically_defined_method.call(meth)
-          code_type = :ruby
-        end
-      end
-      code_type
-    end
+    try_to_load_pry_doc
 
     command "!", "Clear the input buffer. Useful if the parsing process goes wrong and you get stuck in the read loop." do
       output.puts "Input buffer cleared!"
@@ -151,7 +51,7 @@ class Pry
       end
     end
 
-    command "file-mode", "Toggle file mode." do
+    command "shell-mode", "Toggle shell mode. Bring in pwd prompt and file completion." do
       case Pry.active_instance.prompt
       when Pry::FILE_PROMPT
         Pry.active_instance.prompt = Pry::DEFAULT_PROMPT
@@ -164,6 +64,8 @@ class Pry
       end        
     end
 
+    alias_command "file-mode", "shell-mode", ""
+
     command "nesting", "Show nesting information." do 
       nesting = opts[:nesting]
       
@@ -188,7 +90,7 @@ class Pry
       output.puts "Pry version: #{Pry::VERSION}"
       output.puts "Ruby version: #{RUBY_VERSION}"
 
-      mn = meth_name_from_binding.call(target)
+      mn = meth_name_from_binding(target)
       output.puts "Current method: #{mn ? mn : "N/A"}"
       output.puts "Pry instance: #{Pry.active_instance}"
       output.puts "Last result: #{Pry.view(Pry.last_result)}"
@@ -204,8 +106,8 @@ class Pry
       else
         i_num = 5
       end
-      
-      meth_name = meth_name_from_binding.call(target)
+
+      meth_name = meth_name_from_binding(target)
       meth_name = "N/A" if !meth_name
 
       if file =~ /(\(.*\))|<.*>/ || file == ""
@@ -213,9 +115,8 @@ class Pry
         next
       end
      
-      set_file_and_dir_locals.call(file) 
-      puts "blah blah #{target}"
-      output.puts "--\nFrom #{file} @ line #{line_num} in #{klass}##{meth_name}:\n--"
+      set_file_and_dir_locals(file) 
+      output.puts "\nFrom #{file} @ line #{line_num} in #{klass}##{meth_name}:\n\n"
       
       # This method inspired by http://rubygems.org/gems/ir_b
       File.open(file).each_with_index do |line, index|
@@ -245,13 +146,13 @@ class Pry
     end
     
     command "exit-all", "End all nested Pry sessions. Accepts optional return value. Aliases: !@" do 
-      str = remove_first_word.call(opts[:val])
+      str = remove_first_word(opts[:val])
       throw(:breakout, [0, target.eval(str)])
     end
 
     alias_command "!@", "exit-all", ""
 
-    command "ls", "Show the list of vars in the current scope. Type `ls --help` for more info." do |*args|
+    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
@@ -416,48 +317,7 @@ Shows local and instance variables by default.
       end
     end
 
-    file_map = {
-      [".c", ".h"] => :c,
-      [".cpp", ".hpp", ".cc", ".h", "cxx"] => :cpp,
-      ".rb" => :ruby,
-      ".py" => :python,
-      ".diff" => :diff,
-      ".css" => :css,
-      ".html" => :html,
-      [".yaml", ".yml"] => :yaml,
-      ".xml" => :xml,
-      ".php" => :php,
-      ".js" => :javascript,
-      ".java" => :java,
-      ".rhtml" => :rhtml,
-      ".json" => :json
-    }
-
-    syntax_highlight_by_file_type_or_specified = lambda do |contents, file_name, file_type|
-      _, language_detected = file_map.find { |k, v| Array(k).include?(File.extname(file_name)) }
-
-      language_detected = file_type if file_type
-      CodeRay.scan(contents, language_detected).term
-    end
-
-    read_between_the_lines = lambda do |file_name, start_line, end_line|
-      content = File.read(File.expand_path(file_name))
-      content.each_line.to_a[start_line..end_line].join
-    end
-
-    add_line_numbers = lambda do |lines, start_line|
-      lines.each_line.each_with_index.map do |line, idx|
-        adjusted_index = idx + start_line
-        if Pry.color
-          cindex = CodeRay.scan("#{adjusted_index}", :ruby).term
-          "#{cindex}: #{line}"
-        else
-          "#{idx}: #{line}"
-        end
-      end
-    end
-    
-    command "cat-file", "Show output of file FILE. Type `cat --help` for more information." do |*args|
+    command "cat-file", "Show output of file FILE. Type `cat-file --help` for more information." do |*args|
       options= {}
       file_name = nil
       start_line = 0
@@ -484,7 +344,11 @@ e.g: cat-file hello.rb
 
         opts.on("-t", "--type TYPE", "The specific file type for syntax higlighting (e.g ruby, python, cpp, java)") do |type|
           file_type = type.to_sym
-        end        
+        end
+
+        opts.on("-f", "--flood", "Do not use a pager to view text longer than one screen.") do 
+          options[:f] = true
+        end
 
         opts.on_tail("-h", "--help", "This message.") do 
           output.puts opts
@@ -501,18 +365,14 @@ e.g: cat-file hello.rb
         next
       end
 
-      contents = read_between_the_lines.call(file_name, start_line, end_line)
+      contents, normalized_start_line, _ = read_between_the_lines(file_name, start_line, end_line)
 
       if Pry.color
-        contents = syntax_highlight_by_file_type_or_specified.call(contents, file_name, file_type)
+        contents = syntax_highlight_by_file_type_or_specified(contents, file_name, file_type)
       end
 
-      if options[:l]
-        contents = add_line_numbers.call(contents, start_line + 1)
-      end
-       
-      set_file_and_dir_locals.call(file_name)
-      output.puts contents
+      set_file_and_dir_locals(file_name)
+      render_output(options[:f], options[:l] ? normalized_start_line + 1 : false, contents)
       contents
     end
 
@@ -556,7 +416,7 @@ e.g: eval-file -c self "hello.rb"
         TOPLEVEL_BINDING.eval(File.read(File.expand_path(file_name)))
         output.puts "--\nEval'd '#{file_name}' at top-level."
       end
-      set_file_and_dir_locals.call(file_name)
+      set_file_and_dir_locals(file_name)
 
       new_constants = Object.constants - old_constants
       output.puts "Brought in the following top-level constants: #{new_constants.inspect}" if !new_constants.empty?
@@ -589,61 +449,6 @@ e.g: eval-file -c self "hello.rb"
       Pry.start target.eval("#{obj}")
     end
 
-    strip_color_codes = lambda do |str|
-      str.gsub(/\e\[.*?(\d)+m/, '')
-    end
-
-    process_rdoc = lambda do |comment, code_type|
-      comment = comment.dup
-      comment.gsub(/<code>(?:\s*\n)?(.*?)\s*<\/code>/m) { Pry.color ? CodeRay.scan($1, code_type).term : $1 }.
-        gsub(/<em>(?:\s*\n)?(.*?)\s*<\/em>/m) { Pry.color ? "\e[32m#{$1}\e[0m": $1 }.
-        gsub(/<i>(?:\s*\n)?(.*?)\s*<\/i>/m) { Pry.color ? "\e[34m#{$1}\e[0m" : $1 }.
-        gsub(/\B\+(\w*?)\+\B/)  { Pry.color ? "\e[32m#{$1}\e[0m": $1 }.
-        gsub(/((?:^[ \t]+.+(?:\n+|\Z))+)/)  { Pry.color ? CodeRay.scan($1, code_type).term : $1 }.
-        gsub(/`(?:\s*\n)?(.*?)\s*`/) { Pry.color ? CodeRay.scan($1, code_type).term : $1 }
-    end
-
-    process_yardoc_tag = lambda do |comment, tag|
-      in_tag_block = nil
-      output = comment.lines.map do |v|
-        if in_tag_block && v !~ /^\S/
-          strip_color_codes.call(strip_color_codes.call(v))
-        elsif in_tag_block
-          in_tag_block = false
-          v
-        else
-          in_tag_block = true if v =~ /^@#{tag}/
-          v
-        end
-      end.join
-    end
-      
-    # FIXME - invert it -- should only ALLOW color if @example
-    process_yardoc = lambda do |comment|
-      yard_tags = ["param", "return", "option", "yield", "attr", "attr_reader", "attr_writer",
-                   "deprecate", "example"]
-      (yard_tags - ["example"]).inject(comment) { |a, v| process_yardoc_tag.call(a, v) }.
-        gsub(/^@(#{yard_tags.join("|")})/) { Pry.color ? "\e[33m#{$1}\e[0m": $1 }
-    end
-    
-    process_comment_markup = lambda do |comment, code_type|
-      process_yardoc.call process_rdoc.call(comment, code_type)
-    end
-
-    # strip leading whitespace but preserve indentation
-    strip_leading_whitespace = lambda do |text|
-      return text if text.empty?
-      leading_spaces = text.lines.first[/^(\s+)/, 1]
-      text.gsub(/^#{leading_spaces}/, '')
-    end
-
-    strip_leading_hash_and_whitespace_from_ruby_comments = lambda do |comment|
-      comment = comment.dup
-      comment.gsub!(/\A\#+?$/, '')
-      comment.gsub!(/^\s*#/, '')
-      strip_leading_whitespace.call(comment)
-    end
-
     command "show-doc", "Show the comments above METH. Type `show-doc --help` for more info. Aliases: \?" do |*args|
       options = {}
       target = target()
@@ -667,6 +472,10 @@ e.g show-doc hello_method
           target = Pry.binding_for(target.eval(context))
         end
 
+        opts.on("-f", "--flood", "Do not use a pager to view text longer than one screen.") do 
+          options[:f] = true
+        end
+
         opts.on_tail("-h", "--help", "This message.") do 
           output.puts opts
           options[:h] = true
@@ -677,37 +486,34 @@ e.g show-doc hello_method
 
       next if options[:h]
 
-      if (meth = get_method_object.call(meth_name, target, options)).nil?
+      if (meth = get_method_object(meth_name, target, options)).nil?
         output.puts "Invalid method name: #{meth_name}. Type `show-doc --help` for help"
         next
       end
 
-      case code_type = code_type_for.call(meth)
+      case code_type = code_type_for(meth)
       when nil
         next
       when :c
         doc = Pry::MethodInfo.info_for(meth).docstring
       when :ruby
         doc = meth.comment
-        doc = strip_leading_hash_and_whitespace_from_ruby_comments.call(doc)
-        set_file_and_dir_locals.call(meth.source_location.first)
+        doc = strip_leading_hash_and_whitespace_from_ruby_comments(doc)
+        set_file_and_dir_locals(meth.source_location.first)
       end
 
       next output.puts("No documentation found.") if doc.empty?
       
-      doc = process_comment_markup.call(doc, code_type)
+      doc = process_comment_markup(doc, code_type)
       
-      output.puts make_header.call(meth, code_type)
-      output.puts doc
+      output.puts make_header(meth, code_type, doc)
+
+      render_output(options[:f], false, doc)
       doc
     end
 
     alias_command "?", "show-doc", ""
 
-    strip_comments_from_c_code = lambda do |code|
-      code.sub /\A\s*\/\*.*?\*\/\s*/m, ''
-    end
-    
     command "show-method", "Show the source for METH. Type `show-method --help` for more info. Aliases: show-source" do |*args|
       options = {}
       target = target()
@@ -731,6 +537,10 @@ e.g: show-method hello_method
           options[:m] = true
         end
 
+        opts.on("-f", "--flood", "Do not use a pager to view text longer than one screen.") do 
+          options[:f] = true
+        end
+
         opts.on("-c", "--context CONTEXT", "Select object context to run under.") do |context|
           target = Pry.binding_for(target.eval(context))
         end
@@ -745,41 +555,69 @@ e.g: show-method hello_method
 
       next if options[:h]
 
-      meth_name = meth_name_from_binding.call(target) if !meth_name
+      meth_name = meth_name_from_binding(target) if !meth_name
 
-      if (meth = get_method_object.call(meth_name, target, options)).nil?
+      if (meth = get_method_object(meth_name, target, options)).nil?
         output.puts "Invalid method name: #{meth_name}. Type `show-method --help` for help"
         next
       end
     
-      case code_type = code_type_for.call(meth)
+      case code_type = code_type_for(meth)
       when nil
         next
       when :c
         code = Pry::MethodInfo.info_for(meth).source
-        code = strip_comments_from_c_code.call(code)
+        code = strip_comments_from_c_code(code)
       when :ruby
-        code = strip_leading_whitespace.call(meth.source)
-        set_file_and_dir_locals.call(meth.source_location.first)
+        code = strip_leading_whitespace(meth.source)
+        set_file_and_dir_locals(meth.source_location.first)
       end
 
-      output.puts make_header.call(meth, code_type)
+      output.puts make_header(meth, code_type, code)
       if Pry.color
         code = CodeRay.scan(code, code_type).term
       end
 
+      start_line = false
       if options[:l]
         start_line = meth.source_location ? meth.source_location.last : 1
-        code = add_line_numbers.call(code, start_line)
       end
       
-      output.puts code
+      render_output(options[:f], start_line, code)
       code
     end
 
     alias_command "show-source", "show-method", ""
-    
-    command "show-command", "Show sourcecode for a Pry command, e.g: show-command cd" do |command_name|
+
+    command "show-command", "Show the source for CMD. Type `show-command --help` for more info." do |*args|
+      options = {}
+      target = target()
+      command_name = nil
+      
+      OptionParser.new do |opts|
+        opts.banner = %{Usage: show-command [OPTIONS] [CMD]
+Show the source for command CMD. 
+e.g: show-command show-method
+--
+}
+        opts.on("-l", "--line-numbers", "Show line numbers.") do |line|
+          options[:l] = true
+        end
+
+        opts.on("-f", "--flood", "Do not use a pager to view text longer than one screen.") do 
+          options[:f] = true
+        end
+
+        opts.on_tail("-h", "--help", "This message.") do 
+          output.puts opts
+          options[:h] = true
+        end
+      end.order(args) do |v|
+        command_name = v
+      end
+
+      next if options[:h]
+
       if !command_name
         output.puts "You must provide a command name."
         next
@@ -788,18 +626,18 @@ e.g: show-method hello_method
       if commands[command_name]
         meth = commands[command_name][:action]
 
-        code = strip_leading_whitespace.call(meth.source)
+        code = strip_leading_whitespace(meth.source)
         file, line = meth.source_location
-        set_file_and_dir_locals.call(file)
-        check_for_dynamically_defined_method.call(meth)
+        set_file_and_dir_locals(file)
+        check_for_dynamically_defined_method(meth)
 
-        output.puts "--\nFrom #{file} @ line #{line}:\n--"
+        output.puts make_header(meth, :ruby, code)
 
         if Pry.color
           code = CodeRay.scan(code, :ruby).term
         end
 
-        output.puts code
+        render_output(options[:f], options[:l] ? meth.source_location.last : false, code)
         code
       else
         output.puts "No such command: #{command_name}."
@@ -822,7 +660,7 @@ e.g: show-method hello_method
     end
 
     command "exit", "End the current Pry session. Accepts optional return value. Aliases: quit, back" do 
-      str = remove_first_word.call(opts[:val])
+      str = remove_first_word(opts[:val])
       throw(:breakout, [opts[:nesting].level, target.eval(str)])
     end
 
@@ -862,7 +700,7 @@ Is absorbed, not refracted, by grey stone.
 The dahlias sleep in the empty silence.
 Wait for the early owl.
 -- T.S Eliot
-}
+            }
       output.puts text
       text
     end

data/lib/pry/hooks.rb

@@ -12,7 +12,7 @@ class Pry
 
       # /unknown/ for rbx
       if file !~ /(\(.*\))|<.*>/ && file !~ /__unknown__/ && file != ""
-        Pry.run_command "whereami", :output => out, :show_output => true, :context => target, :commands => Pry::Commands
+        Pry.run_command "whereami 5", :output => out, :show_output => true, :context => target, :commands => Pry::Commands
       end
     end,
     

data/lib/pry/pry_class.rb

@@ -179,7 +179,13 @@ class Pry
     
     null_output = Object.new.tap { |v| v.instance_eval { def puts(*) end } }
     
-    commands = options[:commands].clone
+    # FIXME! ugly hack to get around broken methods in both YARD and RBX
+    if RUBY_VERSION =~ /1.9/
+      commands = options[:commands].dup
+    else
+      commands = options[:commands].clone
+    end
+      
     commands.output = options[:show_output] ? options[:output] : null_output
     commands.target = Pry.binding_for(options[:context])
 

data/lib/pry/pry_instance.rb

@@ -143,7 +143,7 @@ class Pry
     target = Pry.binding_for(target)
     result = re(target)
 
-    print.call output, result if !@suppress_output
+    print.call output, result if should_print?(result)
   end
 
   # Perform a read-eval
@@ -202,7 +202,7 @@ class Pry
     @suppress_output = true if eval_string =~ /;\Z/
     
     eval_string
-  end
+  end 
 
   # Returns true if input is "" and a command is not returning a
   # value.
@@ -284,6 +284,15 @@ class Pry
     end
   end
 
+  # Whether the print proc should be invoked.
+  # Currently only invoked if the output is not suppressed OR the output
+  # is an exception regardless of suppression.
+  # @param [Object] result The result of evaluation stage of the REPL
+  # @return [Boolean] Whether the print proc should be invoked.
+  def should_print?(result)
+    !@suppress_output || result.is_a?(Exception)
+  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.8.0pre5"
+  VERSION = "0.8.0pre7" 
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pry
 version: !ruby/object:Gem::Version 
+  hash: -766259880
   prerelease: true
   segments: 
   - 0
   - 8
-  - 0pre5
-  version: 0.8.0pre5
+  - 0pre7
+  version: 0.8.0pre7
 platform: i386-mingw32
 authors: 
 - John Mair (banisterfiend)
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 +12:00
+date: 2011-04-12 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 2
         - 0
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 53
         segments: 
         - 0
         - 9
@@ -55,6 +58,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -70,6 +74,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 4
@@ -85,6 +90,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -109,6 +115,7 @@ files:
 - lib/pry/hooks.rb
 - lib/pry/custom_completions.rb
 - lib/pry/core_extensions.rb
+- lib/pry/command_helpers.rb
 - lib/pry/command_processor.rb
 - lib/pry/completion.rb
 - lib/pry/print.rb
@@ -148,6 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -156,6 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3