command_line_reporter 3.2.1 → 3.3.0

data/spec/nested_formatter_spec.rb

@@ -1,11 +1,10 @@
 require 'spec_helper'
-require 'nested_formatter'
 
 describe CommandLineReporter::NestedFormatter do
   subject { CommandLineReporter::NestedFormatter.instance }
 
-  before :all do
-    @controls = {
+  let(:controls) do
+    {
       :clear => "\e[0m",
       :bold => "\e[1m",
       :red => "\e[31m",
@@ -13,9 +12,20 @@ describe CommandLineReporter::NestedFormatter do
   end
 
   describe '#method default values' do
-    its(:message_string) { should == 'working' }
-    its(:complete_string) { should == 'complete' }
-    its(:indent_size) { should eq 2 }
+    describe '#message_string' do
+      subject { super().message_string }
+      it { should == 'working' }
+    end
+
+    describe '#complete_string' do
+      subject { super().complete_string }
+      it { should == 'complete' }
+    end
+
+    describe '#indent_size' do
+      subject { super().indent_size }
+      it { should eq 2 }
+    end
   end
 
   describe '#format' do
@@ -30,25 +40,25 @@ describe CommandLineReporter::NestedFormatter do
       end
 
       it 'raises exception when there is an invalid argument' do
-        lambda {
+        expect {
           subject.format({:asdf => true}, lambda { })
-        }.should raise_exception ArgumentError
+        }.to raise_exception ArgumentError
       end
 
       it 'raises an exception when a block is not given' do
-        lambda {
+        expect {
           subject.format({:message => 'test'})
-        }.should raise_exception
+        }.to raise_exception
       end
 
       it 'accepts valid arguments' do
-        subject.should_receive(:puts).with('test')
-        subject.should_receive(:puts).with('complete')
+        expect(subject).to receive(:puts).with('test')
+        expect(subject).to receive(:puts).with('complete')
 
-        lambda {
+        expect {
           subject.format({:message => 'test'}, lambda { }) do
           end
-        }.should_not raise_exception
+        }.not_to raise_exception
       end
     end
 
@@ -65,38 +75,38 @@ describe CommandLineReporter::NestedFormatter do
       end
 
       it 'performs a wrapped report' do
-        subject.should_receive(:puts).with('working')
-        subject.should_receive(:puts).with('complete')
+        expect(subject).to receive(:puts).with('working')
+        expect(subject).to receive(:puts).with('complete')
 
         subject.format({ }, lambda { })
       end
 
       it 'performs a wrapped report with color' do
-        subject.should_receive(:puts).with("#{@controls[:red]}working#{@controls[:clear]}")
-        subject.should_receive(:puts).with("#{@controls[:red]}complete#{@controls[:clear]}")
+        expect(subject).to receive(:puts).with("#{controls[:red]}working#{controls[:clear]}")
+        expect(subject).to receive(:puts).with("#{controls[:red]}complete#{controls[:clear]}")
 
         subject.format({:color => 'red'}, lambda { })
       end
 
       it 'performs a wrapped report with color' do
-        subject.should_receive(:puts).with("#{@controls[:bold]}working#{@controls[:clear]}")
-        subject.should_receive(:puts).with("#{@controls[:bold]}complete#{@controls[:clear]}")
+        expect(subject).to receive(:puts).with("#{controls[:bold]}working#{controls[:clear]}")
+        expect(subject).to receive(:puts).with("#{controls[:bold]}complete#{controls[:clear]}")
 
         subject.format({:bold => true}, lambda { })
       end
 
       it 'performs a wrapped report overriding the message' do
-        subject.should_receive(:puts).with('test')
-        subject.should_receive(:puts).with('complete')
+        expect(subject).to receive(:puts).with('test')
+        expect(subject).to receive(:puts).with('complete')
 
         subject.format({:message => 'test'}, lambda { })
       end
 
       it 'performs an inline report' do
-        subject.should_receive(:print).with('test...')
-        subject.should_receive(:puts).with('complete')
-        subject.should_receive(:print).with('test2...')
-        subject.should_receive(:puts).with('complete')
+        expect(subject).to receive(:print).with('test...')
+        expect(subject).to receive(:puts).with('complete')
+        expect(subject).to receive(:print).with('test2...')
+        expect(subject).to receive(:puts).with('complete')
 
         subject.format({:message => 'test', :type => 'inline'}, lambda { })
         subject.format({:message => 'test2', :type => 'inline'}, lambda { })
@@ -104,40 +114,40 @@ describe CommandLineReporter::NestedFormatter do
 
       it 'overrides the default for all invocations of a wrapped report' do
         subject.complete_string = 'done'
-        subject.should_receive(:puts).with('test')
-        subject.should_receive(:puts).with('done')
-        subject.should_receive(:puts).with('test2')
-        subject.should_receive(:puts).with('done')
+        expect(subject).to receive(:puts).with('test')
+        expect(subject).to receive(:puts).with('done')
+        expect(subject).to receive(:puts).with('test2')
+        expect(subject).to receive(:puts).with('done')
 
         subject.format({:message => 'test'}, lambda { })
         subject.format({:message => 'test2'}, lambda { })
       end
 
       it 'overrides the default complete string for a wrapped report' do
-        subject.should_receive(:puts).with('test')
-        subject.should_receive(:puts).with('done')
-        subject.should_receive(:puts).with('test2')
-        subject.should_receive(:puts).with('finally')
+        expect(subject).to receive(:puts).with('test')
+        expect(subject).to receive(:puts).with('done')
+        expect(subject).to receive(:puts).with('test2')
+        expect(subject).to receive(:puts).with('finally')
 
         subject.format({:message => 'test', :complete => 'done'}, lambda { })
         subject.format({:message => 'test2', :complete => 'finally'}, lambda { })
       end
 
       it 'overrides the default complete string for an inline report' do
-        subject.should_receive(:print).with('test...')
-        subject.should_receive(:puts).with('done')
-        subject.should_receive(:print).with('test2...')
-        subject.should_receive(:puts).with('finally')
+        expect(subject).to receive(:print).with('test...')
+        expect(subject).to receive(:puts).with('done')
+        expect(subject).to receive(:print).with('test2...')
+        expect(subject).to receive(:puts).with('finally')
 
         subject.format({:message => 'test', :type => 'inline', :complete => 'done'}, lambda { })
         subject.format({:message => 'test2', :type => 'inline', :complete => 'finally'}, lambda { })
       end
 
       it 'performs another wrapped report to ensure defaul behavior' do
-        subject.should_receive(:puts).with('test')
-        subject.should_receive(:puts).with('complete')
-        subject.should_receive(:puts).with('test2')
-        subject.should_receive(:puts).with('complete')
+        expect(subject).to receive(:puts).with('test')
+        expect(subject).to receive(:puts).with('complete')
+        expect(subject).to receive(:puts).with('test2')
+        expect(subject).to receive(:puts).with('complete')
 
         subject.format({:message => 'test'}, lambda { })
         subject.format({:message => 'test2'}, lambda { })
@@ -155,10 +165,10 @@ describe CommandLineReporter::NestedFormatter do
       end
 
       it 'indents the nested wrapped messages' do
-        subject.should_receive(:puts).with('test')
-        subject.should_receive(:puts).with('  test2')
-        subject.should_receive(:puts).with('  complete')
-        subject.should_receive(:puts).with('complete')
+        expect(subject).to receive(:puts).with('test')
+        expect(subject).to receive(:puts).with('  test2')
+        expect(subject).to receive(:puts).with('  complete')
+        expect(subject).to receive(:puts).with('complete')
 
         subject.format({:message => 'test'}, lambda {
           subject.format({:message => 'test2'}, lambda {})
@@ -166,10 +176,10 @@ describe CommandLineReporter::NestedFormatter do
       end
 
       it 'indents the nested wrapped messages and outputs color' do
-        subject.should_receive(:puts).with("#{@controls[:red]}test#{@controls[:clear]}")
-        subject.should_receive(:puts).with("#{@controls[:red]}  test2#{@controls[:clear]}")
-        subject.should_receive(:puts).with("#{@controls[:red]}  complete#{@controls[:clear]}")
-        subject.should_receive(:puts).with("#{@controls[:red]}complete#{@controls[:clear]}")
+        expect(subject).to receive(:puts).with("#{controls[:red]}test#{controls[:clear]}")
+        expect(subject).to receive(:puts).with("#{controls[:red]}  test2#{controls[:clear]}")
+        expect(subject).to receive(:puts).with("#{controls[:red]}  complete#{controls[:clear]}")
+        expect(subject).to receive(:puts).with("#{controls[:red]}complete#{controls[:clear]}")
 
         subject.format({:message => 'test', :color => 'red'}, lambda {
           subject.format({:message => 'test2', :color => 'red'}, lambda {})
@@ -177,10 +187,10 @@ describe CommandLineReporter::NestedFormatter do
       end
 
       it 'indents the nested wrapped messages and outputs bold' do
-        subject.should_receive(:puts).with("#{@controls[:bold]}test#{@controls[:clear]}")
-        subject.should_receive(:puts).with("#{@controls[:bold]}  test2#{@controls[:clear]}")
-        subject.should_receive(:puts).with("#{@controls[:bold]}  complete#{@controls[:clear]}")
-        subject.should_receive(:puts).with("#{@controls[:bold]}complete#{@controls[:clear]}")
+        expect(subject).to receive(:puts).with("#{controls[:bold]}test#{controls[:clear]}")
+        expect(subject).to receive(:puts).with("#{controls[:bold]}  test2#{controls[:clear]}")
+        expect(subject).to receive(:puts).with("#{controls[:bold]}  complete#{controls[:clear]}")
+        expect(subject).to receive(:puts).with("#{controls[:bold]}complete#{controls[:clear]}")
 
         subject.format({:message => 'test', :bold => true}, lambda {
           subject.format({:message => 'test2', :bold => true}, lambda {})
@@ -188,12 +198,12 @@ describe CommandLineReporter::NestedFormatter do
       end
 
       it 'indents the multiple nested wrapped messages' do
-        subject.should_receive(:puts).with('test')
-        subject.should_receive(:puts).with('  test2')
-        subject.should_receive(:puts).with('    test3')
-        subject.should_receive(:puts).with('    complete')
-        subject.should_receive(:puts).with('  complete')
-        subject.should_receive(:puts).with('complete')
+        expect(subject).to receive(:puts).with('test')
+        expect(subject).to receive(:puts).with('  test2')
+        expect(subject).to receive(:puts).with('    test3')
+        expect(subject).to receive(:puts).with('    complete')
+        expect(subject).to receive(:puts).with('  complete')
+        expect(subject).to receive(:puts).with('complete')
 
         subject.format({:message => 'test'}, lambda {
           subject.format({:message => 'test2'}, lambda {
@@ -203,10 +213,10 @@ describe CommandLineReporter::NestedFormatter do
       end
 
       it 'indents the nested wrapped and inline messages' do
-        subject.should_receive(:puts).with('test')
-        subject.should_receive(:print).with('  test2...')
-        subject.should_receive(:puts).with('complete')
-        subject.should_receive(:puts).with('complete')
+        expect(subject).to receive(:puts).with('test')
+        expect(subject).to receive(:print).with('  test2...')
+        expect(subject).to receive(:puts).with('complete')
+        expect(subject).to receive(:puts).with('complete')
 
         subject.format({:message => 'test'}, lambda {
           subject.format({:message => 'test2', :type => 'inline'}, lambda { })
@@ -214,12 +224,12 @@ describe CommandLineReporter::NestedFormatter do
       end
 
       it 'indents the multiple nested wrapped messages' do
-        subject.should_receive(:puts).with('test')
-        subject.should_receive(:puts).with('  test2')
-        subject.should_receive(:print).with('    test3...')
-        subject.should_receive(:puts).with('complete')
-        subject.should_receive(:puts).with('  complete')
-        subject.should_receive(:puts).with('complete')
+        expect(subject).to receive(:puts).with('test')
+        expect(subject).to receive(:puts).with('  test2')
+        expect(subject).to receive(:print).with('    test3...')
+        expect(subject).to receive(:puts).with('complete')
+        expect(subject).to receive(:puts).with('  complete')
+        expect(subject).to receive(:puts).with('complete')
 
         subject.format({:message => 'test'}, lambda {
           subject.format({:message => 'test2'}, lambda {
@@ -229,12 +239,12 @@ describe CommandLineReporter::NestedFormatter do
       end
 
       it 'overrides the indent spacing of all messages' do
-        subject.should_receive(:puts).with('test')
-        subject.should_receive(:puts).with('    test2')
-        subject.should_receive(:print).with('        test3...')
-        subject.should_receive(:puts).with('complete')
-        subject.should_receive(:puts).with('    complete')
-        subject.should_receive(:puts).with('complete')
+        expect(subject).to receive(:puts).with('test')
+        expect(subject).to receive(:puts).with('    test2')
+        expect(subject).to receive(:print).with('        test3...')
+        expect(subject).to receive(:puts).with('complete')
+        expect(subject).to receive(:puts).with('    complete')
+        expect(subject).to receive(:puts).with('complete')
 
         subject.indent_size = 4
 
@@ -246,12 +256,12 @@ describe CommandLineReporter::NestedFormatter do
       end
 
       it 'overrides the indent spacing of specific message' do
-        subject.should_receive(:puts).with('test')
-        subject.should_receive(:puts).with('      test2')
-        subject.should_receive(:print).with('      test3...')
-        subject.should_receive(:puts).with('complete')
-        subject.should_receive(:puts).with('      complete')
-        subject.should_receive(:puts).with('complete')
+        expect(subject).to receive(:puts).with('test')
+        expect(subject).to receive(:puts).with('      test2')
+        expect(subject).to receive(:print).with('      test3...')
+        expect(subject).to receive(:puts).with('complete')
+        expect(subject).to receive(:puts).with('      complete')
+        expect(subject).to receive(:puts).with('complete')
 
         subject.indent_size = 4
 
@@ -265,12 +275,12 @@ describe CommandLineReporter::NestedFormatter do
       it 'performs the sums specified in the block' do
         x,y,z = 0,0,0
 
-        subject.should_receive(:puts).with('sum x and 10')
-        subject.should_receive(:puts).with('  y is the difference of 20 and x')
-        subject.should_receive(:puts).with('    z = x + y')
-        subject.should_receive(:puts).with('    complete')
-        subject.should_receive(:puts).with('  complete')
-        subject.should_receive(:puts).with('complete')
+        expect(subject).to receive(:puts).with('sum x and 10')
+        expect(subject).to receive(:puts).with('  y is the difference of 20 and x')
+        expect(subject).to receive(:puts).with('    z = x + y')
+        expect(subject).to receive(:puts).with('    complete')
+        expect(subject).to receive(:puts).with('  complete')
+        expect(subject).to receive(:puts).with('complete')
 
         subject.format({:message => 'sum x and 10'}, lambda {
           x = x + 10
@@ -282,9 +292,9 @@ describe CommandLineReporter::NestedFormatter do
           })
         })
 
-        x.should == 10
-        y.should == 10
-        z.should == 20
+        expect(x).to eq(10)
+        expect(y).to eq(10)
+        expect(z).to eq(20)
       end
     end
   end

data/spec/options_validator_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'options_validator'
 
 describe OptionsValidator do
   subject { Class.new.extend(OptionsValidator) }

data/spec/progress_formatter_spec.rb

@@ -1,15 +1,17 @@
 require 'spec_helper'
-require 'progress_formatter'
 
 describe CommandLineReporter::ProgressFormatter do
   subject { CommandLineReporter::ProgressFormatter.instance }
 
   describe '#method default values' do
-    its(:indicator) { should == '.' }
+    describe '#indicator' do
+      subject { super().indicator }
+      it { should == '.' }
+    end
   end
 
-  before :all do
-    @controls = {
+  let :controls do
+    {
       :clear => "\e[0m",
       :bold => "\e[1m",
       :red => "\e[31m",
@@ -18,8 +20,8 @@ describe CommandLineReporter::ProgressFormatter do
 
   describe '#format' do
     it 'displays dots for the indicator' do
-      subject.should_receive(:print).exactly(10).times.with('.')
-      subject.should_receive(:puts).exactly(1).times
+      expect(subject).to receive(:print).exactly(10).times.with('.')
+      expect(subject).to receive(:puts).exactly(1).times
 
       subject.format({}, lambda {
         10.times {subject.progress}
@@ -27,8 +29,8 @@ describe CommandLineReporter::ProgressFormatter do
     end
 
     it 'displays colored red dots for the indicator' do
-      subject.should_receive(:print).exactly(10).times.with("#{@controls[:red]}.#{@controls[:clear]}")
-      subject.should_receive(:puts).exactly(1).times
+      expect(subject).to receive(:print).exactly(10).times.with("#{controls[:red]}.#{controls[:clear]}")
+      expect(subject).to receive(:puts).exactly(1).times
 
       subject.format({:color => 'red'}, lambda {
         10.times {subject.progress}
@@ -36,8 +38,8 @@ describe CommandLineReporter::ProgressFormatter do
     end
 
     it 'displays BOLD dots for the indicator' do
-      subject.should_receive(:print).exactly(10).times.with("#{@controls[:bold]}.#{@controls[:clear]}")
-      subject.should_receive(:puts).exactly(1).times
+      expect(subject).to receive(:print).exactly(10).times.with("#{controls[:bold]}.#{controls[:clear]}")
+      expect(subject).to receive(:puts).exactly(1).times
 
       subject.format({:bold => true}, lambda {
         10.times {subject.progress}
@@ -46,8 +48,8 @@ describe CommandLineReporter::ProgressFormatter do
 
     it 'uses the defined indicator' do
       subject.indicator = '+'
-      subject.should_receive(:print).exactly(10).times.with('+')
-      subject.should_receive(:puts)
+      expect(subject).to receive(:print).exactly(10).times.with('+')
+      expect(subject).to receive(:puts)
 
       subject.format({}, lambda {
         10.times {subject.progress}
@@ -56,8 +58,8 @@ describe CommandLineReporter::ProgressFormatter do
     end
 
     it 'allows override of the indicator' do
-      subject.should_receive(:print).exactly(10).times.with('=')
-      subject.should_receive(:puts)
+      expect(subject).to receive(:print).exactly(10).times.with('=')
+      expect(subject).to receive(:puts)
 
       subject.format({:indicator => '='}, lambda {
         10.times {subject.progress}
@@ -67,8 +69,8 @@ describe CommandLineReporter::ProgressFormatter do
 
   describe '#progress' do
     it 'allows override of the indicator' do
-      subject.should_receive(:print).exactly(10).times.with('+')
-      subject.should_receive(:puts)
+      expect(subject).to receive(:print).exactly(10).times.with('+')
+      expect(subject).to receive(:puts)
 
       subject.format({}, lambda {
         10.times {subject.progress('+')}
@@ -76,8 +78,8 @@ describe CommandLineReporter::ProgressFormatter do
     end
 
     it 'allows any indicator' do
-      subject.should_receive(:print).exactly(10).times
-      subject.should_receive(:puts)
+      expect(subject).to receive(:print).exactly(10).times
+      expect(subject).to receive(:puts)
 
       subject.format({}, lambda {
         10.times {|i| subject.progress("#{i}")}

data/spec/row_spec.rb

@@ -1,63 +1,69 @@
 require 'spec_helper'
-require 'row'
 
 describe CommandLineReporter::Row do
-  before :each do
-    @cols = 10.times.map {|v| CommandLineReporter::Column.new("test#{v}")}
-  end
+  let(:cols) { 10.times.map {|v| CommandLineReporter::Column.new("test#{v}")} }
 
   describe '#initialize' do
     it 'accepts header' do
-      CommandLineReporter::Row.new(:header => true).header.should be_true
+      expect(CommandLineReporter::Row.new(:header => true).header).to be_true
     end
 
     it 'accepts color' do
-      CommandLineReporter::Row.new(:color => 'red').color.should == 'red'
+      expect(CommandLineReporter::Row.new(:color => 'red').color).to eq('red')
     end
 
     it 'accepts bold' do
-      CommandLineReporter::Row.new(:bold => true).bold.should be_true
+      expect(CommandLineReporter::Row.new(:bold => true).bold).to be_true
+    end
+
+    it 'output encoding should be ascii' do
+      expect(CommandLineReporter::Row.new(:encoding => :ascii).encoding).to eq(:ascii)
     end
+
+    it 'output encoding should be unicode' do
+      expect(CommandLineReporter::Row.new.encoding).to be_false
+    end
+
   end
 
   describe '#add' do
     subject { CommandLineReporter::Row.new }
 
     it 'columns' do
-      subject.add(@cols[0])
-      subject.columns.size.should == 1
-      subject.columns[0].should == @cols[0]
-      subject.add(@cols[1])
-      subject.columns.should == @cols[0,2]
+      subject.add(cols[0])
+      expect(subject.columns.size).to eq(1)
+      expect(subject.columns[0]).to eq(cols[0])
+      subject.add(cols[1])
+      expect(subject.columns).to eq(cols[0,2])
     end
 
     it 'defaults colors on columns' do
       row = CommandLineReporter::Row.new(:color => 'red')
-      row.add(@cols[0])
-      row.columns[0].color.should == 'red'
-      row.add(@cols[1])
-      row.columns[1].color.should == 'red'
+      row.add(cols[0])
+      expect(row.columns[0].color).to eq('red')
+      row.add(cols[1])
+      expect(row.columns[1].color).to eq('red')
     end
 
     it 'allows columns to override the row color' do
       col = CommandLineReporter::Column.new('test', :color => 'blue')
       row = CommandLineReporter::Row.new(:color => 'red')
       row.add(col)
-      row.columns[0].color.should == 'blue'
+      expect(row.columns[0].color).to eq('blue')
     end
 
     it 'supercedes bold on columns' do
       row = CommandLineReporter::Row.new(:bold => true)
-      row.add(@cols[0])
-      row.columns[0].bold.should be_true
-      row.add(@cols[1])
-      row.columns[1].bold.should be_true
+      row.add(cols[0])
+      expect(row.columns[0].bold).to be_true
+      row.add(cols[1])
+      expect(row.columns[1].bold).to be_true
     end
   end
 
   describe '#output' do
-    before :each do
-      @cols = [
+    let :cols do
+      [
         CommandLineReporter::Column.new('asdf'),
         CommandLineReporter::Column.new('qwer', :align => 'center'),
         CommandLineReporter::Column.new('zxcv', :align => 'right'),
@@ -67,56 +73,54 @@ describe CommandLineReporter::Row do
       ]
     end
 
-    before :all do
-      @one_space = ' '
-      @three_spaces = ' {3,3}'
-      @six_spaces = ' {6,6}'
-      @nine_spaces = ' {9,9}'
-      @five_xs = 'x{5,5}'
-      @ten_xs = 'x{10,10}'
-    end
+    let(:one_space) { ' ' }
+    let(:three_spaces) { ' {3,3}' }
+    let(:six_spaces) { ' {6,6}' }
+    let(:nine_spaces) { ' {9,9}' }
+    let(:five_xs) { 'x{5,5}' }
+    let(:ten_xs) { 'x{10,10}' }
 
     context 'no border' do
       context 'no wrap' do
         it 'outputs a single column' do
-          subject.add(@cols[0])
-          subject.should_receive(:puts).with(/^asdf#{@six_pieces}/)
+          subject.add(cols[0])
+          expect(subject).to receive(:puts).with(/^asdf#{@six_pieces}/)
           subject.output
         end
         it 'outputs three columns' do
-          subject.add(@cols[0])
-          subject.add(@cols[1])
-          subject.add(@cols[2])
-          subject.should_receive(:puts).with(/^asdf#{@six_spaces}#{@one_space}#{@three_spaces}qwer#{@three_spaces}#{@one_space}#{@six_spaces}zxcv $/)
+          subject.add(cols[0])
+          subject.add(cols[1])
+          subject.add(cols[2])
+          expect(subject).to receive(:puts).with(/^asdf#{six_spaces}#{one_space}#{three_spaces}qwer#{three_spaces}#{one_space}#{six_spaces}zxcv $/)
           subject.output
         end
       end
 
       context 'with wrapping' do
         it 'outputs a single column' do
-          subject.add(@cols[3])
-          subject.should_receive(:puts).with(/^#{@ten_xs}#{@one_space}$/)
-          subject.should_receive(:puts).with(/^#{@ten_xs}#{@one_space}$/)
-          subject.should_receive(:puts).with(/^#{@five_xs}#{@six_spaces}$/)
+          subject.add(cols[3])
+          expect(subject).to receive(:puts).with(/^#{ten_xs}#{one_space}$/)
+          expect(subject).to receive(:puts).with(/^#{ten_xs}#{one_space}$/)
+          expect(subject).to receive(:puts).with(/^#{five_xs}#{six_spaces}$/)
           subject.output
         end
 
         it 'outputs multiple columns of the same size' do
-          subject.add(@cols[3])
-          subject.add(@cols[4])
-          subject.should_receive(:puts).with(/^#{@ten_xs}#{@one_space}#{@ten_xs}#{@one_space}$/)
-          subject.should_receive(:puts).with(/^#{@ten_xs}#{@one_space}#{@ten_xs}#{@one_space}$/)
-          subject.should_receive(:puts).with(/^#{@five_xs}#{@nine_spaces}#{@five_xs}#{@three_spaces}$/)
+          subject.add(cols[3])
+          subject.add(cols[4])
+          expect(subject).to receive(:puts).with(/^#{ten_xs}#{one_space}#{ten_xs}#{one_space}$/)
+          expect(subject).to receive(:puts).with(/^#{ten_xs}#{one_space}#{ten_xs}#{one_space}$/)
+          expect(subject).to receive(:puts).with(/^#{five_xs}#{nine_spaces}#{five_xs}#{three_spaces}$/)
           subject.output
         end
 
         it 'outputs multiple columns with different sizes' do
-          subject.add(@cols[5])
-          subject.add(@cols[3])
-          subject.should_receive(:puts).with(/^#{@ten_xs}#{@one_space}#{@ten_xs}#{@one_space}$/)
-          subject.should_receive(:puts).with(/^#{@ten_xs}#{@one_space}#{@ten_xs}#{@one_space}$/)
-          subject.should_receive(:puts).with(/^#{@ten_xs}#{@one_space}#{@five_xs}#{@six_spaces}$/)
-          subject.should_receive(:puts).with(/^#{@five_xs} {5,17}$/)
+          subject.add(cols[5])
+          subject.add(cols[3])
+          expect(subject).to receive(:puts).with(/^#{ten_xs}#{one_space}#{ten_xs}#{one_space}$/)
+          expect(subject).to receive(:puts).with(/^#{ten_xs}#{one_space}#{ten_xs}#{one_space}$/)
+          expect(subject).to receive(:puts).with(/^#{ten_xs}#{one_space}#{five_xs}#{six_spaces}$/)
+          expect(subject).to receive(:puts).with(/^#{five_xs} {5,17}$/)
           subject.output
         end
       end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
 
-Dir[File.dirname(__FILE__) + "../lib/*.rb"].each {|f| require f}
-Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
+require 'command_line_reporter'
+
+require_relative 'support/helpers/stdout'
+require_relative 'support/matchers/argument'