hammer_cli 0.17.1 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 541191afc24c45034d93c4c8adb074510ecc29dbf511becc8b1ba0ef4b2cac6c
-  data.tar.gz: 33e1685510fc9e0e4c7d8dafe1a9e78ccbd08f73008681dc8686a5d802e4b2af
+  metadata.gz: eb040c3f40863eea4ec0c05ac2d1ffc597b3ca9499470bda6ecc18ff66bcfad2
+  data.tar.gz: acb3307c3d9fcda2903ae19f026f1b4767950562c1507cb02afc2e433a4094c0
 SHA512:
-  metadata.gz: 6a775fe77ed8459c6f223606da43d060ae618eb5c1c599d656f4b7774d42cba9169617681577dbb23d7c0e7e124d3da53a4f5e153a3dc720acf0fa09f550ca1f
-  data.tar.gz: c095b66a7155e2ca6b8ae8d00fc183ecf8e45071c258a00d1a109792d1cbf7300f38c5fe5f9d7b285d393f36057867ff4be182cdfb747c5fc44e1e1f5009b9cb
+  metadata.gz: 89d7b3eb46518f18b718cef888205a1a62f03a079bd1e8600aae8217b99f882aa18a7fcc3a7787ab727c05a0a8ddc15690bcfc81ab8e19b2a7cb01c1f5034ac8
+  data.tar.gz: bbbd9bc7fb32e52edfe4451c98c534330d577380074ca3095f00d7666f72e8879fc9efaffd0a141ee86daf006db78cce878e304af21eae50c555a5075da4d0a4

data/config/cli_config.template.yml

@@ -72,3 +72,6 @@
   # Local CA cert store path where hammer stores certificates fetched from the server.
   # Certs from the local storage are used only when neither :ssl_ca_file: nor :ssl_ca_path: is cofigured.
   #:local_ca_store_path: '~/.hammer/certs'
+
+ # Allows setting the SSL version to use when making API calls
+  #:ssl_version: 'TLSv1_2'

data/doc/commands_modification.md

@@ -33,10 +33,15 @@ HammerCLIForeman::Host::InfoCommand.extend_output_definition do |definition|
   end
   # Returns output definition of the command or field specified with path.
   # Where:
-  #   path = Array of :key or/and :id or/and 'label']
+  #   path is an Array of field's :key or/and :id or/and 'label'
   definition.at(path)
   # Returns field from current output definition.
   definition.find_field(:id)
+  # Finds and adds fields to a set (creates a new one if the set doesn't exist).
+  # Where:
+  #   sets is an Array of String with set names
+  #   fields is an Array of field's :key or/and :id or/and 'label'
+  definition.update_field_sets(sets, fields)
   # Deletes all fields from current output definition.
   definition.clear
 end
@@ -55,6 +60,12 @@ HammerCLIForeman::Host::InfoCommand.extend_output_definition do |definition|
                                       definition.at(:path)
                                       .find_field(:id).label = _('New label')
                                     end
+# Update fields in a field set
+# Adds fields with :field_id and 'My field' to 'SET' set
+HammerCLIForeman::Host::InfoCommand.extend_output_definition do |definition|
+                                      definition.at(:path)
+                                      .update_field_sets('SET', [:field_id, 'My field'])
+                                    end
 # Expand a field with new definition
 HammerCLIForeman::Host::InfoCommand.extend_output_definition do |definition|
                                       definition.at([_('some'), :path])

data/doc/creating_commands.md

@@ -164,6 +164,14 @@ In cases when you want to deprecate just one of more possible switches use the e
     :deprecated => { '--name' => _('Use --alias instead') }
 ```
 
+#### Predefined options
+Also Hammer offers predefined options now. Those are just options, but with
+predefined functionality. To define them in your command use
+`use_option :option_name` method.
+
+Here is the list of predefined options:
+  * `:fields` Expects a list with fields to show in output, see [example](creating_commands.md#printing-hash-records).
+
 
 ### Option builders
 Hammer commands offer option builders that can be used for automatic option generation.
@@ -523,8 +531,12 @@ Imagine there's an API of some service that returns list of users:
 ```
 
 We can create an output definition that selects and formats some of the fields:
+
+_NOTE_: Every field can be arranged in so-called field sets. All the fields by default go to `'DEFAULT'` and `'ALL'` sets. Fields which are in the `'DEFAULT'` set will be printed by default. To see printed other field sets, use predefined option `--fields NAME`, where `NAME` is a field set name in ALLCAPS.
 ```ruby
 class Command < HammerCLI::AbstractCommand
+  # To be able to select fields which should be printed
+  use_option :fields
 
   output do
     # Simple field with a label. The first parameter is the key in the printed hash.
@@ -536,7 +548,7 @@ class Command < HammerCLI::AbstractCommand
     field :roles, 'System Roles', Fields::List
 
     # Label is used for grouping fields.
-    label 'Contacts' do
+    label 'Contacts', sets: ['ADDITIONAL', 'ALL'] do
       field :email, 'Email'
       field :phone, 'Phone No.'
     end
@@ -565,18 +577,38 @@ Using the base adapter the output will look like:
 ID:            1
 System Roles:  Admin, Editor
 Name:          Tom Sawyer
+Created At:    2012/12/18 15:24:42
+
+ID:            2
+System Roles:  Admin
+Name:          Huckleberry Finn
+Created At:    2012/12/18 15:25:00
+```
+
+Using the base adapter with `--fields ALL` or `--fields DEFAULT,ADDITIONAL` the output will look like:
+```
+ID:            1
+System Roles:  Admin, Editor
+Name:          Tom Sawyer
+Created At:    2012/12/18 15:24:42
 Contacts:
   Email:       tom@email.com
   Phone No.:   123456111
-Created At:    2012/12/18 15:24:42
 
 ID:            2
 System Roles:  Admin
 Name:          Huckleberry Finn
+Created At:    2012/12/18 15:25:00
 Contacts:
   Email:       huckleberry@email.com
   Phone No.:   123456222
-Created At:    2012/12/18 15:25:00
+```
+
+_NOTE_: `--fields` as well lets you to print desired fields only. E.g. to see the users' emails without any additional information use `--fields contacts/email`:
+```
+Email:       tom@email.com
+
+Email:       huckleberry@email.com
 ```
 
 You can optionally use the output definition from another command as a base and extend it with

data/doc/release_notes.md

@@ -1,6 +1,11 @@
 Release notes
 =============
-### 0.17.1 (2019-05-02)
+### 0.18.0 (2019-08-01)
+* Unsure minimal label length ([PR #310](https://github.com/theforeman/hammer-cli/pull/310)) ([#26960](http://projects.theforeman.org/issues/26960))
+* The --fields option has set help ([PR #308](https://github.com/theforeman/hammer-cli/pull/308)) ([#26960](http://projects.theforeman.org/issues/26960))
+* Filter fields properly ([#26961](http://projects.theforeman.org/issues/26961))
+* Possibility to limit fields that are displayed ([PR #276](https://github.com/theforeman/hammer-cli/pull/276)) ([#19135](http://projects.theforeman.org/issues/19135))
+* Allow setting the SSL version to use for API calls
 * Make sure list opts return a list ([#26703](http://projects.theforeman.org/issues/26703))
 
 ### 0.17.0 (2019-04-24)

data/lib/hammer_cli/abstract.rb

@@ -9,13 +9,13 @@ require 'hammer_cli/options/validators/dsl_block_validator'
 require 'hammer_cli/clamp'
 require 'hammer_cli/subcommand'
 require 'hammer_cli/options/matcher'
+require 'hammer_cli/options/predefined'
 require 'hammer_cli/help/builder'
 require 'hammer_cli/help/text_builder'
 require 'hammer_cli/command_extensions'
 require 'logging'
 
 module HammerCLI
-
   class AbstractCommand < Clamp::Command
     include HammerCLI::Subcommand
 
@@ -57,6 +57,12 @@ module HammerCLI
           end
         end
       end
+
+      def add_sets_help(help)
+        sets_details = HammerCLI::Help::Section.new(_('Predefined field sets'), nil, id: :s_sets_details, richtext: true)
+        sets_details.definition << HammerCLI::Help::Text.new(output_definition.sets_table)
+        help.definition.unshift(sets_details)
+      end
     end
 
     def adapter
@@ -118,9 +124,10 @@ module HammerCLI
 
     def self.help(invocation_path, builder = HammerCLI::Help::Builder.new)
       super(invocation_path, builder)
-
+      help_extension = HammerCLI::Help::TextBuilder.new(builder.richtext)
+      fields_switch = HammerCLI::Options::Predefined::OPTIONS[:fields].first[0]
+      add_sets_help(help_extension) if find_option(fields_switch)
       unless help_extension_blocks.empty?
-        help_extension = HammerCLI::Help::TextBuilder.new(builder.richtext)
         help_extension_blocks.each do |extension_block|
           begin
             extension_block.call(help_extension)
@@ -129,8 +136,8 @@ module HammerCLI
             handler.handle_exception(e)
           end
         end
-        builder.add_text(help_extension.string)
       end
+      builder.add_text(help_extension.string)
       builder.string
     end
 
@@ -161,13 +168,11 @@ module HammerCLI
       self.class.output_definition
     end
 
-
     def self.output_definition
       @output_definition = @output_definition || inherited_output_definition || HammerCLI::Output::Definition.new
       @output_definition
     end
 
-
     def interactive?
       HammerCLI.interactive?
     end
@@ -197,6 +202,7 @@ 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_output(self)
         extension.extend_help(self)
@@ -205,6 +211,12 @@ module HammerCLI
       end
     end
 
+    def self.use_option(*names)
+      names.each do |name|
+        HammerCLI::Options::Predefined.use(name, self)
+      end
+    end
+
     protected
 
     def self.find_options(switch_filter, other_filters={})
@@ -316,7 +328,6 @@ module HammerCLI
       @option_collector ||= HammerCLI::Options::OptionCollector.new(self.class.recognised_options, add_validators(option_sources))
     end
 
-
     def option_sources
       sources = HammerCLI::Options::ProcessorList.new(name: 'DefaultInputs')
       sources << HammerCLI::Options::Sources::CommandLine.new(self)
@@ -348,6 +359,5 @@ module HammerCLI
       end
       od
     end
-
   end
 end

data/lib/hammer_cli/apipie/resource.rb

@@ -7,7 +7,7 @@ module HammerCLI::Apipie
     end
 
     def resource
-      self.class.resource || parent_command_resource
+      self.class.resource || parent_command_resource || nil
     end
 
     def action

data/lib/hammer_cli/command_extensions.rb

@@ -15,7 +15,7 @@ module HammerCLI
     ALLOWED_EXTENSIONS = %i[
       option command_options before_print data output help request
       request_headers headers request_options options request_params params
-      option_sources
+      option_sources predefined_options use_option
     ].freeze
 
     def initialize(options = {})
@@ -54,6 +54,10 @@ module HammerCLI
                     opts: opts, block: block }
     end
 
+    def self.use_option(*names)
+      @predefined_option_names = names
+    end
+
     def self.before_print(&block)
       @before_print_block = block
     end
@@ -91,6 +95,13 @@ module HammerCLI
       self.class.extend_options(command_class)
     end
 
+    def extend_predefined_options(command_class)
+      allowed = @only & %i[predefined_options use_option]
+      return if allowed.empty? || (allowed & @except).any?
+
+      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?
@@ -170,6 +181,11 @@ module HammerCLI
       end
     end
 
+    def self.extend_predefined_options(command_class)
+      command_class.send(:use_option, *@predefined_option_names)
+      logger.debug("Added predefined options for #{command_class}: #{@predefined_option_names}")
+    end
+
     def self.extend_before_print(data)
       return if @before_print_block.nil?
 

data/lib/hammer_cli/options/predefined.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module HammerCLI
+  module Options
+    # Contains predefined by HammerCLI options for commands
+    module Predefined
+      OPTIONS = {
+        fields: [['--fields'], 'FIELDS',
+                 _('Show specified fileds or predefined filed sets only. (See below)'),
+                 format: HammerCLI::Options::Normalizers::List.new,
+                 context_target: :fields]
+      }.freeze
+
+      def self.use(option_name, command_class)
+        unless OPTIONS.key?(option_name)
+          raise ArgumentError, _('There is no such predefined option %s.') % option_name
+        end
+        command_class.send(:option, *OPTIONS[option_name])
+      end
+    end
+  end
+end

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

@@ -6,11 +6,12 @@ module HammerCLI::Output::Adapter
       []
     end
 
-    def initialize(context={}, formatters={})
+    def initialize(context={}, formatters={}, filters = {})
       context[:verbosity] ||= HammerCLI::V_VERBOSE
       @context = context
       @formatters = HammerCLI::Output::Formatters::FormatterLibrary.new(filter_formatters(formatters))
       @paginate_by_default = true
+      @filters = filters
     end
 
     def paginate_by_default?
@@ -41,10 +42,14 @@ module HammerCLI::Output::Adapter
       raise NotImplementedError
     end
 
+    def reset_context
+      @context.delete(:fields)
+    end
+
     protected
 
-    def field_filter
-      HammerCLI::Output::FieldFilter.new
+    def filter_fields(fields)
+      HammerCLI::Output::FieldFilter.new(fields, field_filters)
     end
 
     def self.data_for_field(field, record)
@@ -71,17 +76,25 @@ module HammerCLI::Output::Adapter
       $stdout
     end
 
-    def displayable_fields(fields, record, compact_only: false)
-      fields.select do |field|
-        field_data = data_for_field(field, record)
-        if compact_only && !field_data.is_a?(HammerCLI::Output::DataMissing)
-          true
-        else
-          field.display?(field_data)
-        end
+    def field_filters
+      {
+        classes_filter: classes_filter,
+        sets_filter: sets_filter
+      }.merge(@filters) do |_, old_filter, new_filter|
+        old_filter + new_filter
       end
     end
 
+    def classes_filter
+      return [] if @context[:show_ids]
+
+      [Fields::Id]
+    end
+
+    def sets_filter
+      @context[:fields] || ['DEFAULT']
+    end
+
     private
 
     def filter_formatters(formatters_map)
@@ -94,6 +107,5 @@ module HammerCLI::Output::Adapter
         map
       end
     end
-
   end
 end

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

@@ -21,18 +21,12 @@ module HammerCLI::Output::Adapter
 
     protected
 
-    def field_filter
-      filtered = []
-      filtered << Fields::Id unless @context[:show_ids]
-      HammerCLI::Output::FieldFilter.new(filtered)
-    end
-
     def render_fields(fields, data)
-      output = ""
-
-      fields = field_filter.filter(fields)
-      fields = displayable_fields(fields, data)
-
+      output = ''
+      fields = filter_fields(fields).filter_by_classes
+                                    .filter_by_sets
+                                    .filter_by_data(data)
+                                    .filtered_fields
       label_width = label_width(fields)
 
       fields.collect do |field|

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

@@ -126,7 +126,7 @@ module HammerCLI::Output::Adapter
       end
     end
 
-    def initialize(context={}, formatters={})
+    def initialize(context = {}, formatters = {}, filters = {})
       super
       @paginate_by_default = false
     end
@@ -148,7 +148,11 @@ module HammerCLI::Output::Adapter
     end
 
     def print_collection(fields, collection)
-      fields = displayable_fields(fields, collection.first, compact_only: true)
+      fields = filter_fields(fields).filter_by_classes
+                                    .filter_by_sets
+                                    .filter_by_data(collection.first,
+                                                    compact_only: true)
+                                    .filtered_fields
       rows = row_data(fields, collection)
       # get headers using columns heuristic
       headers = rows.map{ |r| Cell.headers(r, @context) }.max_by{ |headers| headers.size }
@@ -198,7 +202,7 @@ module HammerCLI::Output::Adapter
     end
 
     def default_headers(fields)
-      fields.select{ |f| !(f.class <= Fields::Id) || @context[:show_ids] }.map { |f| f.label }
+      fields.map(&:label)
     end
 
   end

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

@@ -21,9 +21,11 @@ module HammerCLI::Output::Adapter
     end
 
     def print_collection(all_fields, collection)
-      fields = field_filter.filter(all_fields)
-      fields = displayable_fields(fields, collection.first, compact_only: true)
-
+      fields = filter_fields(all_fields).filter_by_classes
+                                        .filter_by_sets
+                                        .filter_by_data(collection.first,
+                                                        compact_only: true)
+                                        .filtered_fields
       formatted_collection = format_values(fields, collection)
       # calculate hash of column widths (label -> width)
       widths = calculate_widths(fields, formatted_collection)
@@ -63,6 +65,10 @@ module HammerCLI::Output::Adapter
 
     protected
 
+    def classes_filter
+      super << Fields::ContainerField
+    end
+
     def normalize_column(width, value)
       value = value.to_s
       padding = width - HammerCLI::Output::Utils.real_length(value)
@@ -103,12 +109,6 @@ module HammerCLI::Output::Adapter
       width
     end
 
-    def field_filter
-      filtered = [Fields::ContainerField]
-      filtered << Fields::Id unless @context[:show_ids]
-      HammerCLI::Output::FieldFilter.new(filtered)
-    end
-
     private
 
     def max_width_for(field)

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

@@ -1,7 +1,6 @@
 module HammerCLI::Output::Adapter
   class TreeStructure < Abstract
-
-    def initialize(context={}, formatters={})
+    def initialize(context = {}, formatters = {}, filters = {})
       super
       @paginate_by_default = false
     end
@@ -34,15 +33,11 @@ module HammerCLI::Output::Adapter
 
     protected
 
-    def field_filter
-      filtered = []
-      filtered << Fields::Id unless @context[:show_ids]
-      HammerCLI::Output::FieldFilter.new(filtered)
-    end
-
     def render_fields(fields, data)
-      fields = field_filter.filter(fields)
-      fields = displayable_fields(fields, data)
+      fields = filter_fields(fields).filter_by_classes
+                                    .filter_by_sets
+                                    .filter_by_data(data)
+                                    .filtered_fields
       fields.reduce({}) do |hash, field|
         field_data = data_for_field(field, data)
         next unless field.display?(field_data)

data/lib/hammer_cli/output/definition.rb

@@ -19,6 +19,14 @@ module HammerCLI::Output
       @fields[field_index(field_id)]
     end
 
+    def update_field_sets(set_names, field_ids)
+      set_names = [set_names] unless set_names.is_a?(Array)
+      field_ids = [field_ids] unless field_ids.is_a?(Array)
+      field_ids.each do |field_id|
+        find_field(field_id).sets = find_field(field_id).sets.concat(set_names).uniq
+      end
+    end
+
     def insert(mode, field_id, fields = nil, &block)
       definition = self.class.new
       definition.append(fields, &block)
@@ -46,8 +54,84 @@ module HammerCLI::Output
       @fields.empty?
     end
 
+    def field_sets
+      nested_fields_sets(@fields).uniq.sort
+    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
+    end
+
     private
 
+    def max_label_length
+      field_labels(@fields, full_labels: true).map(&:size).max
+    end
+
+    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)
+        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
+
+    def nested_fields_sets(fields)
+      fields.map do |field|
+        next field.sets unless field.respond_to?(:fields)
+
+        nested_fields_sets(field.fields)
+      end.flatten
+    end
+
     def field_index(field_id)
       index = @fields.find_index do |f|
         f.match_id?(field_id)

data/lib/hammer_cli/output/field_filter.rb

@@ -1,21 +1,84 @@
 module HammerCLI::Output
-
   class FieldFilter
+    attr_reader :fields, :filtered_fields
+    attr_accessor :classes_filter, :sets_filter
+
+    def initialize(fields = [], filters = {})
+      self.fields = fields
+      @classes_filter = filters[:classes_filter] || []
+      @sets_filter = filters[:sets_filter] || []
+    end
 
-    def initialize(field_classes=[])
-      @field_classes = field_classes
+    def fields=(fields)
+      @fields = fields || []
+      @filtered_fields = @fields.dup
     end
 
-    def filter(fields)
-      fields = fields.clone
-      @field_classes.each do |cls|
-        fields.reject! do |f|
+    def filter_by_classes(classes = nil)
+      classes ||= @classes_filter
+      classes.each do |cls|
+        @filtered_fields.reject! do |f|
           f.is_a? cls
         end
       end
-      fields
+      self
     end
 
-  end
+    def filter_by_sets(sets = nil)
+      sets ||= @sets_filter
+      return self if sets.empty?
+
+      set_names, labels = resolve_set_names(sets)
+      deep_filter(@filtered_fields, set_names, labels)
+      self
+    end
+
+    def filter_by_data(data, compact_only: false)
+      @filtered_fields = displayable_fields(@filtered_fields,
+                                            data,
+                                            compact_only: compact_only)
+      self
+    end
+
+    private
+
+    def deep_filter(fields, set_names, labels)
+      fields.select! do |f|
+        allowed = include_by_label?(labels, f.full_label.downcase)
+        allowed ||= (f.sets & set_names).any?
+        deep_filter(f.fields, set_names, labels) if f.respond_to?(:fields)
+        allowed
+      end
+    end
 
+    def displayable_fields(fields, record, compact_only: false)
+      fields.select do |field|
+        field_data = HammerCLI::Output::Adapter::Abstract.data_for_field(
+          field, record
+        )
+        if compact_only && !field_data.is_a?(HammerCLI::Output::DataMissing)
+          true
+        else
+          field.display?(field_data)
+        end
+      end
+    end
+
+    def include_by_label?(labels, label)
+      labels.any? do |l|
+        l.start_with?("#{label}/") || label.match(%r{^#{l.gsub(/\*/, '.*')}(|\/.*)$})
+      end
+    end
+
+    def resolve_set_names(sets)
+      set_names = []
+      labels = []
+      sets.each do |name|
+        next set_names << name if name.upcase == name
+
+        labels << name.downcase
+      end
+      [set_names, labels]
+    end
+  end
 end

data/lib/hammer_cli/output/fields.rb

@@ -1,16 +1,17 @@
 require 'hammer_cli/output/dsl'
 
 module Fields
-
   class Field
     attr_reader :path
-    attr_accessor :label
+    attr_writer :sets
+    attr_accessor :label, :parent
 
     def initialize(options={})
       @hide_blank = options[:hide_blank].nil? ? false : options[:hide_blank]
       @hide_missing = options[:hide_missing].nil? ? true : options[:hide_missing]
       @path = options[:path] || []
       @label = options[:label]
+      @sets = options[:sets]
       @options = options
     end
 
@@ -30,6 +31,15 @@ module Fields
       @hide_missing
     end
 
+    def full_label
+      return @label.to_s if @parent.nil?
+      "#{@parent.full_label}/#{@label}"
+    end
+
+    def sets
+      @sets || inherited_sets || default_sets
+    end
+
     def display?(value)
       if value.is_a?(HammerCLI::Output::DataMissing)
         !hide_missing?
@@ -44,6 +54,16 @@ module Fields
       @options
     end
 
+    protected
+
+    def inherited_sets
+      return nil if @parent.nil?
+      @parent.sets
+    end
+
+    def default_sets
+      %w[DEFAULT ALL]
+    end
   end
 
 
@@ -53,7 +73,7 @@ module Fields
       super(options)
       dsl = HammerCLI::Output::Dsl.new
       dsl.build &block if block_given?
-
+      dsl.fields.each { |f| f.parent = self }
       self.output_definition.append dsl.fields
     end
 

data/lib/hammer_cli/output/output.rb

@@ -25,6 +25,7 @@ module HammerCLI::Output
 
     def print_record(definition, record)
       adapter.print_record(definition.fields, record) if appropriate_verbosity?(:record)
+      adapter.reset_context
     end
 
     def print_collection(definition, collection)
@@ -32,6 +33,7 @@ module HammerCLI::Output
         collection = HammerCLI::Output::RecordCollection.new([collection].flatten(1))
       end
       adapter.print_collection(definition.fields, collection) if appropriate_verbosity?(:collection)
+      adapter.reset_context
     end
 
     def adapter

data/lib/hammer_cli/ssloptions.rb

@@ -14,7 +14,7 @@ module HammerCLI
 
     def get_options(uri = nil)
       ssl_options = {}
-      for sslopt in [:ssl_ca_file, :ssl_ca_path, :verify_ssl] do
+      for sslopt in [:ssl_ca_file, :ssl_ca_path, :verify_ssl, :ssl_version] do
         ssloptval = read_ssl_option(sslopt)
         ssl_options[sslopt] = ssloptval unless ssloptval.nil?
       end

data/lib/hammer_cli/version.rb

@@ -1,5 +1,5 @@
 module HammerCLI
   def self.version
-    @version ||= Gem::Version.new '0.17.1'
+    @version ||= Gem::Version.new '0.18.0'
   end
 end

data/test/unit/abstract_test.rb

@@ -270,6 +270,7 @@ describe HammerCLI::AbstractCommand do
       option "--test", "TEST", "Test option"
       option "--test-format", "TEST_FORMAT", "Test option with a formatter",
         :format => HammerCLI::Options::Normalizers::List.new
+      use_option :fields
     end
 
     it "should create instances of hammer options" do
@@ -282,6 +283,10 @@ describe HammerCLI::AbstractCommand do
       opt.value_formatter.kind_of?(HammerCLI::Options::Normalizers::List).must_equal true
     end
 
+    it 'should allow using of predefined options' do
+      opt = TestOptionCmd.find_option('--fields')
+      opt.is_a?(HammerCLI::Options::OptionDefinition).must_equal true
+    end
   end
 
   describe "#options" do

data/test/unit/output/definition_test.rb

@@ -257,4 +257,24 @@ describe HammerCLI::Output::Definition do
       definition.at(path).must_equal label_field.output_definition
     end
   end
+
+  describe 'sets_table' do
+    it 'prints a table with fields and sets ' do
+      cont_field = Fields::ContainerField.new(id: :id1, label: 'cf', sets: ['SET']) do
+        field :a, 'abc', Fields::Field
+        field :b, 'bca', Fields::Field
+      end
+      definition.fields += [new_field, cont_field]
+
+      sets_table = "+----------+-----+---------+-----+
+|  Fields  | ALL | DEFAULT | SET |
++----------+-----+---------+-----+
+| newfield |  x  |    x    |     |
+| cf/abc   |     |         |  x  |
+| cf/bca   |     |         |  x  |
++----------+-----+---------+-----+\n"
+
+      definition.sets_table.must_equal sets_table
+    end
+  end
 end

data/test/unit/output/field_filter_test.rb

@@ -1,27 +1,72 @@
 require File.join(File.dirname(__FILE__), '../test_helper')
 
 describe HammerCLI::Output::FieldFilter do
-
-  let(:fields) { [
-    Fields::Field.new(:label => "field"),
-    Fields::Collection.new(:label => "collection"),
-    Fields::Id.new(:label => "id")
-  ] }
+  let(:fields) do
+    [
+      Fields::Field.new(:label => 'field', :hide_blank => true),
+      Fields::Collection.new(:label => 'collection'),
+      Fields::Id.new(:label => 'id', :sets => ['THIN'])
+    ]
+  end
+  let(:container_fields) do
+    fields + [
+      Fields::ContainerField.new(:label => 'container') do
+        field :first, 'first'
+        field :second, 'second', Fields::ContainerField do
+          field :nested, 'nested'
+        end
+      end
+    ]
+  end
   let(:field_labels) { fields.map(&:label).sort }
 
-  it "lets all fields go by default" do
-    f = HammerCLI::Output::FieldFilter.new
-    f.filter(fields).map(&:label).sort.must_equal ["field", "collection", "id"].sort
+  it 'lets all fields go by default' do
+    f = HammerCLI::Output::FieldFilter.new(fields)
+    f.filtered_fields.map(&:label).sort.must_equal ['field', 'collection', 'id'].sort
+  end
+
+  it 'filters fields by class' do
+    f = HammerCLI::Output::FieldFilter.new(fields, classes_filter: [Fields::Id])
+    f.filter_by_classes.filtered_fields.map(&:label).sort.must_equal ['field', 'collection'].sort
+  end
+
+  it 'filters fields by superclass' do
+    f = HammerCLI::Output::FieldFilter.new(fields, classes_filter: [Fields::ContainerField])
+    f.filter_by_classes.filtered_fields.map(&:label).sort.must_equal ['field', 'id'].sort
+  end
+
+  it 'filters fields by sets' do
+    f = HammerCLI::Output::FieldFilter.new(fields, sets_filter: ['THIN'])
+    f.filter_by_sets.filtered_fields.map(&:label).must_equal ['id']
+  end
+
+  it 'filters fields by sets with labels' do
+    f = HammerCLI::Output::FieldFilter.new(fields, sets_filter: ['THIN', 'field'])
+    f.filter_by_sets.filtered_fields.map(&:label).sort.must_equal ['field', 'id'].sort
+  end
+
+  it 'filters by full labels' do
+    f = HammerCLI::Output::FieldFilter.new(container_fields, sets_filter: ['container/first'])
+    f.filter_by_sets.filtered_fields.first.fields.map(&:label).must_equal ['first']
+  end
+
+  it 'filters by superclass labels' do
+    f = HammerCLI::Output::FieldFilter.new(container_fields, sets_filter: ['container'])
+    f.filter_by_sets.filtered_fields.first.fields.map(&:label).must_equal ['first', 'second']
   end
 
-  it "filters fields by class" do
-    f = HammerCLI::Output::FieldFilter.new([Fields::Id])
-    f.filter(fields).map(&:label).sort.must_equal ["field", "collection"].sort
+  it 'filters by labels with wildcards' do
+    f = HammerCLI::Output::FieldFilter.new(container_fields, sets_filter: ['container/f*'])
+    f.filter_by_sets.filtered_fields.first.fields.map(&:label).must_equal ['first']
   end
 
-  it "filters fields by superclass" do
-    f = HammerCLI::Output::FieldFilter.new([Fields::ContainerField])
-    f.filter(fields).map(&:label).sort.must_equal ["field", "id"].sort
+  it 'allows chained filtering' do
+    f = HammerCLI::Output::FieldFilter.new(fields, sets_filter: ['THIN'], classes_filter: [Fields::Id])
+    f.filter_by_classes.filter_by_sets.filtered_fields.map(&:label).must_equal []
   end
 
+  it 'filters fields by data' do
+    f = HammerCLI::Output::FieldFilter.new(fields)
+    f.filter_by_data(nil).filtered_fields.map(&:label).sort.must_equal ['id', 'collection'].sort
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.0
 platform: ruby
 authors:
 - Martin Bačovský
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2019-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -242,6 +242,7 @@ files:
 - lib/hammer_cli/options/option_collector.rb
 - lib/hammer_cli/options/option_definition.rb
 - lib/hammer_cli/options/option_processor.rb
+- lib/hammer_cli/options/predefined.rb
 - lib/hammer_cli/options/processor_list.rb
 - lib/hammer_cli/options/sources/base.rb
 - lib/hammer_cli/options/sources/command_line.rb