pry 0.9.8pre5-i386-mswin32 → 0.9.8pre6-i386-mswin32

data/test/test_default_commands/test_shell.rb

@@ -5,7 +5,7 @@ describe "Pry::DefaultCommands::Shell" do
 
     describe "on receiving a file that does not exist" do
       it 'should display an error message' do
-        mock_pry("cat supercalifragilicious66").should =~ /Could not find file/
+        mock_pry("cat supercalifragilicious66").should =~ /Cannot open/
       end
     end
 
@@ -65,7 +65,7 @@ describe "Pry::DefaultCommands::Shell" do
         temp_file do |f|
           f << "bt number 1"
           f.flush
-          pry_instance.last_exception = MockPryException.new("#{f.path}:1", "x", "x")
+          pry_instance.last_exception = mock_exception("#{f.path}:1", "x", "x")
           pry_instance.rep(self)
         end
 
@@ -78,7 +78,7 @@ describe "Pry::DefaultCommands::Shell" do
         temp_file do |f|
           f << "bt number 1"
           f.flush
-          pry_instance.last_exception = MockPryException.new("#{f.path}:1", "x", "x")
+          pry_instance.last_exception = mock_exception("#{f.path}:1", "x", "x")
           pry_instance.rep(self)
         end
 
@@ -91,31 +91,31 @@ describe "Pry::DefaultCommands::Shell" do
         temp_file do |f|
           f << "bt number 2"
           f.flush
-          pry_instance.last_exception = MockPryException.new("x", "#{f.path}:1", "x")
+          pry_instance.last_exception = mock_exception("x", "#{f.path}:1", "x")
           pry_instance.rep(self)
         end
 
         str_output.string.should =~ /bt number 2/
       end
 
-      it 'should cat third level of backtrace when --ex 2 used ' do
+      it 'should cat third level of backtrace when --ex 2 used' do
         pry_instance = Pry.new(:input => StringIO.new("cat --ex 2"), :output => str_output = StringIO.new)
 
         temp_file do |f|
           f << "bt number 3"
           f.flush
-          pry_instance.last_exception = MockPryException.new("x", "x", "#{f.path}:1")
+          pry_instance.last_exception = mock_exception("x", "x", "#{f.path}:1")
           pry_instance.rep(self)
         end
 
         str_output.string.should =~ /bt number 3/
       end
 
-      it 'should show error when backtrace level out of bounds  ' do
+      it 'should show error when backtrace level out of bounds' do
         pry_instance = Pry.new(:input => StringIO.new("cat --ex 3"), :output => str_output = StringIO.new)
-        pry_instance.last_exception = MockPryException.new("x", "x", "x")
+        pry_instance.last_exception = mock_exception("x", "x", "x")
         pry_instance.rep(self)
-        str_output.string.should =~ /No Exception or Exception has no associated file/
+        str_output.string.should =~ /out of bounds/
       end
 
       it 'each successive cat --ex should show the next level of backtrace, and going past the final level should return to the first' do
@@ -129,7 +129,7 @@ describe "Pry::DefaultCommands::Shell" do
         pry_instance = Pry.new(:input => StringIO.new("cat --ex\n" * 4),
                                :output => (str_output = StringIO.new))
 
-        pry_instance.last_exception = MockPryException.new(*temp_files.map { |f| "#{f.path}:1" })
+        pry_instance.last_exception = mock_exception(*temp_files.map { |f| "#{f.path}:1" })
 
         3.times do |i|
           pry_instance.rep(self)

data/test/test_hooks.rb

@@ -290,6 +290,21 @@ describe Pry::Hooks do
       @hooks.add_hook(:test_hook, :my_name3) { 3 }
       @hooks.exec_hook(:test_hook).should == 3
     end
+
+    it 'should add exceptions to the errors array' do
+      @hooks.add_hook(:test_hook, :foo1) { raise 'one' }
+      @hooks.add_hook(:test_hook, :foo2) { raise 'two' }
+      @hooks.add_hook(:test_hook, :foo3) { raise 'three' }
+      @hooks.exec_hook(:test_hook)
+      @hooks.errors.map(&:message).should == ['one', 'two', 'three']
+    end
+
+    it 'should return the last exception raised as the return value' do
+      @hooks.add_hook(:test_hook, :foo1) { raise 'one' }
+      @hooks.add_hook(:test_hook, :foo2) { raise 'two' }
+      @hooks.add_hook(:test_hook, :foo3) { raise 'three' }
+      @hooks.exec_hook(:test_hook).should == @hooks.errors.last
+    end
   end
 
   describe "integration tests" do
@@ -385,6 +400,27 @@ describe Pry::Hooks do
         # cleanup after test
         Pry.config.exception_whitelist = old_ew
       end
+
+      describe "exceptions" do
+        before do
+          Pry.config.hooks.add_hook(:after_eval, :baddums){ raise "Baddums" }
+          Pry.config.hooks.add_hook(:after_eval, :simbads){ raise "Simbads" }
+        end
+
+        after do
+          Pry.config.hooks.delete_hook(:after_eval, :baddums)
+          Pry.config.hooks.delete_hook(:after_eval, :simbads)
+        end
+        it "should not raise exceptions" do
+          lambda{
+            mock_pry("1", "2", "3")
+          }.should.not.raise
+        end
+
+        it "should print out a notice for each exception raised" do
+          mock_pry("1").should =~ /after_eval hook failed: RuntimeError: Baddums\n.*after_eval hook failed: RuntimeError: Simbads/m
+        end
+      end
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry
 version: !ruby/object:Gem::Version
-  version: 0.9.8pre5
+  version: 0.9.8pre6
   prerelease: 5
 platform: i386-mswin32
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70205700271700 !ruby/object:Gem::Requirement
+  requirement: &70213408948620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,24 +21,24 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70205700271700
+  version_requirements: *70213408948620
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70205700271080 !ruby/object:Gem::Requirement
+  requirement: &70213408948000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.4.3
     - - <
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70205700271080
+  version_requirements: *70213408948000
 - !ruby/object:Gem::Dependency
   name: method_source
-  requirement: &70205700270180 !ruby/object:Gem::Requirement
+  requirement: &70213408947040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +46,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70205700270180
+  version_requirements: *70213408947040
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70205700269540 !ruby/object:Gem::Requirement
+  requirement: &70213408946460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,10 +57,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70205700269540
+  version_requirements: *70213408946460
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70205700268960 !ruby/object:Gem::Requirement
+  requirement: &70213408945880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +68,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70205700268960
+  version_requirements: *70213408945880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70205700268380 !ruby/object:Gem::Requirement
+  requirement: &70213408945300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,10 +79,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70205700268380
+  version_requirements: *70213408945300
 - !ruby/object:Gem::Dependency
   name: win32console
-  requirement: &70205700267800 !ruby/object:Gem::Requirement
+  requirement: &70213408944720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,7 +90,7 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70205700267800
+  version_requirements: *70213408944720
 description: An IRB alternative and runtime developer console
 email: jrmair@gmail.com
 executables:
@@ -124,6 +124,7 @@ files:
 - 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
@@ -141,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
@@ -165,6 +165,7 @@ files:
 - 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
@@ -222,6 +223,7 @@ 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_integration.rb

data/lib/pry/extended_commands/user_command_api.rb

@@ -1,122 +0,0 @@
-class Pry
-  module ExtendedCommands
-
-    UserCommandAPI = Pry::CommandSet.new do
-
-      command "define-command", "Define a command in the session, use same syntax as `command` method for command API" do |arg|
-        if arg.nil?
-          raise CommandError, "Provide an arg!"
-        end
-
-        prime_string = "command #{arg_string}\n"
-        command_string = _pry_.r(target, prime_string)
-
-        eval_string.replace <<-HERE
-          _pry_.commands.instance_eval do
-            #{command_string}
-          end
-        HERE
-
-      end
-
-      command_class "reload-command", "Reload a Pry command." do
-        banner <<-BANNER
-          Usage: reload-command command
-          Reload a Pry command.
-        BANNER
-
-        def process
-          command = _pry_.commands.find_command(args.first)
-
-          if command.nil?
-            raise Pry::CommandError, 'No command found.'
-          end
-
-          source_code = command.block.source
-          file, lineno = command.block.source_location
-
-          set = Pry::CommandSet.new do
-            eval(source_code, binding, file, lineno)
-          end
-
-          _pry_.commands.delete(command.name)
-          _pry_.commands.import(set)
-        end
-      end
-
-      command_class "edit-command", "Edit a Pry command." do
-        banner <<-BANNER
-          Usage: edit-command [options] command
-          Edit a Pry command.
-        BANNER
-
-        def initialize env
-          @pry = env[:pry_instance]
-          @command = nil
-          super(env)
-        end
-
-        def options(opt)
-          opt.on :p, :patch, 'Perform a in-memory edit of a command'
-        end
-
-        def process
-          @command = @pry.commands.find_command(args.first)
-
-          if @command.nil?
-            raise Pry::CommandError, 'Command not found.'
-          end
-
-          case
-          when opts.present?(:patch)
-            edit_temporarily
-          else
-            edit_permanently
-          end
-        end
-
-        def edit_permanently
-          file, lineno = @command.block.source_location
-          invoke_editor(file, lineno)
-
-          command_set = silence_warnings do
-            eval File.read(file), TOPLEVEL_BINDING, file, 1
-          end
-
-          unless command_set.is_a?(Pry::CommandSet)
-            raise Pry::CommandError,
-                  "Expected file '#{file}' to return a CommandSet"
-          end
-
-          @pry.commands.delete(@command.name)
-          @pry.commands.import(command_set)
-          set_file_and_dir_locals(file)
-        end
-
-        def edit_temporarily
-          source_code = Pry::Method(@command.block).source
-          modified_code = nil
-
-          temp_file do |f|
-            f.write(source_code)
-            f.flush
-
-            invoke_editor(f.path, 1)
-            modified_code = File.read(f.path)
-          end
-
-          command_set = CommandSet.new do
-            silence_warnings do
-              pry = Pry.new :input => StringIO.new(modified_code)
-              pry.rep(binding)
-            end
-          end
-
-          @pry.commands.delete(@command.name)
-          @pry.commands.import(command_set)
-        end
-      end
-
-    end
-  end
-end