Rubocop auto-fixes

Author: wyardley

lib/facter/erl_ssl_path.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Fact to get the ssl path for the erlang distribution in the current
 # system as described in the RabbitMQ docs [1].
 #

lib/facter/rabbitmq_clustername.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Facter.add(:rabbitmq_clustername) do
   setcode do
     if Facter::Util::Resolution.which('rabbitmqctl')

lib/facter/rabbitmq_nodename.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 Facter.add(:rabbitmq_nodename) do
   setcode do
     if Facter::Util::Resolution.which('rabbitmqctl')
       rabbitmq_nodename = Facter::Core::Execution.execute('rabbitmqctl status 2>&1')
       begin
-        %r{^Status of node '?([\w\.\-]+@[\w\.\-]+)'?}.match(rabbitmq_nodename)[1]
-      rescue
+        %r{^Status of node '?([\w.\-]+@[\w.\-]+)'?}.match(rabbitmq_nodename)[1]
+      rescue StandardError
         Facter.debug("Error: rabbitmq_nodename facter failed. Output was #{rabbitmq_nodename}")
       end
     end

lib/facter/rabbitmq_plugins_dirs.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 Facter.add(:rabbitmq_plugins_dirs) do
   setcode do
     if Facter::Util::Resolution.which('rabbitmqctl')
       rabbitmq_pluginsdirs_env = Facter::Core::Execution.execute("rabbitmqctl eval 'application:get_env(rabbit, plugins_dir).'")
-      rabbitmq_plugins_dirs_match = %r{^\{ok\,\"(\/.+\/\w+)}.match(rabbitmq_pluginsdirs_env)
+      rabbitmq_plugins_dirs_match = %r{^\{ok,"(/.+/\w+)}.match(rabbitmq_pluginsdirs_env)
       rabbitmq_plugins_dirs_match[1].split(':') if rabbitmq_plugins_dirs_match
     end
   end

lib/facter/rabbitmq_version.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 Facter.add(:rabbitmq_version) do
   setcode do
     if Facter::Util::Resolution.which('rabbitmqadmin')
       rabbitmq_version = Facter::Core::Execution.execute('rabbitmqadmin --version 2>&1')
-      %r{^rabbitmqadmin ([\w\.]+)}.match(rabbitmq_version).to_a[1]
+      %r{^rabbitmqadmin ([\w.]+)}.match(rabbitmq_version).to_a[1]
     end
   end
 end

lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'puppet'
 require 'digest'
@@ -10,11 +12,7 @@
   mk_resource_methods
 
   def should_vhost
-    if @should_vhost
-      @should_vhost
-    else
-      @should_vhost = resource[:vhost]
-    end
+    @should_vhost || @should_vhost = resource[:vhost]
   end
 
   def self.all_vhosts
@@ -35,14 +33,15 @@ def self.instances
       all_bindings(vhost).map do |line|
         source_name, destination_name, destination_type, routing_key, arguments = line.split(%r{\t})
         # Convert output of arguments from the rabbitmqctl command to a json string.
-        if !arguments.nil?
+        if arguments.nil?
+          arguments = '{}'
+        else
           arguments = arguments.gsub(%r{^\[(.*)\]$}, '').gsub(%r{\{("(?:.|\\")*?"),}, '{\1:').gsub(%r{\},\{}, ',')
           arguments = '{}' if arguments == ''
-        else
-          arguments = '{}'
         end
         hashed_name = Digest::SHA256.hexdigest format('%s@%s@%s@%s', source_name, destination_name, vhost, routing_key)
         next if source_name.empty?
+
         binding = {
           source: source_name,
           destination: destination_name,

lib/puppet/provider/rabbitmq_cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Puppet::Provider::RabbitmqCli < Puppet::Provider
   initvars
 
@@ -38,7 +40,7 @@ def self.rabbitmq_version
     return @rabbitmq_version if defined? @rabbitmq_version
 
     output = rabbitmqctl('-q', 'status')
-    version = output.match(%r{RabbitMQ.*?([\d\.]+)})
+    version = output.match(%r{RabbitMQ.*?([\d.]+)})
     @rabbitmq_version = version[1] if version
     @rabbitmq_version
   end
@@ -56,35 +58,32 @@ def self.rabbitmqctl_list(resource, *opts)
 
   def self.rabbitmq_running
     rabbitmqctl('-q', 'status')
-    return true
+    true
   rescue Puppet::ExecutionFailure, Timeout::Error
-    return false
+    false
   end
 
   # Retry the given code block 'count' retries or until the
   # command succeeds. Use 'step' delay between retries.
   # Limit each query time by 'timeout'.
   # For example:
   #   users = self.class.run_with_retries { rabbitmqctl 'list_users' }
-  def self.run_with_retries(count = 30, step = 6, timeout = 10)
+  def self.run_with_retries(count = 30, step = 6, timeout = 10, &block)
     count.times do |_n|
-      begin
-        output = Timeout.timeout(timeout) do
-          yield
-        end
-      rescue Puppet::ExecutionFailure, Timeout::Error
-        Puppet.debug 'Command failed, retrying'
-        sleep step
-      else
-        Puppet.debug 'Command succeeded'
-        return output
-      end
+      output = Timeout.timeout(timeout, &block)
+    rescue Puppet::ExecutionFailure, Timeout::Error
+      Puppet.debug 'Command failed, retrying'
+      sleep step
+    else
+      Puppet.debug 'Command succeeded'
+      return output
     end
     raise Puppet::Error, "Command is still failing after #{count * step} seconds expired!"
   end
 
   def self.define_instance_method(name)
     return if method_defined?(name)
+
     define_method(name) do |*args, &block|
       self.class.send(name, *args, &block)
     end

lib/puppet/provider/rabbitmq_cluster/rabbitmqctl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'rabbitmq_cli'))
 Puppet::Type.type(:rabbitmq_cluster).provide(
   :rabbitmqctl,

lib/puppet/provider/rabbitmq_erlang_cookie/ruby.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'puppet'
 require 'set'
 Puppet::Type.type(:rabbitmq_erlang_cookie).provide(:ruby) do
@@ -13,7 +15,7 @@ def content=(value)
     raise('The current erlang cookie needs to change. In order to do this the RabbitMQ database needs to be wiped.  Please set force => true to allow this to happen automatically.') unless resource[:force] == :true # Danger!
 
     Puppet::Type.type(:service).new(name: resource[:service_name]).provider.stop
-    FileUtils.rm_rf(resource[:rabbitmq_home] + File::SEPARATOR + 'mnesia')
+    FileUtils.rm_rf("#{resource[:rabbitmq_home]}#{File::SEPARATOR}mnesia")
     File.open(resource[:path], 'w') do |cookie|
       cookie.chmod(0o400)
       cookie.write(value)

lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb

@@ -1,14 +1,12 @@
+# frozen_string_literal: true
+
 require 'puppet'
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'rabbitmq_cli'))
 Puppet::Type.type(:rabbitmq_exchange).provide(:rabbitmqadmin, parent: Puppet::Provider::RabbitmqCli) do
   confine feature: :posix
 
   def should_vhost
-    if @should_vhost
-      @should_vhost
-    else
-      @should_vhost = resource[:name].split('@')[1]
-    end
+    @should_vhost || @should_vhost = resource[:name].split('@')[1]
   end
 
   def self.all_vhosts
@@ -19,7 +17,7 @@ def self.all_exchanges(vhost)
     exchange_list = run_with_retries do
       rabbitmqctl_list('exchanges', '-p', vhost, 'name', 'type', 'internal', 'durable', 'auto_delete', 'arguments')
     end
-    exchange_list.split(%r{\n}).reject { |exchange| exchange =~ %r{^federation:} }
+    exchange_list.split(%r{\n}).grep_v(%r{^federation:})
   end
 
   def self.instances
@@ -34,11 +32,11 @@ def self.instances
           name = ''
         end
         # Convert output of arguments from the rabbitmqctl command to a json string.
-        if !arguments.nil?
+        if arguments.nil?
+          arguments = '{}'
+        else
           arguments = arguments.gsub(%r{^\[(.*)\]$}, '').gsub(%r{\{("(?:.|\\")*?"),}, '{\1:').gsub(%r{\},\{}, ',')
           arguments = '{}' if arguments == ''
-        else
-          arguments = '{}'
         end
         exchange = {
           type: type,
@@ -57,7 +55,7 @@ def self.instances
 
   def self.prefetch(resources)
     packages = instances
-    resources.keys.each do |name|
+    resources.each_key do |name|
       if (provider = packages.find { |pkg| pkg.name == name })
         resources[name].provider = provider
       end