Refs #36337 - Fix undefined variable warnings

lib/hammer_cli/abstract.rb

@@ -42,7 +42,7 @@ def help_extension_blocks
       end
 
       def command_extensions
-        @command_extensions = @command_extensions || inherited_command_extensions || []
+        @command_extensions ||= inherited_command_extensions || []
         @command_extensions
       end
 
@@ -206,7 +206,7 @@ def output_definition
     end
 
     def self.output_definition
-      @output_definition = @output_definition || inherited_output_definition || HammerCLI::Output::Definition.new
+      @output_definition ||= inherited_output_definition || HammerCLI::Output::Definition.new
       @output_definition
     end
 
@@ -341,27 +341,27 @@ def exception_handler_class
     end
 
     def self.desc(desc=nil)
-      @desc = desc if desc
-      @desc
+      return @desc ||= nil unless desc
+
+      @desc = desc
     end
 
     def self.command_name(name=nil)
-      if @names && name
-        @names << name if !@names.include?(name)
-      else
-        @names = [name] if name
-      end
-      @names || (superclass.respond_to?(:command_names) ? superclass.command_names : nil)
+      command_names(name)
     end
 
     def self.command_names(*names)
-      @names = names unless names.empty?
-      @names || (superclass.respond_to?(:command_names) ? superclass.command_names : nil)
+      names = names.compact
+      return @names ||= (superclass.respond_to?(:command_names) ? superclass.command_names : nil) if names.empty?
+
+      @names ||= []
+      @names |= names
     end
 
     def self.warning(message = nil)
-      @warning_msg = message if message
-      @warning_msg
+      return @warning_msg ||= nil unless message
+
+      @warning_msg = message
     end
 
     def self.autoload_subcommands

lib/hammer_cli/apipie/resource.rb

@@ -37,7 +37,7 @@ def connection_name(resource_class)
       end
 
       def class_resource
-        return @api_resource if @api_resource
+        return @api_resource if @api_resource ||= nil
         return superclass.class_resource if superclass.respond_to? :class_resource
       end
 
@@ -68,7 +68,7 @@ def resource(resource=nil, action=nil)
 
       def action(action=nil)
         @api_action = action unless action.nil?
-        return @api_action if @api_action
+        return @api_action if @api_action ||= nil
         return superclass.action if superclass.respond_to? :action
       end
 

lib/hammer_cli/command_extensions.rb

@@ -33,7 +33,7 @@ def inheritable?
     end
 
     def self.method_missing(message, *args, &block)
-      if @delegatee
+      if @delegatee ||= nil
         @delegatee.send(message, *args, &block)
       else
         super
@@ -121,7 +121,7 @@ def extend_output
       allowed = @only & %i[output]
       return if allowed.empty? || (allowed & @except).any?
 
-      self.class.extend_output(@command_class, @command_object)
+      self.class.extend_output(@command_class, @command_object ||= nil)
     end
 
     def extend_help
@@ -191,7 +191,7 @@ def details
     # Class
 
     def self.extend_options(command_class)
-      return if @options.nil?
+      return unless @options ||= nil
 
       @options.each do |option|
         command_class.send(:option,
@@ -205,63 +205,62 @@ def self.extend_options(command_class)
     end
 
     def self.extend_predefined_options(command_class)
+      @predefined_option_names ||= nil
       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, command_object, command_class)
-      return if @before_print_block.nil?
+      return unless @before_print_block ||= nil
 
       @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, command_object)
-      return if @output_extension_block.nil?
+      return unless @output_extension_block ||= nil
 
       @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
 
     def self.extend_help(command_class)
-      return if @help_extension_block.nil?
+      return unless @help_extension_block ||= nil
 
       command_class.help_extension_blocks << @help_extension_block
       logger.debug("Saved block for #{@delegatee} help definition:\n\t#{@help_extension_block}")
     end
 
     def self.extend_request_headers(headers, command_object, command_class)
-      return if @request_headers_block.nil?
+      return unless @request_headers_block ||= nil
 
       @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, command_object, command_class)
-      return if @request_options_block.nil?
+      return unless @request_options_block ||= nil
 
       @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, command_object, command_class)
-      return if @request_params_block.nil?
+      return unless @request_params_block ||= nil
 
       @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_object, command_class)
-      return if @option_sources_block.nil?
+      return unless @option_sources_block ||= nil
 
       @option_sources_block.call(sources, command_object, command_class)
       logger.debug("Called block for #{@delegatee} option sources:\n\t#{@option_sources_block}")
     end
 
     def self.extend_option_family(command_class)
-      return if @option_family_extensions.nil?
-
-      @option_family_extensions.each do |extension|
+      (@option_family_extensions ||= []).each do |extension|
         extension[:options][:creator] = command_class
         command_class.send(:option_family, extension[:options], &extension[:block])
         logger.debug("Called option family block for #{command_class}:\n\t#{extension[:block]}")

lib/hammer_cli/options/option_family.rb

@@ -19,6 +19,7 @@ def initialize(options = {})
         @children = []
         @options = options
         @creator = options[:creator] || self
+        @parent = nil
         @prefix = options[:prefix]
         @root = options[:root] || options[:aliased_resource] || options[:referenced_resource]
         @creator.family_registry.register(self) if @creator != self

lib/hammer_cli/output/fields.rb

@@ -13,6 +13,7 @@ def initialize(options={})
       @label = options[:label]
       @sets = options[:sets]
       @options = options
+      @parent = nil
     end
 
     def id
@@ -57,8 +58,7 @@ def parameters
     protected
 
     def inherited_sets
-      return nil if @parent.nil?
-      @parent.sets
+      @parent&.sets
     end
 
     def default_sets

lib/hammer_cli/output/record_collection.rb

@@ -6,10 +6,10 @@ class MetaData
     attr_accessor :total, :subtotal, :page, :per_page, :search, :sort_by, :sort_order, :pagination_verbosity
 
     def initialize(options={})
-      @total = options[:total].to_i if options[:total]
-      @subtotal = options[:subtotal].to_i if options[:subtotal]
-      @page = options[:page].to_i if options[:page]
-      @per_page = options[:per_page].to_i if options[:per_page]
+      @total = options[:total]&.to_i
+      @subtotal = options[:subtotal]&.to_i
+      @page = options[:page]&.to_i
+      @per_page = options[:per_page]&.to_i
       @search = options[:search]
       @sort_by = options[:sort_by]
       @sort_order = options[:sort_order]

lib/hammer_cli/testing/command_assertions.rb

@@ -35,7 +35,7 @@ def run_cmd(options, context={}, cmd_class=HammerCLI::MainCommand)
       end
 
       def exit_code_map
-        return @exit_code_map unless @exit_code_map.nil?
+        return @exit_code_map if @exit_code_map ||= nil
 
         hammer_exit_codes = HammerCLI.constants.select{|c| c.to_s.start_with?('EX_')}
         @exit_code_map = hammer_exit_codes.inject({}) do |code_map, code|

test/unit/apipie/option_definition_test.rb

@@ -4,7 +4,7 @@
 
 describe HammerCLI::Apipie::OptionDefinition do
 
-  let(:opt) { HammerCLI::Apipie::OptionDefinition.new("--opt", "OPT", "", :referenced_resource => @referenced_resource) }
+  let(:opt) { HammerCLI::Apipie::OptionDefinition.new("--opt", "OPT", "", :referenced_resource => @referenced_resource ||= nil) }
 
   describe "referenced resource" do
     it "should be nil by default" do