pdk 2.7.1 → 3.0.0

data/lib/pdk/generate/module.rb

@@ -3,17 +3,17 @@ require 'pdk'
 module PDK
   module Generate
     class Module
-      def self.validate_options(opts)
+      def self.validate_options(opts = {})
         require 'pdk/cli/util/option_validator'
 
         unless PDK::CLI::Util::OptionValidator.valid_module_name?(opts[:module_name])
-          error_msg = "'%{module_name}' is not a valid module name.\n" \
-                      'Module names must begin with a lowercase letter and can only include lowercase letters, digits, and underscores.' % { module_name: opts[:module_name] }
+          error_msg = format("'%{module_name}' is not a valid module name.\n" \
+                             'Module names must begin with a lowercase letter and can only include lowercase letters, digits, and underscores.', module_name: opts[:module_name])
           raise PDK::CLI::ExitWithError, error_msg
         end
 
         target_dir = PDK::Util::Filesystem.expand_path(opts[:target_dir])
-        raise PDK::CLI::ExitWithError, "The destination directory '%{dir}' already exists" % { dir: target_dir } if PDK::Util::Filesystem.exist?(target_dir)
+        raise PDK::CLI::ExitWithError, format("The destination directory '%{dir}' already exists", dir: target_dir) if PDK::Util::Filesystem.exist?(target_dir)
       end
 
       def self.invoke(opts = {})
@@ -32,10 +32,8 @@ module PDK
           test_file = File.join(parent_dir, '.pdk-test-writable')
           PDK::Util::Filesystem.write_file(test_file, 'This file was created by the Puppet Development Kit to test if this folder was writable, you can safely remove this file.')
           PDK::Util::Filesystem.rm_f(test_file)
-        rescue Errno::EACCES
-          raise PDK::CLI::FatalError, "You do not have permission to write to '%{parent_dir}'" % {
-            parent_dir: parent_dir,
-          }
+        rescue Errno::EACCES || Errno::EROFS
+          raise PDK::CLI::FatalError, format("You do not have permission to write to '%{parent_dir}'", parent_dir: parent_dir)
         end
 
         temp_target_dir = PDK::Util.make_tmpdir_name('pdk-module-target')
@@ -47,10 +45,8 @@ module PDK
         if template_uri.default? && template_uri.default_ref?
           PDK.logger.info 'Using the default template-url and template-ref.'
         else
-          PDK.logger.info "Using the %{method} template-url and template-ref '%{template_uri}'." % {
-            method: opts.key?(:'template-url') ? 'specified' : 'saved',
-              template_uri: template_uri.metadata_format,
-          }
+          PDK.logger.info format("Using the %{method} template-url and template-ref '%{template_uri}'.", method: opts.key?(:'template-url') ? 'specified' : 'saved',
+                                                                                                         template_uri: template_uri.metadata_format)
         end
 
         begin
@@ -58,6 +54,7 @@ module PDK
           PDK::Template.with(template_uri, context) do |template_dir|
             template_dir.render_new_module(metadata.data['name'], metadata.data) do |relative_file_path, file_content, file_status|
               next if [:delete, :unmanage].include?(file_status)
+
               file = Pathname.new(temp_target_dir) + relative_file_path
               file.dirname.mkpath
               PDK::Util::Filesystem.write_file(file, file_content)
@@ -79,11 +76,11 @@ module PDK
           # If the user specifies our default template url via the command
           # line, remove the saved template-url answer so that the template_uri
           # resolution can find new default URLs in the future.
-          PDK.config.set(%w[user module_defaults template-url], nil) if opts.key?(:'template-url')
+          PDK.config.set(['user', 'module_defaults', 'template-url'], nil) if opts.key?(:'template-url')
         else
           # Save the template-url answers if the module was generated using a
           # template/reference other than ours.
-          PDK.config.set(%w[user module_defaults template-url], template_uri.metadata_format)
+          PDK.config.set(['user', 'module_defaults', 'template-url'], template_uri.metadata_format)
         end
 
         begin
@@ -95,18 +92,11 @@ module PDK
               end
             end
 
-            PDK.logger.info "Module '%{name}' generated at path '%{path}'." % {
-              name: opts[:module_name],
-              path: target_dir,
-            }
+            PDK.logger.info format("Module '%{name}' generated at path '%{path}'.", name: opts[:module_name], path: target_dir)
             PDK.logger.info "In your module directory, add classes with the 'pdk new class' command."
           end
         rescue Errno::EACCES => e
-          raise PDK::CLI::FatalError, "Failed to move '%{source}' to '%{target}': %{message}" % {
-            source:  temp_target_dir,
-            target:  target_dir,
-            message: e.message,
-          }
+          raise PDK::CLI::FatalError, format("Failed to move '%{source}' to '%{target}': %{message}", source: temp_target_dir, target: target_dir, message: e.message)
         end
       end
 
@@ -114,13 +104,11 @@ module PDK
         require 'etc'
 
         login = Etc.getlogin || ''
-        login_clean = login.downcase.gsub(%r{[^0-9a-z]}i, '')
+        login_clean = login.downcase.gsub(/[^0-9a-z]/i, '')
         login_clean = 'username' if login_clean.empty?
 
         if login_clean != login
-          PDK.logger.debug 'Your username is not a valid Forge username. Proceeding with the username %{username}. You can fix this later in metadata.json.' % {
-            username: login_clean,
-          }
+          PDK.logger.debug format('Your username is not a valid Forge username. Proceeding with the username %{username}. You can fix this later in metadata.json.', username: login_clean)
         end
 
         login_clean
@@ -138,9 +126,15 @@ module PDK
         PDK.config.with_scoped_value('module_defaults.author') { |val| defaults['author'] = val }
         PDK.config.with_scoped_value('module_defaults.license') { |val| defaults['license'] = val }
         defaults['license'] = opts[:license] if opts.key?(:license)
+        PDK.config.with_scoped_value('module_defaults.operatingsystem_support') { |val| defaults['operatingsystem_support'] = val }
 
         metadata = PDK::Module::Metadata.new(defaults)
-        module_interview(metadata, opts) unless opts[:'skip-interview']
+
+        if opts[:'skip-interview']
+          metadata.data['operatingsystem_support'] = metadata.data['operatingsystem_support'].map { |val| PDK::Module::Metadata::OPERATING_SYSTEMS[val] }.flatten
+        else
+          module_interview(metadata, opts)
+        end
 
         metadata
       end
@@ -151,16 +145,11 @@ module PDK
           File.join(target_dir, 'files'),
           File.join(target_dir, 'manifests'),
           File.join(target_dir, 'templates'),
-          File.join(target_dir, 'tasks'),
+          File.join(target_dir, 'tasks')
         ].each do |dir|
-          begin
-            PDK::Util::Filesystem.mkdir_p(dir)
-          rescue SystemCallError => e
-            raise PDK::CLI::FatalError, "Unable to create directory '%{dir}': %{message}" % {
-              dir:     dir,
-              message: e.message,
-            }
-          end
+          PDK::Util::Filesystem.mkdir_p(dir)
+        rescue SystemCallError => e
+          raise PDK::CLI::FatalError, format("Unable to create directory '%{dir}': %{message}", dir: dir, message: e.message)
         end
       end
 
@@ -170,88 +159,88 @@ module PDK
 
         questions = [
           {
-            name:             'module_name',
-            question:         'If you have a name for your module, add it here.',
-            help:             'This is the name that will be associated with your module, it should be relevant to the modules content.',
-            required:         true,
-            validate_pattern: %r{\A[a-z][a-z0-9_]*\Z}i,
-            validate_message: 'Module names must begin with a lowercase letter and can only include lowercase letters, numbers, and underscores.',
+            name: 'module_name',
+            question: 'If you have a name for your module, add it here.',
+            help: 'This is the name that will be associated with your module, it should be relevant to the modules content.',
+            required: true,
+            validate_pattern: /\A[a-z][a-z0-9_]*\Z/i,
+            validate_message: 'Module names must begin with a lowercase letter and can only include lowercase letters, numbers, and underscores.'
           },
           {
-            name:             'forge_username',
-            question:         'If you have a Puppet Forge username, add it here.',
-            help:             'We can use this to upload your module to the Forge when it\'s complete.',
-            required:         true,
-            validate_pattern: %r{\A[a-z0-9]+\Z}i,
+            name: 'forge_username',
+            question: 'If you have a Puppet Forge username, add it here.',
+            help: 'We can use this to upload your module to the Forge when it\'s complete.',
+            required: true,
+            validate_pattern: /\A[a-z0-9]+\Z/i,
             validate_message: 'Forge usernames can only contain lowercase letters and numbers',
-            default:          opts[:username],
+            default: opts[:username]
           },
           {
-            name:             'version',
-            question:         'What version is this module?',
-            help:             'Puppet uses Semantic Versioning (semver.org) to version modules.',
-            required:         true,
-            validate_pattern: %r{\A[0-9]+\.[0-9]+\.[0-9]+}i,
+            name: 'version',
+            question: 'What version is this module?',
+            help: 'Puppet uses Semantic Versioning (semver.org) to version modules.',
+            required: true,
+            validate_pattern: /\A[0-9]+\.[0-9]+\.[0-9]+/i,
             validate_message: 'Semantic Version numbers must be in the form MAJOR.MINOR.PATCH',
-            default:          metadata.data['version'],
-            forge_only:       true,
+            default: metadata.data['version'],
+            forge_only: true
           },
           {
-            name:     'author',
+            name: 'author',
             question: 'Who wrote this module?',
-            help:     'This is used to credit the module\'s author.',
+            help: 'This is used to credit the module\'s author.',
             required: true,
-            default:  metadata.data['author'],
+            default: metadata.data['author']
           },
           {
-            name:     'license',
+            name: 'license',
             question: 'What license does this module code fall under?',
-            help:     'This should be an identifier from https://spdx.org/licenses/. Common values are "Apache-2.0", "MIT", or "proprietary".',
+            help: 'This should be an identifier from https://spdx.org/licenses/. Common values are "Apache-2.0", "MIT", or "proprietary".',
             required: true,
-            default:  metadata.data['license'],
+            default: metadata.data['license']
           },
           {
-            name:     'operatingsystem_support',
+            name: 'operatingsystem_support',
             question: 'What operating systems does this module support?',
-            help:     'Use the up and down keys to move between the choices, space to select and enter to continue.',
+            help: 'Use the up and down keys to move between the choices, space to select and enter to continue.',
             required: true,
-            type:     :multi_select,
-            choices:  PDK::Module::Metadata::OPERATING_SYSTEMS,
-            default:  PDK::Module::Metadata::DEFAULT_OPERATING_SYSTEMS.map do |os_name|
+            type: :multi_select,
+            choices: PDK::Module::Metadata::OPERATING_SYSTEMS,
+            default: metadata.data['operatingsystem_support'] do |os_name|
               # tty-prompt uses a 1-index
               PDK::Module::Metadata::OPERATING_SYSTEMS.keys.index(os_name) + 1
-            end,
+            end
           },
           {
-            name:       'summary',
-            question:   'Summarize the purpose of this module in a single sentence.',
-            help:       'This helps other Puppet users understand what the module does.',
-            required:   true,
-            default:    metadata.data['summary'],
-            forge_only: true,
+            name: 'summary',
+            question: 'Summarize the purpose of this module in a single sentence.',
+            help: 'This helps other Puppet users understand what the module does.',
+            required: true,
+            default: metadata.data['summary'],
+            forge_only: true
           },
           {
-            name:       'source',
-            question:   'If there is a source code repository for this module, enter the URL here.',
-            help:       'Skip this if no repository exists yet. You can update this later in the metadata.json.',
-            required:   true,
-            default:    metadata.data['source'],
-            forge_only: true,
+            name: 'source',
+            question: 'If there is a source code repository for this module, enter the URL here.',
+            help: 'Skip this if no repository exists yet. You can update this later in the metadata.json.',
+            required: true,
+            default: metadata.data['source'],
+            forge_only: true
           },
           {
-            name:       'project_page',
-            question:   'If there is a URL where others can learn more about this module, enter it here.',
-            help:       'Optional. You can update this later in the metadata.json.',
-            default:    metadata.data['project_page'],
-            forge_only: true,
+            name: 'project_page',
+            question: 'If there is a URL where others can learn more about this module, enter it here.',
+            help: 'Optional. You can update this later in the metadata.json.',
+            default: metadata.data['project_page'],
+            forge_only: true
           },
           {
-            name:       'issues_url',
-            question:   'If there is a public issue tracker for this module, enter its URL here.',
-            help:       'Optional. You can update this later in the metadata.json.',
-            default:    metadata.data['issues_url'],
-            forge_only: true,
-          },
+            name: 'issues_url',
+            question: 'If there is a public issue tracker for this module, enter its URL here.',
+            help: 'Optional. You can update this later in the metadata.json.',
+            default: metadata.data['issues_url'],
+            forge_only: true
+          }
         ]
 
         prompt = TTY::Prompt.new(help_color: :cyan)
@@ -260,8 +249,8 @@ module PDK
 
         if opts[:only_ask]
           questions.reject! do |question|
-            if %w[module_name forge_username].include?(question[:name])
-              metadata.data['name'] && metadata.data['name'] =~ %r{\A[a-z0-9]+-[a-z][a-z0-9_]*\Z}i
+            if ['module_name', 'forge_username'].include?(question[:name])
+              metadata.data['name'] && metadata.data['name'] =~ /\A[a-z0-9]+-[a-z][a-z0-9_]*\Z/i
             else
               !opts[:only_ask].include?(question[:name])
             end
@@ -275,15 +264,11 @@ module PDK
         interview.add_questions(questions)
 
         if PDK::Util::Filesystem.file?('metadata.json')
-          puts "\nWe need to update the metadata.json file for this module, so we\'re going to ask you %{count} " \
-               "questions.\n" % {
-                 count: interview.num_questions,
-               }
+          puts format("\nWe need to update the metadata.json file for this module, so we're going to ask you %{count} " \
+                      "questions.\n", count: interview.num_questions)
         else
-          puts "\nWe need to create the metadata.json file for this module, so we\'re going to ask you %{count} " \
-               "questions.\n" % {
-                 count: interview.num_questions,
-               }
+          puts format("\nWe need to create the metadata.json file for this module, so we're going to ask you %{count} " \
+                      "questions.\n", count: interview.num_questions)
         end
 
         puts 'If the question is not applicable to this module, accept the default option ' \
@@ -320,8 +305,8 @@ module PDK
 
           continue = PDK::CLI::Util.prompt_for_yes(
             'Metadata will be generated based on this information, continue?',
-            prompt:         prompt,
-            cancel_message: 'Interview cancelled; exiting.',
+            prompt: prompt,
+            cancel_message: 'Interview cancelled; exiting.'
           )
 
           unless continue
@@ -331,9 +316,9 @@ module PDK
         end
 
         require 'pdk/answer_file'
-        PDK.config.set(%w[user module_defaults forge_username], opts[:username]) unless opts[:username].nil?
-        PDK.config.set(%w[user module_defaults author], answers['author']) unless answers['author'].nil?
-        PDK.config.set(%w[user module_defaults license], answers['license']) unless answers['license'].nil?
+        PDK.config.set(['user', 'module_defaults', 'forge_username'], opts[:username]) unless opts[:username].nil?
+        PDK.config.set(['user', 'module_defaults', 'author'], answers['author']) unless answers['author'].nil?
+        PDK.config.set(['user', 'module_defaults', 'license'], answers['license']) unless answers['license'].nil?
       end
     end
   end

data/lib/pdk/generate/provider.rb

@@ -9,13 +9,14 @@ module PDK
 
       def template_files
         files = {
-          'provider_spec.erb'      => File.join('spec', 'unit', 'puppet', 'provider', object_name, object_name) + '_spec.rb',
-          'provider_type_spec.erb' => File.join('spec', 'unit', 'puppet', 'type', object_name) + '_spec.rb',
+          'provider_spec.erb' => "#{File.join('spec', 'unit', 'puppet', 'provider', object_name, object_name)}_spec.rb",
+          'provider_type_spec.erb' => "#{File.join('spec', 'unit', 'puppet', 'type', object_name)}_spec.rb"
         }
         return files if spec_only?
+
         files.merge(
-          'provider.erb' => File.join('lib', 'puppet', 'provider', object_name, object_name) + '.rb',
-          'provider_type.erb' => File.join('lib', 'puppet', 'type', object_name) + '.rb',
+          'provider.erb' => "#{File.join('lib', 'puppet', 'provider', object_name, object_name)}.rb",
+          'provider_type.erb' => "#{File.join('lib', 'puppet', 'type', object_name)}.rb"
         )
       end
 

data/lib/pdk/generate/puppet_class.rb

@@ -25,12 +25,12 @@ module PDK
         class_name_parts = object_name.split('::')
         # Drop the module name if the object name contains multiple parts
         class_name_parts.delete_at(0) if class_name_parts.length > 1
-        files = { 'class_spec.erb' => File.join('spec', 'classes', *class_name_parts) + '_spec.rb' }
+        files = { 'class_spec.erb' => "#{File.join('spec', 'classes', *class_name_parts)}_spec.rb" }
         return files if spec_only?
 
-        class_name_parts = object_name.split('::')[1..-1]
+        class_name_parts = object_name.split('::')[1..]
         class_name_parts << 'init' if class_name_parts.empty?
-        files['class.erb'] = File.join('manifests', *class_name_parts) + '.pp'
+        files['class.erb'] = "#{File.join('manifests', *class_name_parts)}.pp"
 
         files
       end

data/lib/pdk/generate/puppet_object.rb

@@ -3,9 +3,7 @@ require 'pdk'
 module PDK
   module Generate
     class PuppetObject
-      attr_reader :context
-      attr_reader :object_name
-      attr_reader :options
+      attr_reader :context, :object_name, :options
 
       # Initialises the PDK::Generate::PuppetObject object.
       #
@@ -21,7 +19,8 @@ module PDK
       # @param object_name [String] The name of the object.
       # @param options [Hash{Symbol => Object}]
       def initialize(context, object_name, options)
-        raise ArgumentError, 'Expected PDK::Context::AbstractContext but got \'%{klass}\' for context' % { klass: context.class } unless context.is_a?(PDK::Context::AbstractContext)
+        raise ArgumentError, format('Expected PDK::Context::AbstractContext but got \'%{klass}\' for context', klass: context.class) unless context.is_a?(PDK::Context::AbstractContext)
+
         @context = context
         @options = options
         @object_name = object_name
@@ -61,7 +60,7 @@ module PDK
       # @return [void]
       # @abstract
       def check_preconditions
-        raise ArgumentError, 'Expected a module context but got %{context_name}' % { context_name: context.display_name } unless context.is_a?(PDK::Context::Module)
+        raise ArgumentError, format('Expected a module context but got %{context_name}', context_name: context.display_name) unless context.is_a?(PDK::Context::Module)
       end
 
       # Check the preconditions of this template group, behaving as a predicate rather than raising an exception.
@@ -122,11 +121,9 @@ module PDK
       def stage_change(relative_dest_path, content, update_manager)
         absolute_file_path = File.join(context.root_path, relative_dest_path)
         if PDK::Util::Filesystem.exist?(absolute_file_path)
-          raise PDK::CLI::ExitWithError, "Unable to generate %{object_type}; '%{file}' already exists." % {
-            file:        absolute_file_path,
-            object_type: spec_only? ? 'unit test' : friendly_name,
-          }
+          raise PDK::CLI::ExitWithError, format("Unable to generate %{object_type}; '%{file}' already exists.", file: absolute_file_path, object_type: spec_only? ? 'unit test' : friendly_name)
         end
+
         update_manager.add_file(absolute_file_path, content)
       end
 
@@ -160,7 +157,7 @@ module PDK
 
         templates.each do |template|
           if template[:uri].nil?
-            PDK.logger.debug('No %{dir_type} template found; trying next template directory.' % { dir_type: template[:type] })
+            PDK.logger.debug(format('No %{dir_type} template found; trying next template directory.', dir_type: template[:type]))
             next
           end
 
@@ -170,9 +167,9 @@ module PDK
               # TODO: refactor to a search-and-execute form instead
               return # work is done # rubocop:disable Lint/NonLocalExitFromIterator
             elsif template[:allow_fallback]
-              PDK.logger.debug('Unable to find a %{type} template in %{url}; trying next template directory.' % { type: friendly_name, url: template[:uri] })
+              PDK.logger.debug(format('Unable to find a %{type} template in %{url}; trying next template directory.', type: friendly_name, url: template[:uri]))
             else
-              raise PDK::CLI::FatalError, 'Unable to find the %{type} template in %{url}.' % { type: friendly_name, url: template[:uri] }
+              raise PDK::CLI::FatalError, format('Unable to find the %{type} template in %{url}.', type: friendly_name, url: template[:uri])
             end
           end
         end

data/lib/pdk/generate/task.rb

@@ -9,14 +9,15 @@ module PDK
 
       def template_files
         return {} if spec_only?
+
         {
-          'task.erb' => File.join('tasks', task_name + '.sh'),
+          'task.erb' => File.join('tasks', "#{task_name}.sh")
         }
       end
 
       def template_data
         {
-          name: object_name,
+          name: object_name
         }
       end
 
@@ -29,17 +30,17 @@ module PDK
         super
 
         error = "A task named '%{name}' already exists in this module; defined in %{file}"
-        allowed_extensions = %w[.md .conf]
+        allowed_extensions = ['.md', '.conf']
 
-        PDK::Util::Filesystem.glob(File.join(context.root_path, 'tasks', task_name + '.*')).each do |file|
+        PDK::Util::Filesystem.glob(File.join(context.root_path, 'tasks', "#{task_name}.*")).each do |file|
           next if allowed_extensions.include?(File.extname(file))
 
-          raise PDK::CLI::ExitWithError, error % { name: task_name, file: file }
+          raise PDK::CLI::ExitWithError, format(error, name: task_name, file: file)
         end
       end
 
       def non_template_files
-        task_metadata_file = File.join('tasks', task_name + '.json')
+        task_metadata_file = File.join('tasks', "#{task_name}.json")
         { task_metadata_file => JSON.pretty_generate(task_metadata) }
       end
 
@@ -52,15 +53,15 @@ module PDK
       #
       # @api private
       def task_name
-        (object_name == module_name) ? 'init' : object_name
+        object_name == module_name ? 'init' : object_name
       end
 
       def task_metadata
         {
           puppet_task_version: 1,
-          supports_noop:       false,
-          description:         options.fetch(:description, 'A short description of this task'),
-          parameters:          {},
+          supports_noop: false,
+          description: options.fetch(:description, 'A short description of this task'),
+          parameters: {}
         }
       end
     end

data/lib/pdk/generate/transport.rb

@@ -8,24 +8,25 @@ module PDK
       end
 
       def template_files
-        # Note : Due to how the V1 templates work, the names of the source template files may be mismatched to
+        # NOTE: Due to how the V1 templates work, the names of the source template files may be mismatched to
         # their destination, e.g. transport_type.erb is really a transport schema
         files = {
-          'transport_spec.erb'      => File.join('spec', 'unit', 'puppet', 'transport', object_name) + '_spec.rb',
-          'transport_type_spec.erb' => File.join('spec', 'unit', 'puppet', 'transport', 'schema', object_name) + '_spec.rb',
+          'transport_spec.erb' => "#{File.join('spec', 'unit', 'puppet', 'transport', object_name)}_spec.rb",
+          'transport_type_spec.erb' => "#{File.join('spec', 'unit', 'puppet', 'transport', 'schema', object_name)}_spec.rb"
         }
         return files if spec_only?
+
         files.merge(
-          'transport.erb' => File.join('lib', 'puppet', 'transport', object_name) + '.rb',
-          'transport_device.erb'    => File.join('lib', 'puppet', 'util', 'network_device', object_name, 'device.rb'),
-          'transport_type.erb'      => File.join('lib', 'puppet', 'transport', 'schema', object_name) + '.rb',
+          'transport.erb' => "#{File.join('lib', 'puppet', 'transport', object_name)}.rb",
+          'transport_device.erb' => File.join('lib', 'puppet', 'util', 'network_device', object_name, 'device.rb'),
+          'transport_type.erb' => "#{File.join('lib', 'puppet', 'transport', 'schema', object_name)}.rb"
         )
       end
 
       def template_data
         {
           name: object_name,
-          transport_class: class_name_from_object_name(object_name),
+          transport_class: class_name_from_object_name(object_name)
         }
       end
     end

data/lib/pdk/generate.rb

@@ -16,7 +16,7 @@ module PDK
         PDK::Generate::Provider,
         PDK::Generate::PuppetClass,
         PDK::Generate::Task,
-        PDK::Generate::Transport,
+        PDK::Generate::Transport
       ].freeze
     end
     module_function :generators

data/lib/pdk/logger.rb

@@ -6,7 +6,7 @@ module PDK
     WRAP_COLUMN_LIMIT = 78
 
     def initialize
-      super(STDERR)
+      super($stderr)
       @sent_messages = {}
 
       # TODO: Decide on output format.
@@ -14,7 +14,7 @@ module PDK
         prefix = "pdk (#{severity}): "
         if msg.is_a?(Hash)
           if msg.fetch(:wrap, false)
-            wrap_pattern = %r{(.{1,#{WRAP_COLUMN_LIMIT - prefix.length}})(\s+|\Z)}
+            wrap_pattern = /(.{1,#{WRAP_COLUMN_LIMIT - prefix.length}})(\s+|\Z)/
             "#{prefix}#{msg[:text].gsub(wrap_pattern, "\\1\n#{' ' * prefix.length}")}\n"
           else
             "#{prefix}#{msg[:text]}\n"
@@ -30,6 +30,7 @@ module PDK
     def warn_once(*args)
       hash = args.inspect.hash
       return if (@sent_messages[::Logger::WARN] ||= {}).key?(hash)
+
       @sent_messages[::Logger::WARN][hash] = true
       warn(*args)
     end