pry 0.9.7.3 → 0.9.7.4

data/CHANGELOG

@@ -1,3 +1,10 @@
+5/11/2011 version 0.9.7.4 hotfix
+* ls -M now works in modules (bugfix)
+* added exception msg for bad cd object/path
+* no longer die when encounter exceptions in .pryrc
+* baked in CoolLine support
+* Pry.config.input in .pryrc now respected
+
 28/10/2011 version 0.9.7.3 hotfix-hotfix ;)
 * really fixed indentation for 'super if' and friends
 * Fixed indentation for tmux

data/bin/pry

@@ -90,5 +90,5 @@ else
 end
 
 # Start the session (running any code passed with -e, if there is any)
-Pry.start(context, :input => StringIO.new(exec_string), :input_stack => [Readline])
+Pry.start(context, :input => StringIO.new(exec_string))
 

data/lib/pry/default_commands/context.rb

@@ -34,8 +34,9 @@ class Pry
               stack.push(Pry.binding_for(stack.last.eval(context)))
             end
 
-          rescue RescuableException
-            output.puts "Bad object path: #{arg_string}. Failed trying to resolve: #{context}"
+          rescue RescuableException => e
+            output.puts "Bad object path: #{arg_string.chomp}. Failed trying to resolve: #{context}"
+            output.puts e.inspect
             resolve_failure = true
             break
           end

data/lib/pry/default_commands/easter_eggs.rb

@@ -8,6 +8,16 @@ class Pry
         run "show-input"
       end
 
+      command "get-naked" "" do
+        text = %{
+--
+We dont have to take our clothes off to have a good time.
+We could dance & party all night And drink some cherry wine.
+-- Jermaine Stewart }
+        output.puts text
+        text
+      end
+
       command "east-coker", "" do
         text = %{
 --

data/lib/pry/method.rb

@@ -132,7 +132,7 @@ class Pry
       # This is required to introspect methods on objects like Net::HTTP::Get that
       # have overridden the `method` method.
       def safe_send(obj, method, *args, &block)
-        (Class === obj ? Class : Object).instance_method(method).bind(obj).call(*args, &block)
+        (Module === obj ? Module : Object).instance_method(method).bind(obj).call(*args, &block)
       end
 
       # Get the singleton classes of superclasses that could define methods on

data/lib/pry/pry_class.rb

@@ -58,7 +58,11 @@ class Pry
   def self.load_rc
     files = RC_FILES.collect { |file_name| File.expand_path(file_name) }.uniq
     files.each do |file_name|
-      load(file_name) if File.exists?(file_name)
+      begin
+        load(file_name) if File.exists?(file_name)
+      rescue RescuableException => e
+        puts "Error loading #{file_name}: #{e}"
+      end
     end
   end
 

data/lib/pry/pry_instance.rb

@@ -215,9 +215,15 @@ class Pry
   def re(target=TOPLEVEL_BINDING)
     target = Pry.binding_for(target)
 
-    if input.respond_to?(:completion_proc=)
-      # Readline tab completion
-      input.completion_proc = Pry::InputCompleter.build_completion_proc target, instance_eval(&custom_completions)
+    compl = Pry::InputCompleter.build_completion_proc(target,
+                                                      instance_eval(&custom_completions))
+
+    if defined? Coolline and input.is_a? Coolline
+      input.completion_proc = proc do |cool|
+        compl.call cool.completed_word
+      end
+    elsif input.respond_to? :completion_proc=
+      input.completion_proc = compl
     end
 
     # It's not actually redundant to inject them continually as we may have
@@ -452,6 +458,8 @@ class Pry
     handle_read_errors do
       if input == Readline
         input.readline(current_prompt, false) # false since we'll add it manually
+      elsif defined? Coolline and input.is_a? Coolline
+        input.readline(current_prompt)
       else
         if input.method(:readline).arity == 1
           input.readline(current_prompt)

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.7.3"
+  VERSION = "0.9.7.4"
 end

data/pry.gemspec

@@ -2,20 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = "pry"
-  s.version = "0.9.7.1"
+  s.version = "0.9.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mair (banisterfiend)"]
-  s.date = "2011-10-26"
+  s.date = "2011-11-05"
   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/command_context.rb", "lib/pry/command_processor.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/extended_commands/user_command_api.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/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", "pry.gemspec", "test/helper.rb", "test/test_command_helpers.rb", "test/test_command_processor.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_indent.rb", "test/test_input_stack.rb", "test/test_method.rb", "test/test_pry.rb", "test/test_pry_history.rb", "test/test_pry_output.rb", "test/test_special_locals.rb", "test/testrc", "wiki/Customizing-pry.md", "wiki/Home.md"]
+  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/command_context.rb", "lib/pry/command_processor.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/extended_commands/user_command_api.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/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", "pry.gemspec", "test/helper.rb", "test/test_command_helpers.rb", "test/test_command_processor.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_indent.rb", "test/test_input_stack.rb", "test/test_method.rb", "test/test_pry.rb", "test/test_pry_history.rb", "test/test_pry_output.rb", "test/test_special_locals.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.11"
   s.summary = "An IRB alternative and runtime developer console"
-  s.test_files = ["test/helper.rb", "test/test_command_helpers.rb", "test/test_command_processor.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_indent.rb", "test/test_input_stack.rb", "test/test_method.rb", "test/test_pry.rb", "test/test_pry_history.rb", "test/test_pry_output.rb", "test/test_special_locals.rb", "test/testrc"]
+  s.test_files = ["test/helper.rb", "test/test_command_helpers.rb", "test/test_command_processor.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_indent.rb", "test/test_input_stack.rb", "test/test_method.rb", "test/test_pry.rb", "test/test_pry_history.rb", "test/test_pry_output.rb", "test/test_special_locals.rb", "test/testrc", "test/testrcbad"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<ruby_parser>, [">= 2.3.1"])
       s.add_runtime_dependency(%q<coderay>, ["~> 0.9.8"])
       s.add_runtime_dependency(%q<slop>, ["~> 2.1.0"])
-      s.add_runtime_dependency(%q<method_source>, ["~> 0.6.5"])
+      s.add_runtime_dependency(%q<method_source>, ["~> 0.6.7"])
       s.add_development_dependency(%q<bacon>, ["~> 1.1.0"])
       s.add_development_dependency(%q<open4>, ["~> 1.0.1"])
       s.add_development_dependency(%q<rake>, ["~> 0.9"])
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ruby_parser>, [">= 2.3.1"])
       s.add_dependency(%q<coderay>, ["~> 0.9.8"])
       s.add_dependency(%q<slop>, ["~> 2.1.0"])
-      s.add_dependency(%q<method_source>, ["~> 0.6.5"])
+      s.add_dependency(%q<method_source>, ["~> 0.6.7"])
       s.add_dependency(%q<bacon>, ["~> 1.1.0"])
       s.add_dependency(%q<open4>, ["~> 1.0.1"])
       s.add_dependency(%q<rake>, ["~> 0.9"])
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ruby_parser>, [">= 2.3.1"])
     s.add_dependency(%q<coderay>, ["~> 0.9.8"])
     s.add_dependency(%q<slop>, ["~> 2.1.0"])
-    s.add_dependency(%q<method_source>, ["~> 0.6.5"])
+    s.add_dependency(%q<method_source>, ["~> 0.6.7"])
     s.add_dependency(%q<bacon>, ["~> 1.1.0"])
     s.add_dependency(%q<open4>, ["~> 1.0.1"])
     s.add_dependency(%q<rake>, ["~> 0.9"])

data/test/test_default_commands/test_ls.rb

@@ -81,6 +81,12 @@ describe "ls" do
     end
   end
 
+  describe "when inside Modules" do
+    it "should still work" do
+      mock_pry("cd Module.new{ def foobie; end }", "ls -M").should =~ /foobie/
+    end
+  end
+
   describe "constants" do
     it "should show constants defined on the current module" do
       mock_pry("class TempFoo1; BARGHL = 1; end", "ls TempFoo1").should =~ /BARGHL/

data/test/test_pry.rb

@@ -322,6 +322,46 @@ describe Pry do
           Object.const_defined?(:TEST_RC).should == false
           Pry.config.should_load_rc = false
         end
+
+        describe "that raise exceptions" do
+          before do
+            Pry::RC_FILES << File.expand_path("../testrcbad", __FILE__)
+            Pry.config.should_load_rc = true
+
+            putsed = nil
+
+            # YUCK! horrible hack to get round the fact that output is not configured
+            # at the point this message is printed.
+            (class << Pry; self; end).send(:define_method, :puts) { |str|
+              putsed = str
+            }
+
+            @doing_it = lambda{
+              Pry.start(self, :input => StringIO.new("Object::TEST_AFTER_RAISE=1\nexit-all\n"), :output => Pry::NullOutput)
+              putsed
+            }
+          end
+
+          after do
+            Object.remove_const(:TEST_BEFORE_RAISE)
+            Object.remove_const(:TEST_AFTER_RAISE)
+            (class << Pry; undef_method :puts; end)
+          end
+
+          it "should not raise exceptions" do
+            @doing_it.should.not.raise
+          end
+
+          it "should continue to run pry" do
+            @doing_it[]
+            Object.const_defined?(:TEST_BEFORE_RAISE).should == true
+            Object.const_defined?(:TEST_AFTER_RAISE).should == true
+          end
+
+          it "should output an error" do
+            @doing_it[].should =~ /Error loading #{File.expand_path("../testrcbad", __FILE__)}: messin with ya/
+          end
+        end
       end
 
       describe "nesting" do

data/test/testrcbad

@@ -0,0 +1,2 @@
+TEST_BEFORE_RAISE = 1
+raise "messin with ya"

metadata

@@ -1,103 +1,100 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pry
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.9.7.4
   prerelease: 
-  version: 0.9.7.3
 platform: ruby
-authors: 
+authors:
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ruby_parser
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70358296218720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: coderay
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70358296218720
+- !ruby/object:Gem::Dependency
+  name: coderay
+  requirement: &70358296218040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.9.8
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: slop
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70358296218040
+- !ruby/object:Gem::Dependency
+  name: slop
+  requirement: &70358296217040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: method_source
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70358296217040
+- !ruby/object:Gem::Dependency
+  name: method_source
+  requirement: &70358296216480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.6.7
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: bacon
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70358296216480
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: &70358296215860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: open4
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70358296215860
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: &70358296215360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.1
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70358296215360
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70358296214740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *70358296214740
 description: An IRB alternative and runtime developer console
 email: jrmair@gmail.com
-executables: 
+executables:
 - pry
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gemtest
 - .gitignore
@@ -181,36 +178,34 @@ files:
 - test/test_pry_output.rb
 - test/test_special_locals.rb
 - test/testrc
+- test/testrcbad
 - wiki/Customizing-pry.md
 - 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.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: An IRB alternative and runtime developer console
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_command_helpers.rb
 - test/test_command_processor.rb
@@ -234,3 +229,4 @@ test_files:
 - test/test_pry_output.rb
 - test/test_special_locals.rb
 - test/testrc
+- test/testrcbad