pry 0.8.0pre2 → 0.8.0pre4

data/lib/pry/command_processor.rb

@@ -2,6 +2,9 @@ require 'forwardable'
 
 class Pry
   class CommandProcessor
+    SYSTEM_COMMAND_DELIMITER = "."
+    SYSTEM_COMMAND_REGEX = /^#{Regexp.escape(SYSTEM_COMMAND_DELIMITER)}(.*)/
+
     extend Forwardable
     
     attr_reader :pry_instance
@@ -12,23 +15,33 @@ class Pry
 
     def_delegators :@pry_instance, :commands, :nesting, :output
     
-    def system_command(val)
-      if val =~ /^\.(.*)/
-        execute_system_command($1)
-        val.clear
-      else
-        return false
-      end
-      true
+    def valid_command?(val)
+      system_command?(val) || pry_command?(val)
     end
 
-    def execute_system_command(cmd)
+    def system_command?(val)
+      !!(SYSTEM_COMMAND_REGEX =~ val)
+    end
+
+    def pry_command?(val)
+      !!command_matched(val).first
+    end
+    
+    def execute_system_command(val)
+      SYSTEM_COMMAND_REGEX  =~ val
+      cmd = $1
+      
       if cmd =~ /^cd\s+(.+)/i
-        Dir.chdir(File.expand_path($1))
-        system(cmd)
+        begin
+          Dir.chdir(File.expand_path($1))
+        rescue Errno::ENOENT
+          output.puts "No such directory: #{$1}"
+        end
       else
         system(cmd)
       end
+
+      val.clear
     end
     
     # Determine whether a Pry command was matched and return command data
@@ -57,7 +70,10 @@ class Pry
       def val.clear() replace("") end
       def eval_string.clear() replace("") end
 
-      return if system_command(val)
+      if system_command?(val)
+        execute_system_command(val)
+        return
+      end
 
       cmd_data, args_string = command_matched(val)
 

data/lib/pry/commands.rb

@@ -120,6 +120,13 @@ class Pry
     alias_command "quit-program", "exit-program", ""
     alias_command "!!!", "exit-program", ""
 
+    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
+      Dir.chdir(File.expand_path(gem_spec.full_gem_path))
+    end
+
     command "toggle-color", "Toggle syntax highlighting." do
       Pry.color = !Pry.color
       output.puts "Syntax highlighting #{Pry.color ? "on" : "off"}"
@@ -134,7 +141,6 @@ 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
@@ -413,9 +419,10 @@ Shows local and instance variables by default.
       ".json" => :json
     }
 
-    syntax_highlight_by_file_type = lambda do |contents, file_name|
+    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
 
@@ -443,11 +450,12 @@ Shows local and instance variables by default.
       end
     end
     
-    command "cat-file", "Show output of file FILE. Type `cat --help` for more information. Aliases: :cat" do |*args|
+    command "cat-file", "Show output of file FILE. Type `cat --help` for more information." do |*args|
       options= {}
       file_name = nil
       start_line = 0
       end_line = -1
+      file_type = nil
 
       OptionParser.new do |opts|
         opts.banner = %{Usage: cat-file [OPTIONS] FILE
@@ -467,6 +475,10 @@ 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|
+          file_type = type.to_sym
+        end        
+
         opts.on_tail("-h", "--help", "This message.") do 
           output.puts opts
           options[:h] = true
@@ -485,7 +497,7 @@ e.g: cat-file hello.rb
       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)
+        contents = syntax_highlight_by_file_type_or_specified.call(contents, file_name, file_type)
       end
 
       if options[:l]
@@ -496,8 +508,6 @@ e.g: cat-file hello.rb
       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()

data/lib/pry/pry_class.rb

@@ -57,6 +57,12 @@ class Pry
     #     :after_session => proc { puts "goodbye" }
     attr_accessor :hooks
 
+    
+    # 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
+    # @example Add file names to completion list
+    #   Pry.custom_completions = proc { Dir.entries('.') }
     attr_accessor :custom_completions
 
     # Get the array of Procs to be used for the prompts by default by

data/lib/pry/pry_instance.rb

@@ -141,7 +141,8 @@ class Pry
   #   Pry.new.rep(Object.new)
   def rep(target=TOPLEVEL_BINDING)
     target = Pry.binding_for(target)
-    print.call output, re(target)
+    result = re(target)
+    print.call output, result if !@suppress_output
   end
 
   # Perform a read-eval
@@ -185,13 +186,29 @@ class Pry
   #   Pry.new.r(Object.new)
   def r(target=TOPLEVEL_BINDING)
     target = Pry.binding_for(target)
+    @suppress_output = false
     eval_string = ""
 
     loop do
       val = retrieve_line(eval_string, target)
       process_line(val, eval_string, target)
-      break eval_string if valid_expression?(eval_string)
+      if valid_expression?(eval_string)
+        redo if null_input?(val)
+        break 
+      end
     end
+
+    @suppress_output = true if eval_string =~ /;\Z/
+    
+    eval_string
+  end
+
+  # Returns true if input is "" and a command is not returning a
+  # value.
+  # @param [String] val The input string.
+  # @return [Boolean] Whether the input is null.
+  def null_input?(val)
+    val.empty? && !Pry.cmd_ret_value
   end
 
   # Read a line of input and check for ^d, also determine prompt to use.
@@ -224,7 +241,7 @@ class Pry
     if Pry.cmd_ret_value
       eval_string << "Pry.cmd_ret_value\n"
     else
-      eval_string << "#{val}\n"
+      eval_string << "#{val}\n" if !val.empty?
     end
   end
 

data/lib/pry/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 0pre2
-  version: 0.8.0pre2
+  - 0pre4
+  version: 0.8.0pre4
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-07 00:00:00 +12:00
+date: 2011-04-08 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency