pry 0.9.8.4 → 0.9.9

data/pry.gemspec

@@ -2,20 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = "pry"
-  s.version = "0.9.8.4"
+  s.version = "0.9.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mair (banisterfiend)"]
-  s.date = "2012-03-06"
+  s.date = "2012-04-18"
   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/cli.rb", "lib/pry/code.rb", "lib/pry/command.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/cd.rb", "lib/pry/default_commands/commands.rb", "lib/pry/default_commands/context.rb", "lib/pry/default_commands/easter_eggs.rb", "lib/pry/default_commands/editing.rb", "lib/pry/default_commands/gems.rb", "lib/pry/default_commands/help.rb", "lib/pry/default_commands/hist.rb", "lib/pry/default_commands/input_and_output.rb", "lib/pry/default_commands/introspection.rb", "lib/pry/default_commands/ls.rb", "lib/pry/default_commands/misc.rb", "lib/pry/default_commands/navigating_pry.rb", "lib/pry/extended_commands/experimental.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/hooks.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", "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_integration.rb", "test/test_command_set.rb", "test/test_completion.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_help.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_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_sticky_locals.rb", "test/test_syntax_checking.rb", "test/test_wrapped_module.rb", "test/testrc", "test/testrcbad", "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/cli.rb", "lib/pry/code.rb", "lib/pry/command.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/cd.rb", "lib/pry/default_commands/commands.rb", "lib/pry/default_commands/context.rb", "lib/pry/default_commands/easter_eggs.rb", "lib/pry/default_commands/editing.rb", "lib/pry/default_commands/find_method.rb", "lib/pry/default_commands/gems.rb", "lib/pry/default_commands/help.rb", "lib/pry/default_commands/hist.rb", "lib/pry/default_commands/input_and_output.rb", "lib/pry/default_commands/introspection.rb", "lib/pry/default_commands/ls.rb", "lib/pry/default_commands/misc.rb", "lib/pry/default_commands/navigating_pry.rb", "lib/pry/extended_commands/experimental.rb", "lib/pry/helpers.rb", "lib/pry/helpers/base_helpers.rb", "lib/pry/helpers/command_helpers.rb", "lib/pry/helpers/documentation_helpers.rb", "lib/pry/helpers/options_helpers.rb", "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", "lib/pry/pry_class.rb", "lib/pry/pry_instance.rb", "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_integration.rb", "test/test_command_set.rb", "test/test_completion.rb", "test/test_default_commands/test_cd.rb", "test/test_default_commands/test_context.rb", "test/test_default_commands/test_documentation.rb", "test/test_default_commands/test_find_method.rb", "test/test_default_commands/test_gems.rb", "test/test_default_commands/test_help.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_default_commands/test_show_source.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_sticky_locals.rb", "test/test_syntax_checking.rb", "test/test_wrapped_module.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.16"
+  s.rubygems_version = "1.8.12"
   s.summary = "An IRB alternative and runtime developer console"
-  s.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", "test/test_command_set.rb", "test/test_completion.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_help.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_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_sticky_locals.rb", "test/test_syntax_checking.rb", "test/test_wrapped_module.rb", "test/testrc", "test/testrcbad"]
+  s.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", "test/test_command_set.rb", "test/test_completion.rb", "test/test_default_commands/test_cd.rb", "test/test_default_commands/test_context.rb", "test/test_default_commands/test_documentation.rb", "test/test_default_commands/test_find_method.rb", "test/test_default_commands/test_gems.rb", "test/test_default_commands/test_help.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_default_commands/test_show_source.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_sticky_locals.rb", "test/test_syntax_checking.rb", "test/test_wrapped_module.rb", "test/testrc", "test/testrcbad"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/helper.rb

@@ -24,6 +24,28 @@ ensure
   Thread.current[:__pry_local__] = nil
 end
 
+def constant_scope(*names)
+  names.each do |name|
+    Object.remove_const name if Object.const_defined?(name)
+  end
+
+  yield
+ensure
+  names.each do |name|
+    Object.remove_const name if Object.const_defined?(name)
+  end
+end
+
+def mri18_and_no_real_source_location?
+  Pry::Helpers::BaseHelpers.mri_18? && !(Method.instance_method(:source_location).owner == Method)
+end
+
+# used by test_show_source.rb and test_documentation.rb
+class TestClassForShowSource
+  def alpha
+  end
+end
+
 # in case the tests call reset_defaults, ensure we reset them to
 # amended (test friendly) values
 class << Pry

data/test/test_command.rb

@@ -594,4 +594,33 @@ describe "Pry::Command" do
        end
      end
    end
+
+   describe "commands made with custom sub-classes" do
+     before do
+
+       class MyTestCommand < Pry::ClassCommand
+         match /my-*test/
+         description "So just how many sound technicians does it take to change a lightbulb? 1? 2? 3? 1-2-3? Testing?"
+         options :shellwords => false, :listing => "my-test"
+
+         def process
+           output.puts command_name * 2
+         end
+       end
+
+       Pry.commands.add_command MyTestCommand
+     end
+
+     after do
+       Pry.commands.delete 'my-test'
+     end
+
+     it "should allow creating custom sub-classes of Pry::Command" do
+       mock_pry("my---test").should =~ /my-testmy-test/
+     end
+
+     it "should show the source of the process method" do
+       mock_pry("show-command my-test").should =~ /output.puts command_name/
+     end
+   end
  end

data/test/test_command_integration.rb

@@ -1,5 +1,117 @@
 require 'helper'
 describe "commands" do
+
+  describe "alias_command" do
+    it 'should make an aliasd command behave like its original' do
+      set = Pry::CommandSet.new do
+        command "test-command" do
+          output.puts "testing 1, 2, 3"
+        end
+        alias_command "test-alias", "test-command"
+      end
+      redirect_pry_io(InputTester.new("test-alias"), out1 = StringIO.new) do
+        Pry.start self, :commands => set
+      end
+
+      redirect_pry_io(InputTester.new("test-command"), out2 = StringIO.new) do
+        Pry.start self, :commands => set
+      end
+
+      out1.string.should == out2.string
+    end
+
+    it 'should pass on arguments to original' do
+      set = Pry::CommandSet.new do
+        command "test-command" do |*args|
+          output.puts "testing #{args.join(' ')}"
+        end
+        alias_command "test-alias", "test-command"
+      end
+
+      redirect_pry_io(InputTester.new("test-command hello baby duck"), out1 = StringIO.new) do
+        Pry.start self, :commands => set
+      end
+
+      out1.string.should =~ /hello baby duck/
+
+      redirect_pry_io(InputTester.new("test-alias hello baby duck"), out2 = StringIO.new) do
+        Pry.start self, :commands => set
+      end
+
+      out2.string.should == out1.string
+    end
+
+    it 'should pass option arguments to original' do
+      set = Pry::CommandSet.new do
+        import Pry::Commands
+        alias_command "test-alias", "ls"
+      end
+
+      obj = Class.new { @x = 10 }
+      redirect_pry_io(InputTester.new("ls -i"), out1 = StringIO.new) do
+        Pry.start obj, :commands => set
+      end
+
+      out1.string.should =~ /@x/
+
+      redirect_pry_io(InputTester.new("test-alias -i"), out2 = StringIO.new) do
+        Pry.start obj, :commands => set
+      end
+
+      out2.string.should == out1.string
+    end
+
+    it 'should pass option arguments to original with additional parameters' do
+      set = Pry::CommandSet.new do
+        import Pry::Commands
+        alias_command "test-alias", "ls -M"
+      end
+
+      obj = Class.new { @x = Class.new { define_method(:plymouth) {} } }
+      redirect_pry_io(InputTester.new("ls -M @x"), out1 = StringIO.new) do
+        Pry.start obj, :commands => set
+      end
+
+      out1.string.should =~ /plymouth/
+
+      redirect_pry_io(InputTester.new("test-alias @x"), out2 = StringIO.new) do
+        Pry.start obj, :commands => set
+      end
+
+      out2.string.should == out1.string
+    end
+
+    it 'should be able to alias a regex command' do
+      set = Pry::CommandSet.new do
+        command /du.k/ do
+          output.puts "ducky"
+        end
+        alias_command "test-alias", "duck"
+      end
+
+      redirect_pry_io(InputTester.new("test-alias"), out1 = StringIO.new) do
+        Pry.start self, :commands => set
+      end
+
+      out1.string.should =~ /ducky/
+    end
+
+    it 'should be able to make the alias a regex' do
+      set = Pry::CommandSet.new do
+        command /du.k/ do
+          output.puts "ducky"
+        end
+        alias_command /test-ali.s/, "duck"
+      end
+
+      redirect_pry_io(InputTester.new("test-alias"), out1 = StringIO.new) do
+        Pry.start self, :commands => set
+      end
+
+      out1.string.should =~ /ducky/
+    end
+  end
+
   it 'should interpolate ruby code into commands' do
     klass = Pry::CommandSet.new do
       command "hello", "", :keep_retval => true do |arg|
@@ -199,7 +311,7 @@ describe "commands" do
     str_output = StringIO.new
     Pry.new(:input => StringIO.new("hello\n"), :output => str_output, :commands => klass).rep
     (str_output.string =~ /:kept_hello/).should == nil
-      str_output.string !~ /=>/
+str_output.string !~ /=>/
   end
 
   it 'should define a command that keeps its return value even when nil' do
@@ -211,7 +323,7 @@ describe "commands" do
     str_output = StringIO.new
     Pry.new(:input => StringIO.new("hello\n"), :output => str_output, :commands => klass).rep
     str_output.string.should =~ /nil/
-        str_output.string.should =~ /=>/
+  str_output.string.should =~ /=>/
   end
 
   it 'should define a command that keeps its return value but does not return when value is void' do
@@ -299,14 +411,6 @@ describe "commands" do
     klass.commands.include?("v").should == true
   end
 
-  it 'should alias a command with another command' do
-    klass = Pry::CommandSet.new do
-      import Pry::DefaultCommands::Help
-      alias_command "help2", "help"
-    end
-    klass.commands["help2"].block.should == klass.commands["help"].block
-  end
-
   it 'should change description of a command using desc' do
     klass = Pry::CommandSet.new do; import Pry::DefaultCommands::Help; end
     orig = klass.commands["help"].description
@@ -317,6 +421,83 @@ describe "commands" do
     klass.commands["help"].description.should == "blah"
   end
 
+
+describe "Pry::Command#run" do
+it 'should allow running of commands with following whitespace' do
+  $_scratch = Object.new
+  o = Object.new
+
+  set = Pry::CommandSet.new do
+    import Pry::Commands
+    command "test-run" do
+      run "cd / "
+    end
+  end
+  redirect_pry_io(InputTester.new("cd 1/2/3/4/5/6/$_scratch",
+                                  "@nesting1 = _pry_.binding_stack.size",
+                                  "test-run",
+                                     "@obj = self",
+                                  "@nesting2 = _pry_.binding_stack.size",
+                                  "exit-all")) do
+    Pry.start(o, :commands => set)
+  end
+
+  $_scratch.instance_variable_get(:@nesting1).should == 8
+  o.instance_variable_get(:@obj).should == o
+  o.instance_variable_get(:@nesting2).should == 1
+  $_scratch = nil
+end
+
+it 'should allow running of cd command when contained in a single string' do
+  $_scratch = Object.new
+  o = Object.new
+
+  set = Pry::CommandSet.new do
+    import Pry::Commands
+    command "test-run" do
+      run "cd /"
+    end
+  end
+  redirect_pry_io(InputTester.new("cd 1/2/3/4/5/6/$_scratch",
+                                  "@nesting1 = _pry_.binding_stack.size",
+                                  "test-run",
+                                     "@obj = self",
+                                  "@nesting2 = _pry_.binding_stack.size",
+                                  "exit-all")) do
+    Pry.start(o, :commands => set)
+  end
+
+  $_scratch.instance_variable_get(:@nesting1).should == 8
+  o.instance_variable_get(:@obj).should == o
+  o.instance_variable_get(:@nesting2).should == 1
+  $_scratch = nil
+end
+
+it 'should allow running of cd command when split into array' do
+  $_scratch = Object.new
+  o = Object.new
+
+  set = Pry::CommandSet.new do
+    import Pry::Commands
+    command "test-run" do
+      run "cd", "/"
+    end
+  end
+  redirect_pry_io(InputTester.new("cd 1/2/3/4/5/6/$_scratch",
+                                  "@nesting1 = _pry_.binding_stack.size",
+                                  "test-run",
+                                     "@obj = self",
+                                  "@nesting2 = _pry_.binding_stack.size",
+                                  "exit-all")) do
+    Pry.start(o, :commands => set)
+  end
+
+  $_scratch.instance_variable_get(:@nesting1).should == 8
+  o.instance_variable_get(:@obj).should == o
+  o.instance_variable_get(:@nesting2).should == 1
+  $_scratch = nil
+end
+
   it 'should run a command from within a command' do
     klass = Pry::CommandSet.new do
       command "v" do
@@ -376,6 +557,8 @@ describe "commands" do
     end
   end
 
+end
+
   it 'should enable an inherited method to access opts and output and target, due to instance_exec' do
     klass = Pry::CommandSet.new do
       command "v" do

data/test/test_command_set.rb

@@ -80,6 +80,28 @@ describe Pry::CommandSet do
     }.should.raise(Pry::NoCommandError)
   end
 
+  it 'should return command set after import' do
+    run = false
+
+    other_set = Pry::CommandSet.new do
+      command('foo') { run = true }
+      command('bar') {}
+    end
+
+    @set.import(other_set).should == @set
+  end
+
+  it 'should return command set after import_from' do
+    run = false
+
+    other_set = Pry::CommandSet.new do
+      command('foo') { run = true }
+      command('bar') {}
+    end
+
+    @set.import_from(other_set, 'foo').should == @set
+  end
+
   it 'should be able to import some commands from other sets using listing name' do
     run = false
 
@@ -121,28 +143,71 @@ describe Pry::CommandSet do
     @set.commands['foo'].description.should == 'some stuff'
   end
 
-  it 'should be able to alias method' do
-    run = false
-    @set.command('foo', 'stuff') { run = true }
+  describe "aliases" do
+    it 'should be able to alias command' do
+      run = false
+      @set.command('foo', 'stuff') { run = true }
 
-    @set.alias_command 'bar', 'foo'
-    @set.commands['bar'].name.should == 'bar'
-    @set.commands['bar'].description.should == ''
+      @set.alias_command 'bar', 'foo'
+      @set.commands['bar'].match.should == 'bar'
+      @set.commands['bar'].description.should == 'Alias for `foo`'
 
-    @set.run_command @ctx, 'bar'
-    run.should == true
-  end
+      @set.run_command @ctx, 'bar'
+      run.should == true
+    end
 
-  it "should be able to alias a method by the command's listing name" do
-    run = false
-    @set.command(/^foo1/, 'stuff', :listing => 'foo') { run = true }
+    it 'should inherit options from original command' do
+      run = false
+      @set.command('foo', 'stuff', :shellwords => true, :interpolate => false) { run = true }
 
-    @set.alias_command 'bar', 'foo'
-    @set.commands['bar'].name.should == 'bar'
-    @set.commands['bar'].description.should == ''
+      @set.alias_command 'bar', 'foo'
+      @set.commands['bar'].options[:shellwords].should == @set.commands['foo'].options[:shellwords]
+      @set.commands['bar'].options[:interpolate].should == @set.commands['foo'].options[:interpolate]
 
-    @set.run_command @ctx, 'bar'
-    run.should == true
+      # however some options should not be inherited
+      @set.commands['bar'].options[:listing].should.not ==  @set.commands['foo'].options[:listing]
+      @set.commands['bar'].options[:listing].should == "bar"
+    end
+
+    it 'should be able to specify alias\'s description when aliasing' do
+      run = false
+      @set.command('foo', 'stuff') { run = true }
+
+      @set.alias_command 'bar', 'foo', :desc => "tobina"
+      @set.commands['bar'].match.should == 'bar'
+      @set.commands['bar'].description.should == "tobina"
+
+      @set.run_command @ctx, 'bar'
+      run.should == true
+    end
+
+    it "should be able to alias a command by its invocation line" do
+      run = false
+      @set.command(/^foo1/, 'stuff', :listing => 'foo') { run = true }
+
+      @set.alias_command 'bar', 'foo1'
+      @set.commands['bar'].match.should == 'bar'
+      @set.commands['bar'].description.should == 'Alias for `foo1`'
+
+      @set.run_command @ctx, 'bar'
+      run.should == true
+    end
+
+    it "should be able to specify options when creating alias" do
+      run = false
+      @set.command(/^foo1/, 'stuff', :listing => 'foo') { run = true }
+
+      @set.alias_command /^b.r/, 'foo1', :listing => "bar"
+      @set.commands[/^b.r/].options[:listing].should == "bar"
+    end
+
+    it "should set description to default if description parameter is nil" do
+      run = false
+      @set.command(/^foo1/, 'stuff', :listing => 'foo') { run = true }
+
+      @set.alias_command "bar", 'foo1'
+      @set.commands["bar"].description.should == "Alias for `foo1`"
+    end
   end
 
   it 'should be able to change the descriptions of commands' do

data/test/test_default_commands/test_cd.rb

@@ -0,0 +1,16 @@
+require 'helper'
+
+describe 'Pry::DefaultCommands::CD' do
+  describe 'cd' do
+    # Regression test for ticket #516.
+    #it 'should be able to cd into the Object BasicObject.' do
+    #  mock_pry('cd BasicObject.new').should.not =~ /\Aundefined method `__binding__'/
+    #end
+    
+    # Regression test for ticket #516
+    # Possibly move higher up.
+    it 'should not fail with undefined BasicObject#is_a?' do
+      mock_pry('cd BasicObject.new').should.not =~ /undefined method `is_a\?'/
+    end
+  end
+end