Update specs using yield matcher

spec/command_set_spec.rb

@@ -48,11 +48,10 @@ describe Pry::CommandSet do
   end
 
   it 'should pass arguments of the command to the block' do
-    @set.command 'foo' do |*args|
+    expect { |probe|
-      args.should == [1, 2, 3]
+      @set.command('foo', &probe)
-    end
+      @set.run_command(@ctx, 'foo', 1, 2, 3)
-
+    }.to yield_with_args(1, 2, 3)
-    @set.run_command @ctx, 'foo', 1, 2, 3
   end
 
   it 'should use the first argument as context' do

spec/command_spec.rb

@@ -301,53 +301,52 @@ describe "Pry::Command" do
 
   describe 'tokenize' do
     it 'should interpolate string with #{} in them' do
-      cmd = @set.command 'random-dent' do |*args|
+      expect { |probe|
-        args.should == ["3", "8"]
+        cmd = @set.command('random-dent', &probe)
-      end
 
-      foo = 5
+        foo = 5
-
+        cmd.new(:target => binding).process_line 'random-dent #{1 + 2} #{3 + foo}'
-      cmd.new(:target => binding).process_line 'random-dent #{1 + 2} #{3 + foo}'
+      }.to yield_with_args('3', '8')
     end
 
     it 'should not fail if interpolation is not needed and target is not set' do
-      cmd = @set.command 'the-book' do |*args|
+      expect { |probe|
-        args.should == ['--help']
+        cmd = @set.command('the-book', &probe)
-      end
 
-      cmd.new.process_line 'the-book --help'
+        cmd.new.process_line 'the-book --help'
+      }.to yield_with_args('--help')
     end
 
     it 'should not interpolate commands with :interpolate => false' do
-      cmd = @set.command 'thor', 'norse god', :interpolate => false do |*args|
+      expect { |probe|
-        args.should == ['%(#{foo})']
+        cmd = @set.command('thor', 'norse god', :interpolate => false, &probe)
-      end
 
-      cmd.new.process_line 'thor %(#{foo})'
+        cmd.new.process_line 'thor %(#{foo})'
+      }.to yield_with_args('%(#{foo})')
     end
 
     it 'should use shell-words to split strings' do
-      cmd = @set.command 'eccentrica' do |*args|
+      expect { |probe|
-        args.should == ['gallumbits', 'eroticon', '6']
+        cmd = @set.command('eccentrica', &probe)
-      end
 
-      cmd.new.process_line %(eccentrica "gallumbits" 'erot''icon' 6)
+        cmd.new.process_line %(eccentrica "gallumbits" 'erot''icon' 6)
+      }.to yield_with_args('gallumbits', 'eroticon', '6')
     end
 
     it 'should split on spaces if shellwords is not used' do
-      cmd = @set.command 'bugblatter-beast', 'would eat its grandmother', :shellwords => false do |*args|
+      expect { |probe|
-        args.should == ['"of', 'traal"']
+        cmd = @set.command('bugblatter-beast', 'would eat its grandmother', :shellwords => false, &probe)
-      end
 
-      cmd.new.process_line %(bugblatter-beast "of traal")
+        cmd.new.process_line %(bugblatter-beast "of traal")
+      }.to yield_with_args('"of', 'traal"')
     end
 
     it 'should add captures to arguments for regex commands' do
-      cmd = @set.command /perfectly (normal)( beast)?/i do |*args|
+      expect { |probe|
-        args.should == ['Normal', ' Beast', '(honest!)']
+        cmd = @set.command(/perfectly (normal)( beast)?/i, &probe)
-      end
 
-      cmd.new.process_line %(Perfectly Normal Beast (honest!))
+        cmd.new.process_line %(Perfectly Normal Beast (honest!))
+      }.to yield_with_args('Normal', ' Beast', '(honest!)')
     end
   end