pdk 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daa54ac61ef8e82a47ab9d6b0cbd190b2261a8a9
-  data.tar.gz: f90e5b3f2c554d1da7594967e9b3a500f28f1869
+  metadata.gz: de851b0858e7870cf46b71f5a8647d3f9bc018a4
+  data.tar.gz: ab01700a2ec0373c82224f0566948298eb0d1cb6
 SHA512:
-  metadata.gz: b2d4b1f197c7ca9d8acd269aa4a1ad83760a6b3238cc6dcd2330bc91324687fe370aeccc6a5756bea99ff812f2f6603f7eac1541c21fd6a01660acddd0bb7d41
-  data.tar.gz: 81515d3bf458e1e432fe985c47cb1f481267886a0a525bb5209af81925e4868c7f27b5df35069bcb1b554d145f9d6f74a823b0ada33c8f2c1f431098319e4bff
+  metadata.gz: 325be6b7a78f09fa93e9f2b04a53251961cf21ad370e2d33ed8db251993c1529052123896382bccf5a39742507c81c11e38582b3c290d593796b32d5a6674028
+  data.tar.gz: f21d503b3737b16874e7ef8d3410789104a93e8e7f76064fe82bd590d42fbbb8e6b3c6ae9a3bd76953677c3d2e093b87fbe68f9fa4e0456fbd9b8d2fda7ce0c1

data/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 
 
+## [v1.2.0](https://github.com/puppetlabs/pdk/tree/v1.2.0) (2017-10-05)
+
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.1.0...v1.2.0)
+
+**Implemented enhancements:**
+
+- \(PDK-479\) new module: create examples/, and files/ directory [\#308](https://github.com/puppetlabs/pdk/pull/308) ([DavidS](https://github.com/DavidS))
+- \(PDK-470\) Validation of task metadata. [\#301](https://github.com/puppetlabs/pdk/pull/301) ([bmjen](https://github.com/bmjen))
+- \(PDK-468\) `new task` command [\#299](https://github.com/puppetlabs/pdk/pull/299) ([rodjek](https://github.com/rodjek))
+
+**Fixed bugs:**
+
+- \(PDK-408\) Explain PowerShell escaping for -- on `bundle` [\#309](https://github.com/puppetlabs/pdk/pull/309) ([DavidS](https://github.com/DavidS))
+- \(PDK-482\) Update help messages to be less ambiguous [\#307](https://github.com/puppetlabs/pdk/pull/307) ([DavidS](https://github.com/DavidS))
+- \(PDK-555\) Handle windows style \(backslash separated\) paths when validating [\#306](https://github.com/puppetlabs/pdk/pull/306) ([rodjek](https://github.com/rodjek))
+- \(PDK-543\) Fix spdx.org URLs in messages [\#303](https://github.com/puppetlabs/pdk/pull/303) ([farkasmate](https://github.com/farkasmate))
+- \(PDK-502\) make the private git available to module commands [\#298](https://github.com/puppetlabs/pdk/pull/298) ([rodjek](https://github.com/rodjek))
+
 ## [v1.1.0](https://github.com/puppetlabs/pdk/tree/v1.1.0) (2017-09-13)
 
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.0.1...v1.1.0)

data/README.md

@@ -67,6 +67,16 @@ pdk new defined_type defined_type_name
 
 PDK creates the new defined\_type manifest and a test file (as `defined_type_name_spec.rb`) in your module's `/spec/defines` directory. 
 
+### Generate a task
+
+To generate a task in your module, use the `pdk new task` command, specifying the name of your new task.
+
+1. From the command line, in your module's directory, run: 
+```
+pdk new task task_name
+```
+
+PDK creates the new task file and metadata.
 
 ### Validating a module
 

data/lib/pdk/cli/bundle.rb

@@ -2,10 +2,19 @@
 module PDK::CLI
   @bundle_cmd = @base_cmd.define_command do
     name 'bundle'
-    usage _('bundle -- [bundler_options]')
+    if Gem.win_platform?
+      usage _('bundle `-- [bundler_options]')
+    else
+      usage _('bundle -- [bundler_options]')
+    end
     summary _('(Experimental) Command pass-through to bundler')
-    description _('[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.')
+    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.
+
+Note that for PowerShell the '--' needs to be escaped using a backtick: '`--' to avoid it being parsed by the shell.
+EOF
+                 )
 
     be_hidden
 

data/lib/pdk/cli/exec.rb

@@ -25,6 +25,20 @@ module PDK
         @git_dir ||= File.join('private', 'git', Gem.win_platform? ? 'cmd' : 'bin')
       end
 
+      def self.git_paths
+        @paths ||= begin
+          paths = [File.join(PDK::Util.pdk_package_basedir, git_bindir)]
+
+          if Gem.win_platform?
+            paths << File.join(PDK::Util.pdk_package_basedir, 'private', 'git', 'mingw64', 'bin')
+            paths << File.join(PDK::Util.pdk_package_basedir, 'private', 'git', 'mingw64', 'libexec', 'git-core')
+            paths << File.join(PDK::Util.pdk_package_basedir, 'private', 'git', 'usr', 'bin')
+          end
+
+          paths
+        end
+      end
+
       def self.git_bin
         git_bin = Gem.win_platform? ? 'git.exe' : 'git'
         vendored_bin_path = File.join(git_bindir, git_bin)
@@ -154,9 +168,9 @@ module PDK
               File.join(@process.environment['GEM_HOME'], 'bin'),
               File.join(@process.environment['GEM_PATH'], 'bin'),
               package_binpath,
-              PDK::Util.package_install? ? PDK::CLI::Exec.git_bindir : nil,
               ENV['PATH'],
-            ].compact.join(File::PATH_SEPARATOR)
+              PDK::Util.package_install? ? PDK::CLI::Exec.git_paths : nil,
+            ].compact.flatten.join(File::PATH_SEPARATOR)
 
             mod_root = PDK::Util.module_root
 

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

@@ -0,0 +1,28 @@
+module PDK::CLI
+  @new_task_cmd = @new_cmd.define_command do
+    name 'task'
+    usage _('task [options] <name>')
+    summary _('Create a new task named <name> using given options')
+
+    PDK::CLI.template_url_option(self)
+    option nil, :description, _('A short description of the purpose of the task'), argument: :required
+
+    run do |opts, args, _cmd|
+      PDK::CLI::Util.ensure_in_module!
+
+      task_name = args[0]
+      module_dir = Dir.pwd
+
+      if task_name.nil? || task_name.empty?
+        puts command.help
+        exit 1
+      end
+
+      unless Util::OptionValidator.valid_task_name?(task_name)
+        raise PDK::CLI::ExitWithError, _("'%{name}' is not a valid task name") % { name: task_name }
+      end
+
+      PDK::Generate::Task.new(module_dir, task_name, opts).run
+    end
+  end
+end

data/lib/pdk/cli/new.rb

@@ -1,10 +1,9 @@
-
 module PDK::CLI
   @new_cmd = @base_cmd.define_command do
     name 'new'
-    usage _('new <type> [options]')
+    usage _('new <thing> [options]')
     summary _('create a new module, etc.')
-    description _('Creates a new instance of <type> using relevant options.')
+    description _('Creates a new <thing> using relevant options.')
     default_subcommand 'help'
   end
 
@@ -14,3 +13,4 @@ end
 require 'pdk/cli/new/class'
 require 'pdk/cli/new/defined_type'
 require 'pdk/cli/new/module'
+require 'pdk/cli/new/task'

data/lib/pdk/cli/test.rb

@@ -2,7 +2,7 @@
 module PDK::CLI
   @test_cmd = @base_cmd.define_command do
     name 'test'
-    usage _('test [type] [options]')
+    usage _('test [subcommand] [options]')
     summary _('Run tests.')
     default_subcommand 'help'
   end

data/lib/pdk/cli/util/option_validator.rb

@@ -22,6 +22,7 @@ module PDK
         def self.valid_module_name?(string)
           !(string =~ %r{\A[a-z][a-z0-9_]*\Z}).nil?
         end
+        singleton_class.send(:alias_method, :valid_task_name?, :valid_module_name?)
 
         # Validate a Puppet namespace against the regular expression in the
         # documentation: https://docs.puppet.com/puppet/4.10/lang_reserved.html#classes-and-defined-resource-types

data/lib/pdk/generate.rb

@@ -1,6 +1,7 @@
 require 'pdk/generators/module'
 require 'pdk/generators/defined_type'
 require 'pdk/generators/puppet_class'
+require 'pdk/generators/task'
 require 'pdk/module/metadata'
 require 'pdk/module/templatedir'
 

data/lib/pdk/generators/module.rb

@@ -150,8 +150,11 @@ module PDK
 
       def self.prepare_module_directory(target_dir)
         [
+          File.join(target_dir, 'examples'),
+          File.join(target_dir, 'files'),
           File.join(target_dir, 'manifests'),
           File.join(target_dir, 'templates'),
+          File.join(target_dir, 'tasks'),
         ].each do |dir|
           begin
             FileUtils.mkdir_p(dir)
@@ -194,7 +197,7 @@ module PDK
           {
             name:     'license',
             question: _('What license does this module code fall under?'),
-            help:     _('This should be an identifier from https://spdk.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'],
           },

data/lib/pdk/generators/puppet_object.rb

@@ -11,6 +11,7 @@ module PDK
     class PuppetObject
       attr_reader :module_dir
       attr_reader :object_name
+      attr_reader :options
 
       # Initialises the PDK::Generate::PuppetObject object.
       #
@@ -30,6 +31,7 @@ module PDK
       def initialize(module_dir, object_name, options = {})
         @module_dir = module_dir
         @options = options
+        @object_name = object_name
 
         if [:class, :defined_type].include?(object_type) # rubocop:disable Style/GuardClause
           object_name_parts = object_name.split('::')
@@ -83,10 +85,13 @@ module PDK
       #
       # @api public
       def run
-        [target_object_path, target_spec_path].each do |target_file|
-          if File.exist?(target_file)
-            raise PDK::CLI::ExitWithError, _("Unable to generate %{object_type}; '%{file}' already exists.") % { file: target_file, object_type: object_type }
-          end
+        [target_object_path, target_spec_path].compact.each do |target_file|
+          next unless File.exist?(target_file)
+
+          raise PDK::CLI::ExitWithError, _("Unable to generate %{object_type}; '%{file}' already exists.") % {
+            file:        target_file,
+            object_type: object_type,
+          }
         end
 
         with_templates do |template_path, config_hash|
@@ -115,8 +120,29 @@ module PDK
       #
       # @api private
       def render_file(dest_path, template_path, data)
+        write_file(dest_path) do
+          PDK::TemplateFile.new(template_path, data).render
+        end
+      end
+
+      # Write the result of the block to disk.
+      #
+      # @param dest_path [String] The path that the rendered file should be
+      #   written to. Any necessary directories will be automatically created.
+      # @param &block [String] The content to be written
+      #
+      # @raise [PDK::CLI::FatalError] if the parent directories to `dest_path`
+      #   do not exist and could not be created.
+      # @raise [PDK::CLI::FatalError] if the rendered file could not be written
+      #   to `dest_path`.
+      #
+      # @return [void]
+      #
+      # @api private
+      def write_file(dest_path)
         PDK.logger.info(_("Creating '%{file}' from template.") % { file: dest_path })
-        file_content = PDK::TemplateFile.new(template_path, data).render
+
+        file_content = yield
 
         begin
           FileUtils.mkdir_p(File.dirname(dest_path))

data/lib/pdk/generators/task.rb

@@ -0,0 +1,86 @@
+require 'pdk/generators/puppet_object'
+
+module PDK
+  module Generate
+    class Task < PuppetObject
+      OBJECT_TYPE = :task
+
+      # Prepares the data needed to render the new task template.
+      #
+      # @return [Hash{Symbol => Object}] a hash of information that will be
+      # provided to the task template during rendering. Additionally, this hash
+      # (with the :name key removed) makes up the task metadata.
+      def template_data
+        {
+          name:                object_name,
+          puppet_task_version: 1,
+          supports_noop:       false,
+          description:         options.fetch(:description, 'A short description of this task'),
+          parameters:          {},
+        }
+      end
+
+      # Calculates the path to the file where the new task will be written.
+      #
+      # @return [String] the path to the task file.
+      def target_object_path
+        @target_object_path ||= File.join(module_dir, 'tasks', "#{task_name}.sh")
+      end
+
+      # Calculates the path to the file where the tests for the new task will
+      # be written.
+      #
+      # @return [nil] as there is currently no test framework for Tasks.
+      def target_spec_path
+        nil
+      end
+
+      def run
+        check_if_task_already_exists
+
+        super
+
+        write_task_metadata
+      end
+
+      # Checks that the task has not already been defined with a different
+      # extension.
+      #
+      # @raise [PDK::CLI::ExitWithError] if files with the same name as the
+      # task exist in the <module>/tasks/ directory
+      #
+      # @api private
+      def check_if_task_already_exists
+        error = _("A task named '%{name}' already exists in this module; defined in %{file}")
+        allowed_extensions = %w[.md .conf]
+
+        Dir.glob(File.join(module_dir, 'tasks', "#{task_name}.*")).each do |file|
+          next if allowed_extensions.include?(File.extname(file))
+
+          raise PDK::CLI::ExitWithError, error % { name: task_name, file: file }
+        end
+      end
+
+      # Writes the <module>/tasks/<task_name>.json metadata file for the task.
+      #
+      # @api private
+      def write_task_metadata
+        write_file(File.join(module_dir, 'tasks', "#{task_name}.json")) do
+          task_metadata = template_data.dup
+          task_metadata.delete(:name)
+          JSON.pretty_generate(task_metadata)
+        end
+      end
+
+      # Calculates the file name of the task files ('init' if the task has the
+      # same name as the module, otherwise use the specified task name).
+      #
+      # @return [String] the base name of the file(s) for the task.
+      #
+      # @api private
+      def task_name
+        (object_name == module_name) ? 'init' : object_name
+      end
+    end
+  end
+end

data/lib/pdk/validators/base_validator.rb

@@ -36,18 +36,20 @@ module PDK
                     options[:targets]
                   end
 
+        targets.map! { |r| r.gsub(File::ALT_SEPARATOR, File::SEPARATOR) } if File::ALT_SEPARATOR
         skipped = []
         invalid = []
         matched = targets.map { |target|
           if respond_to?(:pattern)
             if File.directory?(target)
-              target_list = Array[pattern].flatten.map { |p| Dir.glob(File.join(target, p)) }
+              pattern_glob = Array(pattern).map { |p| Dir.glob(File.join(PDK::Util.module_root, p)) }
+              target_list = pattern_glob.flatten.select { |file| File.fnmatch(File.join(File.expand_path(target), '*'), file) }
               skipped << target if target_list.flatten.empty?
               target_list
             elsif File.file?(target)
-              if target.eql? pattern
+              if Array(pattern).include? target
                 target
-              elsif Array[pattern].flatten.map { |p| File.fnmatch(p, File.expand_path(target)) }.include? true
+              elsif Array(pattern).any? { |p| File.fnmatch(File.expand_path(p), File.expand_path(target)) }
                 target
               else
                 skipped << target

data/lib/pdk/validators/metadata/metadata_json_lint.rb

@@ -20,7 +20,7 @@ module PDK
       end
 
       def self.spinner_text(targets = [])
-        _('Checking metadata style (%{targets}).') % {
+        _('Checking module metadata style (%{targets}).') % {
           targets: PDK::Util.targets_relative_to_pwd(targets).join(' '),
         }
       end

data/lib/pdk/validators/metadata/metadata_syntax.rb

@@ -11,12 +11,12 @@ module PDK
       end
 
       def self.pattern
-        'metadata.json'
+        ['metadata.json', 'tasks/*.json']
       end
 
-      def self.spinner_text(targets = [])
+      def self.spinner_text(_targets = [])
         _('Checking metadata syntax (%{targets}).') % {
-          targets: PDK::Util.targets_relative_to_pwd(targets).join(' '),
+          targets: pattern.join(' '),
         }
       end
 

data/lib/pdk/validators/metadata/task_metadata_lint.rb

@@ -0,0 +1,149 @@
+require 'pdk'
+require 'pdk/cli/exec'
+require 'pdk/validators/base_validator'
+require 'pdk/util'
+require 'pathname'
+require 'json-schema'
+
+module PDK
+  module Validate
+    class TaskMetadataLint < BaseValidator
+      FORGE_SCHEMA_URL = 'https://forgeapi.puppet.com/schemas/task.json'.freeze
+
+      def self.name
+        'task-metadata-lint'
+      end
+
+      def self.pattern
+        'tasks/*.json'
+      end
+
+      def self.spinner_text(_targets = [])
+        _('Checking task metadata style (%{targets}).') % {
+          targets: pattern,
+        }
+      end
+
+      def self.create_spinner(targets = [], options = {})
+        return if PDK.logger.debug?
+        options = options.merge(PDK::CLI::Util.spinner_opts_for_platform)
+
+        exec_group = options[:exec_group]
+        @spinner = if exec_group
+                     exec_group.add_spinner(spinner_text(targets), options)
+                   else
+                     TTY::Spinner.new("[:spinner] #{spinner_text(targets)}", options)
+                   end
+        @spinner.auto_spin
+      end
+
+      def self.stop_spinner(exit_code)
+        if exit_code.zero? && @spinner
+          @spinner.success
+        elsif @spinner
+          @spinner.error
+        end
+      end
+
+      def self.vendored_task_schema_path
+        @vendored_task_schema_path ||= File.join(PDK::Util.package_cachedir, 'task.json')
+      end
+
+      def self.schema_file
+        schema = if PDK::Util.package_install? && File.exist?(vendored_task_schema_path)
+                   File.read(vendored_task_schema_path)
+                 else
+                   download_schema_from_forge
+                 end
+
+        JSON.parse(schema)
+      rescue JSON::ParserError
+        raise PDK::CLI::FatalError, _('Failed to parse Task Metadata Schema file.')
+      end
+
+      def self.download_schema_from_forge
+        PDK.logger.debug(_('Task Metadata Schema was not found in the cache. Now downloading from the forge.'))
+        require 'net/https'
+        require 'openssl'
+
+        uri = URI.parse(FORGE_SCHEMA_URL)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE if Gem.win_platform?
+        request = Net::HTTP::Get.new(uri.request_uri)
+        response = http.request(request)
+
+        raise PDK::CLI::FatalError, _('Unable to download Task Metadata Schema file. %{code}: %{message}.') % { code: response.code, message: response.message } unless response.code == '200'
+
+        response.body
+      rescue StandardError => e
+        raise PDK::CLI::FatalError, _('Unable to download Task Metadata Schema file. Please check internet connectivity and retry this action. %{error}') % { error: e }
+      end
+
+      def self.invoke(report, options = {})
+        targets, skipped, invalid = parse_targets(options)
+
+        process_skipped(report, skipped)
+        process_invalid(report, invalid)
+
+        return 0 if targets.empty?
+
+        return_val = 0
+        create_spinner(targets, options)
+
+        targets.each do |target|
+          unless File.readable?(target)
+            report.add_event(
+              file:     target,
+              source:   name,
+              state:    :failure,
+              severity: 'error',
+              message:  _('Could not be read.'),
+            )
+            return_val = 1
+            next
+          end
+
+          begin
+            # Need to set the JSON Parser and State Generator to the Native one to be
+            # compatible with the multi_json adapter.
+            JSON.parser = JSON::Ext::Parser if defined?(JSON::Ext::Parser)
+            JSON.generator = JSON::Ext::Generator
+
+            begin
+              errors = JSON::Validator.fully_validate(schema_file, File.read(target)) || []
+            rescue JSON::Schema::SchemaError => e
+              raise PDK::CLI::FatalError, _('Unable to validate Task Metadata. %{error}.') % { error: e.message }
+            end
+
+            if errors.empty?
+              report.add_event(
+                file:     target,
+                source:   name,
+                state:    :passed,
+                severity: 'ok',
+              )
+            else
+              errors.each do |error|
+                # strip off the trailing parts that aren't relevant
+                error = error.split('in schema').first if error.include? 'in schema'
+
+                report.add_event(
+                  file:     target,
+                  source:   name,
+                  state:    :failure,
+                  severity: 'error',
+                  message:  error,
+                )
+              end
+              return_val = 1
+            end
+          end
+        end
+
+        stop_spinner(return_val)
+        return_val
+      end
+    end
+  end
+end

data/lib/pdk/validators/metadata_validator.rb

@@ -3,6 +3,7 @@ require 'pdk/cli/exec'
 require 'pdk/validators/base_validator'
 require 'pdk/validators/metadata/metadata_json_lint'
 require 'pdk/validators/metadata/metadata_syntax'
+require 'pdk/validators/metadata/task_metadata_lint'
 
 module PDK
   module Validate
@@ -12,7 +13,7 @@ module PDK
       end
 
       def self.metadata_validators
-        [MetadataSyntax, MetadataJSONLint]
+        [MetadataSyntax, MetadataJSONLint, TaskMetadataLint]
       end
 
       def self.invoke(report, options = {})

data/lib/pdk/version.rb

@@ -1,3 +1,3 @@
 module PDK
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/locales/pdk.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: puppet development kit v1.0.1-51-g1a5f668\n"
+"Project-Id-Version: puppet development kit v1.1.0-17-g347e75a\n"
 "\n"
 "Report-Msgid-Bugs-To: docs@puppet.com\n"
-"POT-Creation-Date: 2017-09-13 10:09-0700\n"
-"PO-Revision-Date: 2017-09-13 10:09-0700\n"
+"POT-Creation-Date: 2017-10-05 10:26-0700\n"
+"PO-Revision-Date: 2017-10-05 10:26-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -79,16 +79,24 @@ msgstr ""
 msgid "Path to an answer file."
 msgstr ""
 
-#: ../lib/pdk/cli/bundle.rb:5
+#: ../lib/pdk/cli/bundle.rb:6
+msgid "bundle `-- [bundler_options]"
+msgstr ""
+
+#: ../lib/pdk/cli/bundle.rb:8
 msgid "bundle -- [bundler_options]"
 msgstr ""
 
-#: ../lib/pdk/cli/bundle.rb:6
+#: ../lib/pdk/cli/bundle.rb:10
 msgid "(Experimental) Command pass-through to bundler"
 msgstr ""
 
-#: ../lib/pdk/cli/bundle.rb:7
-msgid "[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."
+#: ../lib/pdk/cli/bundle.rb:11
+msgid ""
+"[experimental] For advanced users, pdk bundle runs arbitrary commands in the bundler environment that pdk manages.\n"
+"Careless use of this command can lead to errors that pdk can't help recover from.\n"
+"\n"
+"Note that for PowerShell the '--' needs to be escaped using a backtick: '`--' to avoid it being parsed by the shell.\n"
 msgstr ""
 
 #: ../lib/pdk/cli/errors.rb:6
@@ -99,39 +107,39 @@ msgstr ""
 msgid "Unable to find `%{name}`. Check that it is installed and try again."
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:56
+#: ../lib/pdk/cli/exec.rb:70
 msgid "PDK package installation not found. Trying '%{fallback}' from the system PATH instead."
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:61
+#: ../lib/pdk/cli/exec.rb:75
 msgid "Using '%{vendored_bin_path}' from PDK package."
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:64
+#: ../lib/pdk/cli/exec.rb:78
 msgid "Could not find '%{vendored_bin_path}' in PDK package. Trying '%{fallback}' from the system PATH instead."
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:102
+#: ../lib/pdk/cli/exec.rb:116
 msgid "Expected execution context to be :system or :module but got '%{context}'."
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:166
+#: ../lib/pdk/cli/exec.rb:180
 msgid "Current working directory is not part of a module. (No metadata.json was found.)"
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:220
+#: ../lib/pdk/cli/exec.rb:234
 msgid "Executing '%{command}'"
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:222
+#: ../lib/pdk/cli/exec.rb:236
 msgid "Command environment: GEM_HOME is '%{gem_home}' and GEM_PATH is '%{gem_path}'"
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:229
+#: ../lib/pdk/cli/exec.rb:243
 msgid "Failed to execute '%{command}': %{message}"
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:243
+#: ../lib/pdk/cli/exec.rb:257
 msgid "Execution of '%{command}' complete (duration: %{duration_in_seconds}s; exit code: %{exit_code})"
 msgstr ""
 
@@ -163,16 +171,16 @@ msgstr ""
 msgid "Creating new module: %{modname}"
 msgstr ""
 
-#: ../lib/pdk/cli/new.rb:5
-msgid "new <type> [options]"
+#: ../lib/pdk/cli/new.rb:4
+msgid "new <thing> [options]"
 msgstr ""
 
-#: ../lib/pdk/cli/new.rb:6
+#: ../lib/pdk/cli/new.rb:5
 msgid "create a new module, etc."
 msgstr ""
 
-#: ../lib/pdk/cli/new.rb:7
-msgid "Creates a new instance of <type> using relevant options."
+#: ../lib/pdk/cli/new.rb:6
+msgid "Creates a new <thing> using relevant options."
 msgstr ""
 
 #: ../lib/pdk/cli/new/class.rb:4
@@ -211,8 +219,24 @@ msgstr ""
 msgid "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'."
 msgstr ""
 
+#: ../lib/pdk/cli/new/task.rb:4
+msgid "task [options] <name>"
+msgstr ""
+
+#: ../lib/pdk/cli/new/task.rb:5
+msgid "Create a new task named <name> using given options"
+msgstr ""
+
+#: ../lib/pdk/cli/new/task.rb:8
+msgid "A short description of the purpose of the task"
+msgstr ""
+
+#: ../lib/pdk/cli/new/task.rb:22
+msgid "'%{name}' is not a valid task name"
+msgstr ""
+
 #: ../lib/pdk/cli/test.rb:5
-msgid "test [type] [options]"
+msgid "test [subcommand] [options]"
 msgstr ""
 
 #: ../lib/pdk/cli/test.rb:6
@@ -287,7 +311,7 @@ msgstr ""
 msgid "Error: the following values are invalid: %{invalid_entries}"
 msgstr ""
 
-#: ../lib/pdk/cli/util/option_validator.rb:69
+#: ../lib/pdk/cli/util/option_validator.rb:70
 msgid "Non-standard data type '%{type}', make sure the type is available in your code, or dependencies"
 msgstr ""
 
@@ -366,87 +390,87 @@ msgstr ""
 msgid "Your username is not a valid Forge username. Proceeding with the username %{username}. You can fix this later in metadata.json."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:159
+#: ../lib/pdk/generators/module.rb:162
 msgid "Unable to create directory '%{dir}': %{message}"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:171
+#: ../lib/pdk/generators/module.rb:174
 msgid "If you have a Puppet Forge username, add it here."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:172
+#: ../lib/pdk/generators/module.rb:175
 msgid "We can use this to upload your module to the Forge when it's complete."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:175
+#: ../lib/pdk/generators/module.rb:178
 msgid "Forge usernames can only contain lowercase letters and numbers"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:180
+#: ../lib/pdk/generators/module.rb:183
 msgid "What version is this module?"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:181
+#: ../lib/pdk/generators/module.rb:184
 msgid "Puppet uses Semantic Versioning (semver.org) to version modules."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:184
+#: ../lib/pdk/generators/module.rb:187
 msgid "Semantic Version numbers must be in the form MAJOR.MINOR.PATCH"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:189
+#: ../lib/pdk/generators/module.rb:192
 msgid "Who wrote this module?"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:190
+#: ../lib/pdk/generators/module.rb:193
 msgid "This is used to credit the module's author."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:196
+#: ../lib/pdk/generators/module.rb:199
 msgid "What license does this module code fall under?"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:197
-msgid "This should be an identifier from https://spdk.org/licenses/. Common values are \"Apache-2.0\", \"MIT\", or \"proprietary\"."
+#: ../lib/pdk/generators/module.rb:200
+msgid "This should be an identifier from https://spdx.org/licenses/. Common values are \"Apache-2.0\", \"MIT\", or \"proprietary\"."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:203
+#: ../lib/pdk/generators/module.rb:206
 msgid "What operating systems does this module support?"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:204
+#: ../lib/pdk/generators/module.rb:207
 msgid "Use the up and down keys to move between the choices, space to select and enter to continue."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:260
+#: ../lib/pdk/generators/module.rb:263
 msgid "Summarize the purpose of this module in a single sentence."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:261
+#: ../lib/pdk/generators/module.rb:264
 msgid "This helps other Puppet users understand what the module does."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:267
+#: ../lib/pdk/generators/module.rb:270
 msgid "If there is a source code repository for this module, enter the URL here."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:268
+#: ../lib/pdk/generators/module.rb:271
 msgid "Skip this if no repository exists yet. You can update this later in the metadata.json."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:274
+#: ../lib/pdk/generators/module.rb:277
 msgid "If there is a URL where others can learn more about this module, enter it here."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:275 ../lib/pdk/generators/module.rb:281
+#: ../lib/pdk/generators/module.rb:278 ../lib/pdk/generators/module.rb:284
 msgid "Optional. You can update this later in the metadata.json."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:280
+#: ../lib/pdk/generators/module.rb:283
 msgid "If there is a public issue tracker for this module, enter its URL here."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:294
+#: ../lib/pdk/generators/module.rb:297
 msgid ""
 "\n"
 "We need to create a metadata.json file for this module, so we're going to ask you %{count} questions.\n"
@@ -454,58 +478,62 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:305 ../lib/pdk/generators/module.rb:327
+#: ../lib/pdk/generators/module.rb:308 ../lib/pdk/generators/module.rb:330
 msgid "Interview cancelled; not generating the module."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:316
+#: ../lib/pdk/generators/module.rb:319
 msgid "SUMMARY"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:323
+#: ../lib/pdk/generators/module.rb:326
 msgid "About to generate this module; continue?"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:324
+#: ../lib/pdk/generators/module.rb:327
 msgid "Answer \"Y\" to continue or \"n\" to cancel."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:332
+#: ../lib/pdk/generators/module.rb:335
 msgid "Module not generated."
 msgstr ""
 
-#: ../lib/pdk/generators/puppet_object.rb:88
+#: ../lib/pdk/generators/puppet_object.rb:91
 msgid "Unable to generate %{object_type}; '%{file}' already exists."
 msgstr ""
 
-#: ../lib/pdk/generators/puppet_object.rb:118
+#: ../lib/pdk/generators/puppet_object.rb:123
 msgid "Creating '%{file}' from template."
 msgstr ""
 
-#: ../lib/pdk/generators/puppet_object.rb:124
+#: ../lib/pdk/generators/puppet_object.rb:129
 msgid "Unable to create directory '%{path}': %{message}"
 msgstr ""
 
-#: ../lib/pdk/generators/puppet_object.rb:132
+#: ../lib/pdk/generators/puppet_object.rb:137
 msgid "Unable to write to file '%{path}': %{message}"
 msgstr ""
 
-#: ../lib/pdk/generators/puppet_object.rb:155
+#: ../lib/pdk/generators/puppet_object.rb:160
 msgid "No %{dir_type} template specified; trying next template directory."
 msgstr ""
 
-#: ../lib/pdk/generators/puppet_object.rb:168
+#: ../lib/pdk/generators/puppet_object.rb:173
 msgid "Unable to find a %{type} template in %{url}; trying next template directory."
 msgstr ""
 
-#: ../lib/pdk/generators/puppet_object.rb:170
+#: ../lib/pdk/generators/puppet_object.rb:175
 msgid "Unable to find the %{type} template in %{url}."
 msgstr ""
 
-#: ../lib/pdk/generators/puppet_object.rb:227
+#: ../lib/pdk/generators/puppet_object.rb:232
 msgid "'%{dir}' does not contain valid Puppet module metadata: %{msg}"
 msgstr ""
 
+#: ../lib/pdk/generators/task.rb:54
+msgid "A task named '%{name}' already exists in this module; defined in %{file}"
+msgstr ""
+
 #: ../lib/pdk/module/metadata.rb:47
 msgid "'%{file}' does not exist or is not a file."
 msgstr ""
@@ -637,11 +665,11 @@ msgid "Failed to prepare to run the unit tests."
 msgstr ""
 
 #: ../lib/pdk/tests/unit.rb:70
-msgid "Running unit tests in parallel."
+msgid "Running unit tests."
 msgstr ""
 
 #: ../lib/pdk/tests/unit.rb:70
-msgid "Running unit tests."
+msgid "Running unit tests in parallel."
 msgstr ""
 
 #: ../lib/pdk/tests/unit.rb:84
@@ -710,28 +738,28 @@ msgid ""
 "%{output}"
 msgstr ""
 
-#: ../lib/pdk/validators/base_validator.rb:72
+#: ../lib/pdk/validators/base_validator.rb:74
 msgid "Invoking %{cmd}"
 msgstr ""
 
-#: ../lib/pdk/validators/base_validator.rb:77
+#: ../lib/pdk/validators/base_validator.rb:79
 msgid "%{validator}: Skipped '%{target}'. Target does not contain any files to validate (%{pattern})."
 msgstr ""
 
-#: ../lib/pdk/validators/base_validator.rb:81
+#: ../lib/pdk/validators/base_validator.rb:83
 msgid "Target does not contain any files to validate (%{pattern})."
 msgstr ""
 
-#: ../lib/pdk/validators/base_validator.rb:90
+#: ../lib/pdk/validators/base_validator.rb:92
 msgid "%{validator}: Skipped '%{target}'. Target file not found."
 msgstr ""
 
-#: ../lib/pdk/validators/base_validator.rb:94
+#: ../lib/pdk/validators/base_validator.rb:96
 msgid "File does not exist."
 msgstr ""
 
 #: ../lib/pdk/validators/metadata/metadata_json_lint.rb:23
-msgid "Checking metadata style (%{targets})."
+msgid "Checking module metadata style (%{targets})."
 msgstr ""
 
 #: ../lib/pdk/validators/metadata/metadata_json_lint.rb:40
@@ -742,10 +770,34 @@ msgstr ""
 msgid "Checking metadata syntax (%{targets})."
 msgstr ""
 
-#: ../lib/pdk/validators/metadata/metadata_syntax.rb:69
+#: ../lib/pdk/validators/metadata/metadata_syntax.rb:69 ../lib/pdk/validators/metadata/task_metadata_lint.rb:101
 msgid "Could not be read."
 msgstr ""
 
+#: ../lib/pdk/validators/metadata/task_metadata_lint.rb:22
+msgid "Checking task metadata style (%{targets})."
+msgstr ""
+
+#: ../lib/pdk/validators/metadata/task_metadata_lint.rb:61
+msgid "Failed to parse Task Metadata Schema file."
+msgstr ""
+
+#: ../lib/pdk/validators/metadata/task_metadata_lint.rb:65
+msgid "Task Metadata Schema was not found in the cache. Now downloading from the forge."
+msgstr ""
+
+#: ../lib/pdk/validators/metadata/task_metadata_lint.rb:76
+msgid "Unable to download Task Metadata Schema file. %{code}: %{message}."
+msgstr ""
+
+#: ../lib/pdk/validators/metadata/task_metadata_lint.rb:80
+msgid "Unable to download Task Metadata Schema file. Please check internet connectivity and retry this action. %{error}"
+msgstr ""
+
+#: ../lib/pdk/validators/metadata/task_metadata_lint.rb:116
+msgid "Unable to validate Task Metadata. %{error}."
+msgstr ""
+
 #: ../lib/pdk/validators/puppet/puppet_lint.rb:22
 msgid "Checking Puppet manifest style (%{pattern})."
 msgstr ""
@@ -758,11 +810,11 @@ msgstr ""
 msgid "Checking Ruby code style (%{pattern})."
 msgstr ""
 
-#: ../lib/puppet/util/windows/api_types.rb:68
+#: ../lib/puppet/util/windows/api_types.rb:72
 msgid "Unable to read wide strings with %{null_terminator} terminal nulls"
 msgstr ""
 
-#: ../lib/puppet/util/windows/api_types.rb:199
+#: ../lib/puppet/util/windows/api_types.rb:203
 msgid "Bad GUID format."
 msgstr ""
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdk
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: json-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: tty-which
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +175,7 @@ files:
 - lib/pdk/cli/new/class.rb
 - lib/pdk/cli/new/defined_type.rb
 - lib/pdk/cli/new/module.rb
+- lib/pdk/cli/new/task.rb
 - lib/pdk/cli/test.rb
 - lib/pdk/cli/test/unit.rb
 - lib/pdk/cli/util.rb
@@ -174,6 +189,7 @@ files:
 - lib/pdk/generators/module.rb
 - lib/pdk/generators/puppet_class.rb
 - lib/pdk/generators/puppet_object.rb
+- lib/pdk/generators/task.rb
 - lib/pdk/i18n.rb
 - lib/pdk/logger.rb
 - lib/pdk/module/metadata.rb
@@ -190,6 +206,7 @@ files:
 - lib/pdk/validators/base_validator.rb
 - lib/pdk/validators/metadata/metadata_json_lint.rb
 - lib/pdk/validators/metadata/metadata_syntax.rb
+- lib/pdk/validators/metadata/task_metadata_lint.rb
 - lib/pdk/validators/metadata_validator.rb
 - lib/pdk/validators/puppet/puppet_lint.rb
 - lib/pdk/validators/puppet/puppet_syntax.rb
@@ -222,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A key part of the Puppet Development Kit, the shortest path to better modules