command_line_reporter 2.1 → 3.0

data/spec/nested_formatter_spec.rb

@@ -4,6 +4,14 @@ require 'nested_formatter'
 describe CommandLineReporter::NestedFormatter do
   subject { CommandLineReporter::NestedFormatter.instance }
 
+  before :all do
+    @controls = {
+      :clear => "\e[0m",
+      :bold => "\e[1m",
+      :red => "\e[31m",
+    }
+  end
+
   describe '#method default values' do
     its(:message_string) { should == 'working' }
     its(:complete_string) { should == 'complete' }
@@ -63,6 +71,20 @@ describe CommandLineReporter::NestedFormatter do
         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]}")
+
+        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]}")
+
+        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')
@@ -138,14 +160,33 @@ describe CommandLineReporter::NestedFormatter do
         subject.should_receive(:puts).with('  complete')
         subject.should_receive(:puts).with('complete')
 
-        nested = lambda {
-        }
-
         subject.format({:message => 'test'}, lambda {
           subject.format({:message => 'test2'}, lambda {})
         })
       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]}")
+
+        subject.format({:message => 'test', :color => 'red'}, lambda {
+          subject.format({:message => 'test2', :color => 'red'}, lambda {})
+        })
+      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]}")
+
+        subject.format({:message => 'test', :bold => true}, lambda {
+          subject.format({:message => 'test2', :bold => true}, lambda {})
+        })
+      end
+
       it 'indents the multiple nested wrapped messages' do
         subject.should_receive(:puts).with('test')
         subject.should_receive(:puts).with('  test2')

data/spec/progress_formatter_spec.rb

@@ -8,6 +8,14 @@ describe CommandLineReporter::ProgressFormatter do
     its(:indicator) { should == '.' }
   end
 
+  before :all do
+    @controls = {
+      :clear => "\e[0m",
+      :bold => "\e[1m",
+      :red => "\e[31m",
+    }
+  end
+
   describe '#format' do
     it 'displays dots for the indicator' do
       subject.should_receive(:print).exactly(10).times.with('.')
@@ -18,6 +26,24 @@ 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
+
+      subject.format({:color => 'red'}, lambda {
+        10.times {subject.progress}
+      })
+    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
+
+      subject.format({:bold => true}, lambda {
+        10.times {subject.progress}
+      })
+    end
+
     it 'uses the defined indicator' do
       subject.indicator = '+'
       subject.should_receive(:print).exactly(10).times.with('+')

data/spec/row_spec.rb

@@ -1,32 +1,69 @@
 require 'spec_helper'
 require 'row'
 
-describe Row do
+describe CommandLineReporter::Row do
   before :each do
-    @cols = 10.times.map {|v| Column.new("test#{v}")}
+    @cols = 10.times.map {|v| CommandLineReporter::Column.new("test#{v}")}
+  end
+
+  describe '#initialize' do
+    it 'accepts header' do
+      CommandLineReporter::Row.new(:header => true).header.should be_true
+    end
+
+    it 'accepts color' do
+      CommandLineReporter::Row.new(:color => 'red').color.should == 'red'
+    end
+
+    it 'accepts bold' do
+      CommandLineReporter::Row.new(:bold => true).bold.should be_true
+    end
   end
 
   describe '#add' do
-    subject { Row.new }
+    subject { CommandLineReporter::Row.new }
 
-    it 'adds columns' do
+    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]
     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'
+    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'
+    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
+    end
   end
 
   describe '#output' do
     before :each do
       @cols = [
-        Column.new('asdf'),
-        Column.new('qwer', :align => 'center'),
-        Column.new('zxcv', :align => 'right'),
-        Column.new('x' * 25, :align => 'left', :width => 10),
-        Column.new('x' * 25, :align => 'center', :width => 10),
-        Column.new('x' * 35, :align => 'left', :width => 10),
+        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),
       ]
     end
 

data/spec/table_spec.rb

@@ -1,45 +1,99 @@
 require 'spec_helper'
 require 'table'
 
-describe Table do
+describe CommandLineReporter::Table do
   context 'creation' do
     it 'defaults options hash' do
       expect {
-        Table.new
+        CommandLineReporter::Table.new
       }.to_not raise_error
     end
 
     it 'defaults the border' do
-      Table.new.border.should == false
+      CommandLineReporter::Table.new.border.should be_false
     end
 
     it 'accepts the border' do
-      Table.new(:border => true).border.should == true
+      CommandLineReporter::Table.new(:border => true).border.should == true
     end
   end
 
   context 'rows' do
     it 'allows addition' do
-      cols = [Column.new('test1'), Column.new('test2')]
-      row = Row.new
+      cols = [CommandLineReporter::Column.new('test1'), CommandLineReporter::Column.new('test2')]
+      row = CommandLineReporter::Row.new
       cols.each {|c| row.add(c)}
       expect {
-        Table.new.add(row)
+        CommandLineReporter::Table.new.add(row)
       }.to_not raise_error
     end
 
-    it 'normalizes all column width and sizes' do
-      cols = [Column.new('asdf', :width => 5), Column.new('qwer')]
-      row = Row.new
-      row.add(cols[0])
-      t = Table.new
-      t.add(row)
-      row = Row.new
-      row.add(cols[1])
-      t.add(row)
-      output = capture_stdout {
-        t.output
-      }
+    context 'inherits' do
+      before :each do
+        @table = CommandLineReporter::Table.new
+        row = CommandLineReporter::Row.new(:color => 'red')
+        (
+          @cols1 = [
+            CommandLineReporter::Column.new('asdf', :width => 5),
+            CommandLineReporter::Column.new('qwer', :align => 'right', :color => 'purple'),
+            CommandLineReporter::Column.new('tutu', :color => 'green'),
+            CommandLineReporter::Column.new('uiui', :bold => true),
+          ]
+        ).each {|c| row.add(c)}
+        @table.add(row)
+        row = CommandLineReporter::Row.new
+        (@cols2 = [
+            CommandLineReporter::Column.new('test'),
+            CommandLineReporter::Column.new('test'),
+            CommandLineReporter::Column.new('test', :color => 'blue'),
+            CommandLineReporter::Column.new('test'),
+          ]
+        ).each {|c| row.add(c)}
+        @table.add(row)
+      end
+
+      it 'positional attributes' do
+        [:align, :width, :size, :padding].each do |m|
+          4.times do |i|
+            @table.rows[1].columns[i].send(m).should == @table.rows[0].columns[i].send(m)
+          end
+        end
+      end
+
+      context 'no header row' do
+        it 'color' do
+          @table.rows[1].columns[0].color.should == 'red'
+          @table.rows[1].columns[1].color.should == 'purple'
+          @table.rows[1].columns[2].color.should == 'blue'
+          @table.rows[1].columns[3].color.should == 'red'
+        end
+
+        it 'bold' do
+          @table.rows[1].columns[0].bold.should be_false
+          @table.rows[1].columns[1].bold.should be_false
+          @table.rows[1].columns[2].bold.should be_false
+          @table.rows[1].columns[3].bold.should be_true
+        end
+      end
+
+      context 'with header row' do
+        before :each do
+          @table = CommandLineReporter::Table.new
+          row = CommandLineReporter::Row.new(:header => true)
+          @cols1.each {|c| row.add(c)}
+          @table.add(row)
+          row = CommandLineReporter::Row.new
+          @cols2.each {|c| row.add(c)}
+          @table.add(row)
+        end
+
+        it 'bold' do
+          @table.rows[1].columns[0].bold.should be_false
+          @table.rows[1].columns[1].bold.should be_false
+          @table.rows[1].columns[2].bold.should be_false
+          @table.rows[1].columns[3].bold.should be_true
+        end
+      end
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: command_line_reporter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "2.1"
+  version: "3.0"
 platform: ruby
 authors: 
 - Wes
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-29 00:00:00 Z
+date: 2012-02-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -24,6 +24,17 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: colored
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.2"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
 description: This gem makes it easy to provide a report while your ruby script is executing
 email: baywes@gmail.com
 executables: []
@@ -70,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -154884230452992637
+      hash: -3936770633859480563
       segments: 
       - 0
       version: "0"