pry 0.8.0pre4 → 0.8.0pre5

data/Rakefile

@@ -30,13 +30,13 @@ def apply_spec_defaults(s)
 end
 
 task :test do
-  sh "bacon -k #{direc}/test/test.rb"
+  sh "bacon #{direc}/test/test.rb"
 end
 
 desc "run pry"
 task :pry do
   require "#{direc}/lib/pry.rb"
-  Pry.start
+  binding.pry
 end
 
 desc "show pry version"

data/lib/pry/command_base.rb

@@ -68,19 +68,26 @@ class Pry
       end
 
       # Execute a command (this enables commands to call other commands).
+      # @param [Binding] target The current target object.
       # @param [String] name The command to execute
       # @param [Array] args The parameters to pass to the command.
       # @example Wrap one command with another
       #   class MyCommands < Pry::Commands
       #     command "ls2" do
       #       output.puts "before ls"
-      #       run "ls"
+      #       run target, "ls"
       #       output.puts "after ls"
       #     end
       #   end
-      def run(name, *args)
-        action = opts[:commands][name][:action]
-        instance_exec(*args, &action)
+      def run(target, name, *args)
+        command_processor =  CommandProcessor.new(target.eval('_pry_'))
+        
+        if command_processor.system_command?(name)
+          command_processor.execute_system_command("#{name} #{args.join}", target)
+        else
+          action = opts[:commands][name][:action]
+          instance_exec(*args, &action)
+        end
       end
 
       # Import commands from another command object.

data/lib/pry/command_processor.rb

@@ -7,7 +7,7 @@ class Pry
 
     extend Forwardable
     
-    attr_reader :pry_instance
+    attr_accessor :pry_instance
     
     def initialize(pry_instance)
       @pry_instance = pry_instance
@@ -26,10 +26,16 @@ class Pry
     def pry_command?(val)
       !!command_matched(val).first
     end
+
+    def interpolate_string(str, target)
+      dumped_str = str.dump
+      dumped_str.gsub!(/\\\#\{/, '#{')
+      target.eval(dumped_str)
+    end
     
-    def execute_system_command(val)
+    def execute_system_command(val, target)
       SYSTEM_COMMAND_REGEX  =~ val
-      cmd = $1
+      cmd = interpolate_string($1, target)
       
       if cmd =~ /^cd\s+(.+)/i
         begin
@@ -71,15 +77,16 @@ class Pry
       def eval_string.clear() replace("") end
 
       if system_command?(val)
-        execute_system_command(val)
+        execute_system_command(val, target)
         return
       end
 
+      # no command was matched, so return to caller
+      return if !pry_command?(val)
+
+      val.replace interpolate_string(val, target)
       cmd_data, args_string = command_matched(val)
 
-      # no command was matched, so return to caller
-      return if !cmd_data
-      
       args = args_string ? Shellwords.shellwords(args_string) : []
       action = cmd_data[:action]
       keep_retval = cmd_data[:keep_retval]

data/lib/pry/commands.rb

@@ -31,6 +31,16 @@ class Pry
       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 =~ /(\(.*\))|<.*>/
@@ -123,7 +133,7 @@ class Pry
     command "gem-cd", "Change working directory to specified gem's directory." do |gem_name|
       require 'rubygems'
       gem_spec = Gem.source_index.find_name(gem_name).first
-      next output.put("Gem `#{gem_name}` not found.") if !gem_spec
+      next output.puts("Gem `#{gem_name}` not found.") if !gem_spec
       Dir.chdir(File.expand_path(gem_spec.full_gem_path))
     end
 
@@ -149,6 +159,8 @@ class Pry
       else
         Pry.active_instance.prompt = Pry::FILE_PROMPT
         Pry.active_instance.custom_completions = Pry::FILE_COMPLETIONS
+        Readline.completion_proc = Pry::InputCompleter.build_completion_proc target,
+        Pry.active_instance.instance_eval(&Pry::FILE_COMPLETIONS)
       end        
     end
 
@@ -201,6 +213,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--"
       
       # This method inspired by http://rubygems.org/gems/ir_b
@@ -426,20 +440,13 @@ Shows local and instance variables by default.
       CodeRay.scan(contents, language_detected).term
     end
 
-    read_between_the_lines = lambda do |file_name, start_line, end_line, with_line_numbers|
+    read_between_the_lines = lambda do |file_name, start_line, end_line|
       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
+      content.each_line.to_a[start_line..end_line].join
     end
 
     add_line_numbers = lambda do |lines, start_line|
-      lines.each_line.map.with_index do |line, idx|
+      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
@@ -475,7 +482,7 @@ e.g: cat-file hello.rb
           end_line = line.to_i - 1
         end
 
-        opts.on("-t", "--type TYPE", "The specific file type for syntax higlighting.") do |type|
+        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        
 
@@ -494,7 +501,7 @@ e.g: cat-file hello.rb
         next
       end
 
-      contents = read_between_the_lines.call(file_name, start_line, end_line, false)
+      contents = read_between_the_lines.call(file_name, start_line, end_line)
 
       if Pry.color
         contents = syntax_highlight_by_file_type_or_specified.call(contents, file_name, file_type)
@@ -503,7 +510,8 @@ e.g: cat-file hello.rb
       if options[:l]
         contents = add_line_numbers.call(contents, start_line + 1)
       end
-      
+       
+      set_file_and_dir_locals.call(file_name)
       output.puts contents
       contents
     end
@@ -548,6 +556,8 @@ 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)
+
       new_constants = Object.constants - old_constants
       output.puts "Brought in the following top-level constants: #{new_constants.inspect}" if !new_constants.empty?
     end      
@@ -680,6 +690,7 @@ e.g show-doc hello_method
       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)
       end
 
       next output.puts("No documentation found.") if doc.empty?
@@ -749,6 +760,7 @@ e.g: show-method hello_method
         code = strip_comments_from_c_code.call(code)
       when :ruby
         code = strip_leading_whitespace.call(meth.source)
+        set_file_and_dir_locals.call(meth.source_location.first)
       end
 
       output.puts make_header.call(meth, code_type)
@@ -778,6 +790,7 @@ e.g: show-method hello_method
 
         code = strip_leading_whitespace.call(meth.source)
         file, line = meth.source_location
+        set_file_and_dir_locals.call(file)
         check_for_dynamically_defined_method.call(meth)
 
         output.puts "--\nFrom #{file} @ line #{line}:\n--"

data/lib/pry/hooks.rb

@@ -4,7 +4,7 @@ class Pry
   DEFAULT_HOOKS = {
     
     :before_session => proc do |out, target|
-      out.puts "Beginning Pry session for #{Pry.view_clip(target.eval('self'))}"
+     # out.puts "Beginning Pry session for #{Pry.view_clip(target.eval('self'))}"
 
       # ensure we're actually in a method
       meth_name = target.eval('__method__')
@@ -16,6 +16,6 @@ class Pry
       end
     end,
     
-    :after_session => proc { |out, target| out.puts "Ending Pry session for #{Pry.view_clip(target.eval('self'))}" }
+#    :after_session => proc { |out, target| out.puts "Ending Pry session for #{Pry.view_clip(target.eval('self'))}" }
   }
 end

data/lib/pry/pry_instance.rb

@@ -142,6 +142,7 @@ class Pry
   def rep(target=TOPLEVEL_BINDING)
     target = Pry.binding_for(target)
     result = re(target)
+
     print.call output, result if !@suppress_output
   end
 
@@ -235,7 +236,7 @@ class Pry
   # @param [String] eval_string The cumulative lines of input.
   # @target [Binding] target The target of the Pry session.
   def process_line(val, eval_string, target)
-    val.chomp!
+    val.rstrip!
     Pry.cmd_ret_value = @command_processor.process_commands(val, eval_string, target)
     
     if Pry.cmd_ret_value

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.8.0pre4"
+  VERSION = "0.8.0pre5"
 end

data/test/test.rb

@@ -70,15 +70,17 @@ describe Pry do
           o.instance_variable_get(:@x).should == 10
         end
 
-        it 'should execute start session and end session hooks' do
-          input = InputTester.new("exit")
-          str_output = StringIO.new
-          o = Object.new
+        # # this is now deprecated
+        # it 'should execute start session and end session hooks' do
+        #   next
+        #   input = InputTester.new("exit")
+        #   str_output = StringIO.new
+        #   o = Object.new
           
-          pry_tester = Pry.start(o, :input => input, :output => str_output)
-          str_output.string.should =~ /Beginning.*#{o}/
-          str_output.string.should =~ /Ending.*#{o}/
-        end
+        #   pry_tester = Pry.start(o, :input => input, :output => str_output)
+        #   str_output.string.should =~ /Beginning.*#{o}/
+        #   str_output.string.should =~ /Ending.*#{o}/
+        # end
       end
 
       describe "test loading rc files" do
@@ -490,7 +492,7 @@ describe Pry do
               end
 
               command "run_v" do
-                run "v"
+                run target, "v"
               end
             end
 
@@ -514,23 +516,26 @@ describe Pry do
             str_output = StringIO.new
             Pry.new(:print => proc {}, :input => InputTester.new("v"),
                     :output => str_output, :commands => Command4).rep("john")
-            str_output.string.chomp.should == "john"
+
+            str_output.string.rstrip.should == "john"
 
             Object.remove_const(:Command3)
             Object.remove_const(:Command4)
           end
 
           it 'should import commands from another command object' do
-            class Command3 < Pry::CommandBase
+            Object.remove_const(:Command77) if Object.const_defined?(:Command77)
+
+            class Command77 < Pry::CommandBase
               import_from Pry::Commands, "status", "jump-to"
             end
 
             str_output = StringIO.new
             Pry.new(:print => proc {}, :input => InputTester.new("status"),
-                    :output => str_output, :commands => Command3).rep("john")
+                    :output => str_output, :commands => Command77).rep("john")
             str_output.string.should =~ /Status:/
 
-            Object.remove_const(:Command3)
+            Object.remove_const(:Command77)
           end
 
           it 'should delete some inherited commands when using delete method' do
@@ -569,11 +574,11 @@ describe Pry do
             
             str_output = StringIO.new
             Pry.new(:input => InputTester.new("jump-to"), :output => str_output, :commands => Command3).rep
-            str_output.string.chomp.should == "jump-to the music"
+            str_output.string.rstrip.should == "jump-to the music"
 
             str_output = StringIO.new
             Pry.new(:input => InputTester.new("help"), :output => str_output, :commands => Command3).rep
-            str_output.string.chomp.should == "help to the music"
+            str_output.string.rstrip.should == "help to the music"
             
             Object.remove_const(:Command3)
 

data/test/test_helper.rb

@@ -35,6 +35,7 @@ class Pry
   # null output class - doesn't write anywwhere.
   class NullOutput
     def self.puts(*) end
+    def self.string(*) end
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 0pre4
-  version: 0.8.0pre4
+  - 0pre5
+  version: 0.8.0pre5
 platform: ruby
 authors: 
 - John Mair (banisterfiend)