Fixes #36337 - Update rake and clamp deps

Gemfile

@@ -5,7 +5,7 @@ gemspec
 gem 'gettext', '>= 3.1.3', '< 4.0.0'
 
 group :test do
-  gem 'rake', '~> 10.1.0'
+  gem 'rake'
   gem 'thor'
   gem 'minitest', '4.7.4'
   gem 'minitest-spec-context'

Rakefile

@@ -11,6 +11,7 @@ Rake::TestTask.new do |t|
   t.libs.push "lib"
   t.test_files = Dir.glob('test/**/*_test.rb')
   t.verbose = true
+  t.warning = false unless ENV['RUBY_WARNINGS']
 end
 
 file "man/hammer.1.gz" => "man/hammer.1.asciidoc" do |t|

hammer_cli.gemspec

@@ -27,7 +27,7 @@ EOF
   s.require_paths = ["lib"]
   s.executables = ['hammer', 'hammer-complete']
 
-  s.add_dependency 'clamp', '>= 1.1', '< 1.2.0'
+  s.add_dependency 'clamp', '>= 1.1', '< 2.0.0'
   s.add_dependency 'logging'
   s.add_dependency 'unicode-display_width'
   s.add_dependency 'unicode'

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
 
@@ -192,7 +192,7 @@ def self.extend_output_definition(&block)
 
     def self.output(definition=nil, &block)
       dsl = HammerCLI::Output::Dsl.new
-      dsl.build &block if block_given?
+      dsl.build(&block) if block_given?
       output_definition.append definition.fields unless definition.nil?
       output_definition.append dsl.fields
     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/defaults_commands.rb

@@ -1,4 +1,3 @@
-require 'hammer_cli'
 require 'yaml'
 module HammerCLI
   class BaseDefaultsProvider

lib/hammer_cli/help/builder.rb

@@ -14,7 +14,7 @@ def initialize(richtext = false)
       def add_usage(invocation_path, usage_descriptions)
         heading(Clamp.message(:usage_heading))
         usage_descriptions.each do |usage|
-          puts "    #{HammerCLI.expand_invocation_path(invocation_path)} #{usage}".rstrip
+          line "    #{HammerCLI.expand_invocation_path(invocation_path)} #{usage}".rstrip
         end
       end
 
@@ -24,7 +24,7 @@ def add_list(heading, items)
         end
         items.reject! {|item| item.respond_to?(:hidden?) && item.hidden?}
 
-        puts
+        line
         heading(heading)
 
         label_width = DEFAULT_LABEL_INDENT
@@ -47,23 +47,23 @@ def add_list(heading, items)
                                  item.help
                                end
           description.gsub(/^(.)/) { Unicode.capitalize(Regexp.last_match(1)) }.wrap.each_line do |line|
-            puts " %-#{label_width}s %s" % [label, line]
+            line " %-#{label_width}s %s" % [label, line]
             label = ''
           end
         end
       end
 
       def add_text(content)
-        puts
-        puts content
+        line
+        line content
       end
 
       protected
 
       def heading(label)
         label = "#{label}:"
         label = HighLine.color(label, :bold) if @richtext
-        puts label
+        line label
       end
     end
   end

lib/hammer_cli/logger.rb

@@ -54,7 +54,7 @@ def self.initialize_logger(logger)
       log_dir = File.expand_path(HammerCLI::Settings.get(:log_dir) || DEFAULT_LOG_DIR)
       begin
         FileUtils.mkdir_p(log_dir, :mode => 0750)
-      rescue Errno::EACCES => e
+      rescue Errno::EACCES => _
         $stderr.puts _("No permissions to create log dir %s.") % log_dir
       end
 
@@ -68,7 +68,7 @@ def self.initialize_logger(logger)
                                                             :size     => (HammerCLI::Settings.get(:log_size) || 1)*1024*1024) # 1MB
         # set owner and group (it's ignored if attribute is nil)
         FileUtils.chown HammerCLI::Settings.get(:log_owner), HammerCLI::Settings.get(:log_group), filename
-      rescue ArgumentError => e
+      rescue ArgumentError => _
         $stderr.puts _("File %s not writeable, won't log anything to the file!") % filename
       end
 

lib/hammer_cli/modules.rb

@@ -67,7 +67,7 @@ def self.load!(name)
 
     def self.load(name)
       load! name
-    rescue Exception => e
+    rescue Exception => _
       false
     end
 

lib/hammer_cli/options/normalizers.rb

@@ -298,7 +298,7 @@ def format(val)
           json_string = ::File.exist?(::File.expand_path(val)) ? super(val) : val
           ::JSON.parse(json_string)
 
-        rescue ::JSON::ParserError => e
+        rescue ::JSON::ParserError => _
           raise ArgumentError, _("Unable to parse JSON input.")
         end
 

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/options/validators/dsl.rb

@@ -152,7 +152,7 @@ def one_of(*to_check)
         end
 
         def run(&block)
-          self.instance_eval &block
+          self.instance_eval(&block)
         end
       end
     end

lib/hammer_cli/output/adapter/csv.rb

@@ -94,7 +94,6 @@ def initialize(field)
         @name = nil
         @prefixes = []
         @suffixes = []
-        @data
       end
 
       def append_suffix(suffix)

lib/hammer_cli/output/dsl.rb

@@ -12,7 +12,7 @@ def fields
     end
 
     def build(&block)
-      self.instance_eval &block
+      self.instance_eval(&block)
     end
 
     protected

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
@@ -72,7 +72,7 @@ class ContainerField < Field
     def initialize(options={}, &block)
       super(options)
       dsl = HammerCLI::Output::Dsl.new
-      dsl.build &block if block_given?
+      dsl.build(&block) if block_given?
       dsl.fields.each { |f| f.parent = self }
       self.output_definition.append dsl.fields
     end

lib/hammer_cli/output/formatters.rb

@@ -13,7 +13,7 @@ def initialize(formatter_map={})
 
       def register_formatter(type, *formatters)
         if @_formatters[type].nil?
-          @_formatters[type] = FormatterContainer.new *formatters
+          @_formatters[type] = FormatterContainer.new(*formatters)
         else
           formatters.each { |f| @_formatters[type].add_formatter(f) }
         end
@@ -84,8 +84,8 @@ def required_features
         tags.map { |t| HammerCLI::Output::Utils.tag_to_feature(t) }
       end
 
-      def format(data, field_params={})
-        c = HighLine.color(data.to_s, @color)
+      def format(data, _={})
+        HighLine.color(data.to_s, @color)
       end
     end
 
@@ -97,7 +97,7 @@ def required_features
         tags.map { |t| HammerCLI::Output::Utils.tag_to_feature(t) }
       end
 
-      def format(string_date, field_params={})
+      def format(string_date, _={})
         t = DateTime.parse(string_date.to_s)
         t.strftime("%Y/%m/%d %H:%M:%S")
       rescue ArgumentError