pry 0.9.12.6 → 0.10.0.pre2

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.12.6"
+  VERSION = "0.10.0.pre2"
 end

data/lib/pry/wrapped_module.rb

@@ -66,27 +66,12 @@ class Pry
     end
 
     # Returns an array of the names of the constants accessible in the wrapped
-    # module. This provides a consistent interface between 1.8 and 1.9 and also
-    # avoids the problem of accidentally calling the singleton method
-    # `Module.constants`.
-    # @param [Boolean] inherit (true) Include the names of constants from
-    #   included modules?
+    # module. This avoids the problem of accidentally calling the singleton
+    # method `Module.constants`.
+    # @param [Boolean] inherit Include the names of constants from included
+    #   modules?
     def constants(inherit = true)
-      method = Module.instance_method(:constants).bind(@wrapped)
-
-      # If we're on 1.8, we have to manually remove ancestors' constants. If
-      # we're on 1.9, though, it's better to use the built-in `inherit` param,
-      # since it doesn't do things like incorrectly remove Pry::Config.
-      if method.arity == 0
-        consts = method.call
-        if !inherit
-          consts -= (@wrapped.ancestors - [@wrapped]).map(&:constants).flatten
-        end
-      else
-        consts = method.call(inherit)
-      end
-
-      consts
+      Module.instance_method(:constants).bind(@wrapped).call(inherit)
     end
 
     # The prefix that would appear before methods defined on this class.
@@ -120,10 +105,10 @@ class Pry
     # Is this a singleton class?
     # @return [Boolean]
     def singleton_class?
-      if wrapped.respond_to?(:singleton_class?)
-        wrapped.singleton_class?
+      if Pry::Method.safe_send(wrapped, :respond_to?, :singleton_class?)
+        Pry::Method.safe_send(wrapped, :singleton_class?)
       else
-        wrapped != wrapped.ancestors.first
+        wrapped != Pry::Method.safe_send(wrapped, :ancestors).first
       end
     end
 
@@ -258,7 +243,7 @@ class Pry
     # @return [Enumerator, Array] on JRuby 1.9 and higher returns Array, on
     #  other rubies returns Enumerator
     def candidates
-      enum = generator.new do |y|
+      enum = Enumerator.new do |y|
                (0...number_of_candidates).each do |num|
                  y.yield candidate(num)
                end
@@ -291,24 +276,17 @@ class Pry
 
     private
 
-    # Ruby 1.8 doesn't support `Enumerator` (it's called Generator instead)
-    #
-    # @return [Object] Return the appropriate generator class.
-    def generator
-      @generator ||= if defined?(Enumerator)
-                       Enumerator
-                     else
-                       require 'generator'
-                       Generator
-                     end
-    end
-
-    # @return [Pry::WrappedModule::Candidate] The candidate of rank 0,
-    #   that is the 'monkey patch' of this module with the highest
-    #   number of methods. It is considered the 'canonical' definition
-    #   for the module.
+    # @return [Pry::WrappedModule::Candidate] The candidate with the
+    #   highest rank, that is the 'monkey patch' of this module with the
+    #   highest number of methods, which contains a source code line that
+    #   defines the module. It is considered the 'canonical' definition
+    #   for the module. In the absense of a suitable candidate, the
+    #   candidate of rank 0 will be returned, or a CommandError raised if
+    #   there are no candidates at all.
     def primary_candidate
-      @primary_candidate ||= candidate(0)
+      @primary_candidate ||= candidates.find { |c| c.file } ||
+        # This will raise an exception if there is no candidate at all.
+        candidate(0)
     end
 
     # @return [Array<Array<Pry::Method>>] The array of `Pry::Method` objects,
@@ -330,7 +308,12 @@ class Pry
 
       ims = all_relevant_methods_for(wrapped)
       @all_source_locations_by_popularity = ims.group_by { |v| Array(v.source_location).first }.
-        sort_by { |k, v| -v.size }
+        sort_by do |path, methods|
+          expanded = File.expand_path(path)
+          load_order = $LOADED_FEATURES.index{ |file| expanded.end_with?(file) }
+
+          [-methods.size, load_order || (1.0 / 0.0)]
+        end
     end
 
     # We only want methods that have a non-nil `source_location`. We also
@@ -338,30 +321,33 @@ class Pry
     # (i.e we skip `__class_init__` because it's an odd rbx specific thing that causes tests to fail.)
     # @return [Array<Pry::Method>]
     def all_relevant_methods_for(mod)
-      all_methods_for(mod).select(&:source_location).
+      methods = all_methods_for(mod).select(&:source_location).
         reject{ |x| x.name == '__class_init__' || method_defined_by_forwardable_module?(x) }
+
+      return methods unless methods.empty?
+
+      safe_send(mod, :constants).map do |const_name|
+        if const = nested_module?(mod, const_name)
+          all_relevant_methods_for(const)
+        else
+          []
+        end
+      end.flatten
     end
 
     # Return all methods (instance methods and class methods) for a
     # given module.
     # @return [Array<Pry::Method>]
     def all_methods_for(mod)
-      all_from_common(mod, :instance_method) + all_from_common(mod, :method)
-    end
-
-    # FIXME: a variant of this method is also found in Pry::Method
-    def all_from_common(mod, method_type)
-      %w(public protected private).map do |visibility|
-        safe_send(mod, :"#{visibility}_#{method_type}s", false).select do |method_name|
-          if method_type == :method
-            safe_send(mod, method_type, method_name).owner == class << mod; self; end
-          else
-            safe_send(mod, method_type, method_name).owner == mod
-          end
-        end.map do |method_name|
-          Pry::Method.new(safe_send(mod, method_type, method_name), :visibility => visibility.to_sym)
-        end
-      end.flatten
+      Pry::Method.all_from_obj(mod, false) + Pry::Method.all_from_class(mod, false)
+    end
+
+    def nested_module?(parent, name)
+      return if safe_send(parent, :autoload?, name)
+      child = safe_send(parent, :const_get, name)
+      return unless Module === child
+      return unless safe_send(child, :name) == "#{safe_send(parent, :name)}::#{name}"
+      child
     end
 
     # Detect methods that are defined with `def_delegator` from the Forwardable

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry
 version: !ruby/object:Gem::Version
-  version: 0.9.12.6
+  version: 0.10.0.pre2
 platform: ruby
 authors:
 - John Mair (banisterfiend)
@@ -10,120 +10,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: method_source
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: bacon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
-  name: open4
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.13.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.13.1
-- !ruby/object:Gem::Dependency
-  name: bond
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '1.0'
 description: An IRB alternative and runtime developer console
 email:
 - jrmair@gmail.com
@@ -134,24 +78,18 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .travis.yml
-- .yardopts
-- CHANGELOG
-- CONTRIBUTORS
-- Gemfile
+- CHANGELOG.md
 - LICENSE
-- README.markdown
-- Rakefile
-- TODO
+- README.md
 - bin/pry
 - lib/pry.rb
 - lib/pry/cli.rb
 - lib/pry/code.rb
+- lib/pry/code/code_file.rb
 - lib/pry/code/code_range.rb
 - lib/pry/code/loc.rb
 - lib/pry/code_object.rb
+- lib/pry/color_printer.rb
 - lib/pry/command.rb
 - lib/pry/command_set.rb
 - lib/pry/commands.rb
@@ -164,6 +102,8 @@ files:
 - lib/pry/commands/cat/file_formatter.rb
 - lib/pry/commands/cat/input_expression_formatter.rb
 - lib/pry/commands/cd.rb
+- lib/pry/commands/change_inspector.rb
+- lib/pry/commands/change_prompt.rb
 - lib/pry/commands/code_collector.rb
 - lib/pry/commands/disable_pry.rb
 - lib/pry/commands/disabled_commands.rb
@@ -171,7 +111,6 @@ files:
 - lib/pry/commands/edit.rb
 - lib/pry/commands/edit/exception_patcher.rb
 - lib/pry/commands/edit/file_and_line_locator.rb
-- lib/pry/commands/edit/method_patcher.rb
 - lib/pry/commands/exit.rb
 - lib/pry/commands/exit_all.rb
 - lib/pry/commands/exit_program.rb
@@ -187,7 +126,22 @@ files:
 - lib/pry/commands/import_set.rb
 - lib/pry/commands/install_command.rb
 - lib/pry/commands/jump_to.rb
+- lib/pry/commands/list_inspectors.rb
+- lib/pry/commands/list_prompts.rb
 - lib/pry/commands/ls.rb
+- lib/pry/commands/ls/constants.rb
+- lib/pry/commands/ls/formatter.rb
+- lib/pry/commands/ls/globals.rb
+- lib/pry/commands/ls/grep.rb
+- lib/pry/commands/ls/instance_vars.rb
+- lib/pry/commands/ls/interrogatable.rb
+- lib/pry/commands/ls/jruby_hacks.rb
+- lib/pry/commands/ls/local_names.rb
+- lib/pry/commands/ls/local_vars.rb
+- lib/pry/commands/ls/ls_entity.rb
+- lib/pry/commands/ls/methods.rb
+- lib/pry/commands/ls/methods_helper.rb
+- lib/pry/commands/ls/self_methods.rb
 - lib/pry/commands/nesting.rb
 - lib/pry/commands/play.rb
 - lib/pry/commands/pry_backtrace.rb
@@ -207,13 +161,17 @@ files:
 - lib/pry/commands/stat.rb
 - lib/pry/commands/switch_to.rb
 - lib/pry/commands/toggle_color.rb
+- lib/pry/commands/watch_expression.rb
+- lib/pry/commands/watch_expression/expression.rb
 - lib/pry/commands/whereami.rb
 - lib/pry/commands/wtf.rb
-- lib/pry/completion.rb
 - lib/pry/config.rb
+- lib/pry/config/behavior.rb
+- lib/pry/config/convenience.rb
+- lib/pry/config/default.rb
 - lib/pry/core_extensions.rb
-- lib/pry/custom_completions.rb
 - lib/pry/editor.rb
+- lib/pry/exceptions.rb
 - lib/pry/helpers.rb
 - lib/pry/helpers/base_helpers.rb
 - lib/pry/helpers/command_helpers.rb
@@ -225,92 +183,33 @@ files:
 - lib/pry/history_array.rb
 - lib/pry/hooks.rb
 - lib/pry/indent.rb
+- lib/pry/input_completer.rb
+- lib/pry/input_lock.rb
+- lib/pry/inspector.rb
+- lib/pry/last_exception.rb
 - lib/pry/method.rb
 - lib/pry/method/disowned.rb
+- lib/pry/method/patcher.rb
 - lib/pry/method/weird_method_locator.rb
 - lib/pry/module_candidate.rb
+- lib/pry/object_path.rb
+- lib/pry/output.rb
 - lib/pry/pager.rb
 - lib/pry/plugins.rb
+- lib/pry/prompt.rb
 - lib/pry/pry_class.rb
 - lib/pry/pry_instance.rb
-- lib/pry/rbx_method.rb
 - lib/pry/rbx_path.rb
+- lib/pry/repl.rb
 - lib/pry/repl_file_loader.rb
 - lib/pry/rubygem.rb
 - lib/pry/terminal.rb
 - lib/pry/test/helper.rb
 - lib/pry/version.rb
 - lib/pry/wrapped_module.rb
-- man/pry.1
-- man/pry.1.html
-- man/pry.1.ronn
-- pry.gemspec
-- spec/Procfile
-- spec/cli_spec.rb
-- spec/code_object_spec.rb
-- spec/code_spec.rb
-- spec/command_helpers_spec.rb
-- spec/command_integration_spec.rb
-- spec/command_set_spec.rb
-- spec/command_spec.rb
-- spec/commands/amend_line_spec.rb
-- spec/commands/bang_spec.rb
-- spec/commands/cat_spec.rb
-- spec/commands/cd_spec.rb
-- spec/commands/disable_pry_spec.rb
-- spec/commands/edit_spec.rb
-- spec/commands/exit_all_spec.rb
-- spec/commands/exit_program_spec.rb
-- spec/commands/exit_spec.rb
-- spec/commands/find_method_spec.rb
-- spec/commands/gem_list_spec.rb
-- spec/commands/gist_spec.rb
-- spec/commands/help_spec.rb
-- spec/commands/hist_spec.rb
-- spec/commands/jump_to_spec.rb
-- spec/commands/ls_spec.rb
-- spec/commands/play_spec.rb
-- spec/commands/raise_up_spec.rb
-- spec/commands/save_file_spec.rb
-- spec/commands/show_doc_spec.rb
-- spec/commands/show_input_spec.rb
-- spec/commands/show_source_spec.rb
-- spec/commands/whereami_spec.rb
-- spec/completion_spec.rb
-- spec/control_d_handler_spec.rb
-- spec/documentation_helper_spec.rb
-- spec/editor_spec.rb
-- spec/exception_whitelist_spec.rb
-- spec/fixtures/candidate_helper1.rb
-- spec/fixtures/candidate_helper2.rb
-- spec/fixtures/example.erb
-- spec/fixtures/example_nesting.rb
-- spec/fixtures/show_source_doc_examples.rb
-- spec/fixtures/testrc
-- spec/fixtures/testrcbad
-- spec/fixtures/whereami_helper.rb
-- spec/helper.rb
-- spec/helpers/bacon.rb
-- spec/helpers/mock_pry.rb
-- spec/helpers/table_spec.rb
-- spec/history_array_spec.rb
-- spec/hooks_spec.rb
-- spec/indent_spec.rb
-- spec/input_stack_spec.rb
-- spec/method_spec.rb
-- spec/prompt_spec.rb
-- spec/pry_defaults_spec.rb
-- spec/pry_history_spec.rb
-- spec/pry_output_spec.rb
-- spec/pry_spec.rb
-- spec/run_command_spec.rb
-- spec/sticky_locals_spec.rb
-- spec/syntax_checking_spec.rb
-- spec/wrapped_module_spec.rb
-- wiki/Customizing-pry.md
-- wiki/Home.md
-homepage: http://pry.github.com
-licenses: []
+homepage: http://pryrepl.org
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -318,80 +217,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An IRB alternative and runtime developer console
-test_files:
-- spec/Procfile
-- spec/cli_spec.rb
-- spec/code_object_spec.rb
-- spec/code_spec.rb
-- spec/command_helpers_spec.rb
-- spec/command_integration_spec.rb
-- spec/command_set_spec.rb
-- spec/command_spec.rb
-- spec/commands/amend_line_spec.rb
-- spec/commands/bang_spec.rb
-- spec/commands/cat_spec.rb
-- spec/commands/cd_spec.rb
-- spec/commands/disable_pry_spec.rb
-- spec/commands/edit_spec.rb
-- spec/commands/exit_all_spec.rb
-- spec/commands/exit_program_spec.rb
-- spec/commands/exit_spec.rb
-- spec/commands/find_method_spec.rb
-- spec/commands/gem_list_spec.rb
-- spec/commands/gist_spec.rb
-- spec/commands/help_spec.rb
-- spec/commands/hist_spec.rb
-- spec/commands/jump_to_spec.rb
-- spec/commands/ls_spec.rb
-- spec/commands/play_spec.rb
-- spec/commands/raise_up_spec.rb
-- spec/commands/save_file_spec.rb
-- spec/commands/show_doc_spec.rb
-- spec/commands/show_input_spec.rb
-- spec/commands/show_source_spec.rb
-- spec/commands/whereami_spec.rb
-- spec/completion_spec.rb
-- spec/control_d_handler_spec.rb
-- spec/documentation_helper_spec.rb
-- spec/editor_spec.rb
-- spec/exception_whitelist_spec.rb
-- spec/fixtures/candidate_helper1.rb
-- spec/fixtures/candidate_helper2.rb
-- spec/fixtures/example.erb
-- spec/fixtures/example_nesting.rb
-- spec/fixtures/show_source_doc_examples.rb
-- spec/fixtures/testrc
-- spec/fixtures/testrcbad
-- spec/fixtures/whereami_helper.rb
-- spec/helper.rb
-- spec/helpers/bacon.rb
-- spec/helpers/mock_pry.rb
-- spec/helpers/table_spec.rb
-- spec/history_array_spec.rb
-- spec/hooks_spec.rb
-- spec/indent_spec.rb
-- spec/input_stack_spec.rb
-- spec/method_spec.rb
-- spec/prompt_spec.rb
-- spec/pry_defaults_spec.rb
-- spec/pry_history_spec.rb
-- spec/pry_output_spec.rb
-- spec/pry_spec.rb
-- spec/run_command_spec.rb
-- spec/sticky_locals_spec.rb
-- spec/syntax_checking_spec.rb
-- spec/wrapped_module_spec.rb
+test_files: []