columnist 1.1.0 → 1.2.0

data/spec/progress_formatter_spec.rb

@@ -1,89 +1,89 @@
 require 'spec_helper'
 
 describe Columnist::ProgressFormatter do
-  subject { Columnist::ProgressFormatter.instance }
+    subject { Columnist::ProgressFormatter.instance }
 
-  describe '#method default values' do
-    describe '#indicator' do
-      subject { super().indicator }
-      it { should == '.' }
+    describe '#method default values' do
+        describe '#indicator' do
+            subject { super().indicator }
+            it { should == '.' }
+        end
     end
-  end
-
-  let :controls do
-    {
-      :clear => "\e[0m",
-      :bold => "\e[1m",
-      :red => "\e[31m",
-    }
-  end
-
-  describe '#format' do
-    it 'displays dots for the indicator' 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}
-      })
-    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}
-      })
+    let :controls do
+        {
+            :clear => "\e[0m",
+            :bold  => "\e[1m",
+            :red   => "\e[31m",
+        }
     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}
-      })
+    describe '#format' do
+        it 'displays dots for the indicator' 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 }
+            })
+        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 }
+            })
+        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 }
+            })
+        end
+
+        it 'uses the defined indicator' do
+            subject.indicator = '+'
+            expect(subject).to receive(:print).exactly(10).times.with('+')
+            expect(subject).to receive(:puts)
+
+            subject.format({}, lambda {
+                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 }
+            })
+        end
     end
 
-    it 'uses the defined indicator' do
-      subject.indicator = '+'
-      expect(subject).to receive(:print).exactly(10).times.with('+')
-      expect(subject).to receive(:puts)
-
-      subject.format({}, lambda {
-        10.times {subject.progress}
-      })
-
-    end
+    describe '#progress' do
+        it 'allows override of the indicator' do
+            expect(subject).to receive(:print).exactly(10).times.with('+')
+            expect(subject).to receive(:puts)
 
-    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}
-      })
-    end
-  end
-
-  describe '#progress' do
-    it 'allows override of the indicator' do
-      expect(subject).to receive(:print).exactly(10).times.with('+')
-      expect(subject).to receive(:puts)
-
-      subject.format({}, lambda {
-        10.times {subject.progress('+')}
-      })
-    end
+            subject.format({}, lambda {
+                10.times { subject.progress('+') }
+            })
+        end
 
-    it 'allows any indicator' do
-      expect(subject).to receive(:print).exactly(10).times
-      expect(subject).to receive(:puts)
+        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({}, lambda {
+                10.times { |i| subject.progress(" #{i}") }
+            })
+        end
     end
-  end
 end

data/spec/row_spec.rb

@@ -1,129 +1,129 @@
 require 'spec_helper'
 
 describe Columnist::Row do
-  let(:cols) { 10.times.map {|v| Columnist::Column.new("test#{v}")} }
+    let(:cols) { 10.times.map { |v| Columnist::Column.new("test#{v}") } }
 
-  describe '#initialize' do
-    it 'accepts header' do
-      expect(Columnist::Row.new(:header => true).header).to be_true
-    end
-
-    it 'accepts color' do
-      expect(Columnist::Row.new(:color => 'red').color).to eq('red')
-    end
-
-    it 'accepts bold' do
-      expect(Columnist::Row.new(:bold => true).bold).to be_true
-    end
-
-    it 'output encoding should be ascii' do
-      expect(Columnist::Row.new(:encoding => :ascii).encoding).to eq(:ascii)
-    end
+    describe '#initialize' do
+        it 'accepts header' do
+            expect(Columnist::Row.new(:header => true).header).to be_true
+        end
 
-    it 'output encoding should be unicode' do
-      expect(Columnist::Row.new.encoding).to eq(:unicode)
-    end
+        it 'accepts color' do
+            expect(Columnist::Row.new(:color => 'red').color).to eq('red')
+        end
 
-  end
+        it 'accepts bold' do
+            expect(Columnist::Row.new(:bold => true).bold).to be_true
+        end
 
-  describe '#add' do
-    subject { Columnist::Row.new }
+        it 'output encoding should be ascii' do
+            expect(Columnist::Row.new(:encoding => :ascii).encoding).to eq(:ascii)
+        end
 
-    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])
-    end
+        it 'output encoding should be unicode' do
+            expect(Columnist::Row.new.encoding).to eq(:unicode)
+        end
 
-    it 'defaults colors on columns' do
-      row = Columnist::Row.new(:color => '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 = Columnist::Column.new('test', :color => 'blue')
-      row = Columnist::Row.new(:color => 'red')
-      row.add(col)
-      expect(row.columns[0].color).to eq('blue')
-    end
+    describe '#add' do
+        subject { Columnist::Row.new }
 
-    it 'supercedes bold on columns' do
-      row = Columnist::Row.new(:bold => 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
-    let :cols do
-      [
-        Columnist::Column.new('asdf'),
-        Columnist::Column.new('qwer', :align => 'center'),
-        Columnist::Column.new('zxcv', :align => 'right'),
-        Columnist::Column.new('x' * 25, :align => 'left', :width => 10),
-        Columnist::Column.new('x' * 25, :align => 'center', :width => 10),
-        Columnist::Column.new('x' * 35, :align => 'left', :width => 10),
-      ]
-    end
+        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])
+        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])
-          expect(subject).to receive(:puts).with(/^asdf#{@six_pieces}/)
-          subject.output
+        it 'defaults colors on columns' do
+            row = Columnist::Row.new(:color => '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 'outputs three columns' do
-          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
+
+        it 'allows columns to override the row color' do
+            col = Columnist::Column.new('test', :color => 'blue')
+            row = Columnist::Row.new(:color => 'red')
+            row.add(col)
+            expect(row.columns[0].color).to eq('blue')
         end
-      end
-
-      context 'with wrapping' do
-        it 'outputs a single column' do
-          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
+
+        it 'supercedes bold on columns' do
+            row = Columnist::Row.new(:bold => 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
 
-        it 'outputs multiple columns of the same size' do
-          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
+    describe '#output' do
+        let :cols do
+            [
+                Columnist::Column.new('asdf'),
+                Columnist::Column.new('qwer', :align => 'center'),
+                Columnist::Column.new('zxcv', :align => 'right'),
+                Columnist::Column.new('x' * 25, :align => 'left', :width => 10),
+                Columnist::Column.new('x' * 25, :align => 'center', :width => 10),
+                Columnist::Column.new('x' * 35, :align => 'left', :width => 10),
+            ]
         end
 
-        it 'outputs multiple columns with different sizes' do
-          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
+        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])
+                    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])
+                    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])
+                    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])
+                    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])
+                    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
         end
-      end
     end
-  end
 end

data/spec/support/helpers/stdout.rb

@@ -1,8 +1,8 @@
 require 'stringio'
 
 def capture_stdout
-  $stdout = StringIO.new
-  yield
+    $stdout = StringIO.new
+    yield
 ensure
-  $stdout = STDOUT
+    $stdout = STDOUT
 end

data/spec/support/matchers/argument.rb

@@ -1,17 +1,17 @@
 RSpec::Matchers.define :accepts_argument do |expected|
-  match do
-    expected.call.should raise_exception ArgumentError
-  end
+    match do
+        expected.call.should raise_exception ArgumentError
+    end
 
-  # failure_message_for_should do |actual|
-  #   'should raise an ArgumentError'
-  # end
+    # failure_message_for_should do |actual|
+    #   'should raise an ArgumentError'
+    # end
 
-  # failure_message_for_should_not do |actual|
-  #   'should not raise ArgumentError'
-  # end
+    # failure_message_for_should_not do |actual|
+    #   'should not raise ArgumentError'
+    # end
 
-  # description do
-  #   'validates options argument'
-  # end
+    # description do
+    #   'validates options argument'
+    # end
 end