command_line_reporter 3.3.0 → 3.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9f17fc6c5835de05207956fd35a3f0d084066afb
+  data.tar.gz: 1d538a2574f787c91d48883dfe07e08042c816f5
+SHA512:
+  metadata.gz: 72b7895cec242dca32f1c5522de0877b162c39f5cb1413973ccac7f3d73e8155836b21751a8ec120071f07127b8796e7c8898b19fb9f98e3181dc93354c7fd18
+  data.tar.gz: 6e853ae616c1c93387d509cd520767ce070590f8ac8ac8b9ea84e31fa33f82368849baf49433618c85fb3a946e8739cc9a44b0b1d0c325ae69c3d8b03e20a3e1

data/lib/command_line_reporter.rb

@@ -140,14 +140,7 @@ module CommandLineReporter
   private
 
   def section(type, options)
-    validate_options(options, :title, :width, :align, :spacing, :timestamp, :rule, :color, :bold)
-
-    title = options[:title] || 'Report'
-    width = options[:width] || DEFAULTS[:width]
-    align = options[:align] || DEFAULTS[:align]
-    lines = options[:spacing] || 1
-    color = options[:color]
-    bold = options[:bold] || false
+    title, width, align, lines, color, bold = assign_section_properties(options)
 
     # This also ensures that width is a Fixnum
     raise ArgumentError if title.size > width
@@ -165,4 +158,17 @@ module CommandLineReporter
       vertical_spacing(lines)
     end
   end
+
+  def assign_section_properties options
+    validate_options(options, :title, :width, :align, :spacing, :timestamp, :rule, :color, :bold)
+
+    title = options[:title] || 'Report'
+    width = options[:width] || DEFAULTS[:width]
+    align = options[:align] || DEFAULTS[:align]
+    lines = options[:spacing] || 1
+    color = options[:color]
+    bold = options[:bold] || false
+
+    return [title, width, align, lines, color, bold]
+  end
 end

data/lib/command_line_reporter/column.rb

@@ -46,23 +46,26 @@ module CommandLineReporter
       # NOTE: For making underline and reversed work Change so that based on the
       # unformatted text it determines how much spacing to add left and right
       # then colorize the cell text
-      cell =  if str.empty?
-                ' ' * self.size
-              else
-                case self.align
-                when 'left'
-                  str.ljust(self.size)
-                when 'right'
-                  str.rjust(self.size)
-                when 'center'
-                  str.ljust((self.size - str.size)/2.0 + str.size).rjust(self.size)
-                end
-              end
-
+      cell =  str.empty? ? blank_cell : aligned_cell(str)
       padding_str = ' ' * self.padding
       padding_str + colorize(cell) + padding_str
     end
 
+    def blank_cell
+      ' ' * self.size
+    end
+
+    def aligned_cell(str)
+      case self.align
+      when 'left'
+        str.ljust(self.size)
+      when 'right'
+        str.rjust(self.size)
+      when 'center'
+        str.ljust((self.size - str.size)/2.0 + str.size).rjust(self.size)
+      end
+    end
+
     def colorize(str)
       str = str.send(color) if self.color
       str = str.send('bold') if self.bold

data/lib/command_line_reporter/row.rb

@@ -13,7 +13,7 @@ module CommandLineReporter
       self.header = options[:header] || false
       self.color = options[:color]
       self.bold = options[:bold] || false
-      self.encoding = options[:encoding] || false
+      self.encoding = options[:encoding] || :unicode
 
     end
 
@@ -31,8 +31,10 @@ module CommandLineReporter
 
     def output
       screen_count.times do |sr|
-        border_char = ("\u2501" == "u2501" || self.encoding == :ascii) ? '|' : "\u2503"
+        border_char = use_utf8? ? "\u2503" : '|'
+
         line = (self.border) ? "#{border_char} " : ''
+
         self.columns.size.times do |mc|
           col = self.columns[mc]
           # Account for the fact that some columns will have more screen rows than their
@@ -59,8 +61,10 @@ module CommandLineReporter
           else
             line <<  self.columns[mc].screen_rows[sr]
           end
+
           line << ' ' + ((self.border) ? "#{border_char} " : '')
         end
+
         puts line
       end
     end
@@ -70,5 +74,9 @@ module CommandLineReporter
     def screen_count
       @sc ||= self.columns.inject(0) {|max,column| column.screen_rows.size > max ? column.screen_rows.size : max}
     end
+
+    def use_utf8?
+      self.encoding == :unicode && "\u2501" != "u2501"
+    end
   end
 end

data/lib/command_line_reporter/table.rb

@@ -58,13 +58,13 @@ module CommandLineReporter
     private
 
     def separator(type = 'middle')
-      left, right, center, bar = use_utf8? ? ascii_separator : utf8_separator
+      left, center, right, bar = use_utf8? ? utf8_separator(type) : ascii_separator
 
       left + self.rows[0].columns.map {|c| bar * (c.width + 2)}.join(center) + right
     end
 
     def use_utf8?
-      self.encoding == :ascii || "\u2501" == "u2501"
+      self.encoding == :unicode && "\u2501" != "u2501"
     end
 
     def ascii_separator
@@ -76,7 +76,7 @@ module CommandLineReporter
     def utf8_separator(type)
       bar = "\u2501"
 
-      left, right, center = case type
+      left, center, right = case type
                             when 'first'
                               ["\u250F", "\u2533", "\u2513"]
                             when 'middle'
@@ -85,7 +85,7 @@ module CommandLineReporter
                               ["\u2517", "\u253B", "\u251B"]
                             end
 
-      [left, right, center, bar]
+      [left, center, right, bar]
     end
 
     def inherit_column_attrs(row)

data/lib/command_line_reporter/version.rb

@@ -1,3 +1,3 @@
 module CommandLineReporter
-  VERSION = '3.3.0'
+  VERSION = '3.3.1'
 end

data/spec/nested_formatter_spec.rb

@@ -30,7 +30,7 @@ describe CommandLineReporter::NestedFormatter do
 
   describe '#format' do
     context 'argument validation' do
-      before :all do
+      before :each do
         @indent_size = subject.indent_size
       end
 
@@ -63,7 +63,7 @@ describe CommandLineReporter::NestedFormatter do
     end
 
     context 'not nested' do
-      before :all do
+      before :each do
         @complete_string = subject.complete_string
         @indent_size = subject.indent_size
       end
@@ -155,7 +155,7 @@ describe CommandLineReporter::NestedFormatter do
     end
 
     context 'nested commands' do
-      before :all do
+      before :each do
         @indent_size = subject.indent_size
       end
 

data/spec/row_spec.rb

@@ -21,7 +21,7 @@ describe CommandLineReporter::Row do
     end
 
     it 'output encoding should be unicode' do
-      expect(CommandLineReporter::Row.new.encoding).to be_false
+      expect(CommandLineReporter::Row.new.encoding).to eq(:unicode)
     end
 
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: command_line_reporter
 version: !ruby/object:Gem::Version
-  version: 3.3.0
-  prerelease: 
+  version: 3.3.1
 platform: ruby
 authors:
 - Wes
@@ -10,38 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
 description: This gem makes it easy to provide a report while your ruby script is
@@ -51,6 +46,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
+- lib/command_line_reporter.rb
 - lib/command_line_reporter/column.rb
 - lib/command_line_reporter/formatter/nested.rb
 - lib/command_line_reporter/formatter/progress.rb
@@ -58,8 +55,6 @@ files:
 - lib/command_line_reporter/row.rb
 - lib/command_line_reporter/table.rb
 - lib/command_line_reporter/version.rb
-- lib/command_line_reporter.rb
-- README.md
 - spec/column_spec.rb
 - spec/command_line_reporter_spec.rb
 - spec/nested_formatter_spec.rb
@@ -72,30 +67,26 @@ files:
 - spec/table_spec.rb
 homepage: http://github.com/wbailey/command_line_reporter
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3116512959293506911
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A tool for providing interactive command line applications
 test_files:
 - spec/column_spec.rb