pdk 2.4.0 → 2.6.0

data/lib/pdk/cli/get.rb

@@ -1,20 +1,20 @@
-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.')
-    default_subcommand 'help'
-
-    run do |_opts, args, _cmd|
-      if args == ['help']
-        PDK::CLI.run(%w[get --help])
-        exit 0
-      end
-
-      PDK::CLI.run(%w[get help]) if args.empty?
-    end
-  end
-  @get_cmd.add_command Cri::Command.new_basic_help
-end
-
-require 'pdk/cli/get/config'
+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.')
+    default_subcommand 'help'
+
+    run do |_opts, args, _cmd|
+      if args == ['help']
+        PDK::CLI.run(%w[get --help])
+        exit 0
+      end
+
+      PDK::CLI.run(%w[get help]) if args.empty?
+    end
+  end
+  @get_cmd.add_command Cri::Command.new_basic_help
+end
+
+require 'pdk/cli/get/config'

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

@@ -1,12 +1,12 @@
-module PDK::CLI
-  @module_build_cmd = @module_cmd.define_command do
-    name '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."))
-      exit 1
-    end
-  end
-end
+module PDK::CLI
+  @module_build_cmd = @module_cmd.define_command do
+    name '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."))
+      exit 1
+    end
+  end
+end

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

@@ -1,47 +1,47 @@
-module PDK::CLI
-  @module_generate_cmd = @module_cmd.define_command do
-    name 'generate'
-    usage _('generate [options] <module_name>')
-    summary _('This command is now \'pdk new module\'.')
-
-    PDK::CLI.template_url_option(self)
-    PDK::CLI.template_ref_option(self)
-    PDK::CLI.skip_interview_option(self)
-
-    run do |opts, args, _cmd|
-      require 'pdk/generate/module'
-      require 'tty/prompt'
-
-      module_name = args[0]
-
-      if module_name.nil? || module_name.empty?
-        puts command.help
-        exit 1
-      end
-
-      PDK::CLI::Util.validate_template_opts(opts)
-
-      PDK.logger.info(_("New modules are created using the 'pdk new module' command."))
-      prompt = TTY::Prompt.new(help_color: :cyan)
-      redirect = PDK::CLI::Util::CommandRedirector.new(prompt)
-      redirect.target_command('pdk new module')
-      answer = redirect.run
-
-      if answer
-        module_name_parts = module_name.split('-', 2)
-        if module_name_parts.size > 1
-          opts[:username] = module_name_parts[0]
-          opts[:module_name] = module_name_parts[1]
-        else
-          opts[:module_name] = module_name
-        end
-        opts[:target_dir] = opts[:module_name]
-
-        PDK.logger.info(_('Creating new module: %{modname}') % { modname: module_name })
-        PDK::Generate::Module.invoke(opts)
-      else
-        exit 1
-      end
-    end
-  end
-end
+module PDK::CLI
+  @module_generate_cmd = @module_cmd.define_command do
+    name 'generate'
+    usage _('generate [options] <module_name>')
+    summary _('This command is now \'pdk new module\'.')
+
+    PDK::CLI.template_url_option(self)
+    PDK::CLI.template_ref_option(self)
+    PDK::CLI.skip_interview_option(self)
+
+    run do |opts, args, _cmd|
+      require 'pdk/generate/module'
+      require 'tty/prompt'
+
+      module_name = args[0]
+
+      if module_name.nil? || module_name.empty?
+        puts command.help
+        exit 1
+      end
+
+      PDK::CLI::Util.validate_template_opts(opts)
+
+      PDK.logger.info(_("New modules are created using the 'pdk new module' command."))
+      prompt = TTY::Prompt.new(help_color: :cyan)
+      redirect = PDK::CLI::Util::CommandRedirector.new(prompt)
+      redirect.target_command('pdk new module')
+      answer = redirect.run
+
+      if answer
+        module_name_parts = module_name.split('-', 2)
+        if module_name_parts.size > 1
+          opts[:username] = module_name_parts[0]
+          opts[:module_name] = module_name_parts[1]
+        else
+          opts[:module_name] = module_name
+        end
+        opts[:target_dir] = opts[:module_name]
+
+        PDK.logger.info(_('Creating new module: %{modname}') % { modname: module_name })
+        PDK::Generate::Module.invoke(opts)
+      else
+        exit 1
+      end
+    end
+  end
+end

data/lib/pdk/cli/module.rb

@@ -1,14 +1,14 @@
-module PDK::CLI
-  @module_cmd = @base_cmd.define_command do
-    name 'module'
-    usage _('module [options]')
-    summary _('Provide CLI-backwards compatibility to the puppet module tool.')
-    description _('This command is only for reminding you how to accomplish tasks with the PDK, when you were previously doing them with the puppet module command.')
-    default_subcommand 'help'
-  end
-
-  @module_cmd.add_command Cri::Command.new_basic_help
-end
-
-require 'pdk/cli/module/build'
-require 'pdk/cli/module/generate'
+module PDK::CLI
+  @module_cmd = @base_cmd.define_command do
+    name 'module'
+    usage _('module [options]')
+    summary _('Provide CLI-backwards compatibility to the puppet module tool.')
+    description _('This command is only for reminding you how to accomplish tasks with the PDK, when you were previously doing them with the puppet module command.')
+    default_subcommand 'help'
+  end
+
+  @module_cmd.add_command Cri::Command.new_basic_help
+end
+
+require 'pdk/cli/module/build'
+require 'pdk/cli/module/generate'

data/lib/pdk/cli/new/class.rb

@@ -1,32 +1,32 @@
-module PDK::CLI
-  @new_class_cmd = @new_cmd.define_command do
-    name 'class'
-    usage _('class [options] <class_name>')
-    summary _('Create a new class named <class_name> using given options')
-
-    run do |opts, args, _cmd|
-      require 'pdk/generate/puppet_class'
-
-      PDK::CLI::Util.ensure_in_module!(
-        message:   _('Classes can only be created from inside a valid module directory.'),
-        log_level: :info,
-      )
-
-      class_name = args[0]
-
-      if class_name.nil? || class_name.empty?
-        puts command.help
-        exit 1
-      end
-
-      unless Util::OptionValidator.valid_class_name?(class_name)
-        raise PDK::CLI::ExitWithError, _("'%{name}' is not a valid class name") % { name: class_name }
-      end
-
-      PDK::CLI::Util.analytics_screen_view('new_class', opts)
-
-      updates = PDK::Generate::PuppetClass.new(PDK.context, class_name, opts).run
-      PDK::CLI::Util::UpdateManagerPrinter.print_summary(updates, tense: :past)
-    end
-  end
-end
+module PDK::CLI
+  @new_class_cmd = @new_cmd.define_command do
+    name 'class'
+    usage _('class [options] <class_name>')
+    summary _('Create a new class named <class_name> using given options')
+
+    run do |opts, args, _cmd|
+      require 'pdk/generate/puppet_class'
+
+      PDK::CLI::Util.ensure_in_module!(
+        message:   _('Classes can only be created from inside a valid module directory.'),
+        log_level: :info,
+      )
+
+      class_name = args[0]
+
+      if class_name.nil? || class_name.empty?
+        puts command.help
+        exit 1
+      end
+
+      unless Util::OptionValidator.valid_class_name?(class_name)
+        raise PDK::CLI::ExitWithError, _("'%{name}' is not a valid class name") % { name: class_name }
+      end
+
+      PDK::CLI::Util.analytics_screen_view('new_class', opts)
+
+      updates = PDK::Generate::PuppetClass.new(PDK.context, class_name, opts).run
+      PDK::CLI::Util::UpdateManagerPrinter.print_summary(updates, tense: :past)
+    end
+  end
+end

data/lib/pdk/cli/new/defined_type.rb

@@ -1,32 +1,32 @@
-module PDK::CLI
-  @new_define_cmd = @new_cmd.define_command do
-    name 'defined_type'
-    usage _('defined_type [options] <name>')
-    summary _('Create a new defined type named <name> using given options')
-
-    run do |opts, args, _cmd|
-      PDK::CLI::Util.ensure_in_module!(
-        message: _('Defined types can only be created from inside a valid module directory.'),
-        log_level: :info,
-      )
-
-      defined_type_name = args[0]
-
-      if defined_type_name.nil? || defined_type_name.empty?
-        puts command.help
-        exit 1
-      end
-
-      unless Util::OptionValidator.valid_defined_type_name?(defined_type_name)
-        raise PDK::CLI::ExitWithError, _("'%{name}' is not a valid defined type name") % { name: defined_type_name }
-      end
-
-      PDK::CLI::Util.analytics_screen_view('new_defined_type', opts)
-
-      require 'pdk/generate/defined_type'
-
-      updates = PDK::Generate::DefinedType.new(PDK.context, defined_type_name, opts).run
-      PDK::CLI::Util::UpdateManagerPrinter.print_summary(updates, tense: :past)
-    end
-  end
-end
+module PDK::CLI
+  @new_define_cmd = @new_cmd.define_command do
+    name 'defined_type'
+    usage _('defined_type [options] <name>')
+    summary _('Create a new defined type named <name> using given options')
+
+    run do |opts, args, _cmd|
+      PDK::CLI::Util.ensure_in_module!(
+        message: _('Defined types can only be created from inside a valid module directory.'),
+        log_level: :info,
+      )
+
+      defined_type_name = args[0]
+
+      if defined_type_name.nil? || defined_type_name.empty?
+        puts command.help
+        exit 1
+      end
+
+      unless Util::OptionValidator.valid_defined_type_name?(defined_type_name)
+        raise PDK::CLI::ExitWithError, _("'%{name}' is not a valid defined type name") % { name: defined_type_name }
+      end
+
+      PDK::CLI::Util.analytics_screen_view('new_defined_type', opts)
+
+      require 'pdk/generate/defined_type'
+
+      updates = PDK::Generate::DefinedType.new(PDK.context, defined_type_name, opts).run
+      PDK::CLI::Util::UpdateManagerPrinter.print_summary(updates, tense: :past)
+    end
+  end
+end

data/lib/pdk/cli/new/fact.rb

@@ -1,29 +1,29 @@
-module PDK::CLI
-  @new_fact_cmd = @new_cmd.define_command do
-    name 'fact'
-    usage _('fact [options] <name>')
-    summary _('Create a new custom fact named <name> using given options')
-
-    run do |opts, args, _cmd|
-      PDK::CLI::Util.ensure_in_module!
-
-      fact_name = args[0]
-
-      if fact_name.nil? || fact_name.empty?
-        puts command.help
-        exit 1
-      end
-
-      unless Util::OptionValidator.valid_fact_name?(fact_name)
-        raise PDK::CLI::ExitWithError, _("'%{name}' is not a valid fact name") % { name: fact_name }
-      end
-
-      PDK::CLI::Util.analytics_screen_view('new_fact', opts)
-
-      require 'pdk/generate/fact'
-
-      updates = PDK::Generate::Fact.new(PDK.context, fact_name, opts).run
-      PDK::CLI::Util::UpdateManagerPrinter.print_summary(updates, tense: :past)
-    end
-  end
-end
+module PDK::CLI
+  @new_fact_cmd = @new_cmd.define_command do
+    name 'fact'
+    usage _('fact [options] <name>')
+    summary _('Create a new custom fact named <name> using given options')
+
+    run do |opts, args, _cmd|
+      PDK::CLI::Util.ensure_in_module!
+
+      fact_name = args[0]
+
+      if fact_name.nil? || fact_name.empty?
+        puts command.help
+        exit 1
+      end
+
+      unless Util::OptionValidator.valid_fact_name?(fact_name)
+        raise PDK::CLI::ExitWithError, _("'%{name}' is not a valid fact name") % { name: fact_name }
+      end
+
+      PDK::CLI::Util.analytics_screen_view('new_fact', opts)
+
+      require 'pdk/generate/fact'
+
+      updates = PDK::Generate::Fact.new(PDK.context, fact_name, opts).run
+      PDK::CLI::Util::UpdateManagerPrinter.print_summary(updates, tense: :past)
+    end
+  end
+end

data/lib/pdk/cli/new/function.rb

@@ -1,29 +1,29 @@
-module PDK::CLI
-  @new_function_cmd = @new_cmd.define_command do
-    name 'function'
-    usage _('function [options] <name>')
-    summary _('Create a new function named <name> using given options')
-    option :t, :type, _('The function type, (native or v4)'), argument: :required, default: 'native'
-
-    run do |opts, args, _cmd|
-      PDK::CLI::Util.ensure_in_module!
-
-      function_name = args[0]
-
-      if function_name.nil? || function_name.empty?
-        puts command.help
-        exit 1
-      end
-
-      unless Util::OptionValidator.valid_function_name?(function_name)
-        raise PDK::CLI::ExitWithError, _("'%{name}' is not a valid function name") % { name: function_name }
-      end
-
-      PDK::CLI::Util.analytics_screen_view('new_function', opts)
-
-      require 'pdk/generate/function'
-      updates = PDK::Generate::Function.new(PDK.context, function_name, opts).run
-      PDK::CLI::Util::UpdateManagerPrinter.print_summary(updates, tense: :past)
-    end
-  end
-end
+module PDK::CLI
+  @new_function_cmd = @new_cmd.define_command do
+    name 'function'
+    usage _('function [options] <name>')
+    summary _('Create a new function named <name> using given options')
+    option :t, :type, _('The function type, (native or v4)'), argument: :required, default: 'native'
+
+    run do |opts, args, _cmd|
+      PDK::CLI::Util.ensure_in_module!
+
+      function_name = args[0]
+
+      if function_name.nil? || function_name.empty?
+        puts command.help
+        exit 1
+      end
+
+      unless Util::OptionValidator.valid_function_name?(function_name)
+        raise PDK::CLI::ExitWithError, _("'%{name}' is not a valid function name") % { name: function_name }
+      end
+
+      PDK::CLI::Util.analytics_screen_view('new_function', opts)
+
+      require 'pdk/generate/function'
+      updates = PDK::Generate::Function.new(PDK.context, function_name, opts).run
+      PDK::CLI::Util::UpdateManagerPrinter.print_summary(updates, tense: :past)
+    end
+  end
+end

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

@@ -1,53 +1,53 @@
-module PDK::CLI
-  @new_module_cmd = @new_cmd.define_command do
-    name 'module'
-    usage _('module [options] [module_name] [target_dir]')
-    summary _('Create a new module named [module_name] using given options')
-
-    PDK::CLI.template_url_option(self)
-    PDK::CLI.template_ref_option(self)
-    PDK::CLI.skip_interview_option(self)
-    PDK::CLI.full_interview_option(self)
-
-    option nil, 'license', _('Specifies the license this module is written under. ' \
-      "This should be a identifier from https://spdx.org/licenses/. Common values are 'Apache-2.0', 'MIT', or 'proprietary'."), argument: :required
-    option nil, 'skip-bundle-install', _('Do not automatically run `bundle install` after creating the module.'), hidden: true
-
-    run do |opts, args, _cmd|
-      require 'pdk/generate/module'
-
-      module_name = args[0]
-      target_dir = args[1]
-
-      PDK::CLI::Util.validate_template_opts(opts)
-
-      PDK::CLI::Util.analytics_screen_view('new_module', opts)
-
-      if opts[:'skip-interview'] && opts[:'full-interview']
-        PDK.logger.info _('Ignoring --full-interview and continuing with --skip-interview.')
-        opts[:'full-interview'] = false
-      end
-
-      if module_name.nil? || module_name.empty?
-        if opts[:'skip-interview']
-          raise PDK::CLI::ExitWithError, _(
-            'You must specify a module name on the command line when running ' \
-            'with --skip-interview.',
-          )
-        end
-      else
-        module_name_parts = module_name.split('-', 2)
-        if module_name_parts.size > 1
-          opts[:username] = module_name_parts[0]
-          opts[:module_name] = module_name_parts[1]
-        else
-          opts[:module_name] = module_name
-        end
-        opts[:target_dir] = target_dir.nil? ? opts[:module_name] : target_dir
-      end
-
-      PDK.logger.info(_('Creating new module: %{modname}') % { modname: module_name })
-      PDK::Generate::Module.invoke(opts)
-    end
-  end
-end
+module PDK::CLI
+  @new_module_cmd = @new_cmd.define_command do
+    name 'module'
+    usage _('module [options] [module_name] [target_dir]')
+    summary _('Create a new module named [module_name] using given options')
+
+    PDK::CLI.template_url_option(self)
+    PDK::CLI.template_ref_option(self)
+    PDK::CLI.skip_interview_option(self)
+    PDK::CLI.full_interview_option(self)
+
+    option nil, 'license', _('Specifies the license this module is written under. ' \
+      "This should be a identifier from https://spdx.org/licenses/. Common values are 'Apache-2.0', 'MIT', or 'proprietary'."), argument: :required
+    option nil, 'skip-bundle-install', _('Do not automatically run `bundle install` after creating the module.'), hidden: true
+
+    run do |opts, args, _cmd|
+      require 'pdk/generate/module'
+
+      module_name = args[0]
+      target_dir = args[1]
+
+      PDK::CLI::Util.validate_template_opts(opts)
+
+      PDK::CLI::Util.analytics_screen_view('new_module', opts)
+
+      if opts[:'skip-interview'] && opts[:'full-interview']
+        PDK.logger.info _('Ignoring --full-interview and continuing with --skip-interview.')
+        opts[:'full-interview'] = false
+      end
+
+      if module_name.nil? || module_name.empty?
+        if opts[:'skip-interview']
+          raise PDK::CLI::ExitWithError, _(
+            'You must specify a module name on the command line when running ' \
+            'with --skip-interview.',
+          )
+        end
+      else
+        module_name_parts = module_name.split('-', 2)
+        if module_name_parts.size > 1
+          opts[:username] = module_name_parts[0]
+          opts[:module_name] = module_name_parts[1]
+        else
+          opts[:module_name] = module_name
+        end
+        opts[:target_dir] = target_dir.nil? ? opts[:module_name] : target_dir
+      end
+
+      PDK.logger.info(_('Creating new module: %{modname}') % { modname: module_name })
+      PDK::Generate::Module.invoke(opts)
+    end
+  end
+end

data/lib/pdk/cli/new/provider.rb

@@ -1,29 +1,29 @@
-module PDK::CLI
-  @new_provider_cmd = @new_cmd.define_command do
-    name 'provider'
-    usage _('provider [options] <name>')
-    summary _('[experimental] Create a new ruby provider named <name> using given options')
-
-    run do |opts, args, _cmd|
-      PDK::CLI::Util.ensure_in_module!
-
-      provider_name = args[0]
-
-      if provider_name.nil? || provider_name.empty?
-        puts command.help
-        exit 1
-      end
-
-      unless Util::OptionValidator.valid_provider_name?(provider_name)
-        raise PDK::CLI::ExitWithError, _("'%{name}' is not a valid provider name") % { name: provider_name }
-      end
-
-      PDK::CLI::Util.analytics_screen_view('new_provider', opts)
-
-      require 'pdk/generate/provider'
-
-      updates = PDK::Generate::Provider.new(PDK.context, provider_name, opts).run
-      PDK::CLI::Util::UpdateManagerPrinter.print_summary(updates, tense: :past)
-    end
-  end
-end
+module PDK::CLI
+  @new_provider_cmd = @new_cmd.define_command do
+    name 'provider'
+    usage _('provider [options] <name>')
+    summary _('[experimental] Create a new ruby provider named <name> using given options')
+
+    run do |opts, args, _cmd|
+      PDK::CLI::Util.ensure_in_module!
+
+      provider_name = args[0]
+
+      if provider_name.nil? || provider_name.empty?
+        puts command.help
+        exit 1
+      end
+
+      unless Util::OptionValidator.valid_provider_name?(provider_name)
+        raise PDK::CLI::ExitWithError, _("'%{name}' is not a valid provider name") % { name: provider_name }
+      end
+
+      PDK::CLI::Util.analytics_screen_view('new_provider', opts)
+
+      require 'pdk/generate/provider'
+
+      updates = PDK::Generate::Provider.new(PDK.context, provider_name, opts).run
+      PDK::CLI::Util::UpdateManagerPrinter.print_summary(updates, tense: :past)
+    end
+  end
+end