pry 0.9.7.4 → 0.9.8pre2

data/lib/pry/default_commands/introspection.rb

@@ -32,13 +32,13 @@ class Pry
         end
 
         start_line = false
-        if opts.b?
+        if opts.present?(:'base-one')
           start_line = 1
-        elsif opts.l?
+        elsif opts.present?(:'line-numbers')
           start_line = meth.source_line || 1
         end
 
-        render_output(opts.flood?, start_line, code)
+        render_output(opts.present?(:flood), start_line, code)
       end
 
       alias_command "show-source", "show-method"
@@ -61,7 +61,7 @@ class Pry
           end
         end
 
-        next if opts.help?
+        next if opts.present?(:help)
 
         command_name = args.shift
         if !command_name
@@ -84,11 +84,11 @@ class Pry
           end
 
           start_line = false
-          if opts.l?
+          if opts.present?(:'line-numbers')
             start_line = block.source_line || 1
           end
 
-          render_output(opts.flood?, opts.l? ? block.source_line : false, code)
+          render_output(opts.present?(:flood), opts.present?(:'line-numbers') ? block.source_line : false, code)
           code
         else
           raise CommandError, "No such command: #{command_name}."
@@ -114,18 +114,18 @@ class Pry
             output.puts opt
           end
         end
-        next if opts.h?
+        next if opts.present?(:help)
 
-        if [opts.ex?, opts.t?, opts.i?, !args.empty?].count(true) > 1
+        if [opts.present?(:ex), opts.present?(:temp), opts.present?(:in), !args.empty?].count(true) > 1
           raise CommandError, "Only one of --ex, --temp, --in and FILE may be specified."
         end
 
         # edit of local code, eval'd within pry.
-        if !opts.ex? && args.empty?
+        if !opts.present?(:ex) && args.empty?
 
-          content = if opts.t?
+          content = if opts.present?(:temp)
                       ""
-                    elsif opts.i?
+                    elsif opts.present?(:in)
                       case opts[:i]
                       when Range
                         (_pry_.input_array[opts[:i]] || []).join
@@ -146,7 +146,7 @@ class Pry
             f.puts(content)
             f.flush
             invoke_editor(f.path, line)
-            if !opts.n?
+            if !opts.present?(:'no-reload')
               silence_warnings do
                 eval_string.replace(File.read(f.path))
               end
@@ -155,7 +155,7 @@ class Pry
 
         # edit of remote code, eval'd at top-level
         else
-          if opts.ex?
+          if opts.present?(:ex)
             if _pry_.last_exception.nil?
               raise CommandError, "No exception found."
             end
@@ -186,12 +186,12 @@ class Pry
             line = file_name.sub!(/:(\d+)$/, "") ? $1.to_i : 1
           end
 
-          line = opts[:l].to_i if opts.l?
+          line = opts[:l].to_i if opts.present?(:line)
 
           invoke_editor(file_name, line)
           set_file_and_dir_locals(file_name)
 
-          if opts.r? || ((opts.ex? || file_name.end_with?(".rb")) && !opts.n?)
+          if opts.present?(:reload) || ((opts.present?(:ex) || file_name.end_with?(".rb")) && !opts.present?(:'no-reload'))
             silence_warnings do
               TOPLEVEL_BINDING.eval(File.read(file_name), file_name)
             end
@@ -222,7 +222,7 @@ class Pry
           raise CommandError, "No editor set!\nEnsure that #{text.bold("Pry.config.editor")} is set to your editor of choice."
         end
 
-        if opts.p? || meth.dynamically_defined?
+        if opts.present?(:patch) || meth.dynamically_defined?
           lines = meth.source.lines.to_a
 
           if ((original_name = meth.original_name) &&
@@ -256,7 +256,7 @@ class Pry
 
           invoke_editor(file, opts["no-jump"] ? 0 : line)
           silence_warnings do
-            load file if !opts.n? && !Pry.config.disable_auto_reload
+            load file if !opts.present?(:'no-jump') && !Pry.config.disable_auto_reload
           end
         end
       end
@@ -269,7 +269,8 @@ class Pry
           target.eval("alias #{temp_name} #{meth_name}")
           yield
           target.eval("alias #{meth_name} #{temp_name}")
-          target.eval("undef #{temp_name}")
+        ensure
+          target.eval("undef #{temp_name}") rescue nil
         end
       end
     end

data/lib/pry/default_commands/ls.rb

@@ -21,36 +21,19 @@ class Pry
 
         # Get all the methods that we'll want to output
         def all_methods(obj, opts)
-          opts.M? ? Pry::Method.all_from_class(obj) : Pry::Method.all_from_obj(obj)
+          opts.present?(:'instance-methods') ? Pry::Method.all_from_class(obj) : Pry::Method.all_from_obj(obj)
         end
 
         def resolution_order(obj, opts)
-          opts.M? ? Pry::Method.instance_resolution_order(obj) : Pry::Method.resolution_order(obj)
-        end
-
-        # Get the name of the klass for pretty display in the title column of ls -m
-        # as there can only ever be one singleton class of a non-class, we just call
-        # that "self".
-        def class_name(klass)
-          if klass == klass.ancestors.first
-            (klass.name || "") == "" ? klass.to_s : klass.name
-          elsif klass.ancestors.include?(Module)
-            begin
-              "#{class_name(ObjectSpace.each_object(klass).detect{ |x| class << x; self; end == klass })}.self"
-            rescue # ObjectSpace is not enabled by default in jruby
-              klass.to_s.sub(/#<Class:(.*)>/, '\1.self')
-            end
-          else
-            "self"
-          end
+          opts.present?(:'instance-methods') ? Pry::Method.instance_resolution_order(obj) : Pry::Method.resolution_order(obj)
         end
 
         # Get a lambda that can be used with .take_while to prevent over-eager
         # traversal of the Object's ancestry graph.
         def below_ceiling(obj, opts)
-          ceiling = if opts.q?
-                       [opts.M? ? obj.ancestors[1] : obj.class.ancestors[1]] + Pry.config.ls.ceiling
-                     elsif opts.v?
+          ceiling = if opts.present?(:quiet)
+                       [opts.present?(:'instance-methods') ? obj.ancestors[1] : obj.class.ancestors[1]] + Pry.config.ls.ceiling
+                     elsif opts.present?(:verbose)
                        []
                      else
                        Pry.config.ls.ceiling.dup
@@ -142,7 +125,7 @@ class Pry
           USAGE
 
           opt.on :m, "methods", "Show public methods defined on the Object (default)"
-          opt.on :M, "module", "Show methods defined in a Module or Class"
+          opt.on :M, "instance-methods", "Show methods defined in a Module or Class"
 
           opt.on :p, "ppp", "Show public, protected (in yellow) and private (in green) methods"
           opt.on :q, "quiet", "Show only methods defined on object.singleton_class and object.class"
@@ -160,46 +143,48 @@ class Pry
           opt.on :h, "help", "Show help"
         end
 
-        next output.puts(opts) if opts.h?
+        next output.puts(opts.to_s) if opts.present?(:help)
 
         obj = args.empty? ? target_self : target.eval(args.join(" "))
 
         # exclude -q, -v and --grep because they don't specify what the user wants to see.
-        has_opts = (opts.m? || opts.M? || opts.p? || opts.g? || opts.l? || opts.c? || opts.i?)
+        has_opts = (opts.present?(:methods) || opts.present?(:'instance-methods') || opts.present?(:ppp) ||
+                    opts.present?(:globals) || opts.present?(:locals) || opts.present?(:constants) ||
+                    opts.present?(:ivars))
 
-        show_methods   = opts.m? || opts.M? || opts.p? || !has_opts
-        show_constants = opts.c? || (!has_opts && Module === obj)
-        show_ivars     = opts.i? || !has_opts
-        show_locals    = opts.l? || (!has_opts && args.empty?)
+        show_methods   = opts.present?(:methods) || opts.present?(:'instance-methods') || opts.present?(:ppp) || !has_opts
+        show_constants = opts.present?(:constants) || (!has_opts && Module === obj)
+        show_ivars     = opts.present?(:ivars) || !has_opts
+        show_locals    = opts.present?(:locals) || (!has_opts && args.empty?)
 
         grep_regex, grep = [Regexp.new(opts[:G] || "."), lambda{ |x| x.grep(grep_regex) }]
 
-        raise Pry::CommandError, "-l does not make sense with a specified Object" if opts.l? && !args.empty?
-        raise Pry::CommandError, "-g does not make sense with a specified Object" if opts.g? && !args.empty?
-        raise Pry::CommandError, "-q does not make sense with -v" if opts.q? && opts.v?
-        raise Pry::CommandError, "-M only makes sense with a Module or a Class" if opts.M? && !(Module === obj)
-        raise Pry::CommandError, "-c only makes sense with a Module or a Class" if opts.c? && !args.empty? && !(Module === obj)
+        raise Pry::CommandError, "-l does not make sense with a specified Object" if opts.present?(:locals) && !args.empty?
+        raise Pry::CommandError, "-g does not make sense with a specified Object" if opts.present?(:globals) && !args.empty?
+        raise Pry::CommandError, "-q does not make sense with -v" if opts.present?(:quiet) && opts.present?(:verbose)
+        raise Pry::CommandError, "-M only makes sense with a Module or a Class" if opts.present?(:'instance-methods') && !(Module === obj)
+        raise Pry::CommandError, "-c only makes sense with a Module or a Class" if opts.present?(:constants) && !args.empty? && !(Module === obj)
 
 
-        if opts.g?
+        if opts.present?(:globals)
           output_section("global variables", grep[format_globals(target.eval("global_variables"))])
         end
 
         if show_constants
           mod = Module === obj ? obj : Object
           constants = mod.constants
-          constants -= (mod.ancestors - [mod]).map(&:constants).flatten unless opts.v?
+          constants -= (mod.ancestors - [mod]).map(&:constants).flatten unless opts.present?(:verbose)
           output_section("constants", grep[format_constants(mod, constants)])
         end
 
         if show_methods
           # methods is a hash {Module/Class => [Pry::Methods]}
-          methods = all_methods(obj, opts).select{ |method| opts.p? || method.visibility == :public }.group_by(&:owner)
+          methods = all_methods(obj, opts).select{ |method| opts.present?(:ppp) || method.visibility == :public }.group_by(&:owner)
 
           # reverse the resolution order so that the most useful information appears right by the prompt
           resolution_order(obj, opts).take_while(&below_ceiling(obj, opts)).reverse.each do |klass|
             methods_here = format_methods((methods[klass] || []).select{ |m| m.name =~ grep_regex })
-            output_section "#{class_name(klass)} methods", methods_here
+            output_section "#{Pry::WrappedModule.new(klass).method_prefix}methods", methods_here
           end
         end
 

data/lib/pry/default_commands/shell.rb

@@ -31,7 +31,7 @@ class Pry
 
       alias_command "file-mode", "shell-mode"
 
-      command "cat", "Show output of file FILE. Type `cat --help` for more information." do |*args|
+      command "cat", "Show code from a file or Pry's input buffer. Type `cat --help` for more information." do |*args|
         start_line = 0
         end_line = -1
         file_name = nil
@@ -68,6 +68,8 @@ class Pry
             end
           end
 
+          opt.on :i, :in, "Show entries from Pry's input expression history. Takes an index or range.", :optional => true, :as => Range, :default => -5..-1
+
           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."
@@ -76,9 +78,9 @@ class Pry
           end
         end
 
-        next if opts.help?
+        next if opts.present?(:help)
 
-        if opts.ex?
+        if opts.present?(:ex)
           if file_name.nil?
             raise CommandError, "No Exception or Exception has no associated file."
           end
@@ -86,23 +88,53 @@ class Pry
           file_name = args.shift
         end
 
-        if !file_name
-          raise CommandError, "Must provide a file name."
-        end
+        if opts.present?(:in)
+          normalized_range = absolute_index_range(opts[:i], _pry_.input_array.length)
+          input_items = _pry_.input_array[normalized_range] || []
+
+          zipped_items = normalized_range.zip(input_items).reject { |_, s| s.nil? || s == "" }
+
+          unless zipped_items.length > 0
+            raise CommandError, "No expressions found."
+          end
+
+          if opts[:i].is_a?(Range)
+            contents = ""
+
+            zipped_items.each do |i, s|
+              contents << "#{text.bold(i.to_s)}:\n"
+
+              code = syntax_highlight_by_file_type_or_specified(s, nil, :ruby)
+
+              if opts.present?(:'line-numbers')
+                contents << text.indent(text.with_line_numbers(code, 1), 2)
+              else
+                contents << text.indent(code, 2)
+              end
+            end
+          else
+            contents = syntax_highlight_by_file_type_or_specified(zipped_items.first.last, nil, :ruby)
+          end
+        else
+          unless file_name
+            raise CommandError, "Must provide a file name."
+          end
+
+          begin
+            contents, _, _ = read_between_the_lines(file_name, start_line, end_line)
+          rescue Errno::ENOENT
+            raise CommandError, "Could not find file: #{file_name}"
+          end
 
-        begin
-          contents, _, _ = read_between_the_lines(file_name, start_line, end_line)
           contents = syntax_highlight_by_file_type_or_specified(contents, file_name, opts[:type])
-        rescue Errno::ENOENT
-          raise CommandError, "Could not find file: #{file_name}"
-        end
 
-        if opts.l?
-          contents = text.with_line_numbers contents, start_line + 1
+          if opts.present?(:'line-numbers')
+            contents = text.with_line_numbers contents, start_line + 1
+          end
         end
 
         # add the arrow pointing to line that caused the exception
-        if opts.ex?
+        if opts.present?(:ex)
           ex_file, ex_line = _pry_.last_exception.bt_source_location_for(bt_index)
           contents = text.with_line_numbers contents, start_line + 1, :bright_red
 
@@ -122,7 +154,7 @@ class Pry
 
         set_file_and_dir_locals(file_name)
 
-        if opts.f?
+        if opts.present?(:flood)
           output.puts contents
         else
           stagger_output(contents)

data/lib/pry/helpers/command_helpers.rb

@@ -22,7 +22,7 @@ class Pry
       # Open a temp file and yield it to the block, closing it after
       # @return [String] The path of the temp file
       def temp_file
-        file = Tempfile.new(["tmp", ".rb"])
+        file = Tempfile.new(['pry', '.rb'])
         yield file
       ensure
         file.close
@@ -41,7 +41,7 @@ class Pry
           if meth.super
             meth = meth.super
           else
-            command_error("The method '#{meth.name}' is not defined in a superclass of '#{class_name(meth.owner)}'.", omit_help)
+            command_error("'#{meth.name_with_owner}' has no super method.", omit_help)
           end
         end
 
@@ -86,13 +86,16 @@ class Pry
       end
 
       def syntax_highlight_by_file_type_or_specified(contents, file_name, file_type)
-        _, language_detected = file_map.find do |k, v|
-          Array(k).any? do |matcher|
-            matcher == File.extname(file_name) || matcher == File.basename(file_name)
+        if file_type
+          language_detected = file_type
+        else
+          _, language_detected = file_map.find do |k, v|
+            Array(k).any? do |matcher|
+              matcher == File.extname(file_name) || matcher == File.basename(file_name)
+            end
           end
         end
 
-        language_detected = file_type if file_type
         if Pry.color
           CodeRay.scan(contents, language_detected).term
         else
@@ -247,6 +250,25 @@ class Pry
         text.gsub(/^#{margin}/, '')
       end
 
+      def absolute_index_number(line_number, array_length)
+        if line_number >= 0
+          line_number
+        else
+          [array_length + line_number, 0].max
+        end
+      end
+
+      def absolute_index_range(range_or_number, array_length)
+        case range_or_number
+        when Range
+          a = absolute_index_number(range_or_number.begin, array_length)
+          b = absolute_index_number(range_or_number.end, array_length)
+        else
+          a = b = absolute_index_number(range_or_number, array_length)
+        end
+
+        Range.new(a, b)
+      end
     end
 
   end

data/lib/pry/helpers/options_helpers.rb

@@ -22,7 +22,7 @@ class Pry
           yield opt
 
           opt.on :h, :help, "This message" do
-            output.puts opt
+            output.puts opt.to_s
             throw :command_done
           end
         end
@@ -47,11 +47,14 @@ class Pry
 
       # Add the derived :method_object option to a used Slop instance.
       def process_method_object_options(args, opts)
-        opts[:instance] = opts['instance-methods'] if opts.m?
         # TODO: de-hack when we upgrade Slop: https://github.com/injekt/slop/pull/30
-        opts.options[:super].force_argument_value opts.options[:super].count if opts.super?
+        opts.options[:super].force_argument_value opts.options[:super].count if opts.present?(:super)
 
-        get_method_or_raise(args.empty? ? nil : args.join(" "), @method_target, opts.to_hash(true))
+        get_method_or_raise(args.empty? ? nil : args.join(" "), @method_target,
+                            :super => opts[:super],
+                            :instance => opts.present?(:'instance-methods') && !opts.present?(:'methods'),
+                            :methods  => opts.present?(:'methods') && !opts.present?(:'instance-methods')
+                           )
       end
     end
   end

data/lib/pry/helpers/text.rb

@@ -61,11 +61,23 @@ class Pry
         # @param [Proc]
         # @return [void]
         def no_color &block
-          boolean = Pry.color
-          Pry.color = false
+          boolean = Pry.config.color
+          Pry.config.color = false
           yield
         ensure
-          Pry.color = boolean
+          Pry.config.color = boolean
+        end
+
+        # Executes _block_ with _Pry.config.pager_ set to false.
+        #
+        # @param [Proc]
+        # @return [void]
+        def no_pager &block
+          boolean = Pry.config.pager
+          Pry.config.pager = false
+          yield
+        ensure
+          Pry.config.pager = boolean
         end
 
         # Returns _text_ in a numbered list, beginning at _offset_.
@@ -81,6 +93,14 @@ class Pry
             "#{self.send(color, adjusted_index)}: #{line}"
           end.join
         end
+
+        # Returns _text_ indented by _chars_ spaces.
+        #
+        # @param [String] text
+        # @param [Fixnum] chars
+        def indent(text, chars)
+          text.lines.map { |l| "#{' ' * chars}#{l}" }.join
+        end
       end
 
     end