pry 0.9.8pre4 → 0.9.8pre5

data/lib/pry/command_set.rb

@@ -82,6 +82,7 @@ class Pry
     #   # pry(main)> help number
     #   # number-N regex command
     def block_command(name, description="No description.", options={}, &block)
+      description, options = ["No description.", description] if description.is_a?(Hash)
       options = default_options(name).merge!(options)
 
       commands[name] = Pry::BlockCommand.subclass(name, description, options, helper_module, &block)
@@ -114,6 +115,7 @@ class Pry
     #   end
     #
     def create_command(name, description="No description.", options={}, &block)
+      description, options = ["No description.", description] if description.is_a?(Hash)
       options = default_options(name).merge!(options)
 
       commands[name] = Pry::ClassCommand.subclass(name, description, options, helper_module, &block)
@@ -336,7 +338,7 @@ class Pry
 
           help_text << commands.map do |key, command|
             if command.description && !command.description.empty?
-              "#{command.options[:listing]}".ljust(18) + command.description
+              "#{command.options[:listing].to_s.ljust(18)} #{command.description}"
             end
           end.compact.sort.join("\n")
 

data/lib/pry/hooks.rb

@@ -37,18 +37,17 @@ class Pry
     end
 
     def merge_arrays(array1, array2)
-      keys = array1.map {|(k,v)| k}
-      hash = {}
-      array1.each{|(k,v)| hash[k]=v}
-      keys.push(*array2.map {|(k,v)| k})
-      array2.each{|(k,v)| hash[k]=v}
-      result = []
-      keys.uniq!
-      keys.each{|k| result.push([k,hash[k]]) }
-      result
+      uniq_keeping_last(array1 + array2, &:first)
     end
     private :merge_arrays
 
+    def uniq_keeping_last(input, &block)
+      hash, output = {}, []
+      input.reverse.each{ |i| hash[block[i]] ||= (output.unshift i) }
+      output
+    end
+    private :uniq_keeping_last
+
     # Return a new `Pry::Hooks` instance containing a merge of the contents of two `Pry:Hooks` instances,
     # @param [Pry::Hooks] other The `Pry::Hooks` instance to merge
     # @return [Pry::Hooks] The new hash.

data/lib/pry/pry_class.rb

@@ -123,8 +123,12 @@ class Pry
       pry_instance
     )
 
-    head, *tail = binding_stack
-    pry_instance.binding_stack.push(*tail)
+    if pry_instance.binding_stack.empty?
+      head, *tail = binding_stack
+      pry_instance.binding_stack.push(*tail)
+    else
+      head = pry_instance.binding_stack.pop
+    end
 
     # Enter the matrix
     pry_instance.repl(head)

data/lib/pry/pry_instance.rb

@@ -181,8 +181,9 @@ class Pry
       end
     end
 
-    repl_epilogue(target)
     break_data || nil
+  ensure
+    repl_epilogue(target)
   end
 
   # Perform a read-eval-print.
@@ -225,7 +226,9 @@ class Pry
 
     code = r(target)
 
-    result = set_last_result(target.eval(code, Pry.eval_path, Pry.current_line), target)
+    result = target.eval(code, Pry.eval_path, Pry.current_line)
+    set_last_result(result, target, code)
+
     result
   rescue RescuableException => e
     result = set_last_exception(e, target)
@@ -257,7 +260,12 @@ class Pry
         output.puts "Error: #{e.message}"
       end
 
-      break if complete_expression?(eval_string)
+      begin
+        break if complete_expression?(eval_string)
+      rescue SyntaxError => e
+        output.puts "SyntaxError: #{e.message.sub(/.*syntax error, */m, '')}"
+        eval_string = ""
+      end
     end
 
     @suppress_output = true if eval_string =~ /;\Z/ || eval_string.empty?
@@ -398,11 +406,12 @@ class Pry
   # This method should not need to be invoked directly.
   # @param [Object] result The result.
   # @param [Binding] target The binding to set `_` on.
-  def set_last_result(result, target)
+  # @param [String] code The code that was run.
+  def set_last_result(result, target, code="")
     @last_result_is_exception = false
     @output_array << result
 
-    self.last_result = result
+    self.last_result = result unless code =~ /\A\s*\z/
   end
 
   # Set the last exception for a session.
@@ -565,8 +574,8 @@ class Pry
       }
     end
 
-    # Assert that a line which ends with a , or a \ is incomplete.
-    str !~ /[,\\]\z/
+    # Assert that a line which ends with a , is incomplete.
+    str !~ /[,]\z/
   rescue SyntaxError => e
     if incomplete_user_input_exception?(e)
       false

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.8pre4"
+  VERSION = "0.9.8pre5"
 end

data/pry.gemspec

@@ -1,21 +1,21 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "pry"
-  s.version = "0.9.8pre4"
+  s.name = %q{pry}
+  s.version = "0.9.8pre5"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["John Mair (banisterfiend)"]
-  s.date = "2012-01-12"
-  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/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/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/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_command.rb", "test/test_command_helpers.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_hooks.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/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.11"
-  s.summary = "An IRB alternative and runtime developer console"
-  s.test_files = ["test/helper.rb", "test/test_cli.rb", "test/test_command.rb", "test/test_command_helpers.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_hooks.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/test_syntax_checking.rb", "test/test_wrapped_module.rb", "test/testrc", "test/testrcbad"]
+  s.authors = [%q{John Mair (banisterfiend)}]
+  s.date = %q{2012-01-19}
+  s.description = %q{An IRB alternative and runtime developer console}
+  s.email = %q{jrmair@gmail.com}
+  s.executables = [%q{pry}]
+  s.files = [%q{.document}, %q{.gemtest}, %q{.gitignore}, %q{.travis.yml}, %q{.yardopts}, %q{CHANGELOG}, %q{CONTRIBUTORS}, %q{Gemfile}, %q{LICENSE}, %q{README.markdown}, %q{Rakefile}, %q{TODO}, %q{bin/pry}, %q{examples/example_basic.rb}, %q{examples/example_command_override.rb}, %q{examples/example_commands.rb}, %q{examples/example_hooks.rb}, %q{examples/example_image_edit.rb}, %q{examples/example_input.rb}, %q{examples/example_input2.rb}, %q{examples/example_output.rb}, %q{examples/example_print.rb}, %q{examples/example_prompt.rb}, %q{examples/helper.rb}, %q{lib/pry.rb}, %q{lib/pry/cli.rb}, %q{lib/pry/command.rb}, %q{lib/pry/command_set.rb}, %q{lib/pry/commands.rb}, %q{lib/pry/completion.rb}, %q{lib/pry/config.rb}, %q{lib/pry/core_extensions.rb}, %q{lib/pry/custom_completions.rb}, %q{lib/pry/default_commands/basic.rb}, %q{lib/pry/default_commands/context.rb}, %q{lib/pry/default_commands/documentation.rb}, %q{lib/pry/default_commands/easter_eggs.rb}, %q{lib/pry/default_commands/gems.rb}, %q{lib/pry/default_commands/input.rb}, %q{lib/pry/default_commands/introspection.rb}, %q{lib/pry/default_commands/ls.rb}, %q{lib/pry/default_commands/shell.rb}, %q{lib/pry/extended_commands/experimental.rb}, %q{lib/pry/extended_commands/user_command_api.rb}, %q{lib/pry/helpers.rb}, %q{lib/pry/helpers/base_helpers.rb}, %q{lib/pry/helpers/command_helpers.rb}, %q{lib/pry/helpers/options_helpers.rb}, %q{lib/pry/helpers/text.rb}, %q{lib/pry/history.rb}, %q{lib/pry/history_array.rb}, %q{lib/pry/hooks.rb}, %q{lib/pry/indent.rb}, %q{lib/pry/method.rb}, %q{lib/pry/plugins.rb}, %q{lib/pry/pry_class.rb}, %q{lib/pry/pry_instance.rb}, %q{lib/pry/rbx_method.rb}, %q{lib/pry/rbx_path.rb}, %q{lib/pry/version.rb}, %q{lib/pry/wrapped_module.rb}, %q{man/pry.1}, %q{man/pry.1.html}, %q{man/pry.1.ronn}, %q{pry.gemspec}, %q{test/helper.rb}, %q{test/test_cli.rb}, %q{test/test_command.rb}, %q{test/test_command_helpers.rb}, %q{test/test_command_integration.rb}, %q{test/test_command_set.rb}, %q{test/test_completion.rb}, %q{test/test_default_commands.rb}, %q{test/test_default_commands/test_context.rb}, %q{test/test_default_commands/test_documentation.rb}, %q{test/test_default_commands/test_gems.rb}, %q{test/test_default_commands/test_input.rb}, %q{test/test_default_commands/test_introspection.rb}, %q{test/test_default_commands/test_ls.rb}, %q{test/test_default_commands/test_shell.rb}, %q{test/test_exception_whitelist.rb}, %q{test/test_history_array.rb}, %q{test/test_hooks.rb}, %q{test/test_indent.rb}, %q{test/test_input_stack.rb}, %q{test/test_method.rb}, %q{test/test_pry.rb}, %q{test/test_pry_defaults.rb}, %q{test/test_pry_history.rb}, %q{test/test_pry_output.rb}, %q{test/test_special_locals.rb}, %q{test/test_syntax_checking.rb}, %q{test/test_wrapped_module.rb}, %q{test/testrc}, %q{test/testrcbad}, %q{wiki/Customizing-pry.md}, %q{wiki/Home.md}]
+  s.homepage = %q{http://pry.github.com}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
+  s.summary = %q{An IRB alternative and runtime developer console}
+  s.test_files = [%q{test/helper.rb}, %q{test/test_cli.rb}, %q{test/test_command.rb}, %q{test/test_command_helpers.rb}, %q{test/test_command_integration.rb}, %q{test/test_command_set.rb}, %q{test/test_completion.rb}, %q{test/test_default_commands.rb}, %q{test/test_default_commands/test_context.rb}, %q{test/test_default_commands/test_documentation.rb}, %q{test/test_default_commands/test_gems.rb}, %q{test/test_default_commands/test_input.rb}, %q{test/test_default_commands/test_introspection.rb}, %q{test/test_default_commands/test_ls.rb}, %q{test/test_default_commands/test_shell.rb}, %q{test/test_exception_whitelist.rb}, %q{test/test_history_array.rb}, %q{test/test_hooks.rb}, %q{test/test_indent.rb}, %q{test/test_input_stack.rb}, %q{test/test_method.rb}, %q{test/test_pry.rb}, %q{test/test_pry_defaults.rb}, %q{test/test_pry_history.rb}, %q{test/test_pry_output.rb}, %q{test/test_special_locals.rb}, %q{test/test_syntax_checking.rb}, %q{test/test_wrapped_module.rb}, %q{test/testrc}, %q{test/testrcbad}]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/test_command_integration.rb

@@ -0,0 +1,512 @@
+require 'helper'
+describe "commands" do
+  it 'should interpolate ruby code into commands' do
+    klass = Pry::CommandSet.new do
+      command "hello", "", :keep_retval => true do |arg|
+        arg
+      end
+    end
+
+    $test_interpolation = "bing"
+    str_output = StringIO.new
+    Pry.new(:input => StringIO.new('hello #{$test_interpolation}'), :output => str_output, :commands => klass).rep
+    str_output.string.should =~ /bing/
+    $test_interpolation = nil
+  end
+
+  # bug fix for https://github.com/pry/pry/issues/170
+  it 'should not choke on complex string interpolation when checking if ruby code is a command' do
+    redirect_pry_io(InputTester.new('/#{Regexp.escape(File.expand_path("."))}/'), str_output = StringIO.new) do
+      pry
+    end
+
+    str_output.string.should.not =~ /SyntaxError/
+  end
+
+  it 'should NOT interpolate ruby code into commands if :interpolate => false' do
+    klass = Pry::CommandSet.new do
+      command "hello", "", :keep_retval => true, :interpolate => false do |arg|
+        arg
+      end
+    end
+
+    $test_interpolation = "bing"
+    str_output = StringIO.new
+    Pry.new(:input => StringIO.new('hello #{$test_interpolation}'), :output => str_output, :commands => klass).rep
+    str_output.string.should =~ /test_interpolation/
+    $test_interpolation = nil
+  end
+
+  it 'should NOT try to interpolate pure ruby code (no commands) ' do
+    str_output = StringIO.new
+    Pry.new(:input => StringIO.new('format \'#{aggy}\''), :output => str_output).rep
+    str_output.string.should.not =~ /NameError/
+
+    Pry.new(:input => StringIO.new('format #{aggy}'), :output => str_output).rep
+    str_output.string.should.not =~ /NameError/
+
+    $test_interpolation = "blah"
+    Pry.new(:input => StringIO.new('format \'#{$test_interpolation}\''), :output => str_output).rep
+
+    str_output.string.should.not =~ /blah/
+    $test_interpolation = nil
+  end
+
+  it 'should create a command with a space in its name' do
+    set = Pry::CommandSet.new do
+      command "hello baby", "" do
+        output.puts "hello baby command"
+      end
+    end
+
+    str_output = StringIO.new
+    redirect_pry_io(InputTester.new("hello baby", "exit-all"), str_output) do
+      Pry.new(:commands => set).rep
+    end
+
+    str_output.string.should =~ /hello baby command/
+  end
+
+  it 'should create a command with a space in its name and pass an argument' do
+    set = Pry::CommandSet.new do
+      command "hello baby", "" do |arg|
+        output.puts "hello baby command #{arg}"
+      end
+    end
+
+    str_output = StringIO.new
+    redirect_pry_io(InputTester.new("hello baby john"), str_output) do
+      Pry.new(:commands => set).rep
+    end
+
+    str_output.string.should =~ /hello baby command john/
+  end
+
+  it 'should create a regex command and be able to invoke it' do
+    set = Pry::CommandSet.new do
+      command /hello(.)/, "" do
+        c = captures.first
+        output.puts "hello#{c}"
+      end
+    end
+
+    str_output = StringIO.new
+    redirect_pry_io(InputTester.new("hello1"), str_output) do
+      Pry.new(:commands => set).rep
+    end
+
+    str_output.string.should =~ /hello1/
+  end
+
+  it 'should create a regex command and pass captures into the args list before regular arguments' do
+    set = Pry::CommandSet.new do
+      command /hello(.)/, "" do |c1, a1|
+        output.puts "hello #{c1} #{a1}"
+      end
+    end
+
+    str_output = StringIO.new
+    redirect_pry_io(InputTester.new("hello1 baby"), str_output) do
+      Pry.new(:commands => set).rep
+    end
+
+    str_output.string.should =~ /hello 1 baby/
+  end
+
+  it 'should create a regex command and interpolate the captures' do
+    set = Pry::CommandSet.new do
+      command /hello (.*)/, "" do |c1|
+        output.puts "hello #{c1}"
+      end
+    end
+
+    str_output = StringIO.new
+    $obj = "bing"
+    redirect_pry_io(InputTester.new('hello #{$obj}'), str_output) do
+      Pry.new(:commands => set).rep
+    end
+
+    str_output.string.should =~ /hello bing/
+    $obj = nil
+  end
+
+  it 'should create a regex command and arg_string should be interpolated' do
+    set = Pry::CommandSet.new do
+      command /hello(\w+)/, "" do |c1, a1, a2, a3|
+        output.puts "hello #{c1} #{a1} #{a2} #{a3}"
+      end
+    end
+
+    str_output = StringIO.new
+    $a1 = "bing"
+    $a2 = "bong"
+    $a3 = "bang"
+    redirect_pry_io(InputTester.new('hellojohn #{$a1} #{$a2} #{$a3}'), str_output) do
+      Pry.new(:commands => set).rep
+    end
+
+    str_output.string.should =~ /hello john bing bong bang/
+
+    $a1 = nil
+    $a2 = nil
+    $a3 = nil
+  end
+
+
+  it 'if a regex capture is missing it should be nil' do
+    set = Pry::CommandSet.new do
+      command /hello(.)?/, "" do |c1, a1|
+        output.puts "hello #{c1.inspect} #{a1}"
+      end
+    end
+
+    str_output = StringIO.new
+    redirect_pry_io(InputTester.new("hello baby"), str_output) do
+      Pry.new(:commands => set).rep
+    end
+
+    str_output.string.should =~ /hello nil baby/
+  end
+
+  it 'should create a command in  a nested context and that command should be accessible from the parent' do
+    str_output = StringIO.new
+    x = "@x=nil\ncd 7\n_pry_.commands.instance_eval {\ncommand('bing') { |arg| run arg }\n}\ncd ..\nbing ls\nexit-all"
+    redirect_pry_io(StringIO.new("@x=nil\ncd 7\n_pry_.commands.instance_eval {\ncommand('bing') { |arg| run arg }\n}\ncd ..\nbing ls\nexit-all"), str_output) do
+      Pry.new.repl(0)
+    end
+
+    str_output.string.should =~ /@x/
+  end
+
+  it 'should define a command that keeps its return value' do
+    klass = Pry::CommandSet.new do
+      command "hello", "", :keep_retval => true do
+        :kept_hello
+      end
+    end
+    str_output = StringIO.new
+    Pry.new(:input => StringIO.new("hello\n"), :output => str_output, :commands => klass).rep
+    str_output.string.should =~ /:kept_hello/
+    str_output.string.should =~ /=>/
+  end
+
+  it 'should define a command that does NOT keep its return value' do
+    klass = Pry::CommandSet.new do
+      command "hello", "", :keep_retval => false do
+        :kept_hello
+      end
+    end
+    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 !~ /=>/
+  end
+
+  it 'should define a command that keeps its return value even when nil' do
+    klass = Pry::CommandSet.new do
+      command "hello", "", :keep_retval => true do
+        nil
+      end
+    end
+    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 =~ /=>/
+  end
+
+  it 'should define a command that keeps its return value but does not return when value is void' do
+    klass = Pry::CommandSet.new do
+      command "hello", "", :keep_retval => true do
+        void
+      end
+    end
+    str_output = StringIO.new
+    Pry.new(:input => StringIO.new("hello\n"), :output => str_output, :commands => klass).rep
+    str_output.string.empty?.should == true
+  end
+
+  it 'a command (with :keep_retval => false) that replaces eval_string with a valid expression should not have the expression value suppressed' do
+    klass = Pry::CommandSet.new do
+      command "hello", "" do
+        eval_string.replace("6")
+      end
+    end
+    str_output = StringIO.new
+    Pry.new(:input => StringIO.new("def yo\nhello\n"), :output => str_output, :commands => klass).rep
+    str_output.string.should =~ /6/
+  end
+
+
+  it 'a command (with :keep_retval => true) that replaces eval_string with a valid expression should overwrite the eval_string with the return value' do
+    klass = Pry::CommandSet.new do
+      command "hello", "", :keep_retval => true do
+        eval_string.replace("6")
+        7
+      end
+    end
+    str_output = StringIO.new
+    Pry.new(:input => StringIO.new("def yo\nhello\n"), :output => str_output, :commands => klass).rep
+    str_output.string.should =~ /7/
+    str_output.string.should.not =~ /6/
+  end
+
+  it 'a command that return a value in a multi-line expression should clear the expression and return the value' do
+    klass = Pry::CommandSet.new do
+      command "hello", "", :keep_retval => true do
+        5
+      end
+    end
+    str_output = StringIO.new
+    Pry.new(:input => StringIO.new("def yo\nhello\n"), :output => str_output, :commands => klass).rep
+    str_output.string.should =~ /5/
+  end
+
+
+  it 'should set the commands default, and the default should be overridable' do
+    klass = Pry::CommandSet.new do
+      command "hello" do
+        output.puts "hello world"
+      end
+    end
+
+    Pry.commands = klass
+
+    str_output = StringIO.new
+    Pry.new(:input => InputTester.new("hello"), :output => str_output).rep
+    str_output.string.should =~ /hello world/
+
+    other_klass = Pry::CommandSet.new do
+      command "goodbye", "" do
+        output.puts "goodbye world"
+      end
+    end
+
+    str_output = StringIO.new
+
+    Pry.new(:input => InputTester.new("goodbye"), :output => str_output, :commands => other_klass).rep
+    str_output.string.should =~ /goodbye world/
+  end
+
+  it 'should inherit "help" command from Pry::CommandBase' do
+    klass = Pry::CommandSet.new do
+      command "h", "h command" do
+      end
+    end
+
+    klass.commands.keys.size.should == 3
+    klass.commands.keys.include?("help").should == true
+    klass.commands.keys.include?("install-command").should == true
+    klass.commands.keys.include?("h").should == true
+  end
+
+  it 'should inherit commands from Pry::Commands' do
+    klass = Pry::CommandSet.new Pry::Commands do
+      command "v" do
+      end
+    end
+
+    klass.commands.include?("nesting").should == true
+    klass.commands.include?("jump-to").should == true
+    klass.commands.include?("cd").should == true
+    klass.commands.include?("v").should == true
+  end
+
+  it 'should alias a command with another command' do
+    klass = Pry::CommandSet.new do
+      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; end
+    orig = klass.commands["help"].description
+    klass.instance_eval do
+      desc "help", "blah"
+    end
+    klass.commands["help"].description.should.not == orig
+    klass.commands["help"].description.should == "blah"
+  end
+
+  it 'should run a command from within a command' do
+    klass = Pry::CommandSet.new do
+      command "v" do
+        output.puts "v command"
+      end
+
+      command "run_v" do
+        run "v"
+      end
+    end
+
+    str_output = StringIO.new
+    Pry.new(:input => InputTester.new("run_v"), :output => str_output, :commands => klass).rep
+    str_output.string.should =~ /v command/
+  end
+
+  it 'should run a regex command from within a command' do
+    klass = Pry::CommandSet.new do
+      command /v(.*)?/ do |arg|
+        output.puts "v #{arg}"
+      end
+
+      command "run_v" do
+        run "vbaby"
+      end
+    end
+
+    str_output = StringIO.new
+    redirect_pry_io(InputTester.new("run_v"), str_output) do
+      Pry.new(:commands => klass).rep
+    end
+
+    str_output.string.should =~ /v baby/
+  end
+
+  it 'should run a command from within a command with arguments' do
+    klass = Pry::CommandSet.new do
+      command /v(\w+)/ do |arg1, arg2|
+        output.puts "v #{arg1} #{arg2}"
+      end
+
+      command "run_v_explicit_parameter" do
+        run "vbaby", "param"
+      end
+
+      command "run_v_embedded_parameter" do
+        run "vbaby param"
+      end
+    end
+
+    ["run_v_explicit_parameter", "run_v_embedded_parameter"].each do |cmd|
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new(cmd), str_output) do
+        Pry.new(:commands => klass).rep
+      end
+      str_output.string.should =~ /v baby param/
+    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
+        output.puts "#{target.eval('self')}"
+      end
+    end
+
+    child_klass = Pry::CommandSet.new klass do
+    end
+
+    str_output = StringIO.new
+    Pry.new(:print => proc {}, :input => InputTester.new("v"),
+            :output => str_output, :commands => child_klass).rep("john")
+
+    str_output.string.rstrip.should == "john"
+  end
+
+  it 'should import commands from another command object' do
+    klass = Pry::CommandSet.new do
+      import_from Pry::Commands, "ls", "jump-to"
+    end
+
+    klass.commands.include?("ls").should == true
+    klass.commands.include?("jump-to").should == true
+  end
+
+  it 'should delete some inherited commands when using delete method' do
+    klass = Pry::CommandSet.new Pry::Commands do
+      command "v" do
+      end
+
+      delete "show-doc", "show-method"
+      delete "ls"
+    end
+
+    klass.commands.include?("nesting").should == true
+    klass.commands.include?("jump-to").should == true
+    klass.commands.include?("cd").should == true
+    klass.commands.include?("v").should == true
+    klass.commands.include?("show-doc").should == false
+    klass.commands.include?("show-method").should == false
+    klass.commands.include?("ls").should == false
+  end
+
+  it 'should override some inherited commands' do
+    klass = Pry::CommandSet.new Pry::Commands do
+      command "jump-to" do
+        output.puts "jump-to the music"
+      end
+
+      command "help" do
+        output.puts "help to the music"
+      end
+    end
+
+    # suppress evaluation output
+    Pry.print = proc {}
+
+    str_output = StringIO.new
+    Pry.new(:input => InputTester.new("jump-to"), :output => str_output, :commands => klass).rep
+    str_output.string.rstrip.should == "jump-to the music"
+
+    str_output = StringIO.new
+    Pry.new(:input => InputTester.new("help"), :output => str_output, :commands => klass).rep
+    str_output.string.rstrip.should == "help to the music"
+
+
+    Pry.reset_defaults
+    Pry.color = false
+  end
+
+  it 'should run a command with no parameter' do
+    pry_tester = Pry.new
+    pry_tester.commands = CommandTester
+    pry_tester.input = InputTester.new("command1", "exit-all")
+    pry_tester.commands = CommandTester
+
+    str_output = StringIO.new
+    pry_tester.output = str_output
+
+    pry_tester.rep
+
+    str_output.string.should =~ /command1/
+  end
+
+  it 'should run a command with one parameter' do
+    pry_tester = Pry.new
+    pry_tester.commands = CommandTester
+    pry_tester.input = InputTester.new("command2 horsey", "exit-all")
+    pry_tester.commands = CommandTester
+
+    str_output = StringIO.new
+    pry_tester.output = str_output
+
+    pry_tester.rep
+
+    str_output.string.should =~ /horsey/
+  end
+end
+
+describe "Pry#run_command" do
+  it 'should run a command in a specified context' do
+    b = Pry.binding_for(7)
+    p = Pry.new(:output => StringIO.new)
+    p.run_command("ls -m", "", b)
+    p.output.string.should =~ /divmod/
+  end
+
+  it 'should run a command that modifies the passed in eval_string' do
+    b = Pry.binding_for(7)
+    p = Pry.new(:output => StringIO.new)
+    eval_string = "def hello\npeter pan\n"
+    p.run_command("amend-line !", eval_string, b)
+    eval_string.should =~ /def hello/
+    eval_string.should.not =~ /peter pan/
+  end
+
+  it 'should run a command in the context of a session' do
+    mock_pry("@session_ivar = 10", "_pry_.run_command('ls')").should =~ /@session_ivar/
+  end
+end
+
+