command_line_reporter 3.3.4 → 4.0.2

data/spec/nested_formatter_spec.rb

@@ -5,9 +5,9 @@ describe CommandLineReporter::NestedFormatter do
 
   let(:controls) do
     {
-      :clear => "\e[0m",
-      :bold => "\e[1m",
-      :red => "\e[31m",
+      clear: "\e[0m",
+      bold: "\e[1m",
+      red: "\e[31m"
     }
   end
 
@@ -40,25 +40,25 @@ describe CommandLineReporter::NestedFormatter do
       end
 
       it 'raises exception when there is an invalid argument' do
-        expect {
-          subject.format({:asdf => true}, lambda { })
-        }.to raise_exception ArgumentError
+        expect do
+          subject.format({ asdf: true }, -> {})
+        end.to raise_exception ArgumentError
       end
 
       it 'raises an exception when a block is not given' do
-        expect {
-          subject.format({:message => 'test'})
-        }.to raise_exception
+        expect do
+          subject.format(message: 'test')
+        end.to raise_exception Exception
       end
 
       it 'accepts valid arguments' do
         expect(subject).to receive(:puts).with('test')
         expect(subject).to receive(:puts).with('complete')
 
-        expect {
-          subject.format({:message => 'test'}, lambda { }) do
+        expect do
+          subject.format({ message: 'test' }, -> {}) do
           end
-        }.not_to raise_exception
+        end.not_to raise_exception
       end
     end
 
@@ -78,28 +78,28 @@ describe CommandLineReporter::NestedFormatter do
         expect(subject).to receive(:puts).with('working')
         expect(subject).to receive(:puts).with('complete')
 
-        subject.format({ }, lambda { })
+        subject.format({}, -> {})
       end
 
       it 'performs a wrapped report with color' do
         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 { })
+        subject.format({ color: 'red' }, -> {})
       end
 
       it 'performs a wrapped report with color' do
         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 { })
+        subject.format({ bold: true }, -> {})
       end
 
       it 'performs a wrapped report overriding the message' do
         expect(subject).to receive(:puts).with('test')
         expect(subject).to receive(:puts).with('complete')
 
-        subject.format({:message => 'test'}, lambda { })
+        subject.format({ message: 'test' }, -> {})
       end
 
       it 'performs an inline report' do
@@ -108,8 +108,8 @@ describe CommandLineReporter::NestedFormatter do
         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 { })
+        subject.format({ message: 'test', type: 'inline' }, -> {})
+        subject.format({ message: 'test2', type: 'inline' }, -> {})
       end
 
       it 'overrides the default for all invocations of a wrapped report' do
@@ -119,8 +119,8 @@ describe CommandLineReporter::NestedFormatter do
         expect(subject).to receive(:puts).with('test2')
         expect(subject).to receive(:puts).with('done')
 
-        subject.format({:message => 'test'}, lambda { })
-        subject.format({:message => 'test2'}, lambda { })
+        subject.format({ message: 'test' }, -> {})
+        subject.format({ message: 'test2' }, -> {})
       end
 
       it 'overrides the default complete string for a wrapped report' do
@@ -129,8 +129,8 @@ describe CommandLineReporter::NestedFormatter do
         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 { })
+        subject.format({ message: 'test', complete: 'done' }, -> {})
+        subject.format({ message: 'test2', complete: 'finally' }, -> {})
       end
 
       it 'overrides the default complete string for an inline report' do
@@ -139,8 +139,8 @@ describe CommandLineReporter::NestedFormatter do
         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 { })
+        subject.format({ message: 'test', type: 'inline', complete: 'done' }, -> {})
+        subject.format({ message: 'test2', type: 'inline', complete: 'finally' }, -> {})
       end
 
       it 'performs another wrapped report to ensure defaul behavior' do
@@ -149,8 +149,8 @@ describe CommandLineReporter::NestedFormatter do
         expect(subject).to receive(:puts).with('test2')
         expect(subject).to receive(:puts).with('complete')
 
-        subject.format({:message => 'test'}, lambda { })
-        subject.format({:message => 'test2'}, lambda { })
+        subject.format({ message: 'test' }, -> {})
+        subject.format({ message: 'test2' }, -> {})
       end
     end
 
@@ -170,9 +170,9 @@ describe CommandLineReporter::NestedFormatter do
         expect(subject).to receive(:puts).with('  complete')
         expect(subject).to receive(:puts).with('complete')
 
-        subject.format({:message => 'test'}, lambda {
-          subject.format({:message => 'test2'}, lambda {})
-        })
+        subject.format({ message: 'test' }, lambda do
+          subject.format({ message: 'test2' }, -> {})
+        end)
       end
 
       it 'indents the nested wrapped messages and outputs color' do
@@ -181,9 +181,9 @@ describe CommandLineReporter::NestedFormatter do
         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 {})
-        })
+        subject.format({ message: 'test', color: 'red' }, lambda do
+          subject.format({ message: 'test2', color: 'red' }, -> {})
+        end)
       end
 
       it 'indents the nested wrapped messages and outputs bold' do
@@ -192,9 +192,9 @@ describe CommandLineReporter::NestedFormatter do
         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 {})
-        })
+        subject.format({ message: 'test', bold: true }, lambda do
+          subject.format({ message: 'test2', bold: true }, -> {})
+        end)
       end
 
       it 'indents the multiple nested wrapped messages' do
@@ -205,11 +205,11 @@ describe CommandLineReporter::NestedFormatter do
         expect(subject).to receive(:puts).with('  complete')
         expect(subject).to receive(:puts).with('complete')
 
-        subject.format({:message => 'test'}, lambda {
-          subject.format({:message => 'test2'}, lambda {
-            subject.format({:message => 'test3'}, lambda { })
-          })
-        })
+        subject.format({ message: 'test' }, lambda do
+          subject.format({ message: 'test2' }, lambda do
+            subject.format({ message: 'test3' }, -> {})
+          end)
+        end)
       end
 
       it 'indents the nested wrapped and inline messages' do
@@ -218,9 +218,9 @@ describe CommandLineReporter::NestedFormatter do
         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 { })
-        })
+        subject.format({ message: 'test' }, lambda do
+          subject.format({ message: 'test2', type: 'inline' }, -> {})
+        end)
       end
 
       it 'indents the multiple nested wrapped messages' do
@@ -231,11 +231,11 @@ describe CommandLineReporter::NestedFormatter do
         expect(subject).to receive(:puts).with('  complete')
         expect(subject).to receive(:puts).with('complete')
 
-        subject.format({:message => 'test'}, lambda {
-          subject.format({:message => 'test2'}, lambda {
-            subject.format({:message => 'test3', :type => 'inline'}, lambda { })
-          })
-        })
+        subject.format({ message: 'test' }, lambda do
+          subject.format({ message: 'test2' }, lambda do
+            subject.format({ message: 'test3', type: 'inline' }, -> {})
+          end)
+        end)
       end
 
       it 'overrides the indent spacing of all messages' do
@@ -248,11 +248,11 @@ describe CommandLineReporter::NestedFormatter do
 
         subject.indent_size = 4
 
-        subject.format({:message => 'test'}, lambda {
-          subject.format({:message => 'test2'}, lambda {
-            subject.format({:message => 'test3', :type => 'inline'}, lambda { })
-          })
-        })
+        subject.format({ message: 'test' }, lambda do
+          subject.format({ message: 'test2' }, lambda do
+            subject.format({ message: 'test3', type: 'inline' }, -> {})
+          end)
+        end)
       end
 
       it 'overrides the indent spacing of specific message' do
@@ -265,15 +265,15 @@ describe CommandLineReporter::NestedFormatter do
 
         subject.indent_size = 4
 
-        subject.format({:message => 'test'}, lambda {
-          subject.format({:message => 'test2', :indent_size => 6}, lambda {
-            subject.format({:message => 'test3', :type => 'inline', :indent_size => 3}, lambda { })
-          }) 
-        })
+        subject.format({ message: 'test' }, lambda do
+          subject.format({ message: 'test2', indent_size: 6 }, lambda do
+            subject.format({ message: 'test3', type: 'inline', indent_size: 3 }, -> {})
+          end)
+        end)
       end
 
       it 'performs the sums specified in the block' do
-        x,y,z = 0,0,0
+        x, y, z = 0, 0, 0
 
         expect(subject).to receive(:puts).with('sum x and 10')
         expect(subject).to receive(:puts).with('  y is the difference of 20 and x')
@@ -282,15 +282,15 @@ describe CommandLineReporter::NestedFormatter do
         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
-          subject.format({:message => 'y is the difference of 20 and x'}, lambda {
+        subject.format({ message: 'sum x and 10' }, lambda do
+          x += 10
+          subject.format({ message: 'y is the difference of 20 and x' }, lambda do
             y = 20 - x
-            subject.format({:message => 'z = x + y'}, lambda {
+            subject.format({ message: 'z = x + y' }, lambda do
               z = x + y
-            })
-          })
-        })
+            end)
+          end)
+        end)
 
         expect(x).to eq(10)
         expect(y).to eq(10)

data/spec/options_validator_spec.rb

@@ -4,21 +4,21 @@ describe OptionsValidator do
   subject { Class.new.extend(OptionsValidator) }
 
   it 'accepts single key options' do
-    expect {
-      subject.validate_options({:valid => true}, :valid)
-    }.to_not raise_error
+    expect do
+      subject.validate_options({ valid: true }, :valid)
+    end.to_not raise_error Exception
   end
 
   it 'rejects invalid option hashes' do
-    expect {
-      subject.validate_options({:wrong => true}, :valid)
-    }.to raise_error ArgumentError
+    expect do
+      subject.validate_options({ wrong: true }, :valid)
+    end.to raise_error ArgumentError
   end
 
   it 'accepts multi-key options' do
-    expect {
-      valid = [:valid, :another]
-      subject.validate_options({:valid => true, :another => true}, *valid)
-    }.to_not raise_error
+    expect do
+      valid = %i[valid another]
+      subject.validate_options({ valid: true, another: true }, *valid)
+    end.to_not raise_error Exception
   end
 end

data/spec/progress_formatter_spec.rb

@@ -12,9 +12,9 @@ describe CommandLineReporter::ProgressFormatter do
 
   let :controls do
     {
-      :clear => "\e[0m",
-      :bold => "\e[1m",
-      :red => "\e[31m",
+      clear: "\e[0m",
+      bold: "\e[1m",
+      red: "\e[31m"
     }
   end
 
@@ -23,27 +23,21 @@ describe CommandLineReporter::ProgressFormatter do
       expect(subject).to receive(:print).exactly(10).times.with('.')
       expect(subject).to receive(:puts).exactly(1).times
 
-      subject.format({}, lambda {
-        10.times {subject.progress}
-      })
+      subject.format({}, -> { 10.times { subject.progress } })
     end
 
     it 'displays colored red dots for the indicator' do
       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}
-      })
+      subject.format({ color: 'red' }, -> { 10.times { subject.progress } })
     end
 
     it 'displays BOLD dots for the indicator' do
       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}
-      })
+      subject.format({ bold: true }, -> { 10.times { subject.progress } })
     end
 
     it 'uses the defined indicator' do
@@ -51,19 +45,14 @@ describe CommandLineReporter::ProgressFormatter do
       expect(subject).to receive(:print).exactly(10).times.with('+')
       expect(subject).to receive(:puts)
 
-      subject.format({}, lambda {
-        10.times {subject.progress}
-      })
-
+      subject.format({}, -> { 10.times { subject.progress } })
     end
 
     it 'allows override of the indicator' do
       expect(subject).to receive(:print).exactly(10).times.with('=')
       expect(subject).to receive(:puts)
 
-      subject.format({:indicator => '='}, lambda {
-        10.times {subject.progress}
-      })
+      subject.format({ indicator: '=' }, -> { 10.times { subject.progress } })
     end
   end
 
@@ -72,18 +61,14 @@ describe CommandLineReporter::ProgressFormatter do
       expect(subject).to receive(:print).exactly(10).times.with('+')
       expect(subject).to receive(:puts)
 
-      subject.format({}, lambda {
-        10.times {subject.progress('+')}
-      })
+      subject.format({}, -> { 10.times { subject.progress('+') } })
     end
 
     it 'allows any indicator' do
       expect(subject).to receive(:print).exactly(10).times
       expect(subject).to receive(:puts)
 
-      subject.format({}, lambda {
-        10.times {|i| subject.progress("#{i}")}
-      })
+      subject.format({}, -> { 10.times { |i| subject.progress("#{i}") } })
     end
   end
 end

data/spec/row_spec.rb

@@ -1,44 +1,46 @@
 require 'spec_helper'
 
 describe CommandLineReporter::Row do
-  let(:cols) { 10.times.map {|v| CommandLineReporter::Column.new("test#{v}")} }
+  let(:cols) { Array.new(10) { |v| CommandLineReporter::Column.new("test#{v}") } }
 
   describe '#initialize' do
+    subject { CommandLineReporter::Row }
+
     it 'accepts header' do
-      expect(CommandLineReporter::Row.new(:header => true).header).to be true
+      expect(subject.new(header: true).header).to be true
     end
 
     it 'accepts color' do
-      expect(CommandLineReporter::Row.new(:color => 'red').color).to eq('red')
+      expect(subject.new(color: 'red').color).to eq('red')
     end
 
     it 'accepts bold' do
-      expect(CommandLineReporter::Row.new(:bold => true).bold).to be true
+      expect(subject.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)
+      expect(subject.new(encoding: :ascii).encoding).to eq(:ascii)
     end
 
     it 'output encoding should be unicode' do
-      expect(CommandLineReporter::Row.new.encoding).to eq(:unicode)
+      expect(subject.new.encoding).to eq(:unicode)
     end
-
   end
 
   describe '#add' do
-    subject { CommandLineReporter::Row.new }
+    subject { CommandLineReporter::Row }
 
     it 'columns' do
-      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])
+      row = CommandLineReporter::Row.new
+      row.add(cols[0])
+      expect(row.columns.size).to eq(1)
+      expect(row.columns[0]).to eq(cols[0])
+      row.add(cols[1])
+      expect(row.columns).to eq(cols[0, 2])
     end
 
     it 'defaults colors on columns' do
-      row = CommandLineReporter::Row.new(:color => 'red')
+      row = subject.new(color: 'red')
       row.add(cols[0])
       expect(row.columns[0].color).to eq('red')
       row.add(cols[1])
@@ -46,14 +48,14 @@ describe CommandLineReporter::Row do
     end
 
     it 'allows columns to override the row color' do
-      col = CommandLineReporter::Column.new('test', :color => 'blue')
-      row = CommandLineReporter::Row.new(:color => 'red')
+      col = CommandLineReporter::Column.new('test', color: 'blue')
+      row = subject.new(color: 'red')
       row.add(col)
       expect(row.columns[0].color).to eq('blue')
     end
 
     it 'supercedes bold on columns' do
-      row = CommandLineReporter::Row.new(:bold => true)
+      row = subject.new(bold: true)
       row.add(cols[0])
       expect(row.columns[0].bold).to be true
       row.add(cols[1])
@@ -65,11 +67,11 @@ describe CommandLineReporter::Row do
     let :cols do
       [
         CommandLineReporter::Column.new('asdf'),
-        CommandLineReporter::Column.new('qwer', :align => 'center'),
-        CommandLineReporter::Column.new('zxcv', :align => 'right'),
-        CommandLineReporter::Column.new('x' * 25, :align => 'left', :width => 10),
-        CommandLineReporter::Column.new('x' * 25, :align => 'center', :width => 10),
-        CommandLineReporter::Column.new('x' * 35, :align => 'left', :width => 10),
+        CommandLineReporter::Column.new('qwer', align: 'center'),
+        CommandLineReporter::Column.new('zxcv', align: 'right'),
+        CommandLineReporter::Column.new('x' * 25, align: 'left', width: 10),
+        CommandLineReporter::Column.new('x' * 25, align: 'center', width: 10),
+        CommandLineReporter::Column.new('x' * 35, align: 'left', width: 10)
       ]
     end