pry 0.9.6-i386-mingw32 → 0.9.6.1-i386-mingw32

data/.travis.yml

@@ -0,0 +1,16 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree
+  - rbx-2.0
+  - jruby
+
+notifications:
+  irc: "irc.freenode.org#pry"
+  recipients:
+    - jrmair@gmail.com
+
+branches:
+  only:
+    - master

data/README.markdown

@@ -1,7 +1,8 @@
+[![Build Status](https://secure.travis-ci.org/pry/pry.png)](http://travis-ci.org/pry/pry)
 <center>
 ![Alt text](http://dl.dropbox.com/u/26521875/pry_logo_350.png)
 
-(C) John Mair (banisterfiend) 2011
+(C) John Mair (banisterfiend) 2011<br>
 
 
 **Please** [DONATE](http://www.pledgie.com/campaigns/15899) to the Pry project - Pry was a **huge** amount of work and every donation received is encouraging and supports Pry's continued development!

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rake/clean'
-require 'rake/gempackagetask'
+require "rubygems"
+require "rubygems/package_task"
 
 $:.unshift 'lib'
 require 'pry/version'
@@ -26,8 +27,12 @@ def apply_spec_defaults(s)
   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
 
+desc "Set up and run tests"
+task :default => [:test]
+
 desc "Run tests"
 task :test do
   sh "bacon -Itest -rubygems -a -q"
@@ -49,7 +54,7 @@ namespace :ruby do
     s.platform = Gem::Platform::RUBY
   end
 
-  Rake::GemPackageTask.new(spec) do |pkg|
+  Gem::PackageTask.new(spec) do |pkg|
     pkg.need_zip = false
     pkg.need_tar = false
   end
@@ -69,7 +74,7 @@ namespace :jruby do
     s.platform = "java"
   end
 
-  Rake::GemPackageTask.new(spec) do |pkg|
+  Gem::PackageTask.new(spec) do |pkg|
     pkg.need_zip = false
     pkg.need_tar = false
   end
@@ -84,7 +89,7 @@ end
       s.platform = "i386-#{v}"
     end
 
-    Rake::GemPackageTask.new(spec) do |pkg|
+    Gem::PackageTask.new(spec) do |pkg|
       pkg.need_zip = false
       pkg.need_tar = false
     end

data/lib/pry.rb

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

data/lib/pry/default_commands/context.rb

@@ -136,8 +136,11 @@ class Pry
           i_num = 5
         end
 
-        meth_name = meth_name_from_binding(target)
-        meth_name = "N/A" if !meth_name
+        if (meth = Pry::Method.from_binding(target))
+          meth_name = meth.name
+        else
+          meth_name = "N/A"
+        end
 
         if file =~ /(\(.*\))|<.*>/ || file == "" || file == "-e"
           output.puts "Cannot find local context. Did you use `binding.pry` ?"

data/lib/pry/default_commands/documentation.rb

@@ -32,20 +32,15 @@ class Pry
 
         args = [nil] if args.empty?
         args.each do |method_name|
-          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
+          meth = get_method_or_print_error(method_name, target, opts.to_hash(true))
+          next unless meth
 
-          doc, code_type = doc_and_code_type_for(meth)
-          next if !doc
+          next output.puts("No documentation found.") if meth.doc.nil? || meth.doc.empty?
 
-          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)}"
+          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}"
           output.puts
           render_output(opts.flood?, false, doc)
           doc
@@ -76,26 +71,20 @@ class Pry
 
         next if opts.help?
 
-        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.")
+        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
       end
 
       command "gist-method", "Gist a method to github. Type `gist-method --help` for more info.", :requires_gem => "gist" do |*args|
@@ -122,19 +111,17 @@ class Pry
 
         next if opts.help?
 
-        # 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
+        meth = get_method_or_print_error(args.shift, target, opts.to_hash(true))
+        next unless meth
 
         type_map = { :ruby => "rb", :c => "c", :plain => "plain" }
         if !opts.doc?
-          content, code_type = code_and_code_type_for(meth)
+          content = meth.source
+          code_type = meth.source_type
         else
-          content, code_type = doc_and_code_type_for(meth)
+          content = meth.doc
+          code_type = meth.source_type
+
           text.no_color do
             content = process_comment_markup(content, code_type)
           end
@@ -147,44 +134,6 @@ 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,17 +77,13 @@ class Pry
 
         if opts.m?
           meth_name = opts[:m]
-          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
+          meth = get_method_or_print_error(meth_name, target, {}, :omit_help)
+          next unless meth and meth.source
 
           range = opts.l? ? one_index_range_or_number(opts[:l]) : (0..-1)
           range = (0..-2) if opts.o?
 
-          eval_string << Array(code.each_line.to_a[range]).join
+          eval_string << Array(meth.source.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,33 +28,28 @@ 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_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
+          meth = get_method_or_print_error(method_name, target, opts.to_hash(true))
+          next unless meth and meth.source
 
-          output.puts make_header(meth, code_type, code)
+          output.puts make_header(meth)
           if Pry.color
-            code = CodeRay.scan(code, code_type).term
+            code = CodeRay.scan(meth.source, meth.source_type).term
+          else
+            code = meth.source
           end
 
           start_line = false
-          if opts.l?
-            start_line = meth.source_location ? meth.source_location.last : 1
+          if opts.b?
+            start_line = 1
+          elsif opts.l?
+            start_line = meth.source_line || 1
           end
 
-          start_line = opts.b? ? 1 : start_line
-
-
           render_output(opts.flood?, start_line, code)
           code
         end
@@ -89,23 +84,25 @@ class Pry
         end
 
         if find_command(command_name)
-          block = find_command(command_name).block
+          block = Pry::Method.new(find_command(command_name).block)
 
-          code, _ = code_and_code_type_for(block)
-          next if !code
+          next unless block.source
+          set_file_and_dir_locals(block.source_file)
 
-          output.puts make_header(block, :ruby, code)
+          output.puts make_header(block)
 
           if Pry.color
-            code = CodeRay.scan(code, :ruby).term
+            code = CodeRay.scan(block.source, :ruby).term
+          else
+            code = block.source
           end
 
           start_line = false
           if opts.l?
-            start_line = block.source_location ? block.source_location.last : 1
+            start_line = block.source_line || 1
           end
 
-          render_output(opts.flood?, opts.l? ? block.source_location.last : false, code)
+          render_output(opts.flood?, opts.l? ? block.source_line : false, code)
           code
         else
           output.puts "No such command: #{command_name}."
@@ -115,13 +112,14 @@ class Pry
       command "edit", "Invoke the default editor on a file. Type `edit --help` for more info" do |*args|
         opts = Slop.parse!(args) do |opt|
           opt.banner unindent <<-USAGE
-            Usage: edit [--no-reload|--reload] [--line LINE] [--temp|--ex|FILE[:LINE]]
+            Usage: edit [--no-reload|--reload] [--line LINE] [--temp|--ex|FILE[:LINE]|--in N]
             Open a text editor. When no FILE is given, edits the pry input buffer.
             Ensure #{text.bold("Pry.config.editor")} is set to your editor of choice.
             e.g: edit sample.rb
           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 :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"
@@ -141,6 +139,8 @@ class Pry
 
           content = if opts.t?
                       ""
+                    elsif opts.i?
+                      _pry_.input_array[opts[:i] || -1] || ""
                     elsif eval_string.strip != ""
                       eval_string
                     else
@@ -168,8 +168,8 @@ class Pry
             bt_index = opts[:ex].to_i
 
             ex_file, ex_line = ex.bt_source_location_for(bt_index)
-            if ex_file && is_core_rbx_path?(ex_file)
-              file_name = rbx_convert_path_to_full(ex_file)
+            if ex_file && RbxPath.is_core_path?(ex_file)
+              file_name = RbxPath.convert_path_to_full(ex_file)
             else
               file_name = ex_file
             end
@@ -221,7 +221,6 @@ class Pry
             output.puts opt
           end
         end
-
         next if opts.help?
 
         if !Pry.config.editor
@@ -230,21 +229,14 @@ class Pry
           next
         end
 
-        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
+        meth = get_method_or_print_error(args.shift, target, opts.to_hash(true))
+        next unless meth
 
-        if opts.p? || is_a_dynamically_defined_method?(meth)
-          code, _ = code_and_code_type_for(meth)
+        if opts.p? || meth.dynamically_defined?
+          lines = meth.source.lines.to_a
 
-          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
@@ -258,11 +250,10 @@ class Pry
           next
         end
 
-        if is_a_c_method?(meth)
+        if meth.source_type == :c
           output.puts "Error: Can't edit a C method."
         else
-          file, line = path_line_for(meth)
-          set_file_and_dir_locals(file)
+          file, line = meth.source_file, meth.source_line
 
           invoke_editor(file, opts["no-jump"] ? 0 : line)
           silence_warnings do