pry 0.7.7.2 → 0.8.0pre1

data/lib/pry.rb

@@ -20,13 +20,14 @@ if RUBY_PLATFORM =~ /mswin/ || RUBY_PLATFORM =~ /mingw/
   end
 end
 
-require "pry/version"
-require "pry/hooks"
-require "pry/print"
-require "pry/command_base"
-require "pry/commands"
-require "pry/prompts"
-require "pry/completion"
-require "pry/core_extensions"
-require "pry/pry_class"
-require "pry/pry_instance"
+require "#{direc}/pry/version"
+require "#{direc}/pry/hooks"
+require "#{direc}/pry/print"
+require "#{direc}/pry/command_base"
+require "#{direc}/pry/commands"
+require "#{direc}/pry/prompts"
+require "#{direc}/pry/custom_completions"
+require "#{direc}/pry/completion"
+require "#{direc}/pry/core_extensions"
+require "#{direc}/pry/pry_class"
+require "#{direc}/pry/pry_instance"

data/lib/pry/commands.rb

@@ -1,7 +1,9 @@
+direc = File.dirname(__FILE__)
+
 require "optparse"
 require "method_source"
-require "pry/command_base"
-require "pry/pry_instance"
+require "#{direc}/command_base"
+require "#{direc}/pry_instance"
 
 begin
 
@@ -132,6 +134,18 @@ class Pry
       end
     end
 
+    # FIXME: when restoring backups does not restore descriptions
+    command "file-mode", "Toggle file mode." do
+      case Pry.active_instance.prompt
+      when Pry::FILE_PROMPT
+        Pry.active_instance.prompt = Pry::DEFAULT_PROMPT
+        Pry.active_instance.custom_completions = Pry::DEFAULT_CUSTOM_COMPLETIONS
+      else
+        Pry.active_instance.prompt = Pry::FILE_PROMPT
+        Pry.active_instance.custom_completions = Pry::FILE_COMPLETIONS
+      end        
+    end
+
     command "nesting", "Show nesting information." do 
       nesting = opts[:nesting]
       
@@ -382,17 +396,108 @@ Shows local and instance variables by default.
       end
     end
 
-    command "cat-file", "Show output of file FILE" do |file_name|
+    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 = lambda do |contents, file_name|
+      _, language_detected = file_map.find { |k, v| Array(k).include?(File.extname(file_name)) }
+
+      CodeRay.scan(contents, language_detected).term
+    end
+
+    read_between_the_lines = lambda do |file_name, start_line, end_line, with_line_numbers|
+      content = File.read(File.expand_path(file_name))
+
+      if with_line_numbers
+        lines = content.each_line.map.with_index { |line, idx| "#{idx + 1}: #{line}" }
+      else
+        lines = content.each_line.to_a
+      end
+      
+      lines[start_line..end_line].join
+    end
+
+    add_line_numbers = lambda do |lines, start_line|
+      lines.each_line.map.with_index 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. Aliases: :cat" do |*args|
+      options= {}
+      file_name = nil
+      start_line = 0
+      end_line = -1
+
+      OptionParser.new do |opts|
+        opts.banner = %{Usage: cat-file [OPTIONS] FILE
+Cat a file. Defaults to displaying whole file. Syntax highlights file if type is recognized.
+e.g: cat-file hello.rb
+--
+}
+        opts.on("-l", "--line-numbers", "Show line numbers.") do |line|
+          options[:l] = true
+        end
+
+        opts.on("-s", "--start LINE", "Start line (defaults to start of file). Line 1 is the first line.") do |line|
+          start_line = line.to_i - 1
+        end
+
+        opts.on("-e", "--end LINE", "End line (defaults to end of file). Line -1 is the last line.") do |line|
+          end_line = line.to_i - 1
+        end
+
+        opts.on_tail("-h", "--help", "This message.") do 
+          output.puts opts
+          options[:h] = true
+        end
+      end.order(args) do |v|
+        file_name = v
+      end
+
+      next if options[:h]
+      
       if !file_name
         output.puts "Must provide a file name."
         next
       end
 
-      contents = File.read(File.expand_path(file_name))
+      contents = read_between_the_lines.call(file_name, start_line, end_line, false)
+
+      if Pry.color
+        contents = syntax_highlight_by_file_type.call(contents, file_name)
+      end
+
+      if options[:l]
+        contents = add_line_numbers.call(contents, start_line + 1)
+      end
+      
       output.puts contents
       contents
     end
 
+    alias_command ":cat", "cat-file", ""
+
     command "eval-file", "Eval a Ruby script. Type `eval-file --help` for more info." do |*args|
       options = {}
       target = target()
@@ -461,32 +566,65 @@ e.g: eval-file -c self "hello.rb"
         next
       end    
 
-      target.eval("#{obj}").pry
+      Pry.start target.eval("#{obj}")
     end
 
-    process_comment_markup = lambda do |comment, code_type|
+    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 }.
-        gsub(/^@(param|return|example|option|yield|attr|attr_reader|attr_writer)/) { Pry.color ? "\e[33m#{$1}\e[0m": $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." do |*args|
+    command "show-doc", "Show the comments above METH. Type `show-doc --help` for more info. Aliases: \?" do |*args|
       options = {}
       target = target()
       meth_name = nil
@@ -534,7 +672,10 @@ e.g show-doc hello_method
         doc = strip_leading_hash_and_whitespace_from_ruby_comments.call(doc)
       end
 
+      next output.puts("No documentation found.") if doc.empty?
+      
       doc = process_comment_markup.call(doc, code_type)
+      
       output.puts make_header.call(meth, code_type)
       output.puts doc
       doc
@@ -555,6 +696,10 @@ Show the source for method METH. Tries instance methods first and then methods b
 e.g: show-method hello_method
 --
 }
+        opts.on("-l", "--line-numbers", "Show line numbers.") do |line|
+          options[:l] = true
+        end
+
         opts.on("-M", "--instance-methods", "Operate on instance methods.") do 
           options[:M] = true
         end
@@ -598,6 +743,11 @@ e.g: show-method hello_method
       if Pry.color
         code = CodeRay.scan(code, code_type).term
       end
+
+      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
       code

data/lib/pry/custom_completions.rb

@@ -0,0 +1,6 @@
+class Pry
+
+  # This proc will be instance_eval's against the active Pry instance
+  DEFAULT_CUSTOM_COMPLETIONS = proc { commands.commands.keys }
+  FILE_COMPLETIONS = proc { commands.commands.keys + Dir.entries('.') }
+end

data/lib/pry/prompts.rb

@@ -23,4 +23,9 @@ class Pry
 
   # A simple prompt - doesn't display target or nesting level
   SIMPLE_PROMPT = [proc { ">> " }, proc { ">* " }]
+
+  FILE_PROMPT = [
+                 proc { |target_self, _| "pry #{Pry.view_clip(target_self)}:#{Dir.pwd} $ " },
+                 proc { |target_self, _| "pry #{Pry.view_clip(target_self)}:#{Dir.pwd} * " }
+                ]
 end

data/lib/pry/pry_class.rb

@@ -57,6 +57,8 @@ class Pry
     #     :after_session => proc { puts "goodbye" }
     attr_accessor :hooks
 
+    attr_accessor :custom_completions
+
     # Get the array of Procs to be used for the prompts by default by
     # all Pry instances.
     # @return [Array<Proc>] The array of Procs to be used for the
@@ -122,6 +124,9 @@ class Pry
     else
       obj.to_s
     end
+
+  rescue NoMethodError
+    "unknown"
   end
 
   # A version of `Pry.view` that clips the output to `max_size` chars.
@@ -189,6 +194,7 @@ class Pry
     @prompt = DEFAULT_PROMPT
     @print = DEFAULT_PRINT
     @hooks = DEFAULT_HOOKS
+    @custom_completions = DEFAULT_CUSTOM_COMPLETIONS
     @color = true
     @should_load_rc = true
     @rc_loaded = false

data/lib/pry/pry_instance.rb

@@ -2,7 +2,7 @@ class Pry
 
   # The list of configuration options.
   CONFIG_OPTIONS = [:input, :output, :commands, :print,
-                   :prompt, :hooks]
+                   :prompt, :hooks, :custom_completions]
 
   attr_accessor *CONFIG_OPTIONS
 
@@ -71,8 +71,8 @@ class Pry
     Pry.active_instance = self
 
     # Make sure special locals exist
-    target.eval("_pry_ = Pry.active_instance")
-    target.eval("_ = Pry.last_result")
+    target.eval("_pry_ = ::Pry.active_instance")
+    target.eval("_ = ::Pry.last_result")
     self.session_target = target
   end
 
@@ -93,7 +93,7 @@ class Pry
 
     return_value
   end
-  
+
   # Start a read-eval-print-loop.
   # If no parameter is given, default to top-level (main).
   # @param [Object, Binding] target The receiver of the Pry session
@@ -149,13 +149,13 @@ class Pry
 
     if input == Readline
       # Readline tab completion
-      Readline.completion_proc = Pry::InputCompleter.build_completion_proc(target, commands.commands.keys)
+      Readline.completion_proc = Pry::InputCompleter.build_completion_proc target, instance_eval(&custom_completions)
     end
 
 
     # save the pry instance to active_instance
     Pry.active_instance = self
-    target.eval("_pry_ = Pry.active_instance")
+    target.eval("_pry_ = ::Pry.active_instance")
 
     # eval the expression and save to last_result
     # Do not want __FILE__, __LINE__ here because we need to distinguish
@@ -228,7 +228,7 @@ class Pry
   # @param [Binding] target The binding to set `_` on.
   def set_last_result(result, target)
     Pry.last_result = result
-    target.eval("_ = Pry.last_result")
+    target.eval("_ = ::Pry.last_result")
   end
 
   # Set the last exception for a session.
@@ -237,9 +237,29 @@ class Pry
   # @param [Binding] target The binding to set `_ex_` on.
   def set_last_exception(ex, target)
     Pry.last_exception = ex
-    target.eval("_ex_ = Pry.last_exception")
+    target.eval("_ex_ = ::Pry.last_exception")
+  end
+
+  # FIXME
+  def system_command(val)
+    if val =~ /^:(.*)/
+      execute_system_command($1)
+      val.clear
+    else
+      return false
+    end
+    true
   end
 
+  def execute_system_command(cmd)
+    if cmd =~ /^cd\s+(.+)/i
+      Dir.chdir(File.expand_path($1))
+      system(cmd)
+    else
+      system(cmd)
+    end
+  end
+  
   # Determine whether a Pry command was matched and return command data
   # and argument string.
   # This method should not need to be invoked directly.
@@ -266,6 +286,8 @@ class Pry
     def val.clear() replace("") end
     def eval_string.clear() replace("") end
 
+    return if system_command(val)
+
     cmd_data, args_string = command_matched(val)
 
     # no command was matched, so return to caller
@@ -355,7 +377,7 @@ class Pry
     end
   end
 
-  if RUBY_VERSION =~ /1.9/
+  if RUBY_VERSION =~ /1.9/ && RUBY_ENGINE == "ruby"
     require 'ripper'
 
     # Determine if a string of code is a valid Ruby expression.

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.7.7.2"
+  VERSION = "0.8.0pre1"
 end

data/test/test.rb

@@ -10,15 +10,9 @@ puts "Testing Pry #{Pry::VERSION}"
 puts "With method_source version #{MethodSource::VERSION}"
 puts "--"
 
-# Ensure we do not execute any rc files
-Pry::RC_FILES.clear
-Pry.color = false
-Pry.should_load_rc = false
-
 describe Pry do
   describe "open a Pry session on an object" do
     describe "rep" do
-      
       before do
         class Hello
         end

data/test/test_helper.rb

@@ -1,3 +1,8 @@
+# Ensure we do not execute any rc files
+Pry::RC_FILES.clear
+Pry.color = false
+Pry.should_load_rc = false
+
 class Module
   public :remove_const
 end

metadata

@@ -1,114 +1,123 @@
 --- !ruby/object:Gem::Specification 
 name: pry
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.7.7.2
+  prerelease: true
+  segments: 
+  - 0
+  - 8
+  - 0pre1
+  version: 0.8.0pre1
 platform: ruby
 authors: 
-  - John Mair (banisterfiend)
+- John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 +13:00
+date: 2011-04-07 00:00:00 +12:00
 default_executable: 
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: ruby_parser
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 2.0.5
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: coderay
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.9.7
-    type: :runtime
-    version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: bacon
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.1.0
-    type: :development
-    version_requirements: *id003
-  - !ruby/object:Gem::Dependency 
-    name: method_source
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.4.0
-    type: :runtime
-    version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: ruby_parser
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 5
+        version: 2.0.5
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: coderay
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 7
+        version: 0.9.7
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bacon
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: method_source
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 0
+        version: 0.4.0
+  type: :runtime
+  version_requirements: *id004
 description: attach an irb-like session to any object at runtime
 email: jrmair@gmail.com
 executables: 
-  - pry
+- pry
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-  - lib/pry.rb
-  - lib/pry.rbc
-  - lib/pry/commands.rb
-  - lib/pry/print.rbc
-  - lib/pry/version.rb
-  - lib/pry/pry_class.rbc
-  - lib/pry/command_base.rb
-  - lib/pry/pry_instance.rbc
-  - lib/pry/prompts.rb
-  - lib/pry/#commands.rb#
-  - lib/pry/completion.rbc
-  - lib/pry/hooks.rb
-  - lib/pry/commands.rbc
-  - lib/pry/core_extensions.rbc
-  - lib/pry/prompts.rbc
-  - lib/pry/core_extensions.rb
-  - lib/pry/command_base.rbc
-  - lib/pry/version.rbc
-  - lib/pry/completion.rb
-  - lib/pry/print.rb
-  - lib/pry/pry_class.rb
-  - lib/pry/pry_instance.rb
-  - lib/pry/hooks.rbc
-  - examples/example_commands.rb
-  - examples/example_image_edit.rb
-  - examples/example_input2.rb
-  - examples/example_prompt.rb
-  - examples/example_command_override.rb
-  - examples/example_output.rb
-  - examples/example_hooks.rb
-  - examples/example_print.rb
-  - examples/example_basic.rb
-  - examples/example_input.rb
-  - test/test.rb
-  - test/test_helper.rb
-  - test/testrc
-  - CHANGELOG
-  - LICENSE
-  - README.markdown
-  - Rakefile
-  - .gemtest
-  - bin/pry
-has_rdoc: true
+- lib/pry/commands.rb
+- lib/pry/version.rb
+- lib/pry/command_base.rb
+- lib/pry/prompts.rb
+- lib/pry/hooks.rb
+- lib/pry/custom_completions.rb
+- lib/pry/core_extensions.rb
+- lib/pry/completion.rb
+- lib/pry/print.rb
+- lib/pry/pry_class.rb
+- lib/pry/pry_instance.rb
+- lib/pry.rb
+- examples/example_commands.rb
+- examples/example_image_edit.rb
+- examples/example_input2.rb
+- examples/example_prompt.rb
+- examples/example_command_override.rb
+- examples/example_output.rb
+- examples/example_hooks.rb
+- examples/example_print.rb
+- examples/example_basic.rb
+- examples/example_input.rb
+- test/test.rb
+- test/test_helper.rb
+- test/testrc
+- CHANGELOG
+- LICENSE
+- README.markdown
+- Rakefile
+- .gemtest
+- bin/pry
+has_rdoc: yard
 homepage: http://banisterfiend.wordpress.com
 licenses: []
 
@@ -116,23 +125,29 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">"
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: attach an irb-like session to any object at runtime