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

data/lib/pry/commands.rb

@@ -1,6 +1,6 @@
 # Default commands used by Pry.
 Pry::Commands = Pry::CommandSet.new
 
-Dir[File.expand_path('../commands', __FILE__) << '/*.rb'].each do |file|
+Dir[File.expand_path('../commands', __FILE__) + '/*.rb'].each do |file|
   require file
 end

data/lib/pry/commands/amend_line.rb

@@ -48,7 +48,7 @@ class Pry
 
     def insert_into_array(array, range)
       insert_slot = Array(range).first
-      array.insert(insert_slot, arg_string[1..-1] << "\n")
+      array.insert(insert_slot, arg_string[1..-1] + "\n")
     end
 
     def replace_in_array(array, range)

data/lib/pry/commands/bang.rb

@@ -1,6 +1,6 @@
 class Pry
   class Command::Bang < Pry::ClassCommand
-    match(/^\s*!\s*$/)
+    match '!'
     group 'Editing'
     description 'Clear the input buffer.'
     command_options :use_prefix => false

data/lib/pry/commands/cat.rb

@@ -41,20 +41,11 @@ class Pry
                  FileFormatter.new(args.first, _pry_, opts).format
                end
 
-      _pry_.pager.page output
+      stagger_output(output)
     end
 
     def complete(search)
-      super | load_path_completions
-    end
-
-    def load_path_completions
-      $LOAD_PATH.flat_map do |path|
-        Dir[path + '/**/*'].map { |f|
-          next if File.directory?(f)
-          f.sub!(path + '/', '')
-        }
-      end
+      super + Bond::Rc.files(search.split(" ").last || '')
     end
   end
 

data/lib/pry/commands/cat/abstract_formatter.rb

@@ -8,7 +8,7 @@ class Pry
       def decorate(content)
         content.code_type = code_type
         content.between(*between_lines).
-          with_line_numbers(use_line_numbers?).highlighted
+          with_line_numbers(use_line_numbers?)
       end
 
       def code_type

data/lib/pry/commands/cat/exception_formatter.rb

@@ -1,9 +1,9 @@
 class Pry
   class Command::Cat
     class ExceptionFormatter < AbstractFormatter
-      attr_reader :ex
-      attr_reader :opts
-      attr_reader :_pry_
+      attr_accessor :ex
+      attr_accessor :opts
+      attr_accessor :_pry_
 
       def initialize(exception, _pry_, opts)
         @ex = exception
@@ -16,14 +16,14 @@ class Pry
         set_file_and_dir_locals(backtrace_file, _pry_, _pry_.current_context)
         code = decorate(Pry::Code.from_file(backtrace_file).
                                     between(*start_and_end_line_for_code_window).
-                                    with_marker(backtrace_line))
+                                    with_marker(backtrace_line)).to_s
         "#{header}#{code}"
       end
 
       private
 
       def code_window_size
-        _pry_.config.default_window_size || 5
+        Pry.config.default_window_size || 5
       end
 
       def backtrace_level
@@ -44,7 +44,8 @@ class Pry
       end
 
       def backtrace_file
-        Array(ex.bt_source_location_for(backtrace_level)).first
+        file = Array(ex.bt_source_location_for(backtrace_level)).first
+        (file && RbxPath.is_core_path?(file)) ? RbxPath.convert_path_to_full(file) : file
       end
 
       def backtrace_line

data/lib/pry/commands/cat/file_formatter.rb

@@ -1,32 +1,31 @@
 class Pry
   class Command::Cat
     class FileFormatter < AbstractFormatter
-      attr_reader :file_with_embedded_line
-      attr_reader :opts
-      attr_reader :_pry_
+      attr_accessor :file_with_embedded_line
+      attr_accessor :opts
+      attr_accessor :_pry_
 
       def initialize(file_with_embedded_line, _pry_, opts)
         @file_with_embedded_line = file_with_embedded_line
         @opts = opts
         @_pry_ = _pry_
-        @code_from_file = Pry::Code.from_file(file_name)
       end
 
       def format
         raise CommandError, "Must provide a filename, --in, or --ex." if !file_with_embedded_line
 
         set_file_and_dir_locals(file_name, _pry_, _pry_.current_context)
-        decorate(@code_from_file)
+        decorate(Pry::Code.from_file(file_name))
       end
 
+      private
+
       def file_and_line
-        file_name, line_num = file_with_embedded_line.split(/:(?!\/|\\)/)
+        file_name, line_num = file_with_embedded_line.split(':')
 
-        [file_name, line_num ? line_num.to_i : nil]
+        [File.expand_path(file_name), line_num ? line_num.to_i : nil]
       end
 
-      private
-
       def file_name
         file_and_line.first
       end
@@ -36,7 +35,7 @@ class Pry
       end
 
       def code_window_size
-        _pry_.config.default_window_size || 7
+        Pry.config.default_window_size || 7
       end
 
       def decorate(content)
@@ -48,18 +47,36 @@ class Pry
       end
 
       def detect_code_type_from_file(file_name)
-        code_type = @code_from_file.code_type
+        name, ext = File.basename(file_name).split('.', 2)
 
-        if code_type == :unknown
-          name = File.basename(file_name).split('.', 2).first
+        if ext
+          case ext
+          when "py"
+            :python
+          when "rb", "gemspec", "rakefile", "ru", "pryrc", "irbrc"
+            :ruby
+          when "js"
+            return :javascript
+          when "yml", "prytheme"
+            :yaml
+          when "groovy"
+            :groovy
+          when "c"
+            :c
+          when "cpp"
+            :cpp
+          when "java"
+            :java
+          else
+            :text
+          end
+        else
           case name
           when "Rakefile", "Gemfile"
             :ruby
           else
             :text
           end
-        else
-          code_type
         end
       end
     end

data/lib/pry/commands/cat/input_expression_formatter.rb

@@ -20,7 +20,7 @@ class Pry
 
           content
         else
-          decorate(Pry::Code(selected_input_items.first))
+          decorate(Pry::Code(selected_input_items.first)).to_s
         end
       end
 

data/lib/pry/commands/cd.rb

@@ -9,7 +9,7 @@ class Pry
 
       Move into new context (object or scope). As in UNIX shells use `cd ..` to go
       back, `cd /` to return to Pry top-level and `cd -` to toggle between last two
-      scopes. Complex syntax (e.g `cd ../@x/@y`) also supported.
+      scopes. Complex syntax (e.g `cd ../@x/y`) also supported.
 
       cd @x
       cd ..
@@ -21,19 +21,8 @@ class Pry
 
     def process
       state.old_stack ||= []
-
-      if arg_string.strip == "-"
-        unless state.old_stack.empty?
-          _pry_.binding_stack, state.old_stack = state.old_stack, _pry_.binding_stack
-        end
-      else
-        stack = ObjectPath.new(arg_string, _pry_.binding_stack).resolve
-
-        if stack && stack != _pry_.binding_stack
-          state.old_stack = _pry_.binding_stack
-          _pry_.binding_stack = stack
-        end
-      end
+      stack, state.old_stack = context_from_object_path(arg_string, _pry_, state.old_stack)
+      _pry_.binding_stack = stack if stack
     end
   end
 

data/lib/pry/commands/code_collector.rb

@@ -2,9 +2,9 @@ class Pry
   class Command::CodeCollector
     include Helpers::CommandHelpers
 
-    attr_reader :args
-    attr_reader :opts
-    attr_reader :_pry_
+    attr_accessor :args
+    attr_accessor :opts
+    attr_accessor :_pry_
 
     # The name of the explicitly given file (if any).
     attr_accessor :file
@@ -91,7 +91,7 @@ class Pry
     # @return [String]
     def pry_output_content
       pry_array_content_as_string(_pry_.output_array, self.class.output_result_ranges) do |v|
-        _pry_.config.gist.inspecter.call(v)
+        Pry.config.gist.inspecter.call(v)
       end
     end
 

data/lib/pry/commands/easter_eggs.rb

@@ -83,8 +83,8 @@ TEXT
     end
 
     command "test-ansi", "" do
-      prev_color = _pry_.config.color
-      _pry_.config.color = true
+      prev_color = Pry.color
+      Pry.color = true
 
       picture = unindent <<-'EOS'.gsub(/[[:alpha:]!]/) { |s| text.red(s) }
          ____      _______________________
@@ -106,7 +106,7 @@ TEXT
       output.puts "\n" * 6
       output.puts "** ENV['TERM'] is #{ENV['TERM']} **\n\n"
 
-      _pry_.config.color = prev_color
+      Pry.color = prev_color
     end
   end
 end

data/lib/pry/commands/edit.rb

@@ -1,5 +1,6 @@
 class Pry
   class Command::Edit < Pry::ClassCommand
+    require 'pry/commands/edit/method_patcher'
     require 'pry/commands/edit/exception_patcher'
     require 'pry/commands/edit/file_and_line_locator'
 
@@ -12,7 +13,7 @@ class Pry
 
       Open a text editor. When no FILE is given, edits the pry input buffer.
       When a method/module/command is given, the code is opened in an editor.
-      Ensure `Pry.config.editor` or `_pry_.config.editor` is set to your editor of choice.
+      Ensure `Pry.config.editor` is set to your editor of choice.
 
       edit sample.rb                edit -p MyClass#my_method
       edit sample.rb --line 105     edit MyClass
@@ -30,7 +31,7 @@ class Pry
       opt.on :t, :temp,    "Open an empty temporary file"
       opt.on :l, :line,    "Jump to this line in the opened file",
                            :argument => true, :as => Integer
-      opt.on :n, :"no-reload", "Don't automatically reload the edited file"
+      opt.on :n, :"no-reload", "Don't automatically reload the edited code"
       opt.on :c, :current, "Open the current __FILE__ and at __LINE__ (as returned by `whereami`)"
       opt.on :r, :reload,  "Reload the edited code immediately (default for ruby files)"
       opt.on :p, :patch,   "Instead of editing the object's file, try to edit in a tempfile and apply as a monkey patch"
@@ -60,10 +61,12 @@ class Pry
     end
 
     def repl_edit
-      content = Pry::Editor.new(_pry_).edit_tempfile_with_content(initial_temp_file_content,
+      content = Pry::Editor.edit_tempfile_with_content(initial_temp_file_content,
                                                        initial_temp_file_content.lines.count)
-      silence_warnings do
-        eval_string.replace content
+      if repl_reload?
+        silence_warnings do
+          eval_string.replace content
+        end
       end
     end
 
@@ -80,7 +83,7 @@ class Pry
         ExceptionPatcher.new(_pry_, state, file_and_line_for_current_exception).perform_patch
       else
         if code_object.is_a?(Pry::Method)
-          code_object.redefine Pry::Editor.new(_pry_).edit_tempfile_with_content(code_object.source)
+          MethodPatcher.new(_pry_, code_object).perform_patch
         else
           raise NotImplementedError, "Cannot yet patch #{code_object} objects!"
         end
@@ -116,12 +119,12 @@ class Pry
 
       ensure_file_name_is_valid(file_name)
 
-      Pry::Editor.new(_pry_).invoke_editor(file_name, line, reload?(file_name))
+      Pry::Editor.invoke_editor(file_name, line, reload?(file_name))
       set_file_and_dir_locals(file_name)
 
       if reload?(file_name)
         silence_warnings do
-          load file_name
+          TOPLEVEL_BINDING.eval(File.read(file_name), file_name)
         end
       end
     end
@@ -165,7 +168,12 @@ class Pry
     end
 
     def never_reload?
-      opts.present?(:'no-reload') || _pry_.config.disable_auto_reload
+      opts.present?(:'no-reload') || Pry.config.disable_auto_reload
+    end
+
+    # conditions much less strict than for reload? (which is for file-based reloads)
+    def repl_reload?
+      !never_reload?
     end
 
     def reload?(file_name="")
@@ -186,9 +194,13 @@ class Pry
     end
 
     def probably_a_file?(str)
-      [".rb", ".c", ".py", ".yml", ".gemspec"].include?(File.extname(str)) ||
+      [".rb", ".c", ".py", ".yml", ".gemspec"].include? File.extname(str) ||
         str =~ /\/|\\/
     end
+
+    def complete(search)
+      super + Bond::Rc.files(search.split(" ").last || '')
+    end
   end
 
   Pry::Commands.add_command(Pry::Command::Edit)

data/lib/pry/commands/edit/exception_patcher.rb

@@ -16,7 +16,7 @@ class Pry
         file_name, _ = file_and_line
         lines = state.dynamical_ex_file || File.read(file_name)
 
-        source = Pry::Editor.new(_pry_).edit_tempfile_with_content(lines)
+        source = Pry::Editor.edit_tempfile_with_content(lines)
         _pry_.evaluate_ruby source
         state.dynamical_ex_file = source.split("\n")
       end

data/lib/pry/commands/edit/file_and_line_locator.rb

@@ -21,6 +21,8 @@ class Pry
           raise CommandError, "Exception has no associated file." if file_name.nil?
           raise CommandError, "Cannot edit exceptions raised in REPL." if Pry.eval_path == file_name
 
+          file_name = RbxPath.convert_path_to_full(file_name) if RbxPath.is_core_path?(file_name)
+
           [file_name, line]
         end
 

data/lib/pry/{method/patcher.rb → commands/edit/method_patcher.rb}

@@ -1,38 +1,37 @@
 class Pry
-  class Method
-    class Patcher
-      attr_accessor :method
+  class Command::Edit
+    class MethodPatcher
+      attr_accessor :_pry_
+      attr_accessor :code_object
 
-      @@source_cache = {}
-
-      def initialize(method)
-        @method = method
-      end
-
-      def self.code_for(filename)
-        @@source_cache[filename]
+      def initialize(_pry_, code_object)
+        @_pry_ = _pry_
+        @code_object = code_object
       end
 
       # perform the patch
-      def patch_in_ram(source)
-        if method.alias?
+      def perform_patch
+        if code_object.alias?
           with_method_transaction do
-            redefine source
+            _pry_.evaluate_ruby patched_code
           end
         else
-          redefine source
+          _pry_.evaluate_ruby patched_code
         end
       end
 
       private
 
-      def redefine(source)
-        @@source_cache[cache_key] = source
-        TOPLEVEL_BINDING.eval wrap(source), cache_key
+      def patched_code
+        @patched_code ||= wrap(Pry::Editor.edit_tempfile_with_content(adjusted_lines))
       end
 
-      def cache_key
-        "pry-redefined(0x#{method.owner.object_id.to_s(16)}##{method.name})"
+      # The method code adjusted so that the first line is rewritten
+      # so that def self.foo --> def foo
+      def adjusted_lines
+        lines = code_object.source.lines.to_a
+        lines[0] = definition_line_for_owner(lines.first)
+        lines
       end
 
       # Run some code ensuring that at the end target#meth_name will not have changed.
@@ -46,17 +45,17 @@ class Pry
       # @param [Module] target  The owner of the method
 
       def with_method_transaction
-        temp_name = "__pry_#{method.original_name}__"
-        method = self.method
-        method.owner.class_eval do
-          alias_method temp_name, method.original_name
+        temp_name = "__pry_#{code_object.original_name}__"
+        co = code_object
+        code_object.owner.class_eval do
+          alias_method temp_name, co.original_name
           yield
-          alias_method method.name, method.original_name
-          alias_method method.original_name, temp_name
+          alias_method co.name, co.original_name
+          alias_method co.original_name, temp_name
         end
 
       ensure
-        method.send(:remove_method, temp_name) rescue nil
+        co.send(:remove_method, temp_name) rescue nil
       end
 
       # Update the definition line so that it can be eval'd directly on the Method's
@@ -69,13 +68,13 @@ class Pry
       # This is necessarily done by String manipulation because we can't find out what
       # syntax is needed for the argument list by ruby-level introspection.
       #
-      # @param [String] line The original definition line. e.g. def self.foo(bar, baz=1)
-      # @return [String]  The new definition line. e.g. def foo(bar, baz=1)
-      def definition_for_owner(line)
-        if line =~ /\Adef (?:.*?\.)?#{Regexp.escape(method.original_name)}(?=[\(\s;]|$)/
-          "def #{method.original_name}#{$'}"
+      # @param String   The original definition line. e.g. def self.foo(bar, baz=1)
+      # @return String  The new definition line. e.g. def foo(bar, baz=1)
+      def definition_line_for_owner(line)
+        if line =~ /^def (?:.*?\.)?#{Regexp.escape(code_object.original_name)}(?=[\(\s;]|$)/
+          "def #{code_object.original_name}#{$'}"
         else
-          raise CommandError, "Could not find original `def #{method.original_name}` line to patch."
+          raise CommandError, "Could not find original `def #{code_object.original_name}` line to patch."
         end
       end
 
@@ -88,17 +87,15 @@ class Pry
 
       # Update the source code so that when it has the right owner when eval'd.
       #
-      # This (combined with definition_for_owner) is backup for the case that
+      # This (combined with definition_line_for_owner) is backup for the case that
       # wrap_for_nesting fails, to ensure that the method will stil be defined in
       # the correct place.
       #
       # @param [String] source  The source to wrap
       # @return [String]
       def wrap_for_owner(source)
-        Pry.current[:pry_owner] = method.owner
-        owner_source = definition_for_owner(source)
-        visibility_fix = "#{method.visibility.to_s} #{method.name.to_sym.inspect}"
-        "Pry.current[:pry_owner].class_eval do; #{owner_source}\n#{visibility_fix}\nend"
+        Pry.current[:pry_owner] = code_object.owner
+        "Pry.current[:pry_owner].class_eval do\n#{source}\nend"
       end
 
       # Update the new source code to have the correct Module.nesting.
@@ -114,9 +111,9 @@ class Pry
       # @param [String] source  The source to wrap.
       # @return [String]
       def wrap_for_nesting(source)
-        nesting = Pry::Code.from_file(method.source_file).nesting_at(method.source_line)
+        nesting = Pry::Code.from_file(code_object.source_file).nesting_at(code_object.source_line)
 
-        (nesting + [source] + nesting.map{ "end" } + [""]).join(";")
+        (nesting + [source] + nesting.map{ "end" } + [""]).join("\n")
       rescue Pry::Indent::UnparseableNestingError
         source
       end