pry 0.10.2-i386-mingw32 → 1.0.0.pre1-i386-mingw32

data/lib/pry/commands/play.rb

@@ -2,7 +2,7 @@ class Pry
   class Command::Play < Pry::ClassCommand
     match 'play'
     group 'Editing'
-    description 'Playback a string variable, method, line, or file as input.'
+    description 'Playback a string variable or a method or a file as input.'
 
     banner <<-'BANNER'
       Usage: play [OPTIONS] [--help]
@@ -10,15 +10,10 @@ class Pry
       The play command enables you to replay code from files and methods as if they
       were entered directly in the Pry REPL.
 
-      play --lines 149..153   # assumes current context
-      play -i 20 --lines 1..3 # assumes lines of the input expression at 20
-      play -o 4               # the output of of an expression at 4
-      play Pry#repl -l 1..-1  # play the contents of Pry#repl method
-      play -e 2               # play from specified line until end of valid expression
-      play hello.rb           # play a file
-      play Rakefile -l 5      # play line 5 of a file
-      play -d hi              # play documentation of hi method
-      play hi --open          # play hi method and leave it open
+      play --lines 149..153
+      play -i 20 --lines 1..3
+      play Pry#repl --lines 1..-1
+      play Rakefile --lines 5
 
       https://github.com/pry/pry/wiki/User-Input#wiki-Play
     BANNER
@@ -26,52 +21,23 @@ class Pry
     def options(opt)
       CodeCollector.inject_options(opt)
 
-      opt.on :open, 'Plays the selected content except the last line. Useful' \
-                    ' for replaying methods and leaving the method definition' \
-                    ' "open". `amend-line` can then be used to' \
-                    ' modify the method.'
-
-      opt.on :e, :expression=, 'Executes until end of valid expression', :as => Integer
-      opt.on :p, :print, 'Prints executed code'
+      opt.on :open, 'Plays the select content except except' \
+                    ' the last line. Useful for replaying methods and leaving the method definition "open". `amend-line`' \
+                    ' can then be used to modify the method.'
     end
 
     def process
       @cc = CodeCollector.new(args, opts, _pry_)
 
       perform_play
-      show_input
+      run "show-input" unless Pry::Code.complete_expression?(eval_string)
     end
 
     def perform_play
-      eval_string << content_after_options
+      eval_string << (opts.present?(:open) ? restrict_to_lines(content, (0..-2)) : content)
       run "fix-indent"
     end
 
-    def show_input
-      if opts.present?(:print) or !Pry::Code.complete_expression?(eval_string)
-        run "show-input"
-      end
-    end
-
-
-    def content_after_options
-      if opts.present?(:open)
-        restrict_to_lines(content, (0..-2))
-      elsif opts.present?(:expression)
-        content_at_expression
-      else
-        content
-      end
-    end
-
-    def content_at_expression
-      code_object.expression_at(opts[:expression])
-    end
-
-    def code_object
-      Pry::Code.new(content)
-    end
-
     def should_use_default_file?
       !args.first && !opts.present?(:in) && !opts.present?(:out)
     end

data/lib/pry/commands/pry_backtrace.rb

@@ -17,7 +17,8 @@ class Pry
     BANNER
 
     def process
-      _pry_.pager.page text.bold('Backtrace:') << "\n--\n" << _pry_.backtrace.join("\n")
+      stagger_output text.bold('Backtrace:') +
+        "\n--\n" + _pry_.backtrace.join("\n")
     end
   end
 

data/lib/pry/commands/raise_up.rb

@@ -22,7 +22,7 @@ class Pry
     BANNER
 
     def process
-      return _pry.pager.page help if captures[0] =~ /(-h|--help)\b/
+      return stagger_output help if captures[0] =~ /(-h|--help)\b/
       # Handle 'raise-up', 'raise-up "foo"', 'raise-up RuntimeError, 'farble' in a rubyesque manner
       target.eval("_pry_.raise_up#{captures[0]}")
     end

data/lib/pry/commands/reload_code.rb

@@ -10,49 +10,33 @@ class Pry
       e.g reload-code MyClass#my_method    #=> reload a method
           reload-code MyClass              #=> reload a class
           reload-code my-command           #=> reload a pry command
-          reload-code self                 #=> reload the current object
-          reload-code                      #=> reload the current file or object
+          reload-code self                 #=> reload the 'current' object
+          reload-code                      #=> identical to reload-code self
     BANNER
 
     def process
-      if !args.empty?
-        reload_object(args.join(" "))
-      elsif internal_binding?(target)
-        reload_object("self")
-      else
-        reload_current_file
-      end
-    end
-
-    private
+      code_object = Pry::CodeObject.lookup(obj_name, _pry_)
 
-    def current_file
-      File.expand_path target.eval("__FILE__")
+      check_for_reloadability(code_object)
+      reload_code_object(code_object)
     end
 
-    def reload_current_file
-      if !File.exists?(current_file)
-        raise CommandError, "Current file: #{current_file} cannot be found on disk!"
-      end
+    private
 
-      load current_file
-      output.puts "The current file: #{current_file} was reloaded!"
+    def reload_code_object(code_object)
+      load code_object.source_file
+      output.puts "#{obj_name} was reloaded!"
     end
 
-    def reload_object(identifier)
-      code_object = Pry::CodeObject.lookup(identifier, _pry_)
-      check_for_reloadability(code_object, identifier)
-      load code_object.source_file
-      output.puts "#{identifier} was reloaded!"
+    def obj_name
+      @obj_name ||= args.empty? ? "self" : args.join(" ")
     end
 
-    def check_for_reloadability(code_object, identifier)
-      if !code_object || !code_object.source_file
-        raise CommandError, "Cannot locate #{identifier}!"
+    def check_for_reloadability(code_object)
+      if !code_object
+        raise CommandError, "Cannot locate #{obj_name}!"
       elsif !File.exists?(code_object.source_file)
-        raise CommandError,
-          "Cannot reload #{identifier} as it has no associated file on disk. " \
-          "File found was: #{code_object.source_file}"
+        raise CommandError, "Cannot reload #{obj_name} as it has no associated file on disk. File found was: #{code_object.source_file}"
       end
     end
   end

data/lib/pry/commands/ri.rb

@@ -23,18 +23,14 @@ class Pry
         subclass = Class.new(RDoc::RI::Driver) # the hard way.
 
         subclass.class_eval do
-          def initialize(pager, opts)
-            @pager = pager
-            super opts
-          end
           def page
             paging_text = StringIO.new
             yield paging_text
-            @pager.page(paging_text.string)
+            Pry::Pager.page(paging_text.string)
           end
 
           def formatter(io)
-            if @formatter_klass
+            if @formatter_klass then
               @formatter_klass.new
             else
               RDoc::Markup::ToAnsi.new
@@ -46,7 +42,7 @@ class Pry
       end
 
       # Spin-up an RI insance.
-      ri = RDoc::RI::PryDriver.new _pry_.pager, :use_stdout => true, :interactive => false
+      ri = RDoc::RI::PryDriver.new :use_stdout => true, :interactive => false
 
       begin
         ri.display_names [spec]  # Get the documentation (finally!)

data/lib/pry/commands/shell_command.rb

@@ -16,32 +16,27 @@ class Pry
     BANNER
 
     def process(cmd)
-      if cmd =~ /^cd\s*(.*)/i
-        process_cd parse_destination($1)
+      if cmd =~ /^cd\s+(.+)/i
+        dest = $1
+        begin
+          Dir.chdir File.expand_path(dest)
+        rescue Errno::ENOENT
+          raise CommandError, "No such directory: #{dest}"
+        end
       else
         pass_block(cmd)
+
         if command_block
           command_block.call `#{cmd}`
         else
-          _pry_.config.system.call(output, cmd, _pry_)
+          Pry.config.system.call(output, cmd, _pry_)
         end
       end
     end
 
-    private
-
-      def parse_destination(dest)
-        return "~" if dest.empty?
-        return dest unless dest == "-"
-        state.old_pwd || raise(CommandError, "No prior directory available")
-      end
-
-      def process_cd(dest)
-        state.old_pwd = Dir.pwd
-        Dir.chdir File.expand_path(dest)
-      rescue Errno::ENOENT
-        raise CommandError, "No such directory: #{dest}"
-      end
+    def complete(search)
+      super + Bond::Rc.files(search.split(" ").last || '')
+    end
   end
 
   Pry::Commands.add_command(Pry::Command::ShellCommand)

data/lib/pry/commands/shell_mode.rb

@@ -12,10 +12,10 @@ class Pry
       case _pry_.prompt
       when Pry::SHELL_PROMPT
         _pry_.pop_prompt
-        _pry_.custom_completions = _pry_.config.file_completions
+        _pry_.custom_completions = Pry::DEFAULT_CUSTOM_COMPLETIONS
       else
         _pry_.push_prompt Pry::SHELL_PROMPT
-        _pry_.custom_completions = _pry_.config.command_completions
+        _pry_.custom_completions = Pry::FILE_COMPLETIONS
       end
     end
   end

data/lib/pry/commands/show_doc.rb

@@ -35,11 +35,6 @@ class Pry
         # command '--help' shouldn't use markup highlighting
         docs
       else
-        if docs.empty?
-          raise CommandError, "No docs found for: #{
-            obj_name ? obj_name : 'current context'
-          }"
-        end
         process_comment_markup(docs)
       end
     end

data/lib/pry/commands/show_info.rb

@@ -3,12 +3,17 @@ class Pry
     extend Pry::Helpers::BaseHelpers
 
     command_options :shellwords => false, :interpolate => false
+    command_options :requires_gem => "ruby18_source_location" if mri_18?
+
+    def setup
+      require 'ruby18_source_location' if mri_18?
+    end
 
     def options(opt)
       opt.on :s, :super, "Select the 'super' method. Can be repeated to traverse the ancestors", :as => :count
       opt.on :l, "line-numbers", "Show line numbers"
       opt.on :b, "base-one", "Show line numbers but start numbering at 1 (useful for `amend-line` and `play` commands)"
-      opt.on :a, :all,  "Show all definitions and monkeypatches of the module/class"
+      opt.on :a, :all,   "Show all definitions and monkeypatches of the module/class"
     end
 
     def process
@@ -27,7 +32,7 @@ class Pry
       end
 
       set_file_and_dir_locals(code_object.source_file)
-      _pry_.pager.page result
+      stagger_output result
     end
 
     # This method checks whether the `code_object` is a WrappedModule,
@@ -58,7 +63,7 @@ class Pry
     end
 
     def content_and_header_for_code_object(code_object)
-      header(code_object) << content_for(code_object)
+      header(code_object) + content_for(code_object)
     end
 
     def content_and_headers_for_all_module_candidates(mod)
@@ -90,7 +95,7 @@ class Pry
       h << code_object_header(code_object, line_num)
       h << "\n#{Pry::Helpers::Text.bold('Number of lines:')} " <<
         "#{content_for(code_object).lines.count}\n\n"
-      h << Helpers::Text.bold('** Warning:') << " Cannot find code for #{@original_code_object.nonblank_name}. Showing superclass #{code_object.nonblank_name} instead. **\n\n" if @used_super
+      h << Helpers::Text.bold('** Warning:') + " Cannot find code for #{@original_code_object.nonblank_name}. Showing superclass #{code_object.nonblank_name} instead. **\n\n" if @used_super
       h
     end
 
@@ -121,12 +126,6 @@ class Pry
       h << "@ line #{line_num}:\n"
       h << text.bold(code_object.module? ? "Module" : "Class")
       h << " #{text.bold('name:')} #{code_object.nonblank_name}"
-
-      if code_object.number_of_candidates > 1
-        h << (text.bold("\nNumber of monkeypatches: ") << code_object.number_of_candidates.to_s)
-        h << ". Use the `-a` option to display all available monkeypatches"
-      end
-      h
     end
 
     def method_sections(code_object)
@@ -150,7 +149,7 @@ class Pry
     end
 
     def obj_name
-      @obj_name ||= args.empty? ? nil : args.join(' ')
+      @obj_name ||= args.empty? ? nil : args.join(" ")
     end
 
     def use_line_numbers?

data/lib/pry/commands/show_source.rb

@@ -18,29 +18,17 @@ class Pry
       show-source Pry#rep     # source for Pry#rep method
       show-source Pry         # for Pry class
       show-source Pry -a      # for all Pry class definitions (all monkey patches)
-      show-source Pry.foo -e  # for class of the return value of expression `Pry.foo`
       show-source Pry --super # for superclass of Pry (Object class)
 
       https://github.com/pry/pry/wiki/Source-browsing#wiki-Show_method
     BANNER
 
-    def options(opt)
-      opt.on :e, :eval, "evaluate the command's argument as a ruby expression and show the class its return value"
-      super(opt)
-    end
-
-    def process
-      if opts.present?(:e)
-        obj = target.eval(args.first)
-        self.args = Array.new(1) { Module === obj ? obj.name : obj.class.name }
-      end
-      super
-    end
-
     # The source for code_object prepared for display.
     def content_for(code_object)
+      cannot_locate_source_error if !code_object.source
+
       Code.new(code_object.source, start_line_for(code_object)).
-        with_line_numbers(use_line_numbers?).highlighted
+        with_line_numbers(use_line_numbers?).to_s
     end
   end
 

data/lib/pry/commands/simple_prompt.rb

@@ -1,7 +1,7 @@
 class Pry
   class Command::SimplePrompt < Pry::ClassCommand
     match 'simple-prompt'
-    group 'prompts'
+    group 'Misc'
     description 'Toggle the simple prompt.'
 
     banner <<-'BANNER'

data/lib/pry/commands/toggle_color.rb

@@ -11,14 +11,10 @@ class Pry
     BANNER
 
     def process
-      _pry_.color = color_toggle
-      output.puts "Syntax highlighting #{_pry_.color ? "on" : "off"}"
+      Pry.color = !Pry.color
+      output.puts "Syntax highlighting #{Pry.color ? "on" : "off"}"
     end
-
-    def color_toggle
-      !_pry_.color
-    end
-
-    Pry::Commands.add_command(self)
   end
+
+  Pry::Commands.add_command(Pry::Command::ToggleColor)
 end

data/lib/pry/commands/whereami.rb

@@ -88,10 +88,10 @@ class Pry
 
       set_file_and_dir_locals(@file)
 
-      out = "\n#{text.bold('From:')} #{location}:\n\n" <<
-        code.with_line_numbers(use_line_numbers?).with_marker(marker).highlighted << "\n"
+      out = "\n#{text.bold('From:')} #{location}:\n\n" +
+        code.with_line_numbers(use_line_numbers?).with_marker(marker).to_s + "\n"
 
-      _pry_.pager.page out
+      stagger_output(out)
     end
 
     private
@@ -109,7 +109,7 @@ class Pry
     end
 
     def top_level?
-      target_self == Pry.main
+      target_self == TOPLEVEL_BINDING.eval("self")
     end
 
     def handle_internal_binding
@@ -144,21 +144,14 @@ class Pry
       end
     end
 
-    # This either returns the `target_self`
-    # or it returns the class of `target_self` if `target_self` is not a class.
-    # @return [Pry::WrappedModule]
-    def target_class
-      target_self.is_a?(Module) ? Pry::WrappedModule(target_self) :
-        Pry::WrappedModule(target_self.class)
-    end
-
     def class_code
       return @class_code if @class_code
 
-      mod = @method ? Pry::WrappedModule(@method.owner) : target_class
-
-      idx = mod.candidates.find_index { |v| expand_path(v.source_file) == @file }
-      @class_code = idx && Pry::Code.from_module(mod, idx)
+      if valid_method?
+        mod = Pry::WrappedModule(@method.owner)
+        idx = mod.candidates.find_index { |v| expand_path(v.source_file) == @file }
+        @class_code = idx && Pry::Code.from_module(mod, idx)
+      end
     end
 
     def valid_method?
@@ -178,7 +171,7 @@ class Pry
 
     def window_size
       if args.empty?
-        _pry_.config.default_window_size
+        Pry.config.default_window_size
       else
         args.first.to_i
       end
@@ -186,5 +179,4 @@ class Pry
   end
 
   Pry::Commands.add_command(Pry::Command::Whereami)
-  Pry::Commands.alias_command '@', 'whereami'
 end