hammer_cli 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96f7adf75924a417c91ebd6a06ffebb31df006263e7c8b756956d8e438bee5f6
-  data.tar.gz: 3bf87b0c2a7625fe341a5226606755300053f622b9543ee1c34fee2ed9905a35
+  metadata.gz: dae98160a2f04eb29858cd97cc219ebc440dbe8db359cd4c5c742ef164fb3c7d
+  data.tar.gz: 3c062268d65695c331953183322e23e373ac1359bc3110a1f48aed8d93f818f9
 SHA512:
-  metadata.gz: deca360e00c00eda50d96c387f18c47371734b51267c2a4051252b8899c20ef3afb7f769c55a26ff0d0a91af31351f09fc7d6b99333b29275eecb9f8da41c8ad
-  data.tar.gz: c05d30ecd6439ce5a909d3f2d84f26e78205e82a4f476a035d78970a80f1dc09dc6c39be4b824a8451b47ae0e13baff4f46962a4ec46d48031018ca3ddc7bff5
+  metadata.gz: d12884641c2450d7b9893f5b8db2d13ad27958aabfbd06e9d763d8f35eb86ba813290c73933c6a4cdbf456c32f38d82ff96247f048ad6db4fe4bbd4feb0f0ad1
+  data.tar.gz: 05c7c44cbc98c2e3a4e4e3419120e7bacdc9131f8b0ec086762afe655179ccb7985764042d53e03839358447d5d87bcf20025a5635e0804ac45ec5fc694c0c27

data/doc/release_notes.md

@@ -1,5 +1,8 @@
 Release notes
 =============
+### 2.3.1 (2021-05-04)
+* Better family assignment for options, [#30996](http://projects.theforeman.org/issues/30996)
+
 ### 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)

data/lib/hammer_cli/abstract.rb

@@ -190,18 +190,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)
@@ -411,6 +402,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/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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Martin Bačovský
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -145,37 +145,37 @@ dependencies:
         version: 0.2.0
 description: 'Hammer cli provides universal extendable CLI interface for ruby apps
 
-  '
+'
 email: mbacovsk@redhat.com
 executables:
 - hammer
 - hammer-complete
 extensions: []
 extra_rdoc_files:
-- doc/commands_extension.md
-- doc/release_notes.md
-- doc/design.png
 - doc/commands_modification.md
-- doc/installation.md
-- doc/development_tips.md
-- doc/writing_a_plugin.md
-- doc/output.md
+- doc/creating_apipie_commands.md
+- doc/design.png
+- doc/design.uml
 - doc/developer_docs.md
+- doc/development_tips.md
+- doc/help_modification.md
+- doc/i18n.md
 - doc/installation_deb.md
-- doc/option_normalizers.md
-- doc/installation_rpm.md
 - doc/installation_gem.md
-- doc/help_modification.md
-- doc/creating_commands.md
-- doc/installation_source.md
 - doc/option_builders.md
-- doc/i18n.md
+- doc/option_normalizers.md
+- doc/output.md
 - doc/review_checklist.md
-- doc/creating_apipie_commands.md
-- doc/design.uml
+- doc/writing_a_plugin.md
+- doc/commands_extension.md
+- doc/creating_commands.md
+- doc/installation_rpm.md
+- doc/installation_source.md
+- doc/installation.md
+- doc/release_notes.md
 - config/cli.modules.d/module_config_template.yml
-- config/cli_config.template.yml
 - config/hammer.completion
+- config/cli_config.template.yml
 - README.md
 files:
 - LICENSE
@@ -399,70 +399,70 @@ signing_key:
 specification_version: 4
 summary: Universal command-line interface
 test_files:
-- test/unit/messages_test.rb
-- test/unit/exception_handler_test.rb
-- test/unit/modules_test.rb
-- test/unit/connection_test.rb
-- test/unit/completer_test.rb
-- test/unit/csv_parser_test.rb
-- test/unit/option_builder_test.rb
-- test/unit/test_helper.rb
-- test/unit/utils_test.rb
-- test/unit/apipie/command_test.rb
-- test/unit/apipie/option_builder_test.rb
-- test/unit/apipie/test_helper.rb
+- test/functional/defaults_test.rb
+- test/functional/help_test.rb
+- test/functional/nil_values_test.rb
+- test/functional/test_helper.rb
+- test/test_helper.rb
 - test/unit/apipie/api_connection_test.rb
+- test/unit/apipie/command_test.rb
 - test/unit/apipie/option_definition_test.rb
-- test/unit/command_extensions_test.rb
-- test/unit/main_test.rb
-- test/unit/options/processor_list_test.rb
-- test/unit/options/option_family_test.rb
-- test/unit/options/validators/dsl_test.rb
-- test/unit/options/sources/command_line_test.rb
-- test/unit/options/sources/saved_defaults_test.rb
-- test/unit/options/matcher_test.rb
-- test/unit/options/option_collector_test.rb
-- test/unit/options/normalizers_test.rb
-- test/unit/options/option_definition_test.rb
-- test/unit/settings_test.rb
-- test/unit/history_test.rb
+- test/unit/apipie/test_helper.rb
+- test/unit/apipie/option_builder_test.rb
+- test/unit/bash_test.rb
+- test/unit/ca_cert_manager_test.rb
+- test/unit/completer_test.rb
+- test/unit/connection_test.rb
+- test/unit/csv_parser_test.rb
 - test/unit/defaults_test.rb
-- test/unit/logger_test.rb
-- test/unit/output/formatters_test.rb
-- test/unit/output/record_collection_test.rb
-- test/unit/output/dsl_test.rb
-- test/unit/output/definition_test.rb
-- test/unit/output/output_test.rb
-- test/unit/output/field_filter_test.rb
-- test/unit/output/fields_test.rb
-- test/unit/output/adapter/table_test.rb
-- test/unit/output/adapter/json_test.rb
-- test/unit/output/adapter/abstract_test.rb
-- test/unit/output/adapter/yaml_test.rb
-- test/unit/output/adapter/csv_test.rb
-- test/unit/output/adapter/base_test.rb
-- test/unit/abstract_test.rb
-- test/unit/i18n_test.rb
+- test/unit/exception_handler_test.rb
 - test/unit/fixtures/apipie/architectures.json
 - test/unit/fixtures/apipie/documented.json
-- test/unit/fixtures/defaults/defaults_dashed.yml
-- test/unit/fixtures/defaults/defaults.yml
-- test/unit/fixtures/json_input/valid.json
-- test/unit/fixtures/json_input/invalid.json
 - test/unit/fixtures/certs/ca_cert.pem
 - test/unit/fixtures/certs/non_ca_cert.pem
-- test/unit/bash_test.rb
-- test/unit/help/definition/section_test.rb
-- test/unit/help/definition/list_test.rb
-- test/unit/help/definition/text_test.rb
+- test/unit/fixtures/defaults/defaults.yml
+- test/unit/fixtures/defaults/defaults_dashed.yml
+- test/unit/fixtures/json_input/invalid.json
+- test/unit/fixtures/json_input/valid.json
 - test/unit/help/definition/abstract_item_test.rb
+- test/unit/help/definition/list_test.rb
 - test/unit/help/definition/note_test.rb
+- test/unit/help/definition/section_test.rb
+- test/unit/help/definition/text_test.rb
 - test/unit/help/definition_test.rb
-- test/unit/help/builder_test.rb
 - test/unit/help/text_builder_test.rb
-- test/unit/ca_cert_manager_test.rb
-- test/functional/help_test.rb
-- test/functional/test_helper.rb
-- test/functional/nil_values_test.rb
-- test/functional/defaults_test.rb
-- test/test_helper.rb
+- test/unit/help/builder_test.rb
+- test/unit/history_test.rb
+- test/unit/i18n_test.rb
+- test/unit/logger_test.rb
+- test/unit/main_test.rb
+- test/unit/messages_test.rb
+- test/unit/modules_test.rb
+- test/unit/option_builder_test.rb
+- test/unit/options/matcher_test.rb
+- test/unit/options/normalizers_test.rb
+- test/unit/options/option_collector_test.rb
+- test/unit/options/option_definition_test.rb
+- test/unit/options/processor_list_test.rb
+- test/unit/options/sources/command_line_test.rb
+- test/unit/options/sources/saved_defaults_test.rb
+- test/unit/options/validators/dsl_test.rb
+- test/unit/options/option_family_test.rb
+- test/unit/output/adapter/abstract_test.rb
+- test/unit/output/adapter/base_test.rb
+- test/unit/output/adapter/csv_test.rb
+- test/unit/output/adapter/json_test.rb
+- test/unit/output/adapter/table_test.rb
+- test/unit/output/adapter/yaml_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
+- test/unit/abstract_test.rb
+- test/unit/command_extensions_test.rb