pry 0.6.6 → 0.6.7pre4

data/Rakefile

@@ -20,6 +20,7 @@ def apply_spec_defaults(s)
   s.description = s.summary
   s.require_path = 'lib'
   s.add_dependency("ruby_parser",">=2.0.5")
+  s.add_dependency("coderay",">=0.9.7")
   s.add_development_dependency("bacon",">=1.1.0")
   s.homepage = "http://banisterfiend.wordpress.com"
   s.has_rdoc = 'yard'
@@ -56,6 +57,22 @@ namespace :ruby do
   end
 end
 
+[:mingw32, :mswin32].each do |v|
+  namespace v do
+    spec = Gem::Specification.new do |s|
+      apply_spec_defaults(s)        
+      s.add_dependency("method_source",">=0.3.4")
+      s.add_dependency("win32console", ">=1.3.0")
+      s.platform = "i386-#{v}"
+    end
+
+    Rake::GemPackageTask.new(spec) do |pkg|
+      pkg.need_zip = false
+      pkg.need_tar = false
+    end
+  end
+end
+
 namespace :jruby do
   spec = Gem::Specification.new do |s|
     apply_spec_defaults(s)
@@ -71,7 +88,7 @@ end
 
 
 desc "build all platform gems at once"
-task :gems => [:rmgems, "ruby:gem", "jruby:gem"]
+task :gems => [:rmgems, "ruby:gem", "jruby:gem", "mswin32:gem", "mingw32:gem"]
 
 desc "remove all platform gems"
 task :rmgems => ["ruby:clobber_package"]

data/bin/pry

@@ -35,6 +35,18 @@ See: `https://github.com/banister` for more information.
     options[:loadrc] = false
   end
 
+  opts.on("--color", "Start session with syntax highlighting on.") do 
+    Pry.color = true
+  end
+
+  opts.on("--simple-prompt", "Simple prompt mode.") do 
+    Pry.prompt = Pry::SIMPLE_PROMPT
+  end
+
+  opts.on("-I LOADPATH", "Specify $LOAD_PATH directory.") do  |load_path|
+    $LOAD_PATH << load_path
+  end
+
   opts.on("-v", "--version", "Display the Pry version.") do
     puts "Pry version #{Pry::VERSION} on Ruby #{RUBY_VERSION}"
     exit

data/lib/pry.rb

@@ -3,16 +3,30 @@
 
 direc = File.dirname(__FILE__)
 
+$LOAD_PATH << File.expand_path(direc)
+
 require "method_source"
+require 'shellwords'
 require "readline"
 require "stringio"
-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/completion"
-require "#{direc}/pry/core_extensions"
-require "#{direc}/pry/pry_class"
-require "#{direc}/pry/pry_instance"
+require "coderay"
+
+if RUBY_PLATFORM =~ /mswin/ || RUBY_PLATFORM =~ /mingw/
+  begin
+    require 'win32console'
+  rescue LoadError
+    $stderr.puts "Need to `gem install win32console`" 
+    exit 1
+  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"

data/lib/pry/commands.rb

@@ -1,9 +1,7 @@
-direc = File.dirname(__FILE__)
-
 require "optparse"
 require "method_source"
-require "#{direc}/command_base"
-require "#{direc}/pry_instance"
+require "pry/command_base"
+require "pry/pry_instance"
 
 class Pry
 
@@ -25,6 +23,10 @@ class Pry
         raise "Cannot retrieve source for dynamically defined method."
       end
     end
+
+    remove_first_word = lambda do |text|
+      text.split.drop(1).join(' ')
+    end
     
     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!"
@@ -41,6 +43,20 @@ class Pry
 
     alias_command "quit-program", "exit-program", ""
 
+    command "toggle-color", "Toggle syntax highlighting." do
+      Pry.color = !Pry.color
+      output.puts "Syntax highlighting #{Pry.color ? "on" : "off"}"
+    end
+
+    command "simple-prompt", "Toggle the simple prompt." do
+      case Pry.active_instance.prompt
+      when Pry::SIMPLE_PROMPT
+        Pry.active_instance.prompt = Pry::DEFAULT_PROMPT
+      else
+        Pry.active_instance.prompt = Pry::SIMPLE_PROMPT
+      end
+    end
+
     command "nesting", "Show nesting information." do 
       nesting = opts[:nesting]
       
@@ -76,7 +92,7 @@ class Pry
     end
     
     command "exit-all", "End all nested Pry sessions. Accepts optional return value. Aliases: !@" do 
-      str = opts[:val].split.drop(1).join(' ')
+      str = remove_first_word.call(opts[:val])
       throw(:breakout, [0, target.eval(str)])
     end
 
@@ -219,7 +235,11 @@ Shows local and instance variables by default.
         info.sort_by { |k, v| v.last }.each do |k, v|
           if !v.first.empty?
             output.puts "#{k}:\n--"
-            output.puts Pry.view(v.first)
+            if Pry.color
+              output.puts CodeRay.scan(Pry.view(v.first), :ruby).term
+            else
+              output.puts Pry.view(v.first)
+            end
             output.puts
           end
         end
@@ -227,7 +247,11 @@ Shows local and instance variables by default.
       # plain
       else
         list = info.values.sort_by { |v| v.last }.map { |v| v.first }.inject(&:+)
-        output.puts Pry.view(list)
+        if Pry.color
+          output.puts CodeRay.scan(Pry.view(list), :ruby).term
+        else
+          output.puts Pry.view(list)
+        end
         list
       end
     end
@@ -364,6 +388,11 @@ e.g show-doc hello_method
       check_for_dynamically_defined_method.call(file)
 
       output.puts "--\nFrom #{file} @ line ~#{line}:\n--"
+
+      if Pry.color
+        doc = CodeRay.scan(doc, :ruby).term
+      end
+
       output.puts doc
       doc
     end
@@ -426,6 +455,11 @@ e.g: show-method hello_method
       check_for_dynamically_defined_method.call(file)
       
       output.puts "--\nFrom #{file} @ line #{line}:\n--"
+
+      if Pry.color
+        code = CodeRay.scan(code, :ruby).term
+      end
+      
       output.puts code
       code
     end
@@ -444,6 +478,11 @@ e.g: show-method hello_method
         check_for_dynamically_defined_method.call(file)
 
         output.puts "--\nFrom #{file} @ line #{line}:\n--"
+
+        if Pry.color
+          code = CodeRay.scan(code, :ruby).term
+        end
+
         output.puts code
         code
       else
@@ -467,7 +506,7 @@ e.g: show-method hello_method
     end
 
     command "exit", "End the current Pry session. Accepts optional return value. Aliases: quit, back" do 
-      str = opts[:val].split.drop(1).join(' ')
+      str = remove_first_word.call(opts[:val])
       throw(:breakout, [opts[:nesting].level, target.eval(str)])
     end
 

data/lib/pry/print.rb

@@ -8,7 +8,11 @@ class Pry
       output.puts "#{value.class}: #{value.message}"
       output.puts "from #{value.backtrace.first}"
     else
-      output.puts "=> #{Pry.view(value)}"
+      if Pry.color
+        output.puts "=> #{CodeRay.scan(Pry.view(value), :ruby).term}"
+      else
+        output.puts "=> #{Pry.view(value)}"
+      end
     end
   end
 end

data/lib/pry/prompts.rb

@@ -22,5 +22,5 @@ class Pry
                    ]
 
   # A simple prompt - doesn't display target or nesting level
-  SIMPLE_PROMPT = [proc { "pry> " }, proc { "pry* " }]
+  SIMPLE_PROMPT = [proc { ">> " }, proc { ">* " }]
 end

data/lib/pry/pry_class.rb

@@ -1,14 +1,3 @@
-direc = File.dirname(__FILE__)
-
-require 'readline'
-require 'shellwords'
-require "#{direc}/prompts"
-require "#{direc}/hooks"
-require "#{direc}/print"
-require "#{direc}/commands"
-require "#{direc}/core_extensions"
-require "#{direc}/pry_instance"
-
 # @author John Mair (banisterfiend)
 class Pry
 
@@ -69,6 +58,10 @@ class Pry
     # Value returned by last executed Pry command.
     # @return [Object] The command value
     attr_accessor :cmd_ret_value
+
+    # Determines whether colored output is enabled.
+    # @return [Boolean] 
+    attr_accessor :color
   end
   
   # Start a Pry REPL.
@@ -157,6 +150,7 @@ class Pry
     @prompt = DEFAULT_PROMPT
     @print = DEFAULT_PRINT
     @hooks = DEFAULT_HOOKS
+    @color = false
   end
 
   self.reset_defaults

data/lib/pry/pry_instance.rb

@@ -1,6 +1,3 @@
-require 'readline'
-require 'shellwords'
-
 class Pry
 
   # The list of configuration options.

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.6.6"
+  VERSION = "0.6.7pre4"
 end

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: pry
 version: !ruby/object:Gem::Version
-  version: 0.6.6
-  prerelease: 
+  version: 0.6.7pre4
+  prerelease: 5
 platform: ruby
 authors:
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-28 00:00:00.000000000 +13:00
+date: 2011-03-03 00:00:00.000000000 +13:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_parser
-  requirement: &17356980 !ruby/object:Gem::Requirement
+  requirement: &17582820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,21 @@ dependencies:
         version: 2.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *17356980
+  version_requirements: *17582820
+- !ruby/object:Gem::Dependency
+  name: coderay
+  requirement: &17582472 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.7
+  type: :runtime
+  prerelease: false
+  version_requirements: *17582472
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &17355156 !ruby/object:Gem::Requirement
+  requirement: &17582124 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +44,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *17355156
+  version_requirements: *17582124
 - !ruby/object:Gem::Dependency
   name: method_source
-  requirement: &17336220 !ruby/object:Gem::Requirement
+  requirement: &17576580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +55,7 @@ dependencies:
         version: 0.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *17336220
+  version_requirements: *17576580
 description: attach an irb-like session to any object at runtime
 email: jrmair@gmail.com
 executables:
@@ -97,12 +108,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: attach an irb-like session to any object at runtime