pry 0.9.8.2 → 0.9.8.3

data/lib/pry/default_commands/ls.rb

@@ -3,8 +3,10 @@ class Pry
 
     Ls = Pry::CommandSet.new do
 
-      create_command "ls","Show the list of vars and methods in the current scope. Type `ls --help` for more info.",
-              :shellwords => false, :interpolate => false do
+      create_command "ls","Show the list of vars and methods in the current scope.",
+      :shellwords => false, :interpolate => false do
+
+        group "Context"
 
         def options(opt)
           opt.banner unindent <<-USAGE

data/lib/pry/default_commands/{basic.rb → misc.rb}

@@ -1,7 +1,6 @@
 class Pry
   module DefaultCommands
-
-    Basic = Pry::CommandSet.new do
+    Misc = Pry::CommandSet.new do
       command "toggle-color", "Toggle syntax highlighting." do
         Pry.color = !Pry.color
         output.puts "Syntax highlighting #{Pry.color ? "on" : "off"}"
@@ -20,13 +19,6 @@ class Pry
         output.puts "Pry version: #{Pry::VERSION} on Ruby #{RUBY_VERSION}."
       end
 
-      command "import-set", "Import a command set" do |command_set_name|
-        raise CommandError, "Provide a command set name" if command_set.nil?
-
-        set = target.eval(arg_string)
-        _pry_.commands.import set
-      end
-
       command "reload-method", "Reload the source file that contains the specified method" do |meth_name|
         meth = get_method_or_raise(meth_name, target, {}, :omit_help)
 
@@ -45,11 +37,6 @@ class Pry
         args.each { |file_name| load File.expand_path(file_name) }
       end
 
-      command "reset", "Reset the REPL to a clean state." do
-        output.puts "Pry reset."
-        exec "pry"
-      end
     end
-
   end
 end

data/lib/pry/default_commands/navigating_pry.rb

@@ -0,0 +1,114 @@
+class Pry
+  module DefaultCommands
+
+    NavigatingPry = Pry::CommandSet.new do
+      command "switch-to", "Start a new sub-session on a binding in the current stack (numbered by nesting)." do |selection|
+        selection = selection.to_i
+
+        if selection < 0 || selection > _pry_.binding_stack.size - 1
+          raise CommandError, "Invalid binding index #{selection} - use `nesting` command to view valid indices."
+        else
+          Pry.start(_pry_.binding_stack[selection])
+        end
+      end
+
+      command "nesting", "Show nesting information." do
+        output.puts "Nesting status:"
+        output.puts "--"
+        _pry_.binding_stack.each_with_index do |obj, level|
+          if level == 0
+            output.puts "#{level}. #{Pry.view_clip(obj.eval('self'))} (Pry top level)"
+          else
+            output.puts "#{level}. #{Pry.view_clip(obj.eval('self'))}"
+          end
+        end
+      end
+
+      command "jump-to", "Jump to a binding further up the stack, popping all bindings below." do |break_level|
+        break_level = break_level.to_i
+        nesting_level = _pry_.binding_stack.size - 1
+
+        case break_level
+        when nesting_level
+          output.puts "Already at nesting level #{nesting_level}"
+        when (0...nesting_level)
+          _pry_.binding_stack.slice!(break_level + 1, _pry_.binding_stack.size)
+
+        else
+          max_nest_level = nesting_level - 1
+          output.puts "Invalid nest level. Must be between 0 and #{max_nest_level}. Got #{break_level}."
+        end
+      end
+
+      command "exit-all", "End the current Pry session (popping all bindings) and returning to caller. Accepts optional return value. Aliases: !!@" do
+        # clear the binding stack
+        _pry_.binding_stack.clear
+
+        # break out of the repl loop
+        throw(:breakout, target.eval(arg_string))
+      end
+
+      alias_command "!!@", "exit-all"
+
+      create_command "exit" do
+        description "Pop the previous binding (does NOT exit program). Aliases: quit"
+
+        banner <<-BANNER
+          Usage:   exit [OPTIONS] [--help]
+          Aliases: quit
+
+          It can be useful to exit a context with a user-provided value. For
+          instance an exit value can be used to determine program flow.
+
+          e.g: `exit "pry this"`
+          e.g: `exit`
+
+          https://github.com/pry/pry/wiki/State-navigation#wiki-Exit_with_value
+        BANNER
+
+        command_options(
+                        :keep_retval => true
+                        )
+
+        def process
+          if _pry_.binding_stack.one?
+            # when breaking out of top-level then behave like `exit-all`
+            process_exit_all
+          else
+            # otherwise just pop a binding and return user supplied value
+            process_pop_and_return
+          end
+        end
+
+        def process_exit_all
+          _pry_.binding_stack.clear
+          throw(:breakout, target.eval(arg_string))
+        end
+
+        def process_pop_and_return
+          popped_object = _pry_.binding_stack.pop.eval('self')
+
+          # return a user-specified value if given otherwise return the object
+          return target.eval(arg_string) unless arg_string.empty?
+          popped_object
+        end
+      end
+
+      alias_command "quit", "exit"
+
+      command "exit-program", "End the current program. Aliases: quit-program, !!!" do
+        Pry.save_history if Pry.config.history.should_save
+        Kernel.exit target.eval(arg_string).to_i
+      end
+
+      alias_command "quit-program", "exit-program"
+      alias_command "!!!", "exit-program"
+
+      command "!pry", "Start a Pry session on current self; this even works mid multi-line expression." do
+        target.pry
+      end
+
+    end
+  end
+end
+

data/lib/pry/helpers/base_helpers.rb

@@ -126,15 +126,27 @@ class Pry
       # Try to use `less` for paging, if it fails then use
       # simple_pager. Also do not page if Pry.pager is falsey
       # FIXME! Another JRuby hack
-      def stagger_output(text, output=output())
+      def stagger_output(text, out = nil)
+        out ||= case
+        when respond_to?(:output)
+          # Mixin.
+          output
+        when Pry.respond_to?(:output)
+          # Parent.
+          Pry.output
+        else
+          # Sys.
+          $stdout
+        end
+          
         if text.lines.count < page_size || !Pry.pager
-          output.puts text
+          out.puts text
           return
         end
 
         # FIXME! Another JRuby hack
         if jruby?
-          simple_pager(text, output)
+          simple_pager(text, out)
         else
           lesspipe { |less| less.puts text }
         end

data/lib/pry/helpers/command_helpers.rb

@@ -23,6 +23,22 @@ class Pry
         end
       end
 
+      # Return the file and line for a Binding.
+      # @param [Binding] target The binding
+      # @return [Array] The file and line
+      def file_and_line_from_binding(target)
+        file = target.eval('__FILE__')
+        line_num = target.eval('__LINE__')
+        if rbx?
+          if !target.instance_variable_defined?(:@__actual_file__)
+            target.instance_variable_set(:@__actual_file__, RbxPath.convert_path_to_full(target.variables.method.file.to_s))
+          end
+          file = target.instance_variable_get(:@__actual_file__).to_s
+        end
+
+        [file, line_num]
+      end
+
       def get_method_or_raise(name, target, opts={}, omit_help=false)
         meth = Pry::Method.from_str(name, target, opts)
 

data/lib/pry/history.rb

@@ -70,8 +70,14 @@ class Pry
     def read_from_file
       history_file = File.expand_path(Pry.config.history.file)
 
-      if File.exists?(history_file)
-        File.foreach(history_file) { |line| yield(line) }
+      begin
+        if File.exists?(history_file)
+          File.foreach(history_file) { |line| yield(line) }
+        end
+      rescue => error
+        unless error.message.empty?
+          warn "History file not loaded, received an error: #{error.message}"
+        end
       end
     end
 
@@ -80,8 +86,10 @@ class Pry
     def write_to_file(lines)
       history_file = File.expand_path(Pry.config.history.file)
 
-      File.open(history_file, 'a') do |f|
-        lines.each { |ln| f.puts ln }
+      if File.writable?(history_file)
+        File.open(history_file, 'a') do |f|
+          lines.each { |ln| f.puts ln }
+        end
       end
     end
 

data/lib/pry/method.rb

@@ -109,7 +109,7 @@ class Pry
       # @param [String] name
       # @return [Pry::Method, nil]
       def from_class(klass, name)
-        new(klass.instance_method(name)) rescue nil
+        new(safe_send(klass, :instance_method, name)) rescue nil
       end
       alias from_module from_class
 
@@ -121,7 +121,7 @@ class Pry
       # @param [String] name
       # @return [Pry::Method, nil]
       def from_obj(obj, name)
-        new(obj.method(name)) rescue nil
+        new(safe_send(obj, :method, name)) rescue nil
       end
 
       # Get all of the instance methods of a `Class` or `Module`

data/lib/pry/pry_class.rb

@@ -249,7 +249,13 @@ class Pry
     config.history ||= OpenStruct.new
     config.history.should_save = true
     config.history.should_load = true
-    config.history.file = File.expand_path("~/.pry_history")
+    config.history.file = File.expand_path("~/.pry_history") rescue nil
+
+    if config.history.file.nil?
+      config.should_load_rc = false
+      config.history.should_save = false
+      config.history.should_load = false
+    end
 
     config.control_d_handler = DEFAULT_CONTROL_D_HANDLER
 

data/lib/pry/pry_instance.rb

@@ -79,6 +79,12 @@ class Pry
     true
   end
 
+  # The currently active `Binding`.
+  # @return [Binding] The currently active `Binding` for the session.
+  def current_context
+    binding_stack.last
+  end
+
   # The current prompt.
   # This is the prompt at the top of the prompt stack.
   #

data/lib/pry/rbx_path.rb

@@ -2,33 +2,21 @@ class Pry
   module RbxPath
     module_function
     def is_core_path?(path)
-      path.start_with?("kernel")
+      path.start_with?("kernel") || path.start_with?("lib")
     end
 
     def convert_path_to_full(path)
-      if rvm_ruby?(Rubinius::BIN_PATH)
-        rvm_convert_path_to_full(path)
+      if path.start_with?("kernel")
+        File.join File.dirname(Rubinius::KERNEL_PATH), path
+      elsif path.start_with?("lib")
+        File.join File.dirname(Rubinius::LIB_PATH), path
       else
-        std_convert_path_to_full(path)
+        path
       end
     end
 
     def rvm_ruby?(path)
       !!(path =~ /\.rvm/)
     end
-
-    def rvm_convert_path_to_full(path)
-      ruby_name = File.dirname(Rubinius::BIN_PATH).split("/").last
-      source_path = File.join(File.dirname(File.dirname(File.dirname(Rubinius::BIN_PATH))),  "src", ruby_name)
-      file_name = File.join(source_path, path)
-      raise "Cannot find rbx core source" if !File.exists?(file_name)
-      file_name
-    end
-
-    def std_convert_path_to_full(path)
-      file_name = File.join(Rubinius::BIN_PATH, "..", path)
-      raise "Cannot find rbx core source" if !File.exists?(file_name)
-      file_name
-    end
   end
 end

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.8.2"
+  VERSION = "0.9.8.3"
 end

data/pry.gemspec

@@ -2,20 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = "pry"
-  s.version = "0.9.8.2"
+  s.version = "0.9.8.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mair (banisterfiend)"]
-  s.date = "2012-02-09"
+  s.date = "2012-03-02"
   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/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/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.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_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", "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/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_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.rubygems_version = "1.8.16"
   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.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_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"]
+  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_special_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
@@ -23,14 +23,14 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<coderay>, ["~> 1.0.5"])
       s.add_runtime_dependency(%q<slop>, ["< 3", ">= 2.4.4"])
-      s.add_runtime_dependency(%q<method_source>, ["~> 0.7"])
+      s.add_runtime_dependency(%q<method_source>, ["~> 0.7.1"])
       s.add_development_dependency(%q<bacon>, ["~> 1.1"])
       s.add_development_dependency(%q<open4>, ["~> 1.3"])
       s.add_development_dependency(%q<rake>, ["~> 0.9"])
     else
       s.add_dependency(%q<coderay>, ["~> 1.0.5"])
       s.add_dependency(%q<slop>, ["< 3", ">= 2.4.4"])
-      s.add_dependency(%q<method_source>, ["~> 0.7"])
+      s.add_dependency(%q<method_source>, ["~> 0.7.1"])
       s.add_dependency(%q<bacon>, ["~> 1.1"])
       s.add_dependency(%q<open4>, ["~> 1.3"])
       s.add_dependency(%q<rake>, ["~> 0.9"])
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<coderay>, ["~> 1.0.5"])
     s.add_dependency(%q<slop>, ["< 3", ">= 2.4.4"])
-    s.add_dependency(%q<method_source>, ["~> 0.7"])
+    s.add_dependency(%q<method_source>, ["~> 0.7.1"])
     s.add_dependency(%q<bacon>, ["~> 1.1"])
     s.add_dependency(%q<open4>, ["~> 1.3"])
     s.add_dependency(%q<rake>, ["~> 0.9"])

data/test/helper.rb

@@ -16,6 +16,14 @@ $VERBOSE = nil
 # Ensure we do not execute any rc files
 Pry::RC_FILES.clear
 
+# inject a variable into a binding
+def inject_var(name, value, b)
+  Thread.current[:__pry_local__] = value
+  b.eval("#{name} = Thread.current[:__pry_local__]")
+ensure
+  Thread.current[:__pry_local__] = nil
+end
+
 # in case the tests call reset_defaults, ensure we reset them to
 # amended (test friendly) values
 class << Pry

data/test/test_command.rb

@@ -4,6 +4,7 @@ describe "Pry::Command" do
 
   before do
     @set = Pry::CommandSet.new
+    @set.import Pry::DefaultCommands::Help
   end
 
   describe 'call_safely' do
@@ -339,5 +340,258 @@ describe "Pry::Command" do
         cmd.new.process_line %(grumpos)
       }.should.raise(Pry::CommandError)
     end
-  end
-end
+   end
+
+   describe "block parameters" do
+     before do
+       @context = Object.new
+       @set.command "walking-spanish", "down the hall", :takes_block => true do
+         inject_var(:@x, command_block.call, target)
+       end
+       @set.import Pry::Commands
+     end
+
+     it 'should accept multiline blocks' do
+       redirect_pry_io(InputTester.new("walking-spanish | do",
+                                       "  :jesus",
+                                       "end",
+                                       "exit-all"), out = StringIO.new) do
+         Pry.start @context, :commands => @set
+       end
+       @context.instance_variable_get(:@x).should == :jesus
+     end
+
+     it 'should accept normal parameters along with block' do
+       @set.block_command "walking-spanish", "litella's been screeching for a blind pig.", :takes_block => true do |x, y|
+         inject_var(:@x, x, target)
+         inject_var(:@y, y, target)
+         inject_var(:@block_var, command_block.call, target)
+       end
+       redirect_pry_io(InputTester.new("walking-spanish john carl| { :jesus }",
+                                       "exit-all")) do
+         Pry.start @context, :commands => @set
+       end
+
+       @context.instance_variable_get(:@x).should == "john"
+       @context.instance_variable_get(:@y).should == "carl"
+       @context.instance_variable_get(:@block_var).should == :jesus
+     end
+
+     describe "single line blocks" do
+       it 'should accept blocks with do ; end' do
+         redirect_pry_io(InputTester.new("walking-spanish | do ; :jesus; end",
+                                         "exit-all"), out = StringIO.new) do
+           Pry.start @context, :commands => @set
+         end
+         @context.instance_variable_get(:@x).should == :jesus
+       end
+
+       it 'should accept blocks with do; end' do
+         redirect_pry_io(InputTester.new("walking-spanish | do; :jesus; end",
+                                         "exit-all"), out = StringIO.new) do
+           Pry.start @context, :commands => @set
+         end
+         @context.instance_variable_get(:@x).should == :jesus
+       end
+
+       it 'should accept blocks with { }' do
+         redirect_pry_io(InputTester.new("walking-spanish | { :jesus }",
+                                         "exit-all"), out = StringIO.new) do
+           Pry.start @context, :commands => @set
+         end
+         @context.instance_variable_get(:@x).should == :jesus
+       end
+
+     end
+
+     describe "block-related content removed from arguments" do
+
+       describe "arg_string" do
+         it 'should remove block-related content from arg_string (with one normal arg)' do
+           @set.block_command "walking-spanish", "down the hall", :takes_block => true do |x, y|
+             inject_var(:@arg_string, arg_string, target)
+             inject_var(:@x, x, target)
+           end
+           redirect_pry_io(InputTester.new("walking-spanish john| { :jesus }",
+                                           "exit-all")) do
+             Pry.start @context, :commands => @set
+           end
+           @context.instance_variable_get(:@arg_string).should == @context.instance_variable_get(:@x)
+         end
+
+         it 'should remove block-related content from arg_string (with no normal args)' do
+           @set.block_command "walking-spanish", "down the hall", :takes_block => true do
+             inject_var(:@arg_string, arg_string, target)
+           end
+           redirect_pry_io(InputTester.new("walking-spanish | { :jesus }",
+                                           "exit-all")) do
+             Pry.start @context, :commands => @set
+           end
+           @context.instance_variable_get(:@arg_string).should == ""
+         end
+
+         it 'should NOT remove block-related content from arg_string when :takes_block => false' do
+           block_string = "| { :jesus }"
+           @set.block_command "walking-spanish", "homemade special", :takes_block => false do
+             inject_var(:@arg_string, arg_string, target)
+           end
+           redirect_pry_io(InputTester.new("walking-spanish #{block_string}",
+                                           "exit-all")) do
+             Pry.start @context, :commands => @set
+           end
+           @context.instance_variable_get(:@arg_string).should == block_string
+         end
+       end
+
+       describe "args" do
+         describe "block_command" do
+           it "should remove block-related content from arguments" do
+             @set.block_command "walking-spanish", "glass is full of sand", :takes_block => true do |x, y|
+               inject_var(:@x, x, target)
+               inject_var(:@y, y, target)
+             end
+             redirect_pry_io(InputTester.new("walking-spanish | { :jesus }",
+                                             "exit-all"), out = StringIO.new) do
+               Pry.start @context, :commands => @set
+             end
+             @context.instance_variable_get(:@x).should == nil
+             @context.instance_variable_get(:@y).should == nil
+           end
+
+           it "should NOT remove block-related content from arguments if :takes_block => false" do
+             @set.block_command "walking-spanish", "litella screeching for a blind pig", :takes_block => false do |x, y|
+               inject_var(:@x, x, target)
+               inject_var(:@y, y, target)
+             end
+             redirect_pry_io(InputTester.new("walking-spanish | { :jesus }",
+                                             "exit-all"), out = StringIO.new) do
+               Pry.start @context, :commands => @set
+             end
+             @context.instance_variable_get(:@x).should == "|"
+             @context.instance_variable_get(:@y).should == "{"
+           end
+         end
+
+         describe "create_command" do
+           it "should remove block-related content from arguments" do
+             @set.create_command "walking-spanish", "punk sanders carved one out of wood", :takes_block => true do
+               def process(x, y)
+                 inject_var(:@x, x, target)
+                 inject_var(:@y, y, target)
+               end
+             end
+             redirect_pry_io(InputTester.new("walking-spanish | { :jesus }",
+                                             "exit-all"), out = StringIO.new) do
+               Pry.start @context, :commands => @set
+             end
+             @context.instance_variable_get(:@x).should == nil
+             @context.instance_variable_get(:@y).should == nil
+           end
+
+           it "should NOT remove block-related content from arguments if :takes_block => false" do
+             @set.create_command "walking-spanish", "down the hall", :takes_block => false do
+               def process(x, y)
+                 inject_var(:@x, x, target)
+                 inject_var(:@y, y, target)
+               end
+             end
+             redirect_pry_io(InputTester.new("walking-spanish | { :jesus }",
+                                             "exit-all")) do
+               Pry.start @context, :commands => @set
+             end
+             @context.instance_variable_get(:@x).should == "|"
+             @context.instance_variable_get(:@y).should == "{"
+           end
+         end
+       end
+     end
+
+     describe "blocks can take parameters" do
+       describe "{} style blocks" do
+         it 'should accept multiple parameters' do
+           @set.block_command "walking-spanish", "down the hall", :takes_block => true do
+             inject_var(:@x, command_block.call(1, 2), target)
+           end
+
+           redirect_pry_io(InputTester.new("walking-spanish | { |x, y| [x, y] }",
+                                           "exit-all")) do
+             Pry.start @context, :commands => @set
+           end
+           @context.instance_variable_get(:@x).should == [1, 2]
+         end
+       end
+
+       describe "do/end style blocks" do
+         it 'should accept multiple parameters' do
+           @set.create_command "walking-spanish", "litella", :takes_block => true do
+             def process
+               inject_var(:@x, command_block.call(1, 2), target)
+             end
+           end
+
+           redirect_pry_io(InputTester.new("walking-spanish | do |x, y|",
+                                           "  [x, y]",
+                                           "end",
+                                           "exit-all")) do
+             Pry.start @context, :commands => @set
+           end
+           @context.instance_variable_get(:@x).should == [1, 2]
+         end
+       end
+     end
+
+     describe "closure behaviour" do
+       it 'should close over locals in the definition context' do
+         redirect_pry_io(InputTester.new("var = :hello",
+                                         "walking-spanish | { var }",
+                                         "exit-all")) do
+           Pry.start @context, :commands => @set
+         end
+         @context.instance_variable_get(:@x).should == :hello
+       end
+     end
+
+     describe "exposing block parameter" do
+       describe "block_command" do
+         it "should expose block in command_block method" do
+           @set.block_command "walking-spanish", "glass full of sand", :takes_block => true do
+             inject_var(:@x, command_block.call, target)
+           end
+           redirect_pry_io(InputTester.new("walking-spanish | { :jesus }",
+                                           "exit-all")) do
+             Pry.start @context, :commands => @set
+           end
+           @context.instance_variable_get(:@x).should == :jesus
+         end
+       end
+
+       describe "create_command" do
+         it "should NOT expose &block in create_command's process method" do
+           @set.create_command "walking-spanish", "down the hall", :takes_block => true do
+             def process(&block)
+               inject_var(:@x, block.call, target)
+             end
+           end
+           redirect_pry_io(InputTester.new("walking-spanish | { :jesus }",
+                                           "exit-all")) do
+             Pry.start @context, :commands => @set
+           end
+           @context.instance_variable_get(:@x).should == nil
+         end
+
+         it "should expose block in command_block method" do
+           @set.create_command "walking-spanish", "homemade special", :takes_block => true do
+             def process
+               inject_var(:@x, command_block.call, target)
+             end
+           end
+           redirect_pry_io(InputTester.new("walking-spanish | { :jesus }",
+                                           "exit-all"), out = StringIO.new) do
+             Pry.start @context, :commands => @set
+           end
+           @context.instance_variable_get(:@x).should == :jesus
+         end
+       end
+     end
+   end
+ end