pry 0.9.8.1-i386-mingw32 → 0.9.8.2-i386-mingw32

data/CHANGELOG

@@ -1,3 +1,9 @@
+9/2/2012 version 0.9.8.2 bugfix
+* fixed bugs related to --super
+* upgraded slop dependency
+* added edit -c (edit current line)
+* edit now respects Pry.config.disable_autoreload option
+
 30/1/2012 version 0.9.8.1 bugfix
 * fixed broken --no-plugins option
 * Ensure ARGV is not mutated during option parsing.

data/Rakefile

@@ -20,7 +20,7 @@ def apply_spec_defaults(s)
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- test/*`.split("\n")
   s.add_dependency('coderay', '~> 1.0.5')
-  s.add_dependency('slop', ['>= 2.4.3', '< 3'])
+  s.add_dependency('slop', ['>= 2.4.4', '< 3'])
   s.add_dependency('method_source','~> 0.7')
   s.add_development_dependency('bacon', '~> 1.1')
   s.add_development_dependency('open4', '~> 1.3')

data/lib/pry/code.rb

@@ -110,7 +110,7 @@ class Pry
         lines = lines.lines
       end
 
-      @lines = lines.each_with_index.map { |l, i| [l.chomp, i + start_line] }
+      @lines = lines.each_with_index.map { |l, i| [l.chomp, i + start_line.to_i] }
       @code_type = code_type
     end
 

data/lib/pry/default_commands/introspection.rb

@@ -125,6 +125,7 @@ class Pry
           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"
+          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)"
         end
 
@@ -133,7 +134,7 @@ class Pry
             raise CommandError, "Only one of --ex, --temp, --in and FILE may be specified."
           end
 
-          if !opts.present?(:ex) && args.empty?
+          if !opts.present?(:ex) && !opts.present?(:current) && args.empty?
             # edit of local code, eval'd within pry.
             process_local_edit
           else
@@ -171,7 +172,7 @@ class Pry
             f.puts(content)
             f.flush
             invoke_editor(f.path, line)
-            if !opts.present?(:'no-reload')
+            if !opts.present?(:'no-reload') && !Pry.config.disable_auto_reload
               silence_warnings do
                 eval_string.replace(File.read(f.path))
               end
@@ -204,19 +205,26 @@ class Pry
             if Pry.eval_path == file_name
               raise CommandError, "Cannot edit exceptions raised in REPL."
             end
+          elsif opts.present?(:current)
+            file_name = target.eval("__FILE__")
+            line = target.eval("__LINE__")
           else
+
             # break up into file:line
             file_name = File.expand_path(args.first)
-
             line = file_name.sub!(/:(\d+)$/, "") ? $1.to_i : 1
           end
 
+          if not_a_real_file?(file_name)
+            raise CommandError, "#{file_name} is not a valid file name, cannot edit!"
+          end
+
           line = opts[:l].to_i if opts.present?(:line)
 
           invoke_editor(file_name, line)
           set_file_and_dir_locals(file_name)
 
-          if opts.present?(:reload) || ((opts.present?(:ex) || file_name.end_with?(".rb")) && !opts.present?(:'no-reload'))
+          if opts.present?(:reload) || ((opts.present?(:ex) || file_name.end_with?(".rb")) && !opts.present?(:'no-reload')) && !Pry.config.disable_auto_reload
             silence_warnings do
               TOPLEVEL_BINDING.eval(File.read(file_name), file_name)
             end
@@ -305,7 +313,7 @@ class Pry
 
           invoke_editor(file, opts["no-jump"] ? 0 : line)
           silence_warnings do
-            load file unless opts.present?(:'no-jump') || Pry.config.disable_auto_reload
+            load file unless opts.present?(:'no-reload') || Pry.config.disable_auto_reload
           end
         end
 

data/lib/pry/helpers/base_helpers.rb

@@ -27,6 +27,10 @@ class Pry
         Gem::Specification.respond_to?(:find_all_by_name) ? !Gem::Specification.find_all_by_name(gem_name).empty? : Gem.source_index.find_name(gem_name).first
       end
 
+      def not_a_real_file?(file)
+        file =~ /(\(.*\))|<.*>/ || file =~ /__unknown__/ || file == "" || file == "-e"
+      end
+
       def command_dependencies_met?(options)
         return true if !options[:requires_gem]
         Array(options[:requires_gem]).all? do |g|

data/lib/pry/method.rb

@@ -348,11 +348,11 @@ class Pry
     # @return [Pry::Method, nil] The wrapped method that is called when you
     #   use "super" in the body of this method.
     def super(times=1)
-      if respond_to?(:receiver)
+      if UnboundMethod === @method
+        sup = super_using_ancestors(Pry::Method.instance_resolution_order(owner), times)
+      else
         sup = super_using_ancestors(Pry::Method.resolution_order(receiver), times)
         sup &&= sup.bind(receiver)
-      else
-        sup = super_using_ancestors(Pry::Method.instance_resolution_order(owner), times)
       end
       Pry::Method.new(sup) if sup
     end
@@ -443,8 +443,11 @@ class Pry
       def super_using_ancestors(ancestors, times=1)
         next_owner = self.owner
         times.times do
-          next_owner = ancestors[ancestors.index(next_owner) + 1]
-          return nil unless next_owner
+          i = ancestors.index(next_owner) + 1
+          while ancestors[i] && !(ancestors[i].method_defined?(name) || ancestors[i].private_method_defined?(name))
+            i += 1
+          end
+          next_owner = ancestors[i] or return nil
         end
         next_owner.instance_method(name) rescue nil
       end

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.8.1"
+  VERSION = "0.9.8.2"
 end

data/pry.gemspec

@@ -2,18 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = "pry"
-  s.version = "0.9.8.1"
+  s.version = "0.9.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mair (banisterfiend)"]
-  s.date = "2012-01-30"
+  s.date = "2012-02-09"
   s.description = "An IRB alternative and runtime developer console"
   s.email = "jrmair@gmail.com"
   s.executables = ["pry"]
   s.files = [".document", ".gemtest", ".gitignore", ".travis.yml", ".yardopts", "CHANGELOG", "CONTRIBUTORS", "Gemfile", "LICENSE", "README.markdown", "Rakefile", "TODO", "bin/pry", "examples/example_basic.rb", "examples/example_command_override.rb", "examples/example_commands.rb", "examples/example_hooks.rb", "examples/example_image_edit.rb", "examples/example_input.rb", "examples/example_input2.rb", "examples/example_output.rb", "examples/example_print.rb", "examples/example_prompt.rb", "examples/helper.rb", "lib/pry.rb", "lib/pry/cli.rb", "lib/pry/code.rb", "lib/pry/command.rb", "lib/pry/command_set.rb", "lib/pry/commands.rb", "lib/pry/completion.rb", "lib/pry/config.rb", "lib/pry/core_extensions.rb", "lib/pry/custom_completions.rb", "lib/pry/default_commands/basic.rb", "lib/pry/default_commands/context.rb", "lib/pry/default_commands/documentation.rb", "lib/pry/default_commands/easter_eggs.rb", "lib/pry/default_commands/gems.rb", "lib/pry/default_commands/input.rb", "lib/pry/default_commands/introspection.rb", "lib/pry/default_commands/ls.rb", "lib/pry/default_commands/shell.rb", "lib/pry/extended_commands/experimental.rb", "lib/pry/helpers.rb", "lib/pry/helpers/base_helpers.rb", "lib/pry/helpers/command_helpers.rb", "lib/pry/helpers/options_helpers.rb", "lib/pry/helpers/text.rb", "lib/pry/history.rb", "lib/pry/history_array.rb", "lib/pry/hooks.rb", "lib/pry/indent.rb", "lib/pry/method.rb", "lib/pry/plugins.rb", "lib/pry/pry_class.rb", "lib/pry/pry_instance.rb", "lib/pry/rbx_method.rb", "lib/pry/rbx_path.rb", "lib/pry/version.rb", "lib/pry/wrapped_module.rb", "man/pry.1", "man/pry.1.html", "man/pry.1.ronn", "pry.gemspec", "test/helper.rb", "test/test_cli.rb", "test/test_code.rb", "test/test_command.rb", "test/test_command_helpers.rb", "test/test_command_integration.rb", "test/test_command_set.rb", "test/test_completion.rb", "test/test_default_commands.rb", "test/test_default_commands/test_context.rb", "test/test_default_commands/test_documentation.rb", "test/test_default_commands/test_gems.rb", "test/test_default_commands/test_input.rb", "test/test_default_commands/test_introspection.rb", "test/test_default_commands/test_ls.rb", "test/test_default_commands/test_shell.rb", "test/test_exception_whitelist.rb", "test/test_history_array.rb", "test/test_hooks.rb", "test/test_indent.rb", "test/test_input_stack.rb", "test/test_method.rb", "test/test_pry.rb", "test/test_pry_defaults.rb", "test/test_pry_history.rb", "test/test_pry_output.rb", "test/test_special_locals.rb", "test/test_syntax_checking.rb", "test/test_wrapped_module.rb", "test/testrc", "test/testrcbad", "wiki/Customizing-pry.md", "wiki/Home.md"]
   s.homepage = "http://pry.github.com"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.11"
   s.summary = "An IRB alternative and runtime developer console"
   s.test_files = ["test/helper.rb", "test/test_cli.rb", "test/test_code.rb", "test/test_command.rb", "test/test_command_helpers.rb", "test/test_command_integration.rb", "test/test_command_set.rb", "test/test_completion.rb", "test/test_default_commands.rb", "test/test_default_commands/test_context.rb", "test/test_default_commands/test_documentation.rb", "test/test_default_commands/test_gems.rb", "test/test_default_commands/test_input.rb", "test/test_default_commands/test_introspection.rb", "test/test_default_commands/test_ls.rb", "test/test_default_commands/test_shell.rb", "test/test_exception_whitelist.rb", "test/test_history_array.rb", "test/test_hooks.rb", "test/test_indent.rb", "test/test_input_stack.rb", "test/test_method.rb", "test/test_pry.rb", "test/test_pry_defaults.rb", "test/test_pry_history.rb", "test/test_pry_output.rb", "test/test_special_locals.rb", "test/test_syntax_checking.rb", "test/test_wrapped_module.rb", "test/testrc", "test/testrcbad"]
 
@@ -22,14 +22,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<coderay>, ["~> 1.0.5"])
-      s.add_runtime_dependency(%q<slop>, ["< 3", ">= 2.4.3"])
+      s.add_runtime_dependency(%q<slop>, ["< 3", ">= 2.4.4"])
       s.add_runtime_dependency(%q<method_source>, ["~> 0.7"])
       s.add_development_dependency(%q<bacon>, ["~> 1.1"])
       s.add_development_dependency(%q<open4>, ["~> 1.3"])
       s.add_development_dependency(%q<rake>, ["~> 0.9"])
     else
       s.add_dependency(%q<coderay>, ["~> 1.0.5"])
-      s.add_dependency(%q<slop>, ["< 3", ">= 2.4.3"])
+      s.add_dependency(%q<slop>, ["< 3", ">= 2.4.4"])
       s.add_dependency(%q<method_source>, ["~> 0.7"])
       s.add_dependency(%q<bacon>, ["~> 1.1"])
       s.add_dependency(%q<open4>, ["~> 1.3"])
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<coderay>, ["~> 1.0.5"])
-    s.add_dependency(%q<slop>, ["< 3", ">= 2.4.3"])
+    s.add_dependency(%q<slop>, ["< 3", ">= 2.4.4"])
     s.add_dependency(%q<method_source>, ["~> 0.7"])
     s.add_dependency(%q<bacon>, ["~> 1.1"])
     s.add_dependency(%q<open4>, ["~> 1.3"])

data/test/test_method.rb

@@ -124,6 +124,60 @@ describe Pry::Method do
     end
   end
 
+  describe 'super' do
+    it 'should be able to find the super method on a bound method' do
+      a = Class.new{ def rar; 4; end }
+      b = Class.new(a){ def rar; super; end }
+
+      obj = b.new
+
+      zuper = Pry::Method(obj.method(:rar)).super
+      zuper.owner.should == a
+      zuper.receiver.should == obj
+    end
+
+    it 'should be able to find the super method of an unbound method' do
+      a = Class.new{ def rar; 4; end }
+      b = Class.new(a){ def rar; super; end }
+
+      zuper = Pry::Method(b.instance_method(:rar)).super
+      zuper.owner.should == a
+    end
+
+    it 'should return nil if no super method exists' do
+      a = Class.new{ def rar; super; end }
+
+      Pry::Method(a.instance_method(:rar)).super.should == nil
+    end
+
+    it 'should be able to find super methods defined on modules' do
+      m = Module.new{ def rar; 4; end }
+      a = Class.new{ def rar; super; end; include m }
+
+      zuper = Pry::Method(a.new.method(:rar)).super
+      zuper.owner.should == m
+    end
+
+    it 'should be able to find super methods defined on super-classes when there are modules in the way' do
+      a = Class.new{ def rar; 4; end }
+      m = Module.new{ def mooo; 4; end }
+      b = Class.new(a){ def rar; super; end; include m }
+
+      zuper = Pry::Method(b.new.method(:rar)).super
+      zuper.owner.should == a
+    end
+
+    it 'should be able to jump up multiple levels of bound method, even through modules' do
+      a = Class.new{ def rar; 4; end }
+      m = Module.new{ def rar; 4; end }
+      b = Class.new(a){ def rar; super; end; include m }
+
+      zuper = Pry::Method(b.new.method(:rar)).super
+      zuper.owner.should == m
+      zuper.super.owner.should == a
+    end
+  end
+
   describe 'all_from_class' do
     def should_find_method(name)
       Pry::Method.all_from_class(@class).map(&:name).should.include(name)

metadata

@@ -1,103 +1,106 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: pry
-version: !ruby/object:Gem::Version
-  version: 0.9.8.1
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.9.8.2
 platform: i386-mingw32
-authors:
+authors: 
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-02-09 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: coderay
-  requirement: &70340903260220 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.0.5
   type: :runtime
-  prerelease: false
-  version_requirements: *70340903260220
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: slop
-  requirement: &70340903259700 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.4.3
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.4.4
     - - <
-      - !ruby/object:Gem::Version
-        version: '3'
+      - !ruby/object:Gem::Version 
+        version: "3"
   type: :runtime
-  prerelease: false
-  version_requirements: *70340903259700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: method_source
-  requirement: &70340903258940 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
+      - !ruby/object:Gem::Version 
+        version: "0.7"
   type: :runtime
-  prerelease: false
-  version_requirements: *70340903258940
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: bacon
-  requirement: &70340903258460 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
+      - !ruby/object:Gem::Version 
+        version: "1.1"
   type: :development
-  prerelease: false
-  version_requirements: *70340903258460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: open4
-  requirement: &70340903257920 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+      - !ruby/object:Gem::Version 
+        version: "1.3"
   type: :development
-  prerelease: false
-  version_requirements: *70340903257920
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70340903257440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
+      - !ruby/object:Gem::Version 
+        version: "0.9"
   type: :development
-  prerelease: false
-  version_requirements: *70340903257440
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: win32console
-  requirement: &70340903256960 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+      - !ruby/object:Gem::Version 
+        version: "1.3"
   type: :runtime
-  prerelease: false
-  version_requirements: *70340903256960
+  version_requirements: *id007
 description: An IRB alternative and runtime developer console
 email: jrmair@gmail.com
-executables:
+executables: 
 - pry
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .document
 - .gemtest
 - .gitignore
@@ -198,29 +201,32 @@ files:
 - wiki/Home.md
 homepage: http://pry.github.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: An IRB alternative and runtime developer console
-test_files:
+test_files: 
 - test/helper.rb
 - test/test_cli.rb
 - test/test_code.rb