hammer_cli 0.19.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 257e54094a8995f71d00dbe29299e84801b68404271de7baaad58b6a9207fe93
-  data.tar.gz: f14b2acba71f1a4ad5a237f7dc6da746a23245ba30c504e689bf5a319e5e86b2
+  metadata.gz: fba56b0d34d9914c40df8f424e68d9268d7e2a38e5f2dd421e10991f477fbd1d
+  data.tar.gz: 5b1e6d8ea29af809ab09884cc2579c3f328439a7d102335940820bd32ec3289d
 SHA512:
-  metadata.gz: 559d6704483f5dd8bb2f27ba7c0f8d3c4212033297168fad4cdea0696ee4cd31f8421f1e79cd758b9f4228ff45d2c41751f7509091de0f92ab86a1dab4d97649
-  data.tar.gz: 2396627dc3f2b9d97dca8b0501dc2260b6c02d4a59fbf64e2fbfcdf625d913703dd02d47557193d575156f5a2b1270c81c57ff8caae08345675567d063ecc892
+  metadata.gz: 7fdb4ed23030a8d87156504452c1b04959dd466015579ec2dec75b548bd5af2baea8a5538f0d4b866a2038addf2034c9df2bd89dc709378b275868e6c48c9e99
+  data.tar.gz: 45d29077823ab5997435b51f4cfab81a4c1373cd42793958811cf7ec48ab5837f48779b4ab237af9b980aca43dd43b685b2197e3f485dfc4894421098898c5f3

data/doc/release_notes.md

@@ -1,5 +1,9 @@
 Release notes
 =============
+### 0.19.1 (2019-12-31)
+* Allow column max width more than 80, [#28503](http://projects.theforeman.org/issues/28503)
+* Extract table generator into reusable component ([PR #314](https://github.com/theforeman/hammer-cli/pull/314)), [#27318](http://projects.theforeman.org/issues/27318)
+
 ### 0.19.0 (2019-10-26)
 * Allow schema building for custom options ([PR #316](https://github.com/Apipie/apipie-bindings/pull/316)), [#27899](http://projects.theforeman.org/issues/27899)
 * New lines in text attr dont break output ([PR #300](https://github.com/Apipie/apipie-bindings/pull/300)), [#25878](http://projects.theforeman.org/issues/25878)

data/lib/hammer_cli/output/adapter/table.rb

@@ -1,17 +1,7 @@
 require File.join(File.dirname(__FILE__), 'wrapper_formatter')
-require 'hammer_cli/output/utils'
 
 module HammerCLI::Output::Adapter
-
   class Table < Abstract
-
-    MAX_COLUMN_WIDTH = 80
-    MIN_COLUMN_WIDTH = 5
-
-    HLINE = '-'
-    LINE_SEPARATOR = '-|-'
-    COLUMN_SEPARATOR = ' | '
-
     def features
       return %i[rich_text serialized inline] if tags.empty?
 
@@ -29,33 +19,15 @@ module HammerCLI::Output::Adapter
                                                         compact_only: true)
                                         .filtered_fields
       formatted_collection = format_values(fields, collection)
-      # calculate hash of column widths (label -> width)
-      widths = calculate_widths(fields, formatted_collection)
-
-      header_bits = []
-      hline_bits = []
-      fields.map do |f|
-        header_bits << normalize_column(widths[f.label], f.label.upcase)
-        hline_bits << HLINE * widths[f.label]
-      end
 
-      line = hline_bits.join(LINE_SEPARATOR)
-      unless @context[:no_headers]
-        output_stream.puts line
-        output_stream.puts header_bits.join(COLUMN_SEPARATOR)
-        output_stream.puts line
+      columns = fields.each_with_object({}) do |field, result|
+        result[field.label] = field.parameters
       end
 
-      formatted_collection.collect do |row|
-        row_bits = fields.map do |f|
-          normalize_column(widths[f.label], row[f.label] || "")
-        end
-        output_stream.puts row_bits.join(COLUMN_SEPARATOR)
-      end
-
-      # print closing line only when the table isn't empty
-      # and there is no --no-headers option
-      output_stream.puts line unless formatted_collection.empty? || @context[:no_headers]
+      table_gen = HammerCLI::Output::Generators::Table.new(
+        columns, formatted_collection, no_headers: @context[:no_headers]
+      )
+      output_stream.print(table_gen.result)
 
       if collection.respond_to?(:meta) && collection.meta.pagination_set? &&
          @context[:verbosity] >= collection.meta.pagination_verbosity &&
@@ -71,19 +43,6 @@ module HammerCLI::Output::Adapter
       super << Fields::ContainerField
     end
 
-    def normalize_column(width, value)
-      value = value.to_s
-      padding = width - HammerCLI::Output::Utils.real_length(value)
-      if padding >= 0
-        value += (" " * padding)
-      else
-        value, real_length = HammerCLI::Output::Utils.real_truncate(value, width-3)
-        value += '...'
-        value += ' ' if real_length < (width - 3)
-      end
-      value
-    end
-
     def format_values(fields, collection)
       collection.collect do |d|
         fields.inject({}) do |row, f|
@@ -92,34 +51,6 @@ module HammerCLI::Output::Adapter
         end
       end
     end
-
-    def calculate_widths(fields, collection)
-      Hash[fields.map { |f| [f.label, calculate_column_width(f, collection)] }]
-    end
-
-    def calculate_column_width(field, collection)
-      if field.parameters[:width]
-        return [field.parameters[:width], MIN_COLUMN_WIDTH].max
-      end
-
-      width = HammerCLI::Output::Utils.real_length(field.label.to_s)
-      max_width = max_width_for(field)
-      collection.each do |item|
-        width = [HammerCLI::Output::Utils.real_length(item[field.label]), width].max
-        return max_width if width >= max_width
-      end
-      width
-    end
-
-    private
-
-    def max_width_for(field)
-      if field.parameters[:max_width]
-        [field.parameters[:max_width], MAX_COLUMN_WIDTH].min
-      else
-        MAX_COLUMN_WIDTH
-      end
-    end
   end
 
   HammerCLI::Output::Output.register_adapter(:table, Table)

data/lib/hammer_cli/output/definition.rb

@@ -59,68 +59,23 @@ module HammerCLI::Output
     end
 
     def sets_table
-      fields_col_size = max_label_length || _('Fields').size
-      fields_col = normalize_column(fields_col_size, _('Fields'), centralize: true)
-      fields_col += ' ' unless (fields_col_size - fields_col.size).zero?
-      header_bits = [fields_col]
-      hline_bits = ['-' * fields_col_size]
-      field_sets.map do |set|
-        header_bits << normalize_column(set.size, set)
-        hline_bits << '-' * set.size
-      end
-      rows_bits = fields_row(@fields, field_sets, fields_col_size)
-      line = "+-#{hline_bits.join('-+-')}-+\n"
-      table = line
-      table += "| #{header_bits.join(' | ')} |\n"
-      table += line
-      table += "#{rows_bits.join("\n")}\n"
-      table += line
-      table
+      columns = field_sets.unshift(_('Fields'))
+      data = fields_data(@fields, columns).flatten
+      table_gen = HammerCLI::Output::Generators::Table.new(columns, data)
+      table_gen.result
     end
 
     private
 
-    def max_label_length
-      field_labels(@fields, full_labels: true).map(&:size).max
-    end
+    def fields_data(fields, sets)
+      fields.each_with_object([]) do |field, data|
+        next data << fields_data(field.fields, sets) if field.respond_to?(:fields)
 
-    def normalize_column(width, col, centralize: false)
-      padding = width - HammerCLI::Output::Utils.real_length(col)
-      if padding >= 0
-        if centralize
-          padding /= 2
-          col.prepend(' ' * padding)
+        data << sets.each_with_object({}) do |set, res|
+          mark = field.sets.include?(set) ? 'x' : ''
+          value = set == sets.first ? field.full_label : mark
+          res.update(set => value)
         end
-        col += (' ' * padding)
-      else
-        col, real_len = HammerCLI::Output::Utils.real_truncate(col, width - 3)
-        col += '...'
-        col += ' ' if real_len < (width - 3)
-      end
-      col
-    end
-
-    def fields_row(fields, sets, fields_col_size)
-      fields.each_with_object([]) do |field, rows|
-        next rows << fields_row(field.fields, sets, fields_col_size) if field.respond_to?(:fields)
-
-        row = [normalize_column(fields_col_size, field.full_label)]
-        sets.each do |set|
-          mark = field.sets.include?(set) ? 'x' : ' '
-          column = normalize_column(set.size, mark, centralize: true)
-          column += ' ' unless (set.size - column.size).zero?
-          row << column
-        end
-        rows << "| #{row.join(' | ')} |"
-      end
-    end
-
-    def field_labels(fields, full_labels: false)
-      fields.each_with_object([]) do |field, labels|
-        label = full_labels ? field.full_label : field.label
-        next labels << label unless field.respond_to?(:fields)
-
-        labels.concat(field_labels(field.fields, full_labels: full_labels))
       end
     end
 

data/lib/hammer_cli/output/generators/table.rb

@@ -0,0 +1,121 @@
+require 'hammer_cli/output/utils'
+
+module HammerCLI
+  module Output
+    module Generators
+      class Table
+        class Column
+          attr_reader :label, :params
+
+          def initialize(label, params = nil)
+            @label = label.to_s
+            @params = params || {}
+          end
+        end
+
+        MAX_COLUMN_WIDTH = 80
+        MIN_COLUMN_WIDTH = 5
+
+        HLINE = '-'
+        LINE_SEPARATOR = '-|-'
+        COLUMN_SEPARATOR = ' | '
+
+        attr_reader :header, :body, :footer, :result
+
+        def initialize(columns, data, options = {})
+          @columns = columns.map { |label, params| Column.new(label, params) }
+          @data = data
+          @options = options
+          create_table
+        end
+
+        private
+
+        def create_header(header_bits, line)
+          result = StringIO.new
+          unless @options[:no_headers]
+            result.puts(line)
+            result.puts(header_bits.join(COLUMN_SEPARATOR))
+            result.puts(line)
+          end
+          result.string
+        end
+
+        def create_body(widths)
+          result = StringIO.new
+          @data.collect do |row|
+            row_bits = @columns.map do |col|
+              normalize_column(widths[col.label], row[col.label] || '')
+            end
+            result.puts(row_bits.join(COLUMN_SEPARATOR))
+          end
+          result.string
+        end
+
+        def create_footer(line)
+          result = StringIO.new
+          result.puts(line) unless @data.empty? || @options[:no_headers]
+          result.string
+        end
+
+        def create_result
+          result = StringIO.new
+          result.print(@header, @body, @footer)
+          result.string
+        end
+
+        def create_table
+          widths = calculate_widths(@columns, @data)
+          header_bits = []
+          hline_bits = []
+          @columns.map do |col|
+            header_bits << normalize_column(widths[col.label], col.label.upcase)
+            hline_bits << HLINE * widths[col.label]
+          end
+          line = hline_bits.join(LINE_SEPARATOR)
+          @header = create_header(header_bits, line)
+          @body = create_body(widths)
+          @footer = create_footer(line)
+          @result = create_result
+        end
+
+        def normalize_column(width, value)
+          value = value.to_s
+          padding = width - HammerCLI::Output::Utils.real_length(value)
+          if padding >= 0
+            value += (' ' * padding)
+          else
+            value, real_length = HammerCLI::Output::Utils.real_truncate(value, width - 3)
+            value += '...'
+            value += ' ' if real_length < (width - 3)
+          end
+          value
+        end
+
+        def calculate_widths(columns, data)
+          Hash[columns.map { |c| [c.label, calculate_column_width(c, data)] }]
+        end
+
+        def calculate_column_width(column, data)
+          if column.params[:width]
+            return [column.params[:width], MIN_COLUMN_WIDTH].max
+          end
+
+          width = HammerCLI::Output::Utils.real_length(column.label)
+          max_width = max_width_for(column)
+          data.each do |item|
+            width = [HammerCLI::Output::Utils.real_length(item[column.label]), width].max
+            return max_width if width >= max_width
+          end
+          width
+        end
+
+        def max_width_for(column)
+          return MAX_COLUMN_WIDTH unless column.params[:max_width]
+
+          column.params[:max_width]
+        end
+      end
+    end
+  end
+end

data/lib/hammer_cli/output/generators.rb

@@ -0,0 +1 @@
+require 'hammer_cli/output/generators/table'

data/lib/hammer_cli/output.rb

@@ -1,9 +1,9 @@
 require File.join(File.dirname(__FILE__), 'output/output')
 require File.join(File.dirname(__FILE__), 'output/fields')
 require File.join(File.dirname(__FILE__), 'output/formatters')
+require File.join(File.dirname(__FILE__), 'output/generators')
 require File.join(File.dirname(__FILE__), 'output/adapter')
 require File.join(File.dirname(__FILE__), 'output/definition')
 require File.join(File.dirname(__FILE__), 'output/dsl')
 require File.join(File.dirname(__FILE__), 'output/record_collection')
 require File.join(File.dirname(__FILE__), 'output/field_filter')
-

data/lib/hammer_cli/version.rb

@@ -1,5 +1,5 @@
 module HammerCLI
   def self.version
-    @version ||= Gem::Version.new "0.19.0"
+    @version ||= Gem::Version.new "0.19.1"
   end
 end

data/test/unit/output/definition_test.rb

@@ -266,13 +266,13 @@ describe HammerCLI::Output::Definition do
       end
       definition.fields += [new_field, cont_field]
 
-      sets_table = "+----------+-----+---------+-----+
-|  Fields  | ALL | DEFAULT | SET |
-+----------+-----+---------+-----+
-| newfield |  x  |    x    |     |
-| cf/abc   |     |         |  x  |
-| cf/bca   |     |         |  x  |
-+----------+-----+---------+-----+\n"
+      sets_table = "---------|-----|---------|----\n" \
+                   "FIELDS   | ALL | DEFAULT | SET\n" \
+                   "---------|-----|---------|----\n" \
+                   "newfield | x   | x       |    \n" \
+                   "cf/abc   |     |         | x  \n" \
+                   "cf/bca   |     |         | x  \n" \
+                   "---------|-----|---------|----\n"
 
       definition.sets_table.must_equal sets_table
     end