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

data/lib/pry/rbx_method.rb

@@ -0,0 +1,13 @@
+class Pry
+  module RbxMethod
+    private
+
+    def core_code
+      MethodSource.source_helper(source_location)
+    end
+
+    def core_doc
+      MethodSource.comment_helper(source_location)
+    end
+  end
+end

data/lib/pry/rbx_path.rb

@@ -2,7 +2,7 @@ class Pry
   module RbxPath
     module_function
     def is_core_path?(path)
-      Pry::Helpers::BaseHelpers.rbx? && (path.start_with?("kernel") || path.start_with?("lib")) && File.exist?(convert_path_to_full(path))
+      path.start_with?("kernel") || path.start_with?("lib")
     end
 
     def convert_path_to_full(path)

data/lib/pry/repl.rb

@@ -35,7 +35,7 @@ class Pry
     #   thrown with it.
     def start
       prologue
-      Pry::InputLock.for(:all).with_ownership { repl }
+      repl
     ensure
       epilogue
     end
@@ -48,7 +48,7 @@ class Pry
       pry.exec_hook :before_session, pry.output, pry.current_binding, pry
 
       # Clear the line before starting Pry. This fixes issue #566.
-      if pry.config.correct_indent
+      if Pry.config.correct_indent
         Kernel.print Pry::Helpers::BaseHelpers.windows_ansi? ? "\e[0F" : "\e[0G"
       end
     end
@@ -93,18 +93,18 @@ class Pry
     def read
       @indent.reset if pry.eval_string.empty?
       current_prompt = pry.select_prompt
-      indentation = pry.config.auto_indent ? @indent.current_prefix : ''
+      indentation = Pry.config.auto_indent ? @indent.current_prefix : ''
 
       val = read_line("#{current_prompt}#{indentation}")
 
       # Return nil for EOF, :no_more_input for error, or :control_c for <Ctrl-C>
       return val unless String === val
 
-      if pry.config.auto_indent
+      if Pry.config.auto_indent
         original_val = "#{indentation}#{val}"
         indented_val = @indent.indent(val)
 
-        if output.tty? && pry.config.correct_indent && Pry::Helpers::BaseHelpers.use_ansi_codes?
+        if output.tty? && @indent.should_correct_indentation?
           output.print @indent.correct_indentation(
             current_prompt, indented_val,
             original_val.length - indented_val.length
@@ -128,7 +128,7 @@ class Pry
       begin
         yield
       rescue EOFError
-        pry.config.input = Pry.config.input
+        pry.input = Pry.config.input
         if !should_retry
           output.puts "Error: Pry ran out of things to read from! " \
             "Attempting to break out of REPL."
@@ -179,24 +179,21 @@ class Pry
           end
         end
 
-        if defined?(Readline) and input == Readline
-          input_readline(current_prompt, false) # false since we'll add it manually
+        if input == Readline
+          if !$stdout.tty? && $stdin.tty? && !Pry::Helpers::BaseHelpers.windows?
+            Readline.output = File.open('/dev/tty', 'w')
+          end
+          input.readline(current_prompt, false) # false since we'll add it manually
         elsif defined? Coolline and input.is_a? Coolline
-          input_readline(current_prompt)
+          input.readline(current_prompt)
         else
           if input.method(:readline).arity == 1
-            input_readline(current_prompt)
+            input.readline(current_prompt)
           else
-            input_readline
+            input.readline
           end
         end
       end
     end
-
-    def input_readline(*args)
-      Pry::InputLock.for(:all).interruptible_region do
-        input.readline(*args)
-      end
-    end
   end
 end

data/lib/pry/repl_file_loader.rb

@@ -23,9 +23,9 @@ class Pry
     # and use the regular print and exception handlers.
     # @param [Pry] _pry_ the Pry instance to make interactive.
     def interactive_mode(_pry_)
-      _pry_.config.input = Pry.config.input
-      _pry_.config.print = Pry.config.print
-      _pry_.config.exception_handler = Pry.config.exception_handler
+      _pry_.input = Pry.config.input
+      _pry_.print = Pry.config.print
+      _pry_.exception_handler = Pry.config.exception_handler
       Pry::REPL.new(_pry_).start
     end
 
@@ -44,11 +44,6 @@ class Pry
       content.lines.each do |line|
         break unless _pry_.eval line, :generated => true
       end
-
-      unless _pry_.eval_string.empty?
-        _pry_.output.puts "#{_pry_.eval_string}...exception encountered, going interactive!"
-        interactive_mode(_pry_)
-      end
     end
 
     # Define a few extra commands useful for flipping back & forth

data/lib/pry/rubygem.rb

@@ -23,7 +23,7 @@ class Pry
                   Gem.source_index.find_name(name)
                 end
 
-        first_spec = specs.sort_by{ |spec| Gem::Version.new(spec.version) }.last
+        first_spec = specs.sort_by{ |spec| Gem::Version.new(spec.version) }.first
 
         first_spec or raise CommandError, "Gem `#{name}` not found"
       end
@@ -69,10 +69,10 @@ class Pry
         installer.install(name)
       rescue Errno::EACCES
         raise CommandError,
-          "Insufficient permissions to install #{ Pry::Helpers::Text.green(name) }."
+          "Insufficient permissions to install #{ text.green(name) }."
       rescue Gem::GemNotFoundException
         raise CommandError,
-          "Gem #{ Pry::Helpers::Text.green(name) } not found. Aborting installation."
+          "Gem #{ text.green(name) } not found. Aborting installation."
       else
         Gem.refresh
       end

data/lib/pry/terminal.rb

@@ -5,7 +5,7 @@ class Pry::Terminal
     # If the window size cannot be determined, return nil.
     def screen_size
       rows, cols = actual_screen_size
-      if rows.to_i != 0 && cols.to_i != 0
+      if rows && cols
         [rows.to_i, cols.to_i]
       else
         nil
@@ -44,8 +44,7 @@ class Pry::Terminal
       require 'io/console'
       $stdout.winsize if $stdout.tty? and $stdout.respond_to?(:winsize)
     rescue LoadError
-      # They probably don't have the io/console stdlib or the io-console gem.
-      # We'll keep trying.
+      # They're probably on 1.8 without the io-console gem. We'll keep trying.
     end
 
     def screen_size_according_to_env
@@ -54,7 +53,7 @@ class Pry::Terminal
     end
 
     def screen_size_according_to_readline
-      if defined?(Readline) && Readline.respond_to?(:get_screen_size)
+      if Readline.respond_to?(:get_screen_size)
         size = Readline.get_screen_size
         size if nonzero_column?(size)
       end

data/lib/pry/test/helper.rb

@@ -7,8 +7,8 @@ class << Pry
   def reset_defaults
     orig_reset_defaults
 
-    Pry.config.color = false
-    Pry.config.pager = false
+    Pry.color = false
+    Pry.pager = false
     Pry.config.should_load_rc      = false
     Pry.config.should_load_local_rc= false
     Pry.config.should_load_plugins = false
@@ -47,6 +47,10 @@ module PryTestHelpers
     end
   end
 
+  def mri18_and_no_real_source_location?
+    Pry::Helpers::BaseHelpers.mri_18? && !(Method.instance_method(:source_location).owner == Method)
+  end
+
   # Open a temp file and yield it to the block, closing it after
   # @return [String] The path of the temp file
   def temp_file(ext='.rb')
@@ -63,15 +67,16 @@ module PryTestHelpers
 
   def mock_command(cmd, args=[], opts={})
     output = StringIO.new
-    pry = Pry.new(output: output)
-    ret = cmd.new(opts.merge(pry_instance: pry, :output => output)).call_safely(*args)
+    ret = cmd.new(opts.merge(:output => output)).call_safely(*args)
     Struct.new(:output, :return).new(output.string, ret)
   end
 
   def mock_exception(*mock_backtrace)
-    StandardError.new.tap do |e|
-      e.define_singleton_method(:backtrace) { mock_backtrace }
+    e = StandardError.new("mock exception")
+    (class << e; self; end).class_eval do
+      define_method(:backtrace) { mock_backtrace }
     end
+    e
   end
 end
 

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.10.2"
+  VERSION = "1.0.0.pre1"
 end

data/lib/pry/wrapped_module.rb

@@ -66,12 +66,28 @@ class Pry
     end
 
     # Returns an array of the names of the constants accessible in the wrapped
-    # module. This avoids the problem of accidentally calling the singleton
-    # method `Module.constants`.
+    # 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 Include the names of constants from included
     #   modules?
     def constants(inherit = true)
-      Module.instance_method(:constants).bind(@wrapped).call(inherit)
+      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
+          ancestors_ = Pry::Method.safe_send(@wrapped, :ancestors)
+          consts -= (ancestors_ - [@wrapped]).map(&:constants).flatten
+        end
+      else
+        consts = method.call(inherit)
+      end
+
+      consts
     end
 
     # The prefix that would appear before methods defined on this class.
@@ -105,15 +121,7 @@ class Pry
     # Is this a singleton class?
     # @return [Boolean]
     def singleton_class?
-      if Pry::Method.safe_send(wrapped, :respond_to?, :singleton_class?)
-        Pry::Method.safe_send(wrapped, :singleton_class?)
-      elsif defined?(Rubinius)
-        # https://github.com/rubinius/rubinius/commit/2e71722dba53d1a92c54d5e3968d64d1042486fe singleton_class? added 30 Jul 2014
-        # https://github.com/rubinius/rubinius/commit/4310f6b2ef3c8fc88135affe697db4e29e4621c4 has been around since 2011
-        !!Rubinius::Type.singleton_class_object(wrapped)
-      else
-        wrapped != Pry::Method.safe_send(wrapped, :ancestors).first
-      end
+      wrapped != Pry::Method.safe_send(wrapped, :ancestors).first
     end
 
     # Is this strictly a module? (does not match classes)
@@ -247,7 +255,7 @@ class Pry
     # @return [Enumerator, Array] on JRuby 1.9 and higher returns Array, on
     #  other rubies returns Enumerator
     def candidates
-      enum = Enumerator.new do |y|
+      enum = generator.new do |y|
                (0...number_of_candidates).each do |num|
                  y.yield candidate(num)
                end
@@ -280,17 +288,24 @@ class Pry
 
     private
 
-    # @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.
+    # 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.
     def primary_candidate
-      @primary_candidate ||= candidates.find { |c| c.file } ||
-        # This will raise an exception if there is no candidate at all.
-        candidate(0)
+      @primary_candidate ||= candidate(0)
     end
 
     # @return [Array<Array<Pry::Method>>] The array of `Pry::Method` objects,
@@ -312,12 +327,7 @@ class Pry
 
       ims = all_relevant_methods_for(wrapped)
       @all_source_locations_by_popularity = ims.group_by { |v| Array(v.source_location).first }.
-        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
+        sort_by { |k, v| -v.size }
     end
 
     # We only want methods that have a non-nil `source_location`. We also
@@ -325,33 +335,30 @@ 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)
-      methods = all_methods_for(mod).select(&:source_location).
+      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)
-      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
+      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
     end
 
     # Detect methods that are defined with `def_delegator` from the Forwardable

data/man/pry.1

@@ -0,0 +1,195 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PRY" "1" "November 2011" "" ""
+.
+.SH "NAME"
+\fBPRY\fR \- A Reference to the PRY repl\.
+.
+.SH "Synopsis"
+\fBpry\fR [\fB\-\-version\fR] [\fB\-\-exec\fR] [\fB\-\-no\-pager\fR] [\fB\-\-no\-history\fR] [\fB\-\-no\-color\fR] [\fB\-f\fR] [\fB\-\-no\-plugins\fR] [\fB\-\-installed\-plugins\fR] [\fB\-\-simple\-prompt\fR] [\fB\-\-require\fR \fIfile\fR] [\fB\-I\fR] [\fB\-\-context\fR] [\fB\-\-help\fR]
+.
+.SH "DESCRIPTION"
+Pry is a powerful alternative to the standard IRB shell for Ruby\. It is written from scratch to provide a number of advanced features\.
+.
+.SH "HOMEPAGE"
+http://pry\.github\.com/
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-v \-\-version\fR
+Prints the version of Pry\.
+.
+.TP
+\fB\-e \-\-exec\fR
+Executes argument in context before the session starts\.
+.
+.TP
+\fB\-\-no\-pager\fR
+Disable pager for long output\.
+.
+.TP
+\fB\-\-no\-history\fR
+Disable history loading\.
+.
+.TP
+\fB\-\-no\-color\fR
+Disable syntax highlighting for session\.
+.
+.TP
+\fB\-f\fR
+Prevent loading of ~/\.pryrc for session\.
+.
+.TP
+\fB\-\-no\-plugins\fR
+Supress loading of plugins\.
+.
+.TP
+\fB\-\-installed\-plugins\fR
+List installed plugins\.
+.
+.TP
+\fB\-\-simple\-prompt\fR
+Enable simple prompt mode (eg, >>)\.
+.
+.TP
+\fB\-r \-\-require\fR
+Require a ruby script at startup\.
+.
+.TP
+\fB\-I\fR
+Add a path to the $LOAD_PATH
+.
+.TP
+\fB\-c \-\-context\fR
+Start the session in the specified context\. Equivalent to \fBcontext\.pry\fR in a session\.
+.
+.SH "FILES"
+~/\.pryrc Personal pry initialization
+.
+.SH "EXAMPLES"
+.
+.SS "Basic Usage"
+.
+.nf
+
+$ pry
+[1] pry(main)>4 + 5
+=> 9
+[2] pry(main)> def hello_world
+[2] pry(main)*   puts "Hello, World!"
+[2] pry(main)* end
+=> nil
+[3] pry(main)> hello_world
+Hello, World!
+=> nil
+.
+.fi
+.
+.SS "Command Line Interaction"
+Prefix any command you want your shell to execute with a period and pry will return the results from your shell\.
+.
+.IP "" 4
+.
+.nf
+
+[1] pry(main)> \.date
+Fri Nov 11 09:52:07 EST 2011
+.
+.fi
+.
+.IP "" 0
+.
+.P
+On the command line enter \fBshell\-mode\fR to incorporate the current working directory into the Pry prompt\.
+.
+.IP "" 4
+.
+.nf
+
+pry(main)> shell\-mode
+pry main:/Users/john/ruby/projects/pry $ \.cd \.\.
+pry main:/Users/john/ruby/projects $ \.cd ~
+pry main:/Users/john $ \.pwd
+/Users/john
+pry main:/Users/john $ shell\-mode
+pry(main)>
+.
+.fi
+.
+.IP "" 0
+.
+.SS "State Navigation"
+The cd command is used to move into a new object (or scope) inside a Pry session\. When inside the new scope it becomes the self for the session and all commands and methods will operate on this new self\.
+.
+.IP "" 4
+.
+.nf
+
+pry(main)> self
+=> main
+pry(main)> cd Pry
+pry(Pry):1> self
+=> Pry
+pry(Pry):1> cd \.\.
+pry(main)>
+.
+.fi
+.
+.IP "" 0
+.
+.P
+The ls command is essentially a unified wrapper to a number of Ruby\'s introspection mechanisms, including (but not limited to) the following methods: methods, instance_variables, constants, local_variables, instance_methods, class_variables and all the various permutations thereof\.
+.
+.P
+By default typing ls will return a list of just the local and instance variables available in the current context\.
+.
+.IP "\(bu" 4
+The \-M option selects public instance methods (if available)\.
+.
+.IP "\(bu" 4
+The \-m option selects public methods\.
+.
+.IP "\(bu" 4
+The \-c option selects constants\.
+.
+.IP "\(bu" 4
+The \-i option select just instance variables\.
+.
+.IP "\(bu" 4
+The \-l option selects just local variables\.
+.
+.IP "\(bu" 4
+The \-s option modifies the \-c and \-m and \-M options to go up the superclass chain (excluding Object)\.
+.
+.IP "\(bu" 4
+The \-\-grep REGEX prunes the list to items that match the regex\.
+.
+.IP "" 0
+.
+.SS "Source Browsing"
+Simply typing show\-method method_name will pull the source for the method and display it with syntax highlighting\. You can also look up the source for multiple methods at the same time, by typing show\-method method1 method2\. As a convenience, Pry looks up both instance methods and class methods using this syntax, with priority given to instance methods\.
+.
+.IP "" 4
+.
+.nf
+
+pry(Pry):1> show\-method rep
+
+From: /Users/john/ruby/projects/pry/lib/pry/pry_instance\.rb @ line 191:
+Number of lines: 6
+
+def rep(target=TOPLEVEL_BINDING)
+  target = Pry\.binding_for(target)
+  result = re(target)
+
+  show_result(result) if should_print?
+end
+.
+.fi
+.
+.IP "" 0
+.
+.SH "AUTHORS"
+Pry is primarily the work of John Mair (banisterfiend)