hammer_cli 2.2.1 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4f350c15926f88971bd4ca5a7c6e2de1a58c4f5500129e61a68b2ab7f3e2643
-  data.tar.gz: 9ff9f540add2c845efb74fdced769846fe9118a1dcafdab99537a3eb1d9263f9
+  metadata.gz: a39815aa1d748fda7475b583f55c801a8391e21a6418aad7e479a3a8754f1412
+  data.tar.gz: ffce03a8a4057f28dd21fde44100a7867f7efe2ce2f2f7e2a18dd0b037ce5983
 SHA512:
-  metadata.gz: 1540908ed1806938b8bf53819b0884a17bd2e6d095b5f2ab14a8843bb125e49934732546390475d60349ef9a2cc7bcbf44c19af7c8cbe76e1f61786d1b2b9a0a
-  data.tar.gz: 0c9f1525623225a28472b3221c528b0d03d425507263049b34ff4e0ebf167dc08ea3f9ed6f9014459930639a26935755327cb0a7b339c8f2affaa714179ab09c
+  metadata.gz: fdfe7222cc2b1dc5059a62b8cdef4effd09af391d5880fb2f2315d9ca8d20124ffa2aa07aaebc56be6dd01cf988c69490b8a98da86e29fd166949d9d67e257c3
+  data.tar.gz: 34ee4d3731a3a4d4e883acb11dd7dcae4b7cdc9ff45cc513642ebef428a67fd33e7072cc37ba4a8d791c0425afbdfbc8506bc032041e0d86b62387f736aeb32e

data/bin/hammer-complete

@@ -5,9 +5,7 @@ require 'English'
 $LOAD_PATH.unshift(File.join(@project_root, 'lib'))
 HAMMER = ENV['HAMMER'] || File.join(@project_root, 'bin/hammer')
 
-require 'yaml'
-
-completion_cache_file = ENV['HAMMER_COMPLETION_CACHE'] || '~/.cache/hammer_completion.yml'
+completion_cache_file = ENV['HAMMER_COMPLETION_CACHE'] || '~/.cache/hammer_completion.json'
 completion_cache_file = File.expand_path(completion_cache_file)
 
 # build the cache if it does not exist

data/config/cli_config.template.yml

@@ -45,7 +45,7 @@
 #:log_pattern: '[%5l %d %c] %m'
 
 # Location of cache for bash completion
-:completion_cache_file: '~/.cache/hammer_completion.yml'
+:completion_cache_file: '~/.cache/hammer_completion.json'
 
 # SSL auth options
 #:ssl:

data/doc/commands_extension.md

@@ -16,11 +16,11 @@ Each command can be easily extended with one ore more `HammerCLI::CommandExtensi
       child option_params
     end
     # Extend hash with data returned from server before it is printed
-    before_print do |data|
+    before_print do |data, command_object, command_class|
       # data modifications
     end
     # Extend command's output definition
-    output do |definition|
+    output do |definition, command_object, command_class|
       # output definition modifications
     end
     # Extend command's help definition
@@ -28,19 +28,19 @@ Each command can be easily extended with one ore more `HammerCLI::CommandExtensi
       # help modifications
     end
     # Extend hash with headers before request is sent
-    request_headers do |headers|
+    request_headers do |headers, command_object, command_class|
       # headers modifications
     end
     # Extend hash with options before request is sent
-    request_options do |options|
+    request_options do |options, command_object, command_class|
       # options modifications
     end
     # Extend hash with params before request is sent
-    request_params do |params|
+    request_params do |params, command_object, command_class|
       # params modifications
     end
     # Extend option sources
-    option_sources do |sources, command|
+    option_sources do |sources, command_object, command_class|
       # no need to call super method
       # simply add your sources to sources variable
     end
@@ -63,6 +63,8 @@ __NOTE:__
   - `request_*` extensions are applied before sending a request to the server
   - `option`, `output`, `help` extensions are applied right away after the command is extended with `extend_with`
   - `before_print` extensions are applied right away after the server returns the data
+  - `request_*`, `output`, `before_print` extensions have access to the command object
+    after the command with the extension was initialized
 
 #### Example
 ```ruby

data/doc/installation.md

@@ -144,7 +144,7 @@ executable specified in `/etc/bash_completion.d/hammer`.
 
 Bash completion for hammer needs pre-built cache that holds description of
 all subcommands and its parameters. The cache is located by default in
-`~/.cache/hammer_completion.yml`. The location can be changed in hammer's
+`~/.cache/hammer_completion.json`. The location can be changed in hammer's
 config file. The cache can be built manually with
 `hammer prebuild-bash-completion` or is built automatically when completion is
 used and the cache is missing (this may cause slight delay). The cache expires

data/doc/installation_source.md

@@ -8,6 +8,7 @@ Clone and install CLI core
 ```bash
 $ git clone https://github.com/theforeman/hammer-cli.git
 $ cd hammer-cli
+$ bundle install
 $ rake install
 $ cd ..
 ```
@@ -17,6 +18,7 @@ clone plugin with foreman commands
 ```bash
 $ git clone https://github.com/theforeman/hammer-cli-foreman.git
 $ cd hammer-cli-foreman
+$ bundle install
 $ rake install
 $ cd ..
 ```
@@ -25,7 +27,8 @@ and optionally other plugins.
 
 
 #### Step 2: enable and configure the plugins
-You'll have to copy configuration files to proper locations manually.
-Please check our [configuration instructions](installation.md#configuration)
+- Add the plugin as a gem to `Gemfile.local.rb`
+- Copy the configuration files to proper locations manually,
+please check our [configuration instructions](installation.md#configuration)
 and see how to proceed.
 

data/doc/release_notes.md

@@ -1,7 +1,34 @@
 Release notes
 =============
-### 2.2.1 (2020-09-04)
+### 2.5.1 (2021-06-08)
+* Add full comparison for fields option, [#31984](http://projects.theforeman.org/issues/31984)
+* Force capitalized field names in help, [#32444](http://projects.theforeman.org/issues/32444)
+* Unescape enum validator description, [#32570](http://projects.theforeman.org/issues/32570)
+* Make cmd object be available in command extensions, [#32568](http://projects.theforeman.org/issues/32568)
+
+### 2.5.0 (2021-05-04)
+* Better family assignment for options, [#30996](http://projects.theforeman.org/issues/30996)
+* Bump to 2.5.0-develop
+* Right usage in help output for aliases, [#31563](http://projects.theforeman.org/issues/31563)
+
+### 2.4.0 (2021-02-01)
+* Expand path for bash completion file, [#30639](http://projects.theforeman.org/issues/30639)
+* Remove release notes written twice
+* Bump to 2.4.0-develop
+
+### 2.3.0 (2020-11-03)
+* Stop sending empty compute attrs param, [#30815](http://projects.theforeman.org/issues/30815)
 * Make fuzzy search work in hammer shell ([PR #335](https://github.com/theforeman/hammer-cli/pull/335)), [#30747](http://projects.theforeman.org/issues/30747)
+* Add details to installation from source doc ([PR #334](https://github.com/theforeman/hammer-cli/pull/334)), [#30666](http://projects.theforeman.org/issues/30666)
+* Bump to 2.3.0-develop
+* Bump to 2.2.0
+
+### 2.2.0 (2020-08-11)
+* Update installation_rpm.md ([PR #333](https://github.com/theforeman/hammer-cli/pull/333))
+* Clean gem_release.ipynb up
+* Replace awesome_print with amazing_print ([PR #330](https://github.com/theforeman/hammer-cli/pull/330)), [#29846](http://projects.theforeman.org/issues/29846)
+* Fix typo: s/filed/feild/ ([PR #331](https://github.com/theforeman/hammer-cli/pull/331))
+* Bump to 2.2.0-develop
 
 ### 2.1.0 (2020-05-14)
 * Hammer full-help returns correct output, [#29697](http://projects.theforeman.org/issues/29697)

data/lib/hammer_cli/abstract.rb

@@ -20,6 +20,8 @@ module HammerCLI
   class AbstractCommand < Clamp::Command
     include HammerCLI::Subcommand
 
+    attr_reader :context
+
     class << self
       attr_accessor :validation_blocks
 
@@ -75,7 +77,7 @@ module HammerCLI
       begin
         begin
           exit_code = super
-          context.delete(:fields)
+          clean_up_context
           raise "exit code must be integer" unless exit_code.is_a? Integer
         rescue => e
           exit_code = handle_exception(e)
@@ -97,6 +99,10 @@ module HammerCLI
       HammerCLI::EX_OK
     end
 
+    def clean_up_context
+      context.delete(:fields)
+    end
+
     def self.validate_options(mode=:append, target_name=nil, validator: nil, &block)
       validator ||= HammerCLI::Options::Validators::DSLBlockValidator.new(&block)
       self.validation_blocks ||= []
@@ -115,6 +121,9 @@ module HammerCLI
       super
       context[:path] ||= []
       context[:path] << self
+      self.class.command_extensions.each do |extension|
+        extension.command_object(self)
+      end
     end
 
     def parent_command
@@ -190,18 +199,9 @@ module HammerCLI
 
       option_builder.build(builder_params).each do |option|
         # skip switches that are already defined
-        next if option.nil? or option.switches.any? {|s| find_option(s) }
-
-        if option.respond_to?(:referenced_resource)
-          # Collect options that don't have family, but related to this parent.
-          children = find_options(
-            referenced_resource: option.referenced_resource.to_s,
-            aliased_resource: option.aliased_resource.to_s
-          ).select { |o| o.family.nil? || o.family.head.nil? }
-          children.each do |child|
-            option.family.adopt(child) if option.family
-          end
-        end
+        next if option.nil? || option.switches.any? { |s| find_option(s) }
+
+        adjust_family(option) if option.respond_to?(:family)
         declared_options << option
         block ||= option.default_conversion_block
         define_accessors_for(option, &block)
@@ -216,11 +216,12 @@ module HammerCLI
           raise ArgumentError, _('Command extensions should be inherited from %s.') % HammerCLI::CommandExtensions
         end
         extension.delegatee(self)
-        extension.extend_predefined_options(self)
-        extension.extend_options(self)
-        extension.extend_option_family(self)
-        extension.extend_output(self)
-        extension.extend_help(self)
+        extension.command_class(self)
+        extension.extend_predefined_options
+        extension.extend_options
+        extension.extend_option_family
+        extension.extend_output
+        extension.extend_help
         logger('Extensions').info "Applied #{extension.details} on #{self}."
         command_extensions << extension
       end
@@ -368,7 +369,7 @@ module HammerCLI
 
       sources = HammerCLI::Options::ProcessorList.new([sources])
       self.class.command_extensions.each do |extension|
-        extension.extend_option_sources(sources, self)
+        extension.extend_option_sources(sources)
       end
       sources
     end
@@ -411,6 +412,32 @@ module HammerCLI
 
     private
 
+    def self.adjust_family(option)
+      # Collect options that should share the same family
+      # If those options have family, adopt the current one
+      # Else adopt those options to the family of the current option
+      # NOTE: this shouldn't rewrite any options,
+      # although options from similar family could be adopted (appended)
+      options = find_options(
+        aliased_resource: option.aliased_resource.to_s
+      ).select { |o| o.family.nil? || o.family.formats.include?(option.value_formatter.class) }.group_by do |o|
+        next :to_skip if option.family.children.include?(o)
+        next :to_adopt if o.family.nil? || o.family.head.nil?
+        next :to_skip if o.family.children.include?(option)
+        # If both family heads handle the same switch
+        # then `option` is probably from similar family and can be adopted
+        next :adopt_by if option.family.head.nil? || o.family.head.handles?(option.family.head.long_switch)
+
+        :to_skip
+      end
+      options[:to_adopt]&.each do |child|
+        option.family&.adopt(child)
+      end
+      options[:adopt_by]&.map(&:family)&.uniq&.each do |family|
+        family.adopt(option)
+      end
+    end
+
     def self.inherited_output_definition
       od = nil
       if superclass.respond_to? :output_definition

data/lib/hammer_cli/apipie/option_builder.rb

@@ -72,7 +72,9 @@ module HammerCLI::Apipie
       elsif param.expected_type.to_s == 'boolean' || param.validator.to_s == 'boolean'
         opts[:format] = HammerCLI::Options::Normalizers::Bool.new
       elsif param.expected_type.to_s == 'string' && param.validator =~ /Must be one of: (.*)\./
-        allowed = $1.split(/,\ ?/).map { |val| val.gsub(/<[^>]*>/i,'') }
+        allowed = $1.split(/,\ ?/).map { |val| val.gsub(/<[^>]*>/i, '') }.map do |item|
+          CGI.unescapeHTML(item)
+        end
         opts[:format] = HammerCLI::Options::Normalizers::Enum.new(allowed)
       elsif param.expected_type.to_s == 'numeric'
         opts[:format] = HammerCLI::Options::Normalizers::Number.new

data/lib/hammer_cli/apipie/options.rb

@@ -10,11 +10,11 @@ module HammerCLI::Apipie
       opts = {}
 
       params.each do |p|
-        if p.expected_type == :hash
+        if p.expected_type == :hash && !p.params.empty?
           opts[p.name] = method_options_for_params(p.params, options)
         else
           p_name = HammerCLI.option_accessor_name(p.name)
-          if options.has_key?(p_name)
+          if options.key?(p_name)
             opts[p.name] = options[p_name]
           elsif respond_to?(p_name, true)
             opt = send(p_name)

data/lib/hammer_cli/bash/prebuild_command.rb

@@ -3,10 +3,12 @@ module HammerCLI
     class PrebuildCompletionCommand < HammerCLI::AbstractCommand
       def execute
         map = HammerCLI::MainCommand.completion_map
-        cache_file = HammerCLI::Settings.get(:completion_cache_file)
+        cache_file = File.expand_path(
+          HammerCLI::Settings.get(:completion_cache_file)
+        )
         cache_dir = File.dirname(cache_file)
         FileUtils.mkdir_p(cache_dir) unless File.directory?(cache_dir)
-        File.write(File.expand_path(cache_file), map.to_json)
+        File.write(cache_file, map.to_json)
 
         HammerCLI::EX_OK
       end

data/lib/hammer_cli/command_extensions.rb

@@ -93,80 +93,88 @@ module HammerCLI
 
     # Object
 
-    def extend_options(command_class)
+    def extend_options
       allowed = @only & %i[command_options option]
       return if allowed.empty? || (allowed & @except).any?
 
-      self.class.extend_options(command_class)
+      self.class.extend_options(@command_class)
     end
 
-    def extend_predefined_options(command_class)
+    def extend_predefined_options
       allowed = @only & %i[predefined_options use_option]
       return if allowed.empty? || (allowed & @except).any?
 
-      self.class.extend_predefined_options(command_class)
+      self.class.extend_predefined_options(@command_class)
     end
 
     def extend_before_print(data)
       allowed = @only & %i[before_print data]
       return if allowed.empty? || (allowed & @except).any?
 
-      self.class.extend_before_print(data)
+      self.class.extend_before_print(data, @command_object, @command_class)
     end
 
-    def extend_output(command_class)
+    def extend_output
       allowed = @only & %i[output]
       return if allowed.empty? || (allowed & @except).any?
 
-      self.class.extend_output(command_class)
+      self.class.extend_output(@command_class, @command_object)
     end
 
-    def extend_help(command_class)
+    def extend_help
       allowed = @only & %i[help]
       return if allowed.empty? || (allowed & @except).any?
 
-      self.class.extend_help(command_class)
+      self.class.extend_help(@command_class)
     end
 
     def extend_request_headers(headers)
       allowed = @only & %i[request_headers headers request]
       return if allowed.empty? || (allowed & @except).any?
 
-      self.class.extend_request_headers(headers)
+      self.class.extend_request_headers(headers, @command_object, @command_class)
     end
 
     def extend_request_options(options)
       allowed = @only & %i[request_options options request]
       return if allowed.empty? || (allowed & @except).any?
 
-      self.class.extend_request_options(options)
+      self.class.extend_request_options(options, @command_object, @command_class)
     end
 
     def extend_request_params(params)
       allowed = @only & %i[request_params params request]
       return if allowed.empty? || (allowed & @except).any?
 
-      self.class.extend_request_params(params)
+      self.class.extend_request_params(params, @command_object, @command_class)
     end
 
-    def extend_option_sources(sources, command = nil)
+    def extend_option_sources(sources)
       allowed = @only & %i[option_sources]
       return if allowed.empty? || (allowed & @except).any?
 
-      self.class.extend_option_sources(sources, command)
+      self.class.extend_option_sources(sources, @command_object, @command_class)
     end
 
-    def extend_option_family(command_class)
+    def extend_option_family
       allowed = @only & %i[option_family]
       return if allowed.empty? || (allowed & @except).any?
 
-      self.class.extend_option_family(command_class)
+      self.class.extend_option_family(@command_class)
     end
 
     def delegatee(command_class)
       self.class.delegatee = command_class
     end
 
+    def command_class(command_class)
+      @command_class = command_class
+    end
+
+    def command_object(command_object)
+      @command_object = command_object
+    end
+
     def details
       except = @except.empty? ? '*nothing*' : @except
       details = if @only == ALLOWED_EXTENSIONS
@@ -198,17 +206,17 @@ module HammerCLI
       logger.debug("Added predefined options for #{command_class}: #{@predefined_option_names}")
     end
 
-    def self.extend_before_print(data)
+    def self.extend_before_print(data, command_object, command_class)
       return if @before_print_block.nil?
 
-      @before_print_block.call(data)
+      @before_print_block.call(data, command_object, command_class)
       logger.debug("Called block for #{@delegatee} data:\n\t#{@before_print_block}")
     end
 
-    def self.extend_output(command_class)
+    def self.extend_output(command_class, command_object)
       return if @output_extension_block.nil?
 
-      @output_extension_block.call(command_class.output_definition)
+      @output_extension_block.call(command_class.output_definition, command_object, command_class)
       logger.debug("Called block for #{@delegatee} output definition:\n\t#{@output_extension_block}")
     end
 
@@ -219,31 +227,31 @@ module HammerCLI
       logger.debug("Saved block for #{@delegatee} help definition:\n\t#{@help_extension_block}")
     end
 
-    def self.extend_request_headers(headers)
+    def self.extend_request_headers(headers, command_object, command_class)
       return if @request_headers_block.nil?
 
-      @request_headers_block.call(headers)
+      @request_headers_block.call(headers, command_object, command_class)
       logger.debug("Called block for #{@delegatee} request headers:\n\t#{@request_headers_block}")
     end
 
-    def self.extend_request_options(options)
+    def self.extend_request_options(options, command_object, command_class)
       return if @request_options_block.nil?
 
-      @request_options_block.call(options)
+      @request_options_block.call(options, command_object, command_class)
       logger.debug("Called block for #{@delegatee} request options:\n\t#{@request_options_block}")
     end
 
-    def self.extend_request_params(params)
+    def self.extend_request_params(params, command_object, command_class)
       return if @request_params_block.nil?
 
-      @request_params_block.call(params)
+      @request_params_block.call(params, command_object, command_class)
       logger.debug("Called block for #{@delegatee} request params:\n\t#{@request_params_block}")
     end
 
-    def self.extend_option_sources(sources, command = nil)
+    def self.extend_option_sources(sources, command_object, command_class)
       return if @option_sources_block.nil?
 
-      @option_sources_block.call(sources, command)
+      @option_sources_block.call(sources, command_object, command_class)
       logger.debug("Called block for #{@delegatee} option sources:\n\t#{@option_sources_block}")
     end
 

data/lib/hammer_cli/options/option_family.rb

@@ -5,7 +5,7 @@ module HammerCLI
     class OptionFamily
       attr_reader :children
 
-      IDS_REGEX = /\s?([Ii][Dd][s]?)\W|([Ii][Dd][s]?\Z)/
+      IDS_REGEX = /(\A[Ii][Dd][s]?)|\s([Ii][Dd][s]?)\W|([Ii][Dd][s]?\Z)/
 
       def initialize(options = {})
         @all = []
@@ -13,26 +13,32 @@ module HammerCLI
         @options = options
         @creator = options[:creator] || Class.new(HammerCLI::Apipie::Command)
         @prefix = options[:prefix]
-        @description = options[:description]
         @root = options[:root] || options[:aliased_resource] || options[:referenced_resource]
       end
 
       def description
         types = all.map(&:type).map { |s| s.split('_').last.to_s }
-                   .map(&:capitalize).join('/')
-        @description ||= @parent.help[1].gsub(IDS_REGEX) { |w| w.gsub(/\w+/, types) }
+                   .map(&:downcase).join('/')
+        parent_desc = @parent.help[1].gsub(IDS_REGEX) { |w| w.gsub(/\w+/, types) }
+        desc = parent_desc.strip.empty? ? @options[:description] : parent_desc
         if @options[:deprecation].class <= String
-          format_deprecation_msg(@description, _('Deprecated: %{deprecated_msg}') % { deprecated_msg: @options[:deprecation] })
+          format_deprecation_msg(desc, _('Deprecated: %{deprecated_msg}') % { deprecated_msg: @options[:deprecation] })
         elsif @options[:deprecation].class <= Hash
           full_msg = @options[:deprecation].map do |flag, msg|
             _('%{flag} is deprecated: %{deprecated_msg}') % { flag: flag, deprecated_msg: msg }
           end.join(', ')
-          format_deprecation_msg(@description, full_msg)
+          format_deprecation_msg(desc, full_msg)
         else
-          @description
+          desc
         end
       end
 
+      def formats
+        return [@options[:format].class] if @options[:format]
+
+        all.map(&:value_formatter).map(&:class).uniq
+      end
+
       def switch
         return if @parent.nil? && @children.empty?
         return @parent.help_lhs.strip if @children.empty?
@@ -67,6 +73,9 @@ module HammerCLI
       end
 
       def adopt(child)
+        raise ArgumentError, 'Parent cannot be a child within the same family' if child == @parent
+        raise ArgumentError, 'Child is already in the family' if @children.include?(child)
+
         child.family = self
         @children << child
       end
@@ -103,9 +112,7 @@ module HammerCLI
         max_len.downto(0) do |curr_len|
           0.upto(max_len - curr_len) do |start|
             root = shortest[start, curr_len]
-            if switches.all? { |switch| switch.include?(root) }
-              return root[2..-1].chomp('-')
-            end
+            return root[2..-1].chomp('-') if switches.all? { |switch| switch.include?(root) }
           end
         end
       end

data/lib/hammer_cli/output/definition.rb

@@ -73,7 +73,7 @@ module HammerCLI::Output
 
         data << sets.each_with_object({}) do |set, res|
           mark = field.sets.include?(set) ? 'x' : ''
-          value = set == sets.first ? field.full_label : mark
+          value = set == sets.first ? field.full_label.capitalize : mark
           res.update(set => value)
         end
       end

data/lib/hammer_cli/output/field_filter.rb

@@ -66,7 +66,7 @@ module HammerCLI::Output
 
     def include_by_label?(labels, label)
       labels.any? do |l|
-        l.start_with?("#{label}/") || label.match(%r{^#{l.gsub(/\*/, '.*')}(|\/.*)$})
+        l.start_with?("#{label}/") || label.match(%r{^#{l.gsub(/\*/, '.*')}(|\/.*)$}) || l == label
       end
     end
 

data/lib/hammer_cli/settings.rb

@@ -67,7 +67,7 @@ module HammerCLI
     def self.default_settings
       {
         :use_defaults => true,
-        :completion_cache_file => '~/.cache/hammer_completion.yml'
+        :completion_cache_file => '~/.cache/hammer_completion.json'
       }
     end
 

data/lib/hammer_cli/shell.rb

@@ -97,7 +97,7 @@ module HammerCLI
           history.push(line)
 
           line = HammerCLI::CompleterLine.new(line)
-          ShellMainCommand.run('', line, context) unless line.empty?
+          ShellMainCommand.run('hammer', line, context) unless line.empty?
         end
       rescue Interrupt; end
 

data/lib/hammer_cli/utils.rb

@@ -121,7 +121,7 @@ module HammerCLI
     bits = path.split(' ')
     parent_command = HammerCLI::MainCommand
     new_path = (bits[1..-1] || []).each_with_object([]) do |bit, names|
-      subcommand = parent_command.find_subcommand(bit, fuzzy: false)
+      subcommand = parent_command.find_subcommand(bit)
       next if subcommand.nil?
 
       names << if subcommand.names.size > 1

data/lib/hammer_cli/version.rb

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

data/test/unit/output/definition_test.rb

@@ -269,9 +269,9 @@ describe HammerCLI::Output::Definition do
       sets_table = "---------|-----|---------|----\n" \
                    "FIELDS   | ALL | DEFAULT | SET\n" \
                    "---------|-----|---------|----\n" \
-                   "newfield | x   | x       |    \n" \
-                   "cf/abc   |     |         | x  \n" \
-                   "cf/bca   |     |         | x  \n" \
+                   "Newfield | x   | x       |    \n" \
+                   "Cf/abc   |     |         | x  \n" \
+                   "Cf/bca   |     |         | x  \n" \
                    "---------|-----|---------|----\n"
 
       definition.sets_table.must_equal sets_table

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.5.1
 platform: ruby
 authors:
 - Martin Bačovský
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2021-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -152,7 +152,6 @@ executables:
 - hammer-complete
 extensions: []
 extra_rdoc_files:
-- doc/commands_extension.md
 - doc/commands_modification.md
 - doc/creating_apipie_commands.md
 - doc/creating_commands.md
@@ -165,13 +164,14 @@ extra_rdoc_files:
 - doc/installation.md
 - doc/installation_deb.md
 - doc/installation_gem.md
+- doc/installation_rpm.md
+- doc/installation_source.md
 - doc/option_builders.md
 - doc/option_normalizers.md
 - doc/output.md
 - doc/review_checklist.md
 - doc/writing_a_plugin.md
-- doc/installation_rpm.md
-- doc/installation_source.md
+- doc/commands_extension.md
 - doc/release_notes.md
 - config/cli.modules.d/module_config_template.yml
 - config/cli_config.template.yml
@@ -456,13 +456,13 @@ test_files:
 - test/unit/output/adapter/json_test.rb
 - test/unit/output/adapter/table_test.rb
 - test/unit/output/adapter/yaml_test.rb
-- test/unit/output/definition_test.rb
 - test/unit/output/dsl_test.rb
 - test/unit/output/field_filter_test.rb
 - test/unit/output/fields_test.rb
 - test/unit/output/formatters_test.rb
 - test/unit/output/output_test.rb
 - test/unit/output/record_collection_test.rb
+- test/unit/output/definition_test.rb
 - test/unit/settings_test.rb
 - test/unit/test_helper.rb
 - test/unit/utils_test.rb