pry 0.9.6.1-i386-mswin32 → 0.9.6.2-i386-mswin32

data/CHANGELOG

@@ -1,3 +1,8 @@
+27/9/2011 version 0.9.6.2 HOTFIX release
+* downgrading to CodeRay 0.9.8 due to problems with 1.0 and rails (autoloading problem) see #280 on pry and #6 on CodeRay
+* also added (as a minor feature) cirwin's implementation of edit --in
+* added early break/exit for objectpath errors (the 'cd 34/@hello/bad_path/23')
+
 19/9/2011 version 0.9.6
 * restored previous behavior of command-line switches (allowing "-rfilename")
 * removed -p option (--play) from edit command

data/Rakefile

@@ -21,11 +21,11 @@ def apply_spec_defaults(s)
   s.executables = ["pry"]
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- test/*`.split("\n")
-  s.add_dependency("ruby_parser",">=2.0.5")
-  s.add_dependency("coderay",">=0.9.8")
+  s.add_dependency("ruby_parser","~>2.0.5")
+  s.add_dependency("coderay","~>0.9.8")
   s.add_dependency("slop","~>2.1.0")
-  s.add_dependency("method_source",">=0.6.5")
-  s.add_development_dependency("bacon",">=1.1.0")
+  s.add_dependency("method_source","~>0.6.5")
+  s.add_development_dependency("bacon","~>1.1.0")
   s.add_development_dependency("open4", "~>1.0.1")
   s.add_development_dependency("rake", "~>0.9")
 end
@@ -70,7 +70,7 @@ end
 namespace :jruby do
   spec = Gem::Specification.new do |s|
     apply_spec_defaults(s)
-    s.add_dependency("spoon", ">=0.0.1")
+    s.add_dependency("spoon", "~>0.0.1")
     s.platform = "java"
   end
 
@@ -85,7 +85,7 @@ end
   namespace v do
     spec = Gem::Specification.new do |s|
       apply_spec_defaults(s)
-      s.add_dependency("win32console", ">=1.3.0")
+      s.add_dependency("win32console", "~>1.3.0")
       s.platform = "i386-#{v}"
     end
 

data/lib/pry.rb

@@ -173,9 +173,6 @@ if RUBY_PLATFORM =~ /mswin/ || RUBY_PLATFORM =~ /mingw/
 end
 
 require "pry/version"
-require "pry/rbx_method"
-require "pry/rbx_path"
-require "pry/method"
 require "pry/history_array"
 require "pry/helpers"
 require "pry/history"

data/lib/pry/command_context.rb

@@ -9,7 +9,6 @@ class Pry
     # give it a nice inspect
     def VOID_VALUE.inspect() "void" end
 
-    attr_accessor :command_name
     attr_accessor :output
     attr_accessor :target
     attr_accessor :target_self

data/lib/pry/command_set.rb

@@ -11,8 +11,6 @@ class Pry
     class Command < Struct.new(:name, :description, :options, :block)
 
       def call(context, *args)
-        context.command_name = options[:listing]
-
         if stub_block = options[:stub_info]
           context.instance_eval(&stub_block)
         else

data/lib/pry/default_commands/basic.rb

@@ -28,15 +28,17 @@ class Pry
       end
 
       command "reload-method", "Reload the source file that contains the specified method" do |meth_name|
-        meth = get_method_or_print_error(meth_name, target, {}, :omit_help)
-        next unless meth
+        if (meth = get_method_object(meth_name, target, {})).nil?
+          output.puts "Invalid method name: #{meth_name}."
+          next
+        end
 
-        if meth.source_type == :c
+        if is_a_c_method?(meth)
           output.puts "Error: Can't reload a C method."
-        elsif meth.dynamically_defined?
+        elsif is_a_dynamically_defined_method?(meth)
           output.puts "Error: Can't reload an eval method."
         else
-          file_name = meth.source_file
+          file_name = meth.source_location.first
           load file_name
           output.puts "Reloaded #{file_name}."
         end

data/lib/pry/default_commands/context.rb

@@ -37,6 +37,7 @@ class Pry
           rescue RescuableException
             output.puts "Bad object path: #{arg_string}. Failed trying to resolve: #{context}"
             resolve_failure = true
+            break
           end
         end
 
@@ -136,11 +137,8 @@ class Pry
           i_num = 5
         end
 
-        if (meth = Pry::Method.from_binding(target))
-          meth_name = meth.name
-        else
-          meth_name = "N/A"
-        end
+        meth_name = meth_name_from_binding(target)
+        meth_name = "N/A" if !meth_name
 
         if file =~ /(\(.*\))|<.*>/ || file == "" || file == "-e"
           output.puts "Cannot find local context. Did you use `binding.pry` ?"

data/lib/pry/default_commands/documentation.rb

@@ -32,15 +32,20 @@ class Pry
 
         args = [nil] if args.empty?
         args.each do |method_name|
-          meth = get_method_or_print_error(method_name, target, opts.to_hash(true))
-          next unless meth
+          meth_name = method_name
+          if (meth = get_method_object(meth_name, target, opts.to_hash(true))).nil?
+            output.puts "Invalid method name: #{meth_name}. Type `show-doc --help` for help"
+            next
+          end
 
-          next output.puts("No documentation found.") if meth.doc.nil? || meth.doc.empty?
+          doc, code_type = doc_and_code_type_for(meth)
+          next if !doc
 
-          doc = process_comment_markup(meth.doc, meth.source_type)
-          output.puts make_header(meth, doc)
-          output.puts "#{text.bold("visibility: ")} #{meth.visibility}"
-          output.puts "#{text.bold("signature:  ")} #{meth.signature}"
+          next output.puts("No documentation found.") if doc.empty?
+          doc = process_comment_markup(doc, code_type)
+          output.puts make_header(meth, code_type, doc)
+          output.puts "#{text.bold("visibility: ")} #{method_visibility(meth).to_s}"
+          output.puts "#{text.bold("signature: ")} #{signature_for(meth)}"
           output.puts
           render_output(opts.flood?, false, doc)
           doc
@@ -71,20 +76,26 @@ class Pry
 
         next if opts.help?
 
-        meth = get_method_or_print_error(args.shift, target, opts.to_hash(true))
-        next unless meth
-
-        output.puts unindent <<-EOS
-          Method Information:
-          --
-          Name: #{meth.name}
-          Owner: #{meth.owner ? meth.owner : "Unknown"}
-          Visibility: #{meth.visibility}
-          Type: #{meth.is_a?(Method) ? "Bound" : "Unbound"}
-          Arity: #{meth.arity}
-          Method Signature: #{meth.signature}
-          Source Location: #{meth.source_location ? meth.source_location.join(":") : "Not found."}
-        EOS
+        meth_name = args.shift
+        if (meth = get_method_object(meth_name, target, opts.to_hash(true))).nil?
+          output.puts "Invalid method name: #{meth_name}. Type `stat --help` for help"
+          next
+        end
+
+        if !is_a_c_method?(meth) && !is_a_dynamically_defined_method?(meth)
+          set_file_and_dir_locals(path_line_for(meth).first)
+        end
+
+        output.puts "Method Information:"
+        output.puts "--"
+        output.puts "Name: " + meth_name
+        output.puts "Owner: " + (meth.owner.to_s ? meth.owner.to_s : "Unknown")
+        output.puts "Visibility: " + method_visibility(meth).to_s
+        output.puts "Type: " + (meth.is_a?(Method) ? "Bound" : "Unbound")
+        output.puts "Arity: " + meth.arity.to_s
+        output.puts "Method Signature: " + signature_for(meth)
+
+        output.puts "Source location: " + (meth.source_location ? meth.source_location.join(":") : "Not found.")
       end
 
       command "gist-method", "Gist a method to github. Type `gist-method --help` for more info.", :requires_gem => "gist" do |*args|
@@ -111,17 +122,19 @@ class Pry
 
         next if opts.help?
 
-        meth = get_method_or_print_error(args.shift, target, opts.to_hash(true))
-        next unless meth
+        # This needs to be extracted into its own method as it's shared
+        # by show-method and show-doc and stat commands
+        meth_name = args.shift
+        if (meth = get_method_object(meth_name, target, opts.to_hash(true))).nil?
+          output.puts "Invalid method name: #{meth_name}. Type `gist-method --help` for help"
+          next
+        end
 
         type_map = { :ruby => "rb", :c => "c", :plain => "plain" }
         if !opts.doc?
-          content = meth.source
-          code_type = meth.source_type
+          content, code_type = code_and_code_type_for(meth)
         else
-          content = meth.doc
-          code_type = meth.source_type
-
+          content, code_type = doc_and_code_type_for(meth)
           text.no_color do
             content = process_comment_markup(content, code_type)
           end
@@ -134,6 +147,44 @@ class Pry
 
         output.puts "Gist created at #{link}"
       end
+
+      helpers do
+
+        # paraphrased from awesome_print gem
+        def signature_for(method)
+          if method.respond_to?(:parameters)
+
+            args = method.parameters.inject([]) do |arr, (type, name)|
+              name ||= (type == :block ? 'block' : "arg#{arr.size + 1}")
+              arr << case type
+                     when :req        then name.to_s
+                     when :opt, :rest then "*#{name}"
+                     when :block      then "&#{name}"
+                     else '?'
+                     end
+            end
+          else 
+            args = (1..method.arity.abs).map { |i| "arg#{i}" }
+            args[-1] = "*#{args[-1]}" if method.arity < 0
+          end
+
+          "#{method.name}(#{args.join(', ')})"
+        end
+        
+        def method_visibility(meth)
+          if meth.owner.public_instance_methods.include? meth.name
+            :public
+          elsif meth.owner.protected_instance_methods.include? meth.name
+            :protected
+          elsif meth.owner.private_instance_methods.include? meth.name
+            :private
+          else
+            :none
+          end
+        end
+      end
+
     end
+
   end
 end

data/lib/pry/default_commands/input.rb

@@ -77,13 +77,17 @@ class Pry
 
         if opts.m?
           meth_name = opts[:m]
-          meth = get_method_or_print_error(meth_name, target, {}, :omit_help)
-          next unless meth and meth.source
+          if (meth = get_method_object(meth_name, target, {})).nil?
+            output.puts "Invalid method name: #{meth_name}."
+            next
+          end
+          code, _ = code_and_code_type_for(meth)
+          next if !code
 
           range = opts.l? ? one_index_range_or_number(opts[:l]) : (0..-1)
           range = (0..-2) if opts.o?
 
-          eval_string << Array(meth.source.each_line.to_a[range]).join
+          eval_string << Array(code.each_line.to_a[range]).join
         elsif opts.f?
           file_name = File.expand_path(opts[:f])
           next output.puts "No such file: #{opts[:f]}" if !File.exists?(file_name)

data/lib/pry/default_commands/introspection.rb

@@ -28,28 +28,33 @@ class Pry
             output.puts opt
           end
         end
+
         next if opts.help?
-        opts[:instance] = opts['instance-methods'] if opts.m?
 
         args = [nil] if args.empty?
         args.each do |method_name|
-          meth = get_method_or_print_error(method_name, target, opts.to_hash(true))
-          next unless meth and meth.source
+          meth_name = method_name
+          if (meth = get_method_object(meth_name, target, opts.to_hash(true))).nil?
+            output.puts "Invalid method name: #{meth_name}. Type `show-method --help` for help"
+            next
+          end
+
+          code, code_type = code_and_code_type_for(meth)
+          next if !code
 
-          output.puts make_header(meth)
+          output.puts make_header(meth, code_type, code)
           if Pry.color
-            code = CodeRay.scan(meth.source, meth.source_type).term
-          else
-            code = meth.source
+            code = CodeRay.scan(code, code_type).term
           end
 
           start_line = false
-          if opts.b?
-            start_line = 1
-          elsif opts.l?
-            start_line = meth.source_line || 1
+          if opts.l?
+            start_line = meth.source_location ? meth.source_location.last : 1
           end
 
+          start_line = opts.b? ? 1 : start_line
+
+
           render_output(opts.flood?, start_line, code)
           code
         end
@@ -84,25 +89,23 @@ class Pry
         end
 
         if find_command(command_name)
-          block = Pry::Method.new(find_command(command_name).block)
+          block = find_command(command_name).block
 
-          next unless block.source
-          set_file_and_dir_locals(block.source_file)
+          code, _ = code_and_code_type_for(block)
+          next if !code
 
-          output.puts make_header(block)
+          output.puts make_header(block, :ruby, code)
 
           if Pry.color
-            code = CodeRay.scan(block.source, :ruby).term
-          else
-            code = block.source
+            code = CodeRay.scan(code, :ruby).term
           end
 
           start_line = false
           if opts.l?
-            start_line = block.source_line || 1
+            start_line = block.source_location ? block.source_location.last : 1
           end
 
-          render_output(opts.flood?, opts.l? ? block.source_line : false, code)
+          render_output(opts.flood?, opts.l? ? block.source_location.last : false, code)
           code
         else
           output.puts "No such command: #{command_name}."
@@ -119,7 +122,7 @@ class Pry
           USAGE
 
           opt.on :e, :ex, "Open the file that raised the most recent exception (_ex_.file)", :optional => true, :as => Integer
-          opt.on :i, :in, "Open a temporary file containing the specified line of _in_.", :optional => true, :as => Integer
+          opt.on :i, :in, "Open a temporary file containing the Nth line of _in_. N may be a range.", :optional => true, :as => Range, :default => -1..-1
           opt.on :t, :temp, "Open an empty temporary file"
           opt.on :l, :line, "Jump to this line in the opened file", true, :as => Integer
           opt.on :n, :"no-reload", "Don't automatically reload the edited code"
@@ -130,8 +133,8 @@ class Pry
         end
         next if opts.h?
 
-        if [opts.ex? || nil, opts.t? || nil, !args.empty? || nil].compact.size > 1
-          next output.puts "Only one of --ex, --temp, and FILE may be specified"
+        if [opts.ex?, opts.t?, opts.in?, !args.empty?].count(true) > 1
+          next output.puts "Only one of --ex, --temp, --in and FILE may be specified"
         end
 
         # edit of local code, eval'd within pry.
@@ -140,7 +143,14 @@ class Pry
           content = if opts.t?
                       ""
                     elsif opts.i?
-                      _pry_.input_array[opts[:i] || -1] || ""
+                      case opts[:i]
+                      when Range
+                        (_pry_.input_array[opts[:i]] || []).join
+                      when Fixnum
+                        _pry_.input_array[opts[:i]] || ""
+                      else
+                        next output.puts "Not a valid range: #{opts[:i]}"
+                      end
                     elsif eval_string.strip != ""
                       eval_string
                     else
@@ -168,8 +178,8 @@ class Pry
             bt_index = opts[:ex].to_i
 
             ex_file, ex_line = ex.bt_source_location_for(bt_index)
-            if ex_file && RbxPath.is_core_path?(ex_file)
-              file_name = RbxPath.convert_path_to_full(ex_file)
+            if ex_file && is_core_rbx_path?(ex_file)
+              file_name = rbx_convert_path_to_full(ex_file)
             else
               file_name = ex_file
             end
@@ -221,6 +231,7 @@ class Pry
             output.puts opt
           end
         end
+
         next if opts.help?
 
         if !Pry.config.editor
@@ -229,14 +240,21 @@ class Pry
           next
         end
 
-        meth = get_method_or_print_error(args.shift, target, opts.to_hash(true))
-        next unless meth
+        meth_name = args.shift
+        meth_name, target, type = get_method_attributes(meth_name, target, opts.to_hash(true))
+        meth = get_method_object_from_target(meth_name, target, type)
+
+        if meth.nil?
+          output.puts "Invalid method name: #{meth_name}."
+          next
+        end
 
-        if opts.p? || meth.dynamically_defined?
-          lines = meth.source.lines.to_a
+        if opts.p? || is_a_dynamically_defined_method?(meth)
+          code, _ = code_and_code_type_for(meth)
 
+          lines = code.lines.to_a
           if lines[0] =~ /^def [^( \n]+/
-            lines[0] = "def #{meth.name}#{$'}"
+            lines[0] = "def #{meth_name}#{$'}"
           else
             next output.puts "Error: Pry can only patch methods created with the `def` keyword."
           end
@@ -250,10 +268,11 @@ class Pry
           next
         end
 
-        if meth.source_type == :c
+        if is_a_c_method?(meth)
           output.puts "Error: Can't edit a C method."
         else
-          file, line = meth.source_file, meth.source_line
+          file, line = path_line_for(meth)
+          set_file_and_dir_locals(file)
 
           invoke_editor(file, opts["no-jump"] ? 0 : line)
           silence_warnings do