fix new rubocop errors

Author: trefzer

lib/puppet/provider/dhparam/openssl.rb

@@ -5,7 +5,7 @@
 
 Puppet::Type.type(:dhparam).provide(
   :openssl,
-  parent: Puppet::Provider::Openssl,
+  parent: Puppet::Provider::Openssl
 ) do
   desc 'Manages dhparam files with OpenSSL'
 

lib/puppet/provider/openssl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'etc'
 
 # class to use in openssl providers to handle file permission (mode, group and owner)
@@ -14,8 +16,8 @@ def owner
 
   def owner=(should)
     File.chown(uid(should), nil, resource[:path])
-  rescue => detail
-    raise Puppet::Error, _("Failed to set owner to '%{should}': %{detail}") % { should: should, detail: detail }, detail.backtrace
+  rescue StandardError => e
+    raise Puppet::Error, _("Failed to set owner to '#{should}': #{e}"), detail.backtrace
   end
 
   def group
@@ -28,27 +30,27 @@ def group
 
   def group=(should)
     File.chown(nil, gid(should), resource[:path])
-  rescue => detail
-    raise Puppet::Error, _("Failed to set group to '%{should}': %{detail}") % { should: should, detail: detail }, detail.backtrace
+  rescue StandardError => e
+    raise Puppet::Error, _("Failed to set group to '#{should}': #{e}"), detail.backtrace
   end
 
   # Return the mode as an octal string, not as an integer.
   def mode
     if File.exist?(@resource[:path])
-      '0%o' % (File.stat(@resource[:path]).mode & 0o07777)
+      format('0%o', (File.stat(@resource[:path]).mode & 0o07777))
     else
       :absent
     end
   end
 
   # Set the file mode, converting from a string to an integer.
   def mode=(should)
-    File.chmod(Integer('0' + should), @resource[:path])
+    File.chmod(Integer("0#{should}"), @resource[:path])
   end
 
   def set_file_perm(filename, owner = nil, group = nil, mode = nil)
     File.chown(uid(owner), nil, resource[:path]) if owner
     File.chown(nil, gid(group), resource[:path]) if group
-    File.chmod(Integer('0' + mode), filename) if mode
+    File.chmod(Integer("0#{mode}"), filename) if mode
   end
 end

lib/puppet/provider/ssl_pkey/openssl.rb

@@ -5,7 +5,7 @@
 require File.join(__dir__, '..', '..', '..', 'puppet/provider/openssl')
 Puppet::Type.type(:ssl_pkey).provide(
   :openssl,
-  parent: Puppet::Provider::Openssl,
+  parent: Puppet::Provider::Openssl
 ) do
   desc 'Manages private keys with OpenSSL'
 

lib/puppet/provider/x509_cert/openssl.rb

@@ -4,7 +4,7 @@
 require File.join(__dir__, '..', '..', '..', 'puppet/provider/openssl')
 Puppet::Type.type(:x509_cert).provide(
   :openssl,
-  parent: Puppet::Provider::Openssl,
+  parent: Puppet::Provider::Openssl
 ) do
   desc 'Manages certificates with OpenSSL'
 

lib/puppet/provider/x509_request/openssl.rb

@@ -4,7 +4,7 @@
 require File.join(__dir__, '..', '..', '..', 'puppet/provider/openssl')
 Puppet::Type.type(:x509_request).provide(
   :openssl,
-  parent: Puppet::Provider::Openssl,
+  parent: Puppet::Provider::Openssl
 ) do
   desc 'Manages certificate signing requests with OpenSSL'
 

lib/puppet/type/dhparam.rb

@@ -39,27 +39,21 @@
   newproperty(:owner) do
     desc 'owner of the file'
     validate do |value|
-      unless value =~ %r{^\w+}
-        raise ArgumentError, '%s is not a valid user name' % value
-      end
+      raise ArgumentError, "#{value} is not a valid user name" unless value =~ %r{^\w+}
     end
   end
 
   newproperty(:group) do
     desc 'group of the file'
     validate do |value|
-      unless value =~ %r{^\w+}
-        raise ArgumentError, '%s is not a valid group name' % value
-      end
+      raise ArgumentError, "#{value} is not a valid group name" unless value =~ %r{^\w+}
     end
   end
 
   newproperty(:mode) do
     desc 'mode of the file'
     validate do |value|
-      unless value =~ %r{^0\d\d\d$}
-        raise ArgumentError, '%s is not a valid file mode' % value
-      end
+      raise ArgumentError, "#{value} is not a valid file mode" unless value =~ %r{^0\d\d\d$}
     end
   end
 end

lib/puppet/type/ssl_pkey.rb

@@ -46,27 +46,21 @@
   newproperty(:owner) do
     desc 'owner of the file'
     validate do |value|
-      unless value =~ %r{^\w+}
-        raise ArgumentError, '%s is not a valid user name' % value
-      end
+      raise ArgumentError, "#{value} is not a valid user name" unless value =~ %r{^\w+}
     end
   end
 
   newproperty(:group) do
     desc 'group of the file'
     validate do |value|
-      unless value =~ %r{^\w+}
-        raise ArgumentError, '%s is not a valid group name' % value
-      end
+      raise ArgumentError, "#{value} is not a valid group name" unless value =~ %r{^\w+}
     end
   end
 
   newproperty(:mode) do
     desc 'mode of the file'
     validate do |value|
-      unless value =~ %r{^0\d\d\d$}
-        raise ArgumentError, '%s is not a valid file mode' % value
-      end
+      raise ArgumentError, "#{value} is not a valid file mode" unless value =~ %r{^0\d\d\d$}
     end
   end
 end

lib/puppet/type/x509_cert.rb

@@ -79,27 +79,21 @@
   newproperty(:owner) do
     desc 'owner of the file'
     validate do |value|
-      unless value =~ %r{^\w+}
-        raise ArgumentError, '%s is not a valid user name' % value
-      end
+      raise ArgumentError, "#{value} is not a valid user name" unless value =~ %r{^\w+}
     end
   end
 
   newproperty(:group) do
     desc 'group of the file'
     validate do |value|
-      unless value =~ %r{^\w+}
-        raise ArgumentError, '%s is not a valid group name' % value
-      end
+      raise ArgumentError, "#{value} is not a valid group name" unless value =~ %r{^\w+}
     end
   end
 
   newproperty(:mode) do
     desc 'mode of the file'
     validate do |value|
-      unless value =~ %r{^0\d\d\d$}
-        raise ArgumentError, '%s is not a valid file mode' % value
-      end
+      raise ArgumentError, "#{value} is not a valid file mode" unless value =~ %r{^0\d\d\d$}
     end
   end
 

lib/puppet/type/x509_request.rb

@@ -57,27 +57,21 @@
   newproperty(:owner) do
     desc 'owner of the file'
     validate do |value|
-      unless value =~ %r{^\w+}
-        raise ArgumentError, '%s is not a valid user name' % value
-      end
+      raise ArgumentError, "#{value} is not a valid user name" unless value =~ %r{^\w+}
     end
   end
 
   newproperty(:group) do
     desc 'group of the file'
     validate do |value|
-      unless value =~ %r{^\w+}
-        raise ArgumentError, '%s is not a valid group name' % value
-      end
+      raise ArgumentError, "#{value} is not a valid group name" unless value =~ %r{^\w+}
     end
   end
 
   newproperty(:mode) do
     desc 'mode of the file'
     validate do |value|
-      unless value =~ %r{^0\d\d\d$}
-        raise ArgumentError, '%s is not a valid file mode' % value
-      end
+      raise ArgumentError, "#{value} is not a valid file mode" unless value =~ %r{^0\d\d\d$}
     end
   end
 

spec/unit/puppet/type/dhparam_spec.rb

@@ -53,5 +53,4 @@
     resource[:group] = 'party'
     expect(resource[:group]).to eq('party')
   end
-
 end