pry 0.9.7.4-i386-mswin32 → 0.9.8-i386-mswin32

data/test/test_syntax_checking.rb

@@ -0,0 +1,63 @@
+require 'helper'
+describe Pry do
+
+  [
+    ["p = '", "'"],
+    ["def", "a", "(); end"],
+    ["p = <<FOO", "lots", "and", "lots of", "foo", "FOO"],
+    ["[", ":lets,", "'list',", "[/nested/", "], things ]"],
+    ["abc =~ /hello", "/"],
+    ["issue = %W/", "343/"],
+    ["pouts(<<HI, 'foo", "bar", "HI", "baz')"],
+  ].each do |foo|
+    it "should not raise an error on broken lines: #{foo.join("\\n")}" do
+      output = StringIO.new
+      redirect_pry_io(InputTester.new(*foo), output) do
+        Pry.start
+      end
+
+      output.string.should.not =~ /SyntaxError/
+    end
+  end
+
+  [
+    ["end"],
+    ["puts )("],
+    ["1 1"],
+    ["puts :"],
+    # in this case the syntax error is "expecting ')'".
+    (Pry::Helpers::BaseHelpers.rbx? ? nil : ["def", "method(1"])
+  ].compact.each do |foo|
+    it "should raise an error on invalid syntax like #{foo.inspect}" do
+      output = StringIO.new
+      redirect_pry_io(InputTester.new(*foo), output) do
+        Pry.start
+      end
+      output.string.should =~ /SyntaxError/
+    end
+  end
+
+  it "should not intefere with syntax errors explicitly raised" do
+    output = StringIO.new
+    redirect_pry_io(InputTester.new(%q{raise SyntaxError, "unexpected $end"}), output) do
+      Pry.start
+    end
+    output.string.should =~ /SyntaxError/
+  end
+
+  it "should allow trailing , to continue the line" do
+    pry = Pry.new
+
+    pry.complete_expression?("puts 1, 2,").should == false
+  end
+
+  it "should complete an expression that contains a line ending with a ," do
+    pry = Pry.new
+    pry.complete_expression?("puts 1, 2,\n3").should == true
+  end
+
+  it "should not clobber _ex_ on a SyntaxError in the repl" do
+
+    mock_pry("raise RuntimeError, 'foo';", "puts foo)", "_ex_.is_a?(RuntimeError)").should =~ /^RuntimeError.*\nSyntaxError.*\n=> true/m
+  end
+end

data/test/test_wrapped_module.rb

@@ -0,0 +1,71 @@
+require 'helper'
+
+describe Pry::WrappedModule do
+
+  describe "#initialize" do
+    it "should raise an exception when a non-module is passed" do
+      lambda{ Pry::WrappedModule.new(nil) }.should.raise ArgumentError
+    end
+  end
+
+  describe ".method_prefix" do
+    before do
+      Foo = Class.new
+      @foo = Foo.new
+    end
+
+    after do
+      Object.remove_const(:Foo)
+    end
+
+    it "should return Foo# for normal classes" do
+      Pry::WrappedModule.new(Foo).method_prefix.should == "Foo#"
+    end
+
+    it "should return Bar# for modules" do
+      Pry::WrappedModule.new(Kernel).method_prefix.should == "Kernel#"
+    end
+
+    it "should return Foo. for singleton classes of classes" do
+      Pry::WrappedModule.new(class << Foo; self; end).method_prefix.should == "Foo."
+    end
+
+    describe "of singleton classes of objects" do
+      Pry::WrappedModule.new(class << @foo; self; end).method_prefix.should == "self."
+    end
+
+    describe "of anonymous classes should not be empty" do
+      Pry::WrappedModule.new(Class.new).method_prefix.should =~ /#<Class:.*>#/
+    end
+
+    describe "of singleton classes of anonymous classes should not be empty" do
+      Pry::WrappedModule.new(class << Class.new; self; end).method_prefix.should =~ /#<Class:.*>./
+    end
+  end
+
+  describe ".singleton_class?" do
+    it "should be true for singleton classes" do
+      Pry::WrappedModule.new(class << ""; self; end).singleton_class?.should == true
+    end
+
+    it "should be false for normal classes" do
+      Pry::WrappedModule.new(Class.new).singleton_class?.should == false
+    end
+
+    it "should be false for modules" do
+      Pry::WrappedModule.new(Module.new).singleton_class?.should == false
+    end
+  end
+
+  describe ".singleton_instance" do
+    it "should raise an exception when called on a non-singleton-class" do
+      lambda{ Pry::WrappedModule.new(Class).singleton_instance }.should.raise ArgumentError
+    end
+
+    it "should return the attached object" do
+      Pry::WrappedModule.new(class << "hi"; self; end).singleton_instance.should == "hi"
+      Pry::WrappedModule.new(class << Object; self; end).singleton_instance.should.equal?(Object)
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry
 version: !ruby/object:Gem::Version
-  version: 0.9.7.4
+  version: 0.9.8
   prerelease: 
 platform: i386-mswin32
 authors:
@@ -9,77 +9,69 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-05 00:00:00.000000000 Z
+date: 2012-01-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ruby_parser
-  requirement: &70358292170640 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *70358292170640
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70358292170040 !ruby/object:Gem::Requirement
+  requirement: &70335748746720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70358292170040
+  version_requirements: *70335748746720
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70358292169500 !ruby/object:Gem::Requirement
+  requirement: &70335748746220 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.3
+    - - <
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70358292169500
+  version_requirements: *70335748746220
 - !ruby/object:Gem::Dependency
   name: method_source
-  requirement: &70358292168680 !ruby/object:Gem::Requirement
+  requirement: &70335748789540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70358292168680
+  version_requirements: *70335748789540
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70358292167840 !ruby/object:Gem::Requirement
+  requirement: &70335748789060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70358292167840
+  version_requirements: *70335748789060
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70358292166340 !ruby/object:Gem::Requirement
+  requirement: &70335748788520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70358292166340
+  version_requirements: *70335748788520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70358292165400 !ruby/object:Gem::Requirement
+  requirement: &70335748788060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,18 +79,18 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70358292165400
+  version_requirements: *70335748788060
 - !ruby/object:Gem::Dependency
   name: win32console
-  requirement: &70358292164780 !ruby/object:Gem::Requirement
+  requirement: &70335748787600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70358292164780
+  version_requirements: *70335748787600
 description: An IRB alternative and runtime developer console
 email: jrmair@gmail.com
 executables:
@@ -131,8 +123,9 @@ files:
 - examples/example_prompt.rb
 - examples/helper.rb
 - lib/pry.rb
-- lib/pry/command_context.rb
-- lib/pry/command_processor.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
@@ -149,7 +142,6 @@ files:
 - lib/pry/default_commands/ls.rb
 - lib/pry/default_commands/shell.rb
 - lib/pry/extended_commands/experimental.rb
-- lib/pry/extended_commands/user_command_api.rb
 - lib/pry/helpers.rb
 - lib/pry/helpers/base_helpers.rb
 - lib/pry/helpers/command_helpers.rb
@@ -157,6 +149,7 @@ files:
 - 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
@@ -165,10 +158,17 @@ files:
 - 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_processor.rb
+- test/test_command_integration.rb
 - test/test_command_set.rb
 - test/test_completion.rb
 - test/test_default_commands.rb
@@ -181,13 +181,17 @@ files:
 - 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
@@ -218,8 +222,11 @@ specification_version: 3
 summary: An IRB alternative and runtime developer console
 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_processor.rb
+- test/test_command_integration.rb
 - test/test_command_set.rb
 - test/test_completion.rb
 - test/test_default_commands.rb
@@ -232,12 +239,16 @@ test_files:
 - 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

data/lib/pry/command_context.rb

@@ -1,53 +0,0 @@
-class Pry
-  # Command contexts are the objects runing each command.
-  # Helper modules can be mixed into this class.
-  class CommandContext
-
-    # represents a void return value for a command
-    VOID_VALUE = Object.new
-
-    # 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
-    attr_accessor :captures
-    attr_accessor :eval_string
-    attr_accessor :arg_string
-    attr_accessor :opts
-    attr_accessor :command_set
-    attr_accessor :command_processor
-    attr_accessor :_pry_
-
-    # Run a command from another command.
-    # @param [String] command_string The string that invokes the command
-    # @param [Array] args Further arguments to pass to the command
-    # @example
-    #   run "show-input"
-    # @example
-    #   run ".ls"
-    # @example
-    #   run "amend-line",  "5", 'puts "hello world"'
-    def run(command_string, *args)
-      complete_string = "#{command_string} #{args.join(" ")}"
-      command_processor.process_commands(complete_string, eval_string, target)
-    end
-
-    def commands
-      command_set.commands
-    end
-
-    def text
-      Pry::Helpers::Text
-    end
-
-    def void
-      VOID_VALUE
-    end
-
-    include Pry::Helpers::BaseHelpers
-    include Pry::Helpers::CommandHelpers
-  end
-end

data/lib/pry/command_processor.rb

@@ -1,181 +0,0 @@
-require 'forwardable'
-
-class Pry
-  class CommandProcessor
-
-    # Wraps the return result of process_commands, indicates if the
-    # result IS a command and what kind of command (e.g void)
-    class Result
-      attr_reader :retval
-
-      def initialize(is_command, keep_retval = false, retval = nil)
-        @is_command, @keep_retval, @retval = is_command, keep_retval, retval
-      end
-
-      # Is the result a command?
-      # @return [Boolean]
-      def command?
-        @is_command
-      end
-
-      # Is the result a command and if it is, is it a void command?
-      # (one that does not return a value)
-      # @return [Boolean]
-      def void_command?
-        (command? && !keep_retval?) || retval == CommandContext::VOID_VALUE
-      end
-
-      # Is the return value kept for this command? (i.e :keep_retval => true)
-      # @return [Boolean]
-      def keep_retval?
-        @keep_retval
-      end
-    end
-
-    extend Forwardable
-
-    attr_accessor :pry_instance
-
-    def initialize(pry_instance)
-      @pry_instance = pry_instance
-    end
-
-    def_delegators :@pry_instance, :commands, :output
-
-    # Is the string a valid command?
-    # @param [String] val The string passed in from the Pry prompt.
-    # @param [Binding] target The context where the string should be
-    #   interpolated in.
-    # @return [Boolean] Whether the string is a valid command.
-    def valid_command?(val, target=binding)
-      !!(command_matched(val, target)[0])
-    end
-
-    # Convert the object to a form that can be interpolated into a
-    # Regexp cleanly.
-    # @return [String] The string to interpolate into a Regexp
-    def convert_to_regex(obj)
-      case obj
-      when String
-        Regexp.escape(obj)
-      else
-        obj
-      end
-    end
-
-    # Revaluate the string (str) and perform interpolation.
-    # @param [String] str The string to reevaluate with interpolation.
-    # @param [Binding] target The context where the string should be
-    #   interpolated in.
-    # @return [String] The reevaluated string with interpolations
-    #   applied (if any).
-    def interpolate_string(str, target)
-      dumped_str = str.dump
-      dumped_str.gsub!(/\\\#\{/, '#{')
-      target.eval(dumped_str)
-    end
-
-    # Determine whether a Pry command was matched and return command data
-    # and argument string.
-    # This method should not need to be invoked directly.
-    # @param [String] val The line of input.
-    # @param [Binding] target The binding to perform string
-    #   interpolation against.
-    # @return [Array] The command data and arg string pair
-    def command_matched(val, target)
-      _, cmd_data = commands.commands.find do |name, data|
-        prefix = convert_to_regex(Pry.config.command_prefix)
-        prefix = "(?:#{prefix})?" unless data.options[:use_prefix]
-
-        command_regex = /^#{prefix}#{convert_to_regex(name)}(?!\S)/
-
-        if command_regex =~ val
-          if data.options[:interpolate]
-            val.replace(interpolate_string(val, target))
-            command_regex =~ val # re-match with the interpolated string
-          end
-          true
-        end
-      end
-
-      [cmd_data, (Regexp.last_match ? Regexp.last_match.captures : nil), (Regexp.last_match ? Regexp.last_match.end(0) : nil)]
-    end
-
-    # Process Pry commands. Pry commands are not Ruby methods and are evaluated
-    # prior to Ruby expressions.
-    # Commands can be modified/configured by the user: see `Pry::Commands`
-    # This method should not need to be invoked directly - it is called
-    # by `Pry#r`.
-    # @param [String] val The current line of input.
-    # @param [String] eval_string The cumulative lines of input for
-    #   multi-line input.
-    # @param [Binding] target The receiver of the commands.
-    # @return [Pry::CommandProcessor::Result] A wrapper object
-    #   containing info about the result of the command processing
-    #   (indicating whether it is a command and if it is what kind of
-    #   command it is.
-    def process_commands(val, eval_string, target)
-
-      command, captures, pos = command_matched(val, target)
-
-      # no command was matched, so return to caller
-      return Result.new(false) if !command
-
-      arg_string = val[pos..-1]
-
-      # remove the one leading space if it exists
-      arg_string.slice!(0) if arg_string.start_with?(" ")
-
-      if arg_string
-        args = command.options[:shellwords] ? Shellwords.shellwords(arg_string) : arg_string.split(" ")
-      else
-        args = []
-      end
-
-      options = {
-        :val => val,
-        :arg_string => arg_string,
-        :eval_string => eval_string,
-        :commands => commands.commands,
-        :captures => captures
-      }
-
-      ret = execute_command(target, command.name, options, *(captures + args))
-
-      Result.new(true, command.options[:keep_retval], ret)
-    end
-
-    # Execute a Pry command.
-    # This method should not need to be invoked directly.
-    # @param [Binding] target The target of the Pry session.
-    # @param [String] command The name of the command to be run.
-    # @param [Hash] options The options to set on the Commands object.
-    # @param [Array] args The command arguments.
-    # @return [Object] The value returned by the command
-    def execute_command(target, command, options, *args)
-      context = CommandContext.new
-
-      # set some useful methods to be used by the action blocks
-      context.opts        = options
-      context.target      = target
-      context.target_self = target.eval('self')
-      context.output      = output
-      context.captures    = options[:captures]
-      context.eval_string = options[:eval_string]
-      context.arg_string  = options[:arg_string]
-      context.command_set = commands
-      context._pry_ = @pry_instance
-
-      context.command_processor = self
-
-      ret = nil
-      catch(:command_done) do
-        ret = commands.run_command(context, command, *args)
-      end
-
-      options[:val].replace("")
-
-      ret
-    end
-  end
-end