pdk 2.6.1 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5fd048aa1b88cbb420fc9e68fdb4c0117bf20f3ea7e31786ead40dedb748d56
-  data.tar.gz: bfbcfc0b29a688a124b0e265666928841bc3fbde06ed3b8f4023704a3786e140
+  metadata.gz: 2ff7ec7444ab1a8f6876541359c945180230d9a1b0d6d1496ca012a974f33f4e
+  data.tar.gz: e35b850c844aa4fbb02236f080491b67a020fa52c76ead9a124b5974bb53ecc4
 SHA512:
-  metadata.gz: ff4b2c3d6cba83c6e0890b845607f6c0dbd032967a5dde11e03576693ae1379513d8191b8587f1c5a1e7323ec5963ccafbc6dec2923f5bb130195a44bbedede9
-  data.tar.gz: 4168482e90168f9a05c6bb241497779ea812ca70c53c06f2cb16777c1232575eb61899ab490027a1ccb98a3a7b5fa72317f9bbd042a259c8eccbc0d26f207f78
+  metadata.gz: 3bc285deba8e2655836f16ddb7e8a121ab06e8e7b3c1ef8988332d605dd60ed95da7bc22f1a23e23ccd6059e913962307d9f6459ff563a5a601cb3b22bb0d99e
+  data.tar.gz: '0419acc5d19400b8908e7fc44b2361159d64ff24a7a328b87400994df9a30276f3bfac1c8dff77e1c6630df0643e8c8e42a205510288392bbd67f27a90e35498'

data/CHANGELOG.md

@@ -5,7 +5,29 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v2.6.1](https://github.com/puppetlabs/pdk/tree/v2.6.1) - 2023-01-25
+## [v2.7.1](https://github.com/puppetlabs/pdk/tree/v2.7.1) - 2023-03-24
+
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v2.7.0...v2.7.1)
+
+## [v2.7.0](https://github.com/puppetlabs/pdk/tree/v2.7.0) - 2023-03-14
+
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v2.6.1...v2.7.0)
+
+### Added
+
+- (CONT-694) Bump PDK Template Version [#1216](https://github.com/puppetlabs/pdk/pull/1216) ([chelnak](https://github.com/chelnak))
+- (CONT-370) Remove i18n support [#1211](https://github.com/puppetlabs/pdk/pull/1211) ([chelnak](https://github.com/chelnak))
+- Add Puppet validator for plans [#1207](https://github.com/puppetlabs/pdk/pull/1207) ([jay7x](https://github.com/jay7x))
+
+### Fixed
+
+- (CONT-722) Patch pe to puppet mapping [#1221](https://github.com/puppetlabs/pdk/pull/1221) ([chelnak](https://github.com/chelnak))
+- (GH-1210) Require uri [#1220](https://github.com/puppetlabs/pdk/pull/1220) ([chelnak](https://github.com/chelnak))
+- (CONT-720) Fix default version selection [#1219](https://github.com/puppetlabs/pdk/pull/1219) ([chelnak](https://github.com/chelnak))
+- (CONT-719) Require JSON gem [#1218](https://github.com/puppetlabs/pdk/pull/1218) ([chelnak](https://github.com/chelnak))
+- (CONT-669) Use bundle info command [#1215](https://github.com/puppetlabs/pdk/pull/1215) ([chelnak](https://github.com/chelnak))
+
+## [v2.6.1](https://github.com/puppetlabs/pdk/tree/v2.6.1) - 2023-01-26
 
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v2.6.0...v2.6.1)
 

data/lib/pdk/analytics/client/google_analytics.rb

@@ -42,7 +42,7 @@ module PDK
 
         def screen_view(screen, **kwargs)
           custom_dimensions = walk_keys(kwargs) do |k|
-            CUSTOM_DIMENSIONS[k] || raise(_("Unknown analytics key '%{key}'") % { key: k })
+            CUSTOM_DIMENSIONS[k] || raise("Unknown analytics key '%{key}'" % { key: k })
           end
 
           screen_view_params = {
@@ -57,7 +57,7 @@ module PDK
 
         def event(category, action, label: nil, value: nil, **kwargs)
           custom_dimensions = walk_keys(kwargs) do |k|
-            CUSTOM_DIMENSIONS[k] || raise(_("Unknown analytics key '%{key}'") % { key: k })
+            CUSTOM_DIMENSIONS[k] || raise("Unknown analytics key '%{key}'" % { key: k })
           end
 
           event_params = {
@@ -92,6 +92,8 @@ module PDK
         # These parameters have terrible names. See this page for complete documentation:
         # https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters
         def base_params
+          require 'locale'
+
           {
             v:    PROTOCOL_VERSION,
             # Client ID

data/lib/pdk/cli/build.rb

@@ -1,14 +1,14 @@
 module PDK::CLI
   @build_cmd = @base_cmd.define_command do
     name 'build'
-    usage _('build [options]')
-    summary _('Builds a package from the module that can be published to the Puppet Forge.')
+    usage 'build [options]'
+    summary 'Builds a package from the module that can be published to the Puppet Forge.'
 
     option nil, 'target-dir',
-           _('The target directory where you want PDK to write the package.'),
+           'The target directory where you want PDK to write the package.',
            argument: :required, default: File.join(Dir.pwd, 'pkg')
 
-    option nil, 'force', _('Skips the prompts and builds the module package.')
+    option nil, 'force', 'Skips the prompts and builds the module package.'
 
     run do |opts, _args, _cmd|
       require 'pdk/module/build'
@@ -17,7 +17,7 @@ module PDK::CLI
 
       # Make sure build is being run in a valid module directory with a metadata.json
       PDK::CLI::Util.ensure_in_module!(
-        message:   _('`pdk build` can only be run from inside a valid module with a metadata.json.'),
+        message:   '`pdk build` can only be run from inside a valid module with a metadata.json.',
         log_level: :info,
       )
 
@@ -30,12 +30,8 @@ module PDK::CLI
       #
       unless module_metadata.forge_ready?
         if opts[:force]
-          PDK.logger.warn _(
-            'This module is missing the following fields in the metadata.json: %{fields}. ' \
-            'These missing fields may affect the visibility of the module on the Forge.',
-          ) % {
-            fields: module_metadata.missing_fields.join(', '),
-          }
+          PDK.logger.warn "This module is missing the following fields in the metadata.json: #{module_metadata.missing_fields.join(', ')}. " \
+                          'These missing fields may affect the visibility of the module on the Forge.'
         else
           module_metadata.interview_for_forge!
           module_metadata.write!('metadata.json')
@@ -46,34 +42,34 @@ module PDK::CLI
 
       unless opts[:force]
         if builder.package_already_exists?
-          PDK.logger.info _("The file '%{package}' already exists.") % { package: builder.package_file }
+          PDK.logger.info "The file '%{package}' already exists." % { package: builder.package_file }
 
-          unless PDK::CLI::Util.prompt_for_yes(_('Overwrite?'), default: false)
-            PDK.logger.info _('Build cancelled; exiting.')
+          unless PDK::CLI::Util.prompt_for_yes('Overwrite?', default: false)
+            PDK.logger.info 'Build cancelled; exiting.'
             exit 0
           end
         end
 
         unless builder.module_pdk_compatible?
-          PDK.logger.info _('This module is not compatible with PDK, so PDK can not validate or test this build. ' \
-                            'Unvalidated modules may have errors when uploading to the Forge. ' \
-                            'To make this module PDK compatible and use validate features, cancel the build and run `pdk convert`.')
+          PDK.logger.info 'This module is not compatible with PDK, so PDK can not validate or test this build. ' \
+                          'Unvalidated modules may have errors when uploading to the Forge. ' \
+                          'To make this module PDK compatible and use validate features, cancel the build and run `pdk convert`.'
 
-          unless PDK::CLI::Util.prompt_for_yes(_('Continue build without converting?'))
-            PDK.logger.info _('Build cancelled; exiting.')
+          unless PDK::CLI::Util.prompt_for_yes('Continue build without converting?')
+            PDK.logger.info 'Build cancelled; exiting.'
             exit 0
           end
         end
       end
 
-      PDK.logger.info _('Building %{module_name} version %{module_version}') % {
+      PDK.logger.info 'Building %{module_name} version %{module_version}' % {
         module_name:    module_metadata.data['name'],
         module_version: module_metadata.data['version'],
       }
 
       builder.build
 
-      PDK.logger.info _('Build of %{package_name} has completed successfully. Built package can be found here: %{package_path}') % {
+      PDK.logger.info 'Build of %{package_name} has completed successfully. Built package can be found here: %{package_path}' % {
         package_name: module_metadata.data['name'],
         package_path: builder.package_file,
       }

data/lib/pdk/cli/bundle.rb

@@ -1,13 +1,12 @@
 module PDK::CLI
   @bundle_cmd = @base_cmd.define_command do
     name 'bundle'
-    usage _('bundle [bundler_options]')
-    summary _('(Experimental) Command pass-through to bundler')
-    description _(<<-EOF
+    usage 'bundle [bundler_options]'
+    summary '(Experimental) Command pass-through to bundler'
+    description <<-EOF
 [experimental] For advanced users, pdk bundle runs arbitrary commands in the bundler environment that pdk manages.
 Careless use of this command can lead to errors that pdk can't help recover from.
 EOF
-                 )
     skip_option_parsing
 
     run do |_opts, args, _cmd|
@@ -15,7 +14,7 @@ EOF
       require 'pdk/util/bundler'
 
       PDK::CLI::Util.ensure_in_module!(
-        message: _('`pdk bundle` can only be run from inside a valid module directory.'),
+        message: '`pdk bundle` can only be run from inside a valid module directory.',
       )
 
       PDK::CLI::Util.validate_puppet_version_opts({})

data/lib/pdk/cli/config/get.rb

@@ -1,26 +1,26 @@
 module PDK::CLI
   @config_get_cmd = @config_cmd.define_command do
     name 'get'
-    usage _('config get [name]')
-    summary _('(Deprecated) Retrieve the configuration for <name>. If not specified, retrieve all configuration settings')
+    usage 'config get [name]'
+    summary '(Deprecated) Retrieve the configuration for <name>. If not specified, retrieve all configuration settings'
 
     run do |_opts, args, _cmd|
-      PDK.logger.warn _('The \'pdk config get\' command is deprecated, please use \'pdk get config\' instead.')
+      PDK.logger.warn 'The \'pdk config get\' command is deprecated, please use \'pdk get config\' instead.'
 
       item_name = args[0]
       resolved_config = PDK.config.resolve(item_name)
       # If the user wanted to know a setting but it doesn't exist, raise an error
       if resolved_config.empty? && !item_name.nil?
-        PDK.logger.error(_("Configuration item '%{name}' does not exist") % { name: item_name })
+        PDK.logger.error("Configuration item '%{name}' does not exist" % { name: item_name })
         exit 1
       end
       # If the user requested a setting and it's the only one resolved, then just output the value
       if resolved_config.count == 1 && resolved_config.keys[0] == item_name
-        puts _('%{value}') % { value: resolved_config.values[0] }
+        puts '%{value}' % { value: resolved_config.values[0] }
         exit 0
       end
       # Otherwise just output everything
-      resolved_config.keys.sort.each { |key| puts _('%{name}=%{value}') % { name: key, value: resolved_config[key] } }
+      resolved_config.keys.sort.each { |key| puts '%{name}=%{value}' % { name: key, value: resolved_config[key] } }
     end
   end
 end

data/lib/pdk/cli/config.rb

@@ -1,12 +1,12 @@
 module PDK::CLI
   @config_cmd = @base_cmd.define_command do
     name 'config'
-    usage _('config [subcommand] [options]')
-    summary _('(Deprecated) Configure the Puppet Development Kit.')
+    usage 'config [subcommand] [options]'
+    summary '(Deprecated) Configure the Puppet Development Kit.'
     default_subcommand 'help'
 
     run do |_opts, args, _cmd|
-      PDK.logger.warn _('The \'pdk config\' command is deprecated, please use \'pdk get config\' and \'pdk set config\' instead.')
+      PDK.logger.warn 'The \'pdk config\' command is deprecated, please use \'pdk get config\' and \'pdk set config\' instead.'
 
       if args == ['help']
         PDK::CLI.run(%w[config --help])

data/lib/pdk/cli/console.rb

@@ -1,16 +1,16 @@
 module PDK::CLI
   @console_cmd = @base_cmd.define_command do
     name 'console'
-    usage _('console [console_options]')
-    summary _('(Experimental) Start a session of the puppet debugger console.')
+    usage 'console [console_options]'
+    summary '(Experimental) Start a session of the puppet debugger console.'
     default_subcommand 'help'
-    description _(<<-EOF
+    description <<-EOF
 The pdk console runs a interactive session of the puppet debugger tool to test out snippets of code, run
 language evaluations, datatype prototyping and much more.  A virtual playground for your puppet code!
 For usage details see the puppet debugger docs at https://docs.puppet-debugger.com.
 
 EOF
-                 )
+
     PDK::CLI.puppet_version_options(self)
     PDK::CLI.puppet_dev_option(self)
     # we have to skip option parsing because it is expected the user
@@ -23,7 +23,7 @@ EOF
       require 'pdk/util'
 
       PDK::CLI::Util.ensure_in_module!(
-        message: _('Console can only be run from inside a valid module directory'),
+        message: 'Console can only be run from inside a valid module directory',
         log_level: :fatal,
       )
 
@@ -78,7 +78,7 @@ EOF
       lock_file = ::Bundler::LockfileParser.new(::Bundler.read_file(lock_file_path))
       !lock_file.specs.find { |spec| spec.name.eql?(gem_name) }.nil?
     rescue ::Bundler::GemfileNotFound => e
-      PDK.logger.debug _(e.message)
+      PDK.logger.debug e.message
       false
     end
 
@@ -86,7 +86,7 @@ EOF
       existing_path = base_module_path.split(':').find do |path|
         PDK::Util::Filesystem.directory?(path) && Dir.entries(path).length > 2
       end
-      PDK.logger.warn _('Module fixtures not found, please run pdk bundle exec rake spec_prep.') unless existing_path
+      PDK.logger.warn 'Module fixtures not found, please run pdk bundle exec rake spec_prep.' unless existing_path
     end
 
     # @return [Array] - array of split options [{:"puppet-version"=>"6.9.0"}, ['--loglevel=debug']]

data/lib/pdk/cli/convert.rb

@@ -1,32 +1,32 @@
 module PDK::CLI
   @convert_cmd = @base_cmd.define_command do
     name 'convert'
-    usage _('convert [options]')
-    summary _('Convert an existing module to be compatible with the PDK.')
+    usage 'convert [options]'
+    summary 'Convert an existing module to be compatible with the PDK.'
 
     PDK::CLI.template_url_option(self)
     PDK::CLI.template_ref_option(self)
     PDK::CLI.skip_interview_option(self)
     PDK::CLI.full_interview_option(self)
-    flag nil, :noop, _('Do not convert the module, just output what would be done.')
-    flag nil, :force, _('Convert the module automatically, with no prompts.')
-    flag nil, :'add-tests', _('Add any missing tests while converting the module.')
-    flag nil, :'default-template', _('Convert the module to use the default PDK template.')
+    flag nil, :noop, 'Do not convert the module, just output what would be done.'
+    flag nil, :force, 'Convert the module automatically, with no prompts.'
+    flag nil, :'add-tests', 'Add any missing tests while converting the module.'
+    flag nil, :'default-template', 'Convert the module to use the default PDK template.'
 
     run do |opts, _args, _cmd|
       # Write the context information to the debug log
       PDK.context.to_debug_log
 
       unless PDK.context.is_a?(PDK::Context::Module)
-        raise PDK::CLI::ExitWithError, _('`pdk convert` can only be run from inside a valid module directory.')
+        raise PDK::CLI::ExitWithError, '`pdk convert` can only be run from inside a valid module directory.'
       end
 
       if opts[:noop] && opts[:force]
-        raise PDK::CLI::ExitWithError, _('You can not specify --noop and --force when converting a module')
+        raise PDK::CLI::ExitWithError, 'You can not specify --noop and --force when converting a module'
       end
 
       if opts[:'default-template']
-        raise PDK::CLI::ExitWithError, _('You can not specify --template-url and --default-template.') if opts[:'template-url']
+        raise PDK::CLI::ExitWithError, 'You can not specify --template-url and --default-template.' if opts[:'template-url']
 
         opts[:'template-url'] = PDK::Util::TemplateURI.default_template_addressable_uri.to_s
         PDK.config.set(%w[user module_defaults template-url], nil)
@@ -37,12 +37,12 @@ module PDK::CLI
       PDK::CLI::Util.analytics_screen_view('convert', opts)
 
       if opts[:'skip-interview'] && opts[:'full-interview']
-        PDK.logger.info _('Ignoring --full-interview and continuing with --skip-interview.')
+        PDK.logger.info 'Ignoring --full-interview and continuing with --skip-interview.'
         opts[:'full-interview'] = false
       end
 
       if opts[:force] && opts[:'full-interview']
-        PDK.logger.info _('Ignoring --full-interview and continuing with --force.')
+        PDK.logger.info 'Ignoring --full-interview and continuing with --force.'
         opts[:'full-interview'] = false
       end
 

data/lib/pdk/cli/env.rb

@@ -1,12 +1,11 @@
 module PDK::CLI
   @env_cmd = @base_cmd.define_command do
     name 'env'
-    usage _('env')
-    summary _('(Experimental) Output environment variables for specific Puppet context')
-    description _(<<-EOF
+    usage 'env'
+    summary '(Experimental) Output environment variables for specific Puppet context'
+    description <<-EOF
 [experimental] Aids in setting a CLI context for a specified version of Puppet by outputting export commands for necessary environment variables.
 EOF
-                 )
 
     PDK::CLI.puppet_version_options(self)
     PDK::CLI.puppet_dev_option(self)

data/lib/pdk/cli/errors.rb

@@ -5,7 +5,7 @@ module PDK
     class FatalError < StandardError
       attr_reader :exit_code
 
-      def initialize(msg = _('An unexpected error has occurred. Try running the command again with --debug'), opts = {})
+      def initialize(msg = 'An unexpected error has occurred. Try running the command again with --debug', opts = {})
         @exit_code = opts.fetch(:exit_code, 1)
         super(msg)
       end

data/lib/pdk/cli/exec/command.rb

@@ -57,7 +57,7 @@ module PDK
 
         def context=(new_context)
           unless [:system, :module, :pwd].include?(new_context)
-            raise ArgumentError, _("Expected execution context to be :system or :module but got '%{context}'.") % { context: new_context }
+            raise ArgumentError, "Expected execution context to be :system or :module but got '%{context}'." % { context: new_context }
           end
 
           @context = new_context
@@ -108,7 +108,7 @@ module PDK
             unless mod_root
               @spinner.error if @spinner
 
-              raise PDK::CLI::FatalError, _('Current working directory is not part of a module. (No metadata.json was found.)')
+              raise PDK::CLI::FatalError, 'Current working directory is not part of a module. (No metadata.json was found.)'
             end
 
             if Dir.pwd == mod_root || context == :pwd
@@ -135,10 +135,10 @@ module PDK
             duration: @duration,
           }
 
-          PDK.logger.debug _('STDOUT: %{output}') % {
+          PDK.logger.debug 'STDOUT: %{output}' % {
             output: process_data[:stdout].empty? ? 'N/A' : "\n#{process_data[:stdout]}",
           }
-          PDK.logger.debug _('STDERR: %{output}') % {
+          PDK.logger.debug 'STDERR: %{output}' % {
             output: process_data[:stderr].empty? ? 'N/A' : "\n#{process_data[:stderr]}",
           }
 
@@ -152,16 +152,14 @@ module PDK
 
         def warn_on_legacy_env_vars!
           if PDK::Util::Env['PUPPET_GEM_VERSION']
-            PDK.logger.warn_once _(
-              'PUPPET_GEM_VERSION is not supported by PDK. ' \
-              'Use the --puppet-version option on your PDK command ' \
-              'or set the PDK_PUPPET_VERSION environment variable instead',
-            )
+            PDK.logger.warn_once 'PUPPET_GEM_VERSION is not supported by PDK. ' \
+                                 'Use the --puppet-version option on your PDK command ' \
+                                 'or set the PDK_PUPPET_VERSION environment variable instead'
           end
 
           %w[FACTER HIERA].each do |gem|
             if PDK::Util::Env["#{gem}_GEM_VERSION"]
-              PDK.logger.warn_once _('%{varname} is not supported by PDK.') % { varname: "#{gem}_GEM_VERSION" }
+              PDK.logger.warn_once '%{varname} is not supported by PDK.' % { varname: "#{gem}_GEM_VERSION" }
             end
           end
         end
@@ -232,10 +230,10 @@ module PDK
         def run_process!
           command_string = argv.join(' ')
 
-          PDK.logger.debug(_("Executing '%{command}'") % { command: command_string })
+          PDK.logger.debug("Executing '%{command}'" % { command: command_string })
 
           if context == :module
-            PDK.logger.debug(_('Command environment:'))
+            PDK.logger.debug('Command environment:')
             @process.environment.each do |var, val|
               PDK.logger.debug("  #{var}: #{val}")
             end
@@ -246,7 +244,7 @@ module PDK
           begin
             @process.start
           rescue ChildProcess::LaunchError => e
-            raise PDK::CLI::FatalError, _("Failed to execute '%{command}': %{message}") % { command: command_string, message: e.message }
+            raise PDK::CLI::FatalError, "Failed to execute '%{command}': %{message}" % { command: command_string, message: e.message }
           end
 
           if timeout
@@ -262,7 +260,7 @@ module PDK
 
           @duration = Time.now - start_time
 
-          PDK.logger.debug(_("Execution of '%{command}' complete (duration: %{duration_in_seconds}s; exit code: %{exit_code})") %
+          PDK.logger.debug("Execution of '%{command}' complete (duration: %{duration_in_seconds}s; exit code: %{exit_code})" %
             { command: command_string, duration_in_seconds: @duration, exit_code: @process.exit_code })
         end
 

data/lib/pdk/cli/exec/interactive_command.rb

@@ -15,23 +15,23 @@ module PDK
         end
 
         def register_spinner(_spinner, _opts = {})
-          raise _('This method is not implemented for PDK::CLI::Exec::InteractiveCommand')
+          raise 'This method is not implemented for PDK::CLI::Exec::InteractiveCommand'
         end
 
         def add_spinner(_message, _opts = {})
-          raise _('This method is not implemented for PDK::CLI::Exec::InteractiveCommand')
+          raise 'This method is not implemented for PDK::CLI::Exec::InteractiveCommand'
         end
 
         def timeout
-          raise _('This method is not implemented for PDK::CLI::Exec::InteractiveCommand')
+          raise 'This method is not implemented for PDK::CLI::Exec::InteractiveCommand'
         end
 
         def timeout=(_val)
-          raise _('This method is not implemented for PDK::CLI::Exec::InteractiveCommand')
+          raise 'This method is not implemented for PDK::CLI::Exec::InteractiveCommand'
         end
 
         def exec_group=(_val)
-          raise _('This method is not implemented for PDK::CLI::Exec::InteractiveCommand')
+          raise 'This method is not implemented for PDK::CLI::Exec::InteractiveCommand'
         end
 
         def execute!
@@ -43,7 +43,7 @@ module PDK
             mod_root = PDK::Util.module_root
 
             unless mod_root
-              raise PDK::CLI::FatalError, _('Current working directory is not part of a module. (No metadata.json was found.)')
+              raise PDK::CLI::FatalError, 'Current working directory is not part of a module. (No metadata.json was found.)'
             end
 
             unless context == :pwd || Dir.pwd == mod_root
@@ -72,10 +72,10 @@ module PDK
         # TODO: debug logging
         def run_process!
           command_string = argv.join(' ')
-          PDK.logger.debug(_("Executing '%{command}' interactively") % { command: command_string })
+          PDK.logger.debug("Executing '%{command}' interactively" % { command: command_string })
 
           if context == :module
-            PDK.logger.debug(_('Command environment:'))
+            PDK.logger.debug('Command environment:')
             @resolved_env.each do |var, val|
               PDK.logger.debug("  #{var}: #{val}")
             end
@@ -88,8 +88,8 @@ module PDK
           exit_code = child_status.exitstatus
           duration = Time.now - start_time
 
-          PDK.logger.debug(_("Execution of '%{command}' complete (duration: \
-                              %{duration_in_seconds}s; exit code: %{exit_code})") %
+          PDK.logger.debug("Execution of '%{command}' complete (duration: \
+                              %{duration_in_seconds}s; exit code: %{exit_code})" %
                               {
                                 command: command_string,
                                 exit_code: exit_code,
@@ -106,7 +106,7 @@ module PDK
         end
 
         def stop_spinner
-          raise _('This method is not implemented for PDK::CLI::Exec::InteractiveCommand')
+          raise 'This method is not implemented for PDK::CLI::Exec::InteractiveCommand'
         end
       end
     end

data/lib/pdk/cli/exec.rb

@@ -33,7 +33,7 @@ module PDK
       def self.ensure_bin_present!(bin_path, bin_name)
         require 'tty-which'
 
-        message = _('Unable to find `%{name}`. Check that it is installed and try again.') % {
+        message = 'Unable to find `%{name}`. Check that it is installed and try again.' % {
           name: bin_name,
         }
 
@@ -59,7 +59,7 @@ module PDK
         require 'pdk/util'
 
         unless PDK::Util.package_install?
-          PDK.logger.debug(_("PDK package installation not found. Trying '%{fallback}' from the system PATH instead.") % {
+          PDK.logger.debug("PDK package installation not found. Trying '%{fallback}' from the system PATH instead." % {
             fallback: fallback,
           })
           return fallback
@@ -69,14 +69,14 @@ module PDK
 
         require 'pdk/util/filesystem'
         unless PDK::Util::Filesystem.exist?(vendored_bin_full_path)
-          PDK.logger.debug(_("Could not find '%{vendored_bin}' in PDK package. Trying '%{fallback}' from the system PATH instead.") % {
+          PDK.logger.debug("Could not find '%{vendored_bin}' in PDK package. Trying '%{fallback}' from the system PATH instead." % {
             fallback: fallback,
             vendored_bin: vendored_bin_full_path,
           })
           return fallback
         end
 
-        PDK.logger.debug(_("Using '%{vendored_bin}' from PDK package.") % { vendored_bin: vendored_bin_full_path })
+        PDK.logger.debug "Using '%{vendored_bin}' from PDK package." % { vendored_bin: vendored_bin_full_path }
         vendored_bin_full_path
       end
     end

data/lib/pdk/cli/exec_group.rb

@@ -38,7 +38,7 @@ module PDK
       #
       # @api private
       def register(&_block)
-        raise PDK::CLI::FatalError, _('No block registered') unless block_given?
+        raise PDK::CLI::FatalError, 'No block registered' unless block_given?
       end
 
       # The return code of running all registered blocks
@@ -88,8 +88,6 @@ module PDK
         # and only starts on the call to exit_code
         # e.g. max_threads = No. of CPUs
         @threads << Thread.new do
-          GettextSetup.initialize(File.absolute_path('../../../locales', File.dirname(__FILE__)))
-          GettextSetup.negotiate_locale!(GettextSetup.candidate_locales)
           @exit_codes << yield
         end
       end

data/lib/pdk/cli/get/config.rb

@@ -1,24 +1,24 @@
 module PDK::CLI
   @get_config_cmd = @get_cmd.define_command do
     name 'config'
-    usage _('config [name]')
-    summary _('Retrieve the configuration for <name>. If not specified, retrieve all configuration settings')
+    usage 'config [name]'
+    summary 'Retrieve the configuration for <name>. If not specified, retrieve all configuration settings'
 
     run do |_opts, args, _cmd|
       item_name = args[0]
       resolved_config = PDK.config.resolve(item_name)
       # If the user wanted to know a setting but it doesn't exist, raise an error
       if resolved_config.empty? && !item_name.nil?
-        PDK.logger.error(_("Configuration item '%{name}' does not exist") % { name: item_name })
+        PDK.logger.error("Configuration item '%{name}' does not exist" % { name: item_name })
         exit 1
       end
       # If the user requested a setting and it's the only one resolved, then just output the value
       if resolved_config.count == 1 && resolved_config.keys[0] == item_name
-        puts _('%{value}') % { value: resolved_config.values[0] }
+        puts '%{value}' % { value: resolved_config.values[0] }
         exit 0
       end
       # Otherwise just output everything
-      resolved_config.keys.sort.each { |key| puts _('%{name}=%{value}') % { name: key, value: resolved_config[key] } }
+      resolved_config.keys.sort.each { |key| puts '%{name}=%{value}' % { name: key, value: resolved_config[key] } }
     end
   end
 end

data/lib/pdk/cli/get.rb

@@ -1,8 +1,8 @@
 module PDK::CLI
   @get_cmd = @base_cmd.define_command do
     name 'get'
-    usage _('get [subcommand] [options]')
-    summary _('Retrieve information about the PDK or current project.')
+    usage 'get [subcommand] [options]'
+    summary 'Retrieve information about the PDK or current project.'
     default_subcommand 'help'
 
     run do |_opts, args, _cmd|

data/lib/pdk/cli/module/build.rb

@@ -1,11 +1,11 @@
 module PDK::CLI
   @module_build_cmd = @module_cmd.define_command do
     name 'build'
-    usage _('build')
-    summary _('This command is now \'pdk build\'.')
+    usage 'build'
+    summary 'This command is now \'pdk build\'.'
 
     run do |_opts, _args, _cmd|
-      PDK.logger.warn(_("Modules are built using the 'pdk build' command."))
+      PDK.logger.warn("Modules are built using the 'pdk build' command.")
       exit 1
     end
   end