pry 0.8.4pre1-java → 0.9.0pre1-java

data/lib/pry/default_commands/introspection.rb

@@ -1,26 +1,25 @@
 class Pry
   module DefaultCommands
 
-    Introspection = Pry::CommandSet.new :introspection do
+    Introspection = Pry::CommandSet.new do
 
       command "show-method", "Show the source for METH. Type `show-method --help` for more info. Aliases: $, show-source" do |*args|
         target = target()
 
-        opts = Slop.parse!(args) do |opts|
-          opts.banner %{Usage: show-method [OPTIONS] [METH]
-Show the source for method METH. Tries instance methods first and then methods by default.
-e.g: show-method hello_method
---
-}
-          opts.on :l, "line-numbers", "Show line numbers."
-          opts.on :M, "instance-methods", "Operate on instance methods."
-          opts.on :m, :methods, "Operate on methods."
-          opts.on :f, :flood, "Do not use a pager to view text longer than one screen."
-          opts.on :c, :context, "Select object context to run under.", true do |context|
+        opts = Slop.parse!(args) do |opt|
+          opt.banner "Usage: show-method [OPTIONS] [METH]\n" \
+                     "Show the source for method METH. Tries instance methods first and then methods by default.\n" \
+                     "e.g: show-method hello_method"
+
+          opt.on :l, "line-numbers", "Show line numbers."
+          opt.on :M, "instance-methods", "Operate on instance methods."
+          opt.on :m, :methods, "Operate on methods."
+          opt.on :f, :flood, "Do not use a pager to view text longer than one screen."
+          opt.on :c, :context, "Select object context to run under.", true do |context|
             target = Pry.binding_for(target.eval(context))
           end
-          opts.on :h, :help, "This message." do
-            output.puts opts
+          opt.on :h, :help, "This message." do
+            output.puts opt
           end
         end
 
@@ -53,54 +52,46 @@ e.g: show-method hello_method
       alias_command "$", "show-method", ""
 
       command "show-command", "Show the source for CMD. Type `show-command --help` for more info." do |*args|
-        options = {}
         target = target()
-        command_name = nil
-
-        OptionParser.new do |opts|
-          opts.banner = %{Usage: show-command [OPTIONS] [CMD]
-Show the source for command CMD.
-e.g: show-command show-method
---
-}
-          opts.on("-l", "--line-numbers", "Show line numbers.") do |line|
-            options[:l] = true
-          end
 
-          opts.on("-f", "--flood", "Do not use a pager to view text longer than one screen.") do
-            options[:f] = true
-          end
+        opts = Slop.parse!(args) do |opt|
+          opt.banner = "Usage: show-command [OPTIONS] [CMD]\n" \
+                       "Show the source for command CMD.\n" \
+                       "e.g: show-command show-method"
 
-          opts.on_tail("-h", "--help", "This message.") do
-            output.puts opts
-            options[:h] = true
+          opt.on :l, "line-numbers", "Show line numbers."
+          opt.on :f, :flood, "Do not use a pager to view text longer than one screen."
+          opt.on :h, :help, "This message." do
+            output.puts opt
           end
-        end.order(args) do |v|
-          command_name = v
         end
 
-        next if options[:h]
+        next if opts.help?
 
+        command_name = args.shift
         if !command_name
           output.puts "You must provide a command name."
           next
         end
 
-        if commands[command_name]
-          meth = commands[command_name].block
+        if find_command(command_name)
+          block = find_command(command_name).block
 
-          code = strip_leading_whitespace(meth.source)
-          file, line = meth.source_location
-          set_file_and_dir_locals(file)
-          check_for_dynamically_defined_method(meth)
+          code, _ = code_and_code_type_for(block)
+          next if !code
 
-          output.puts make_header(meth, :ruby, code)
+          output.puts make_header(block, :ruby, code)
 
           if Pry.color
             code = CodeRay.scan(code, :ruby).term
           end
 
-          render_output(options[:f], options[:l] ? meth.source_location.last : false, code)
+          start_line = false
+          if opts.l?
+            start_line = block.source_location ? block.source_location.last : 1
+          end
+
+          render_output(opts.flood?, opts.l? ? block.source_location.last : false, code)
           code
         else
           output.puts "No such command: #{command_name}."
@@ -110,22 +101,21 @@ e.g: show-command show-method
       command "edit-method", "Edit a method. Type `edit-method --help` for more info." do |*args|
         target = target()
 
-        opts = Slop.parse!(args) do |opts|
-          opts.banner %{Usage: edit-method [OPTIONS] [METH]
-Edit the method METH in an editor.
-Ensure #{bold("Pry.editor")} is set to your editor of choice.
-e.g: edit-method hello_method
---
-}
-          opts.on :M, "instance-methods", "Operate on instance methods."
-          opts.on :m, :methods, "Operate on methods."
-          opts.on "no-reload", "Do not automatically reload the method's file after editting."
-          opts.on :n, "no-jump", "Do not fast forward editor to first line of method."
-          opts.on :c, :context, "Select object context to run under.", true do |context|
+        opts = Slop.parse!(args) do |opt|
+          opt.banner "Usage: edit-method [OPTIONS] [METH]\n" \
+                      "Edit the method METH in an editor.\n" \
+                      "Ensure #{text.bold("Pry.editor")} is set to your editor of choice.\n" \
+                      "e.g: edit-method hello_method"
+
+          opt.on :M, "instance-methods", "Operate on instance methods."
+          opt.on :m, :methods, "Operate on methods."
+          opt.on "no-reload", "Do not automatically reload the method's file after editting."
+          opt.on :n, "no-jump", "Do not fast forward editor to first line of method."
+          opt.on :c, :context, "Select object context to run under.", true do |context|
             target = Pry.binding_for(target.eval(context))
           end
-          opts.on :h, :help, "This message." do
-            output.puts opts
+          opt.on :h, :help, "This message." do
+            output.puts opt
           end
         end
 
@@ -137,7 +127,7 @@ e.g: edit-method hello_method
           next
         end
 
-        next output.puts "Error: No editor set!\nEnsure that #{bold("Pry.editor")} is set to your editor of choice." if !Pry.editor
+        next output.puts "Error: No editor set!\nEnsure that #{text.bold("Pry.editor")} is set to your editor of choice." if !Pry.editor
 
         if is_a_c_method?(meth)
           output.puts "Error: Can't edit a C method."
@@ -146,7 +136,12 @@ e.g: edit-method hello_method
 
           # editor is invoked here
         else
-          file, line = meth.source_location
+          if rbx_core?(meth)
+            file, line = rbx_core_path_line_for(meth)
+          else
+            file, line = meth.source_location
+          end
+
           set_file_and_dir_locals(file)
 
           if Pry.editor.respond_to?(:call)
@@ -164,7 +159,6 @@ e.g: edit-method hello_method
         end
       end
 
-
       helpers do
 
         def start_line_for_editor(line_number)

data/lib/pry/default_commands/ls.rb

@@ -1,7 +1,7 @@
 class Pry
   module DefaultCommands
 
-    Ls = Pry::CommandSet.new :ls do
+    Ls = Pry::CommandSet.new do
 
       command "ls", "Show the list of vars and methods in the current scope. Type `ls --help` for more info." do |*args|
         options = {}
@@ -194,6 +194,6 @@ Shows local and instance variables by default.
                             end
 
 
-      end
     end
   end
+end

data/lib/pry/default_commands/shell.rb

@@ -1,10 +1,22 @@
 class Pry
   module DefaultCommands
 
-    Shell = Pry::CommandSet.new :shell do
+    Shell = Pry::CommandSet.new do
+
+      command /\.(.*)/, "All text following a '.' is forwarded to the shell.", :listing => ".<shell command>" do |cmd|
+        if cmd =~ /^cd\s+(.+)/i
+          dest = $1
+          begin
+            Dir.chdir File.expand_path(dest)
+          rescue Errno::ENOENT
+            output.puts "No such directory: #{dest}"
+          end
 
-      # this cannot be accessed, it's just for help purposes.
-      command ".<shell command>", "All text following a '.' is forwarded to the shell." do
+        else
+          if !system(cmd)
+            output.puts "Error: there was a problem executing system command: #{cmd}"
+          end
+        end
       end
 
       command "shell-mode", "Toggle shell mode. Bring in pwd prompt and file completion." do
@@ -22,50 +34,30 @@ class Pry
 
       alias_command "file-mode", "shell-mode", ""
 
-
       command "cat", "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 [OPTIONS] FILE
-Cat a file. Defaults to displaying whole file. Syntax highlights file if type is recognized.
-e.g: cat 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
+        opts = Slop.parse!(args) do |opt|
+          opt.on :s, :start, "Start line (defaults to start of file)Line 1 is the first line.", true, :as => Integer do |line|
+            start_line = line - 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
+          opt.on :e, :end, "End line (defaults to end of file). Line -1 is the last line", true, :as => Integer do |line|
+            end_line = line - 1
           end
 
-          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
+          opt.on :l, "line-numbers", "Show line numbers."
+          opt.on :t, :type, "The specific file type for syntax higlighting (e.g ruby, python)", true, :as => Symbol
+          opt.on :f, :flood, "Do not use a pager to view text longer than one screen."
+          opt.on :h, :help, "This message." do
+            output.puts opt
           end
-
-          opts.on("-f", "--flood", "Do not use a pager to view text longer than one screen.") do
-            options[:f] = true
-          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]
+        next if opts.help?
 
+        file_name = args.shift
         if !file_name
           output.puts "Must provide a file name."
           next
@@ -74,15 +66,13 @@ e.g: cat hello.rb
         contents, normalized_start_line, _ = read_between_the_lines(file_name, start_line, end_line)
 
         if Pry.color
-          contents = syntax_highlight_by_file_type_or_specified(contents, file_name, file_type)
+          contents = syntax_highlight_by_file_type_or_specified(contents, file_name, opts[:type])
         end
 
         set_file_and_dir_locals(file_name)
-        render_output(options[:f], options[:l] ? normalized_start_line + 1 : false, contents)
+        render_output(opts.flood?, opts.l? ? normalized_start_line + 1 : false, contents)
         contents
       end
-
-
     end
 
   end

data/lib/pry/extended_commands/experimental.rb

@@ -0,0 +1,48 @@
+class Pry
+  module ExtendedCommands
+
+    Experimental = Pry::CommandSet.new do
+
+
+      command "reload-method", "Reload the source specifically for a method", :requires_gem => "method_reload" do |meth_name|
+        if (meth = get_method_object(meth_name, target, {})).nil?
+          output.puts "Invalid method name: #{meth_name}."
+          next
+        end
+
+        meth.reload
+      end
+
+      command "play", "Play a string as input" do |*args|
+        Slop.parse!(args) do |opt|
+          opt.banner "Usage: play-method [--replay START..END] [--clear] [--grep PATTERN] [--help]\n"
+
+          opt.on :l, :lines, 'The line (or range of lines) to replay.', true, :as => Range
+          opt.on :m, :method, 'Play a method.', true do |meth_name|
+            if (meth = get_method_object(meth_name, target, {})).nil?
+              output.puts "Invalid method name: #{meth_name}."
+              next
+            end
+            code, code_type = code_and_code_type_for(meth)
+            next if !code
+
+            range = opt.l? ? opt[:l] : (0..-1)
+
+            Pry.active_instance.input = StringIO.new(code[range])
+          end
+
+          opt.on :f, "file", 'The line (or range of lines) to replay.', true do |file_name|
+            text = File.read File.expand_path(file_name)
+            range = opt.l? ? opt[:l] : (0..-1)
+
+            Pry.active_instance.input = StringIO.new(text[range])
+          end
+
+          opt.on :h, :help, "This message." do
+            output.puts opt
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pry/extended_commands/user_command_api.rb

@@ -0,0 +1,22 @@
+class Pry
+  module ExtendedCommands
+
+    UserCommandAPI = Pry::CommandSet.new do
+
+      command "define-command", "To honor Mon-Ouie" do |arg|
+        next output.puts("Provide an arg!") if arg.nil?
+
+        prime_string = "command #{arg_string}\n"
+        command_string = Pry.active_instance.r(target, prime_string)
+
+        eval_string.replace <<-HERE
+          _pry_.commands.instance_eval do
+            #{command_string}
+          end
+        HERE
+
+      end
+
+    end
+  end
+end

data/lib/pry/helpers.rb

@@ -1,2 +1,3 @@
 require "pry/helpers/base_helpers"
 require "pry/helpers/command_helpers"
+require "pry/helpers/text"

data/lib/pry/helpers/base_helpers.rb

@@ -14,18 +14,16 @@ class Pry
         end
       end
 
-      # turn off color for duration of block
-      def no_color(&block)
-        old_color_state = Pry.color
-        Pry.color = false
-        yield
-      ensure
-        Pry.color = old_color_state
+      def find_command(name)
+        command_match = commands.find { |_, command| command.options[:listing] == name }
+
+        return command_match.last if command_match
+        nil
       end
 
       def gem_installed?(gem_name)
         require 'rubygems'
-        !!Gem.source_index.find_name(gem_name).first
+        Gem::Specification.respond_to?(:find_all_by_name) ? !Gem::Specification.find_all_by_name(gem_name).empty? : Gem.source_index.find_name(gem_name).first
       end
 
       def command_dependencies_met?(options)
@@ -47,8 +45,10 @@ 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 "\nThe command '#{name}' requires the following gems to be installed: #{(gems_needed.join(", "))}"
+          output.puts "-"
           output.puts "Command not available due to dependency on gems: `#{gems_not_installed.join(", ")}` not being met."
+          output.puts "-"
           output.puts "Type `install #{name}` to install the required gems and activate this command."
         end
       end
@@ -63,103 +63,6 @@ class Pry
         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