pdk 2.6.0 → 2.7.0

data/lib/pdk/cli.rb

@@ -49,23 +49,7 @@ module PDK::CLI
     end
   end
 
-  def self.deprecated_runtime?
-    Gem::Version.new(RbConfig::CONFIG['ruby_version']) < Gem::Version.new('2.4.0')
-  end
-
   def self.run(args)
-    if deprecated_runtime?
-      PDK.logger.info(
-        text: _(
-          'Support for Ruby versions older than 2.4 will be dropped in the ' \
-          'future PDK 2.0.0 release. We recommend updating your Ruby ' \
-          'installation to ensure that you can continue using the latest ' \
-          'version of PDK.',
-        ),
-        wrap: true,
-      )
-    end
-
     @args = args
     PDK::Config.analytics_config_interview! unless PDK::Util::Env['PDK_DISABLE_ANALYTICS'] || PDK::Config.analytics_config_exist?
     @base_cmd.run(args)
@@ -94,63 +78,62 @@ module PDK::CLI
   def self.template_url_option(dsl)
     require 'pdk/util/template_uri'
 
-    desc = _('Specifies the URL to the template to use when creating new modules or classes. (default: %{default_url})') % { default_url: PDK::Util::TemplateURI.default_template_uri }
+    desc = 'Specifies the URL to the template to use when creating new modules or classes. (default: %{default_url})' % { default_url: PDK::Util::TemplateURI.default_template_uri }
 
     dsl.option nil, 'template-url', desc, argument: :required
   end
 
   def self.template_ref_option(dsl)
-    dsl.option nil, 'template-ref', _('Specifies the template git branch or tag to use when creating new modules or classes.'), argument: :required
+    dsl.option nil, 'template-ref', 'Specifies the template git branch or tag to use when creating new modules or classes.', argument: :required
   end
 
   def self.skip_interview_option(dsl)
-    dsl.option nil, 'skip-interview', _('When specified, skips interactive querying of metadata.')
+    dsl.option nil, 'skip-interview', 'When specified, skips interactive querying of metadata.'
   end
 
   def self.full_interview_option(dsl)
-    dsl.option nil, 'full-interview', _('When specified, interactive querying of metadata will include all optional questions.')
+    dsl.option nil, 'full-interview', 'When specified, interactive querying of metadata will include all optional questions.'
   end
 
   def self.puppet_version_options(dsl)
-    dsl.option nil, 'puppet-version', _('Puppet version to run tests or validations against.'), argument: :required
-    dsl.option nil, 'pe-version', _('Puppet Enterprise version to run tests or validations against.'), argument: :required
+    dsl.option nil, 'puppet-version', 'Puppet version to run tests or validations against.', argument: :required
+    dsl.option nil, 'pe-version', 'Puppet Enterprise version to run tests or validations against.', argument: :required
   end
 
   def self.puppet_dev_option(dsl)
     dsl.option nil,
                'puppet-dev',
-               _('When specified, PDK will validate or test against the current Puppet source from github.com. To use this option, you must have network access to https://github.com.')
+               'When specified, PDK will validate or test against the current Puppet source from github.com. To use this option, you must have network access to https://github.com.'
   end
 
   @base_cmd = Cri::Command.define do
     name 'pdk'
-    usage _('pdk command [options]')
-    summary _('Puppet Development Kit')
-    description _('The shortest path to better modules.')
+    usage 'pdk command [options]'
+    summary 'Puppet Development Kit'
+    description 'The shortest path to better modules.'
     default_subcommand 'help'
 
-    flag nil, :version, _('Show version of pdk.') do |_, _|
+    flag nil, :version, 'Show version of pdk.' do |_, _|
       puts PDK::Util::Version.version_string
       exit 0
     end
 
-    flag :h, :help, _('Show help for this command.') do |_, c|
+    flag :h, :help, 'Show help for this command.' do |_, c|
       puts c.help
       exit 0
     end
 
-    format_desc = _(
-      "Specify desired output format. Valid formats are '%{available_formats}'. " \
+    format_desc =
+      "Specify desired output format. Valid formats are '#{PDK::Report.formats.join("', '")}'. " \
       'You may also specify a file to which the formatted output is sent, ' \
       "for example: '--format=junit:report.xml'. This option may be specified " \
-      'multiple times if each option specifies a distinct target file.',
-    ) % { available_formats: PDK::Report.formats.join("', '") }
+      'multiple times if each option specifies a distinct target file.'
 
     option :f, :format, format_desc, argument: :required, multiple: true do |values|
       PDK::CLI::Util::OptionNormalizer.report_formats(values.compact)
     end
 
-    flag :d, :debug, _('Enable debug output.') do |_, _|
+    flag :d, :debug, 'Enable debug output.' do |_, _|
       PDK.logger.enable_debug_output
     end
   end

data/lib/pdk/config/ini_file_setting.rb

@@ -20,7 +20,7 @@ module PDK
         return if value.nil? || value.is_a?(String) || value.is_a?(Integer)
         # The only other valid-ish type is a Hash
         unless value.is_a?(Hash)
-          raise ArgumentError, _('The setting %{key} may only be a String or Integer, not %{class}') % {
+          raise ArgumentError, 'The setting %{key} may only be a String or Integer, not %{class}' % {
             key:  qualified_name,
             class: value.class,
           }
@@ -28,7 +28,7 @@ module PDK
         # Any hashes can only have a single String/Integer value
         value.each do |child_name, child_value|
           next if child_value.nil? || child_value.is_a?(String) || child_value.is_a?(Integer)
-          raise ArgumentError, _('The setting %{key} may only be a String or Integer, not %{class}') % {
+          raise ArgumentError, 'The setting %{key} may only be a String or Integer, not %{class}' % {
             key:   qualified_name + '.' + child_name,
             class: child_value.class,
           }

data/lib/pdk/config/json_schema_namespace.rb

@@ -99,7 +99,7 @@ module PDK
       #
       # @private
       def create_missing_setting(key, _initial_value = nil)
-        raise ArgumentError, _("Setting '#{key}' does not exist'")
+        raise ArgumentError, "Setting '#{key}' does not exist'"
       end
 
       # Create a valid, but empty schema
@@ -120,7 +120,7 @@ module PDK
 
         return @document_schema if @schema_file.nil?
         unless PDK::Util::Filesystem.file?(@schema_file)
-          raise PDK::Config::LoadError, _('Unable to open %{file} for reading. File does not exist') % {
+          raise PDK::Config::LoadError, 'Unable to open %{file} for reading. File does not exist' % {
             file: @schema_file,
           }
         end
@@ -132,7 +132,7 @@ module PDK
         )
         @document_schema = schema_reader.read(Addressable::URI.convert_path(@schema_file))
       rescue ::JSON::Schema::JsonParseError => e
-        raise PDK::Config::LoadError, _('Unable to open %{file} for reading. JSON Error: %{msg}') % {
+        raise PDK::Config::LoadError, 'Unable to open %{file} for reading. JSON Error: %{msg}' % {
           file: @schema_file,
           msg: e.message,
         }

data/lib/pdk/config/json_schema_setting.rb

@@ -24,7 +24,7 @@ module PDK
           # ... add validate it
           namespace.validate_document!(new_document)
         rescue ::JSON::Schema::ValidationError => e
-          raise ArgumentError, _('%{key} %{message}') % {
+          raise ArgumentError, '%{key} %{message}' % {
             key:     qualified_name,
             message: e.message,
           }

data/lib/pdk/config/json_with_schema.rb

@@ -19,7 +19,7 @@ module PDK
           # Ensure the parsed document is actually valid
           validate_document!(@raw_data)
         rescue ::JSON::Schema::ValidationError => e
-          raise PDK::Config::LoadError, _('The configuration file %{filename} is not valid: %{message}') % {
+          raise PDK::Config::LoadError, 'The configuration file %{filename} is not valid: %{message}' % {
             filename: filename,
             message:  e.message,
           }

data/lib/pdk/config/namespace.rb

@@ -65,7 +65,7 @@ module PDK
       #
       # @return [self] the mounted namespace.
       def mount(key, obj, &block)
-        raise ArgumentError, _('Only PDK::Config::Namespace objects can be mounted into a namespace') unless obj.is_a?(PDK::Config::Namespace)
+        raise ArgumentError, 'Only PDK::Config::Namespace objects can be mounted into a namespace' unless obj.is_a?(PDK::Config::Namespace)
         obj.parent = self
         obj.name = key.to_s
         obj.instance_eval(&block) if block_given?
@@ -138,7 +138,7 @@ module PDK
       # @return [nil]
       def []=(key, value)
         # You can't set the value of a mount
-        raise ArgumentError, _('Namespace mounts can not be set a value') unless @mounts[key.to_s].nil?
+        raise ArgumentError, 'Namespace mounts can not be set a value' unless @mounts[key.to_s].nil?
         set_volatile_value(key, value)
         # Persist the change
         save_data
@@ -305,7 +305,7 @@ module PDK
       rescue Errno::ENOENT => e
         raise PDK::Config::LoadError, e.message
       rescue Errno::EACCES
-        raise PDK::Config::LoadError, _('Unable to open %{file} for reading') % {
+        raise PDK::Config::LoadError, 'Unable to open %{file} for reading' % {
           file: filename,
         }
       end
@@ -328,7 +328,7 @@ module PDK
 
         PDK::Util::Filesystem.write_file(file, serialize_data(to_h))
       rescue Errno::EACCES
-        raise PDK::Config::LoadError, _('Unable to open %{file} for writing') % {
+        raise PDK::Config::LoadError, 'Unable to open %{file} for writing' % {
           file: file,
         }
       rescue SystemCallError => e

data/lib/pdk/config/setting.rb

@@ -77,9 +77,9 @@ module PDK
       #
       # @return [nil]
       def validate(validator)
-        raise ArgumentError, _('`validator` must be a Hash') unless validator.is_a?(Hash)
-        raise ArgumentError, _('the :proc key must contain a Proc') unless validator.key?(:proc) && validator[:proc].is_a?(Proc)
-        raise ArgumentError, _('the :message key must contain a String') unless validator.key?(:message) && validator[:message].is_a?(String)
+        raise ArgumentError, '`validator` must be a Hash' unless validator.is_a?(Hash)
+        raise ArgumentError, 'the :proc key must contain a Proc' unless validator.key?(:proc) && validator[:proc].is_a?(Proc)
+        raise ArgumentError, 'the :message key must contain a String' unless validator.key?(:message) && validator[:message].is_a?(String)
 
         @validators << validator
       end
@@ -96,7 +96,7 @@ module PDK
         @validators.each do |validator|
           next if validator[:proc].call(value)
 
-          raise ArgumentError, _('%{key} %{message}') % {
+          raise ArgumentError, '%{key} %{message}' % {
             key:     qualified_name,
             message: validator[:message],
           }
@@ -110,7 +110,7 @@ module PDK
       #
       # @return [nil]
       def default_to(&block)
-        raise ArgumentError, _('must be passed a block') unless block_given?
+        raise ArgumentError, 'must be passed a block' unless block_given?
         @default_to = block
       end
 

data/lib/pdk/config/validator.rb

@@ -13,7 +13,7 @@ module PDK
       def self.boolean
         {
           proc:    ->(value) { [true, false].include?(value) },
-          message: _('must be a boolean: true or false'),
+          message: 'must be a boolean: true or false',
         }
       end
 
@@ -23,7 +23,7 @@ module PDK
       def self.uuid
         {
           proc:    ->(value) { value.match(%r{\A\h{8}(?:-\h{4}){3}-\h{12}\z}) },
-          message: _('must be a version 4 UUID'),
+          message: 'must be a version 4 UUID',
         }
       end
     end

data/lib/pdk/config/yaml.rb

@@ -22,12 +22,12 @@ module PDK
 
         data.each { |k, v| yield k, PDK::Config::Setting.new(k, self, v) }
       rescue Psych::SyntaxError => e
-        raise PDK::Config::LoadError, _('Syntax error when loading %{file}: %{error}') % {
+        raise PDK::Config::LoadError, 'Syntax error when loading %{file}: %{error}' % {
           file:  filename,
           error: "#{e.problem} #{e.context}",
         }
       rescue Psych::DisallowedClass => e
-        raise PDK::Config::LoadError, _('Unsupported class in %{file}: %{error}') % {
+        raise PDK::Config::LoadError, 'Unsupported class in %{file}: %{error}' % {
           file:  filename,
           error: e.message,
         }

data/lib/pdk/config/yaml_with_schema.rb

@@ -20,7 +20,7 @@ module PDK
           # Ensure the parsed document is actually valid
           validate_document!(@raw_data)
         rescue ::JSON::Schema::ValidationError => e
-          raise PDK::Config::LoadError, _('The configuration file %{filename} is not valid: %{message}') % {
+          raise PDK::Config::LoadError, 'The configuration file %{filename} is not valid: %{message}' % {
             filename: filename,
             message:  e.message,
           }
@@ -36,12 +36,12 @@ module PDK
         # we're left with the settings that we don't manage.
         self.unmanaged_settings = @raw_data.reject { |k, _| schema_property_names.include?(k) }
       rescue Psych::SyntaxError => e
-        raise PDK::Config::LoadError, _('Syntax error when loading %{file}: %{error}') % {
+        raise PDK::Config::LoadError, 'Syntax error when loading %{file}: %{error}' % {
           file:  filename,
           error: "#{e.problem} #{e.context}",
         }
       rescue Psych::DisallowedClass => e
-        raise PDK::Config::LoadError, _('Unsupported class in %{file}: %{error}') % {
+        raise PDK::Config::LoadError, 'Unsupported class in %{file}: %{error}' % {
           file:  filename,
           error: e.message,
         }

data/lib/pdk/config.rb

@@ -143,8 +143,8 @@ module PDK
     # @scopes [Nil, Array[String]] The list of scopes, in order, to query in turn for the setting_name. Invalid or missing scopes are ignored.
     # @return [PDK::Config::Namespace, Object, nil] The value of the configuration setting. Returns nil if it does no exist
     def get_within_scopes(setting_name, scopes = nil)
-      raise ArgumentError, _('Expected an Array but got \'%{klass}\' for scopes') % { klass: scopes.class } unless scopes.nil? || scopes.is_a?(Array)
-      raise ArgumentError, _('Expected an Array or String but got \'%{klass}\' for setting_name') % { klass: setting_name.class } unless setting_name.is_a?(Array) || setting_name.is_a?(String)
+      raise ArgumentError, 'Expected an Array but got \'%{klass}\' for scopes' % { klass: scopes.class } unless scopes.nil? || scopes.is_a?(Array)
+      raise ArgumentError, 'Expected an Array or String but got \'%{klass}\' for setting_name' % { klass: setting_name.class } unless setting_name.is_a?(Array) || setting_name.is_a?(String)
 
       setting_arr = setting_name.is_a?(String) ? split_key_string(setting_name) : setting_name
       all_scope_names = all_scopes.keys
@@ -164,7 +164,7 @@ module PDK
     # @scopes [Nil, Array[String]] The list of scopes, in order, to query in turn for the setting_name. Invalid or missing scopes are ignored.
     # @yield [PDK::Config::Namespace, Object] The value of the configuration setting. Does not yield if the setting does not exist or is nil
     def with_scoped_value(setting_name, scopes = nil)
-      raise ArgumentError, _('must be passed a block') unless block_given?
+      raise ArgumentError, 'must be passed a block' unless block_given?
       value = get_within_scopes(setting_name, scopes)
       yield value unless value.nil?
     end
@@ -183,9 +183,9 @@ module PDK
       }.merge(options)
 
       names = key.is_a?(String) ? split_key_string(key) : key
-      raise ArgumentError, _('Invalid configuration names') if names.nil? || !names.is_a?(Array) || names.empty?
+      raise ArgumentError, 'Invalid configuration names' if names.nil? || !names.is_a?(Array) || names.empty?
       scope_name = names[0]
-      raise ArgumentError, _("Unknown configuration root '%{name}'") % { name: scope_name } if all_scopes[scope_name].nil?
+      raise ArgumentError, "Unknown configuration root '%{name}'" % { name: scope_name } if all_scopes[scope_name].nil?
       deep_set_object(value, options[:force], send(all_scopes[scope_name]), *names[1..-1])
     end
 
@@ -193,7 +193,7 @@ module PDK
       file = PDK::Util::Filesystem.expand_path('~/.puppetlabs/bolt/analytics.yaml')
       PDK::Config::YAML.new(file: file)
     rescue PDK::Config::LoadError => e
-      PDK.logger.debug _('Unable to load %{file}: %{message}') % {
+      PDK.logger.debug 'Unable to load %{file}: %{message}' % {
         file:    file,
         message: e.message,
       }
@@ -234,25 +234,23 @@ module PDK
 
       return unless PDK::CLI::Util.interactive?
 
-      pre_message = _(
+      pre_message =
         'PDK collects anonymous usage information to help us understand how ' \
         'it is being used and make decisions on how to improve it. You can ' \
         'find out more about what data we collect and how it is used in the ' \
-        "PDK documentation at %{url}.\n",
-      ) % { url: 'https://puppet.com/docs/pdk/latest/pdk_install.html' }
-      post_message = _(
+        "PDK documentation at %{url}.\n" % { url: 'https://puppet.com/docs/pdk/latest/pdk_install.html' }
+      post_message =
         'You can opt in or out of the usage data collection at any time by ' \
         'editing the analytics configuration file at %{path} and changing ' \
-        "the '%{key}' value.",
-      ) % {
-        path: PDK::Config.analytics_config_path,
+        "the '%{key}' value." % {
+          path: PDK::Config.analytics_config_path,
         key:  'disabled',
-      }
+        }
 
       questions = [
         {
           name:     'enabled',
-          question: _('Do you consent to the collection of anonymous PDK usage information?'),
+          question: 'Do you consent to the collection of anonymous PDK usage information?',
           type:     :yes,
         },
       ]
@@ -266,7 +264,7 @@ module PDK
       answers = interview.run
 
       if answers.nil?
-        PDK.logger.info _('No answer given, opting out of analytics collection.')
+        PDK.logger.info 'No answer given, opting out of analytics collection.'
         PDK.config.set(%w[user analytics disabled], true)
       else
         PDK.config.set(%w[user analytics disabled], !answers['enabled'])
@@ -304,7 +302,7 @@ module PDK
     # 'user.a.b.c' becomes ['user', 'a', 'b', 'c']
     # @return [Array[String]] The string split into each setting name as an array
     def split_key_string(key)
-      raise ArgumentError, _('Expected a String but got \'%{klass}\'') % { klass: key.class } unless key.is_a?(String)
+      raise ArgumentError, 'Expected a String but got \'%{klass}\'' % { klass: key.class } unless key.is_a?(String)
       key.split('.')
     end
     #:nocov:
@@ -328,8 +326,8 @@ module PDK
     #
     # Creating any missing parent hashes during the traversal
     def deep_set_object(value, force, namespace, *names)
-      raise ArgumentError, _('Missing or invalid namespace') unless namespace.is_a?(PDK::Config::Namespace)
-      raise ArgumentError, _('Missing a name to set') if names.nil? || names.empty?
+      raise ArgumentError, 'Missing or invalid namespace' unless namespace.is_a?(PDK::Config::Namespace)
+      raise ArgumentError, 'Missing a name to set' if names.nil? || names.empty?
 
       name = names.shift
       current_value = namespace[name]
@@ -380,7 +378,7 @@ module PDK
         return value
       end
 
-      raise ArgumentError, _("Unable to set '%{key}' to '%{value}' as it is not a Hash") % { key: namespace.name + '.' + name, value: hash_value } unless current_value.is_a?(Hash)
+      raise ArgumentError, "Unable to set '%{key}' to '%{value}' as it is not a Hash" % { key: namespace.name + '.' + name, value: hash_value } unless current_value.is_a?(Hash)
 
       namespace[name] = current_value.merge(hash_value)
       value

data/lib/pdk/context/control_repo.rb

@@ -44,7 +44,7 @@ module PDK
       #:nocov:
       # @see PDK::Context::AbstractContext.display_name
       def display_name
-        _('a Control Repository context')
+        'a Control Repository context'
       end
       #:nocov:
 

data/lib/pdk/context/module.rb

@@ -20,7 +20,7 @@ module PDK
       #:nocov:
       # @see PDK::Context::AbstractContext.display_name
       def display_name
-        _('a Puppet Module context')
+        'a Puppet Module context'
       end
       #:nocov:
     end

data/lib/pdk/context/none.rb

@@ -8,7 +8,7 @@ module PDK
       #:nocov:
       # @see PDK::Context::AbstractContext.display_name
       def display_name
-        _('an unknown context')
+        'an unknown context'
       end
       #:nocov: