pry 0.8.0pre9-i386-mingw32 → 0.8.1-i386-mingw32

data/Rakefile

@@ -21,6 +21,7 @@ def apply_spec_defaults(s)
   s.require_path = 'lib'
   s.add_dependency("ruby_parser",">=2.0.5")
   s.add_dependency("coderay",">=0.9.7")
+  s.add_dependency("slop",">=1.5.2")
   s.add_development_dependency("bacon",">=1.1.0")
   s.homepage = "http://banisterfiend.wordpress.com"
   s.has_rdoc = 'yard'
@@ -76,7 +77,7 @@ end
 namespace :jruby do
   spec = Gem::Specification.new do |s|
     apply_spec_defaults(s)
-    s.add_dependency("method_source","=0.2.0")
+    s.add_dependency("method_source",">=0.4.0")
     s.platform = "java"
   end
   

data/bin/pry

@@ -9,61 +9,46 @@ rescue LoadError
   require 'rubygems'
   require 'pry'
 end
-require 'optparse'
 
-# defaults
-options = {
-  :context_string => "TOPLEVEL_BINDING",
-  :loadrc => true
-}
-
-OptionParser.new do |opts|
-  opts.banner = %{Usage: pry [OPTIONS] 
+opts = Slop.parse do
+  banner %{Usage: pry [OPTIONS]
 Start a Pry session.
 See: `https://github.com/banister` for more information.
 --
 }
-  opts.on("-r", "--require FILE", "`require` a Ruby script at startup.") do |file|
-    require file
-  end
 
-  opts.on("-e", "--exec CODE", "A line of Ruby code to execute in context before the session starts.") do |code|
-    options[:code] = code
-  end
-
-  opts.on("-f", "Suppress loading of ~/.pryrc") do 
-    options[:loadrc] = false
-  end
+  on :e, :exec, "A line of code to execute in context before the session starts", true
+  on :f, "Supress loading of ~/.pryrc"
+  on "no-color", "Disable syntax highlighting for session"
 
-  opts.on("--no-color", "Start session without syntax highlighting.") do 
-    Pry.color = false
+  on "simple-prompt", "Enable simple prompt mode" do
+    Pry.prompt = Pry::SIMPLE_PROMPT
   end
 
-  opts.on("--simple-prompt", "Simple prompt mode.") do 
-    Pry.prompt = Pry::SIMPLE_PROMPT
+  on :r, :require, "`require` a Ruby script at startup", true do |file|
+    require file
   end
 
-  opts.on("-I LOADPATH", "Specify $LOAD_PATH directory.") do  |load_path|
-    $LOAD_PATH << load_path
+  on :I, "Add a path to the $LOAD_PATH", true do |path|
+    $LOAD_PATH << path
   end
 
-  opts.on("-v", "--version", "Display the Pry version.") do
+  on :v, :version, "Display the Pry version" do
     puts "Pry version #{Pry::VERSION} on Ruby #{RUBY_VERSION}"
     exit
   end
 
-  opts.on("-c", "--context CONTEXT",
-          "Start the session in the specified context. Equivalent to `context.pry` in a session.") do |context|
+  on(:c, :context,
+    "Start the session in the specified context. Equivalent to `context.pry` in a session.",
+    true,
+    :default => "TOPLEVEL_BINDING"
+    )
 
-    # save the context name
-    options[:context_string] = context
-  end
-
-  opts.on_tail("-h", "--help", "This message.") do 
-    puts opts
+  on :h, :help, "This message" do
+    puts help
     exit
   end
-end.parse!
+end
 
 # invoked via cli
 Pry.cli = true
@@ -76,14 +61,14 @@ class Pry::Commands
 end
 
 # load ~/.pryrc, if not suppressed with -f option
-Pry.should_load_rc = false if !options[:loadrc]
+Pry.should_load_rc = !opts.f?
 
 # create the actual context
-context = Pry.binding_for(eval(options[:context_string]))
+context = Pry.binding_for(eval(opts[:context]))
 
 # run code passed with `-e`, if there is any.
-if options[:code]
-  Pry.new(:input => StringIO.new(options[:code]), :print => proc {}).rep(context)
+if opts.exec?
+  Pry.new(:input => StringIO.new(opts[:exec]), :print => proc {}).rep(context)
 end
 
 # start the session

data/lib/pry.rb

@@ -15,7 +15,7 @@ if RUBY_PLATFORM =~ /mswin/ || RUBY_PLATFORM =~ /mingw/
   begin
     require 'win32console'
   rescue LoadError
-    $stderr.puts "Need to `gem install win32console`" 
+    $stderr.puts "Need to `gem install win32console`"
     exit 1
   end
 end
@@ -31,3 +31,9 @@ require "#{direc}/pry/completion"
 require "#{direc}/pry/core_extensions"
 require "#{direc}/pry/pry_class"
 require "#{direc}/pry/pry_instance"
+
+
+# TEMPORARY HACK FOR BUG IN JRUBY 1.9 REGEX (which kills CodeRay)
+if RUBY_VERSION =~ /1.9/ && RUBY_ENGINE =~ /jruby/
+  Pry.color = false
+end

data/lib/pry/command_base.rb

@@ -1,4 +1,5 @@
 direc = File.dirname(__FILE__)
+require 'rubygems/dependency_installer'
 require "#{direc}/command_base_helpers"
 
 class Pry
@@ -8,7 +9,7 @@ class Pry
   class CommandBase
     class << self
       include CommandBaseHelpers
-      
+
       attr_accessor :commands
       attr_accessor :opts, :output, :target
 
@@ -16,7 +17,7 @@ class Pry
       # that the location where the block is defined has the `opts`
       # method in scope.
       private
-      
+
       # Defines a new Pry command.
       # @param [String, Array] names The name of the command (or array of
       #   command name aliases).
@@ -47,7 +48,7 @@ class Pry
           :keep_retval => false,
           :requires_gem => nil
         }.merge!(options)
-        
+
         @commands ||= {}
 
         if command_dependencies_met?(options)
@@ -78,23 +79,23 @@ 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 target, "ls"
+      #       run "ls"
       #       output.puts "after ls"
       #     end
       #   end
-      def run(target, name, *args)
+      def run(name, *args)
         command_processor =  CommandProcessor.new(target.eval('_pry_'))
-        
+
         if command_processor.system_command?(name)
-          command_processor.execute_system_command("#{name} #{args.join}", target)
+          command_processor.execute_system_command("#{name} #{args.join(' ')}", target)
         else
+          raise "#{name.inspect} is not a valid pry command." unless opts[:commands].include? name
           action = opts[:commands][name][:action]
           instance_exec(*args, &action)
         end
@@ -138,13 +139,13 @@ class Pry
         commands[name][:description] = description
       end
     end
-    
+
     command "help", "This menu." do |cmd|
       command_info = opts[:commands]
 
       if !cmd
         output.puts
-        help_text = heading("Command List:") + "\n" 
+        help_text = heading("Command List:") + "\n"
         command_info.each do |k, data|
           if !data[:stub_info]
             help_text << ("#{k}".ljust(18) + data[:description] + "\n") if !data[:description].empty?
@@ -171,8 +172,6 @@ class Pry
       end
 
       output.puts "Attempting to install `#{name}` command..."
-      
-      require 'rubygems/dependency_installer'
       gems_to_install = Array(stub_info[:requires_gem])
 
       gem_install_failed = false
@@ -181,7 +180,7 @@ class Pry
         output.puts "Installing `#{g}` gem..."
 
         begin
-          Gem::DependencyInstaller.new.install(g) 
+          Gem::DependencyInstaller.new.install(g)
         rescue Gem::GemNotFoundException
           output.puts "Required Gem: `#{g}` not found. Aborting command installation."
           gem_install_failed = true
@@ -189,7 +188,7 @@ class Pry
         end
       end
       next if gem_install_failed
-      
+
       Gem.refresh
       load "#{File.dirname(__FILE__)}/commands.rb"
       output.puts "Installation of `#{name}` successful! Type `help #{name}` for information"
@@ -199,6 +198,6 @@ class Pry
     def self.inherited(klass)
       klass.commands = commands.dup
     end
-    
+
   end
 end

data/lib/pry/command_base_helpers.rb

@@ -2,9 +2,9 @@ class Pry
   class CommandBase
     module CommandBaseHelpers
 
-      private
-      
-      def gem_installed?(gem_name)
+     private
+
+     def gem_installed?(gem_name)
         require 'rubygems'
         !!Gem.source_index.find_name(gem_name).first
       end
@@ -20,7 +20,7 @@ class Pry
         gems_needed = Array(options[:requires_gem])
         gems_not_installed = gems_needed.select { |g| !gem_installed?(g) }
         proc do
-          output.puts "\n`#{name}` requires the following gems to be installed: `#{gems_needed.join(", ")}`"
+          output.puts "\n#{name} requires the following gems to be installed: #{(gems_needed.join(", "))}"
           output.puts "Command not available due to dependency on gems: `#{gems_not_installed.join(", ")}` not being met."
           output.puts "Type `install #{name}` to install the required gems and activate this command."
         end
@@ -29,17 +29,114 @@ class Pry
       def create_command_stub(names, description, options, block)
         Array(names).each do |name|
           commands[name] = {
-            :description => "Not available. Execute `#{name}` command for more information.",
+            :description => "Not available. Execute #{(name)} command for more information.",
             :action => stub_proc(name, options),
             :stub_info => options
           }
         end
       end
 
+      #
+      # Color helpers:
+      #   gray, red, green, yellow, blue, purple, cyan, white,
+      #   and bright_red, bright_green, etc...
+      #
+      # ANSI color codes:
+      #   \033 => escape
+      #     30 => color base
+      #      1 => bright
+      #      0 => normal
+      #
+
+      COLORS = {
+         "black" => 0,
+         "red" => 1,
+         "green" => 2,
+         "yellow" => 3,
+         "blue" => 4,
+         "purple" => 5,
+         "magenta" => 5,
+         "cyan" => 6,
+         "white" => 7
+      }
+
+      COLORS.each do |color, i|
+        define_method color do |str|
+          Pry.color ? "\033[0;#{30+i}m#{str}\033[0m" : str
+        end
+
+        define_method "bright_#{color}" do |str|
+          Pry.color ? "\033[1;#{30+i}m#{str}\033[0m" : str
+        end
+      end
+
+      alias_method :grey, :bright_black
+      alias_method :gray, :bright_black
+
+      require 'set'
+      VALID_COLORS = Set.new(
+        COLORS.keys +
+        COLORS.keys.map{|k| "bright_#{k}" } +
+        ["grey", "gray"]
+      )
+
       def bold(text)
         Pry.color ? "\e[1m#{text}\e[0m" : text
       end
 
+      #
+      # Colorize a string that has "color tags".
+      #
+      # Examples:
+      #    puts colorize("<light_green><magenta>*</magenta> Hey mom! I am <light_blue>SO</light_blue> colored right now.</light_green>")
+      #
+      def colorize(string)
+        stack = []
+
+        # split the string into tags and literal strings
+        tokens          = string.split(/(<\/?[\w\d_]+>)/)
+        tokens.delete_if { |token| token.size == 0 }
+
+        result        = ""
+
+        tokens.each do |token|
+
+          # token is an opening tag!
+
+          if /<([\w\d_]+)>/ =~ token and VALID_COLORS.include?($1) #valid_tag?($1)
+            stack.push $1
+
+          # token is a closing tag!
+
+          elsif /<\/([\w\d_]+)>/ =~ token and VALID_COLORS.include?($1) # valid_tag?($1)
+
+            # if this color is on the stack somwehere...
+            if pos = stack.rindex($1)
+              # close the tag by removing it from the stack
+              stack.delete_at pos
+            else
+              raise "Error: tried to close an unopened color tag -- #{token}"
+            end
+
+          # token is a literal string!
+
+          else
+
+            color = (stack.last || "white")
+            #color = BBS_COLOR_TABLE[color.to_i] if color =~ /^\d+$/
+            result << send(color, token) # colorize the result
+
+          end
+
+        end
+
+        result
+      end
+
+      def highlight(string, regexp, highlight_color=:bright_yellow)
+        highlighted = string.gsub(regexp) { |match| "<#{highlight_color}>#{match}</#{highlight_color}>" }
+      end
+
       # formatting
       def heading(text)
         text = "#{text}\n--"
@@ -49,7 +146,7 @@ class Pry
       def page_size
         27
       end
-      
+
       # a simple pager for systems without `less`. A la windows.
       def simple_pager(text)
         text_array = text.lines.to_a
@@ -57,33 +154,67 @@ class Pry
           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>" 
+            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
+
+      # Try to use `less` for paging, if it fails then use
+      # simple_pager. Also do not page if Pry.pager is falsey
+      # FIXME! Another JRuby hack
       def stagger_output(text)
-        if text.lines.count < page_size
+        if text.lines.count < page_size || !Pry.pager
           output.puts text
           return
         end
-        lesspipe { |less| less.puts text }
-      rescue Exception
+
+        # FIXME! Another JRuby hack
+        if Object.const_defined?(:RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
+          simple_pager(text)
+        else
+          lesspipe { |less| less.puts text }
+        end
+      rescue Errno::ENOENT
         simple_pager(text)
+      rescue Errno::EPIPE
       end
 
-      # thanks to epitron for this method
+      #
+      # Create scrollable output via less!
+      #
+      # This command runs `less` in a subprocess, and gives you the IO to its STDIN pipe
+      # so that you can communicate with it.
+      #
+      # Example:
+      #
+      #   lesspipe do |less|
+      #     50.times { less.puts "Hi mom!" }
+      #   end
+      #
+      # The default less parameters are:
+      # * Allow colour
+      # * Don't wrap lines longer than the screen
+      # * Quit immediately (without paging) if there's less than one screen of text.
+      #
+      # You can change these options by passing a hash to `lesspipe`, like so:
+      #
+      #   lesspipe(:wrap=>false) { |less| less.puts essay.to_s }
+      #
+      # It accepts the following boolean options:
+      #    :color  => Allow ANSI colour codes?
+      #    :wrap   => Wrap long lines?
+      #    :always => Always page, even if there's less than one page of text?
+      #
       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
@@ -93,7 +224,7 @@ class Pry
           $stderr.puts "Seeking to end of stream..."
         end
         params << "-X"
-        
+
         IO.popen("less #{params * ' '}", "w") do |less|
           if output
             less.puts output
@@ -101,10 +232,10 @@ class Pry
             yield less
           end
         end
-      end      
+      end
 
     end
   end
 end
 
-      
+