pdk 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b878e02d3bef0909854556bea786e90c9046e19d
-  data.tar.gz: 57f154d05abdef54e0c658529664cfe4eeedc3d3
+  metadata.gz: 6dcde45f10e3958c18de937239e90bdd7f4a4b50
+  data.tar.gz: ed1a5dafcf13c2b7a40a028caf59625a4694b967
 SHA512:
-  metadata.gz: 5334b857cda21c8a2383cded335f22e8fdd16752305db1d3b52bb1f61c98d8ccca6acf33724085e79b4492e0c083a44732acd6b081f75ce20eba8af5bc01a0af
-  data.tar.gz: ff431dd53fa3ebe9d4b5f0ab95d0e3d49101c0bb7cebcd80720d4bf007440df216f03d573f257994d3cb33f0f39a225f4918ff23438276c0c28cceef9c377999
+  metadata.gz: 4addbf8f2b767b3a5774b142acabf289710d6cb5eb7c0e32ef199dc352fe853b6e1291236ce3535ebf99f1c2173ef89d0643c0a489b90ad6a39aef315c9f99cb
+  data.tar.gz: 78ce8ece339647fbcbeda887b3a3e5af7fabd59a90afb7640bb638d5432a43841307cd079ba39a25874c7e02b4f5d3b8ddbd358ebf0ec322d1e79e1a90cec966

data/CHANGELOG.md

@@ -3,7 +3,37 @@
 All notable changes to this project will be documented in this file.
 
 
+## [v0.6.0](https://github.com/puppetlabs/pdk/tree/v0.6.0) (2017-08-08)
+
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v0.5.0...v0.6.0)
+
+**Implemented enhancements:**
+
+- \(MAINT\) Improve moduleroot error message [\#224](https://github.com/puppetlabs/pdk/pull/224) ([DavidS](https://github.com/DavidS))
+- \(PDK-354\) Change PDK::Logger to write to STDERR [\#217](https://github.com/puppetlabs/pdk/pull/217) ([scotje](https://github.com/scotje))
+- \(SDK-331\) Use vendored Gemfile.lock when available and needed [\#215](https://github.com/puppetlabs/pdk/pull/215) ([scotje](https://github.com/scotje))
+- \(maint\) Expose message when FileUtils.mkdir\_p fails during module generation [\#209](https://github.com/puppetlabs/pdk/pull/209) ([rodjek](https://github.com/rodjek))
+- \(SDK-323\) Change color of default answer to cyan [\#206](https://github.com/puppetlabs/pdk/pull/206) ([austb](https://github.com/austb))
+- \(maint\) Remove unimplemented `add provider` from docs [\#200](https://github.com/puppetlabs/pdk/pull/200) ([DavidS](https://github.com/DavidS))
+- Update PowerShell install instructions [\#194](https://github.com/puppetlabs/pdk/pull/194) ([jpogran](https://github.com/jpogran))
+- \(maint\) Remove unused vcs option from 'pdk new module' [\#192](https://github.com/puppetlabs/pdk/pull/192) ([rodjek](https://github.com/rodjek))
+- Document compatibility policy and upgrade strategy [\#188](https://github.com/puppetlabs/pdk/pull/188) ([turbodog](https://github.com/turbodog))
+- \(MAINT\) Remove spinner for `bundle check` command [\#187](https://github.com/puppetlabs/pdk/pull/187) ([scotje](https://github.com/scotje))
+- \(SDK-321\) add `pdk validate help` [\#183](https://github.com/puppetlabs/pdk/pull/183) ([DavidS](https://github.com/DavidS))
+- \(SDK-317\) Ensure parent of 'pdk new module' is writable before generation [\#175](https://github.com/puppetlabs/pdk/pull/175) ([rodjek](https://github.com/rodjek))
+- \(SDK-312\) Add option --parallel to `pdk test unit` [\#154](https://github.com/puppetlabs/pdk/pull/154) ([austb](https://github.com/austb))
+
+**Fixed bugs:**
+
+- \(SDK-325\) Validate all should run all validators [\#230](https://github.com/puppetlabs/pdk/pull/230) ([bmjen](https://github.com/bmjen))
+- \(PDK-373\) Make test unit --list consistent with test unit [\#216](https://github.com/puppetlabs/pdk/pull/216) ([james-stocks](https://github.com/james-stocks))
+- \(MAINT\) Add --strict-dependencies to metadata-json-lint invocation [\#213](https://github.com/puppetlabs/pdk/pull/213) ([scotje](https://github.com/scotje))
+- \(SDK-317\) Replace File.writable? test with actually creating a test file [\#207](https://github.com/puppetlabs/pdk/pull/207) ([scotje](https://github.com/scotje))
+- \(SDK-333\) Rescue Interrupt cleanly [\#199](https://github.com/puppetlabs/pdk/pull/199) ([scotje](https://github.com/scotje))
+- \(\#137\) Nicer response when binary doesn't exist [\#149](https://github.com/puppetlabs/pdk/pull/149) ([rodjek](https://github.com/rodjek))
+
 ## [v0.5.0](https://github.com/puppetlabs/pdk/tree/v0.5.0) (2017-07-20)
+
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v0.4.4...v0.5.0)
 
 **Implemented enhancements:**
@@ -16,6 +46,7 @@ All notable changes to this project will be documented in this file.
 - \(SDK-331\) allow additional gems to be installed [\#178](https://github.com/puppetlabs/pdk/pull/178) ([DavidS](https://github.com/DavidS))
 
 ## [v0.4.4](https://github.com/puppetlabs/pdk/tree/v0.4.4) (2017-07-18)
+
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v0.4.3...v0.4.4)
 
 **Fixed bugs:**
@@ -26,6 +57,7 @@ All notable changes to this project will be documented in this file.
 - \(SDK-319\) force usage of our ruby [\#168](https://github.com/puppetlabs/pdk/pull/168) ([DavidS](https://github.com/DavidS))
 
 ## [v0.4.3](https://github.com/puppetlabs/pdk/tree/v0.4.3) (2017-07-17)
+
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v0.4.2...v0.4.3)
 
 **Fixed bugs:**
@@ -33,6 +65,7 @@ All notable changes to this project will be documented in this file.
 - \(FIXUP\) Fix default subprocess success/failure messages on Windows [\#164](https://github.com/puppetlabs/pdk/pull/164) ([scotje](https://github.com/scotje))
 
 ## [v0.4.2](https://github.com/puppetlabs/pdk/tree/v0.4.2) (2017-07-17)
+
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v0.4.1...v0.4.2)
 
 **Fixed bugs:**
@@ -42,6 +75,7 @@ All notable changes to this project will be documented in this file.
 - Use default username when Etc.getlogin fails [\#160](https://github.com/puppetlabs/pdk/pull/160) ([austb](https://github.com/austb))
 
 ## [v0.4.1](https://github.com/puppetlabs/pdk/tree/v0.4.1) (2017-07-14)
+
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v0.4.0...v0.4.1)
 
 **Fixed bugs:**
@@ -49,6 +83,7 @@ All notable changes to this project will be documented in this file.
 - \(FIXUP\) Resolve conflation of cachedir concepts [\#153](https://github.com/puppetlabs/pdk/pull/153) ([scotje](https://github.com/scotje))
 
 ## [v0.4.0](https://github.com/puppetlabs/pdk/tree/v0.4.0) (2017-07-14)
+
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v0.3.0...v0.4.0)
 
 **Implemented enhancements:**
@@ -64,6 +99,7 @@ All notable changes to this project will be documented in this file.
 - \(SDK-298\) Handle exception raised when an invalid report format is specified on the CLI [\#125](https://github.com/puppetlabs/pdk/pull/125) ([rodjek](https://github.com/rodjek))
 
 ## [v0.3.0](https://github.com/puppetlabs/pdk/tree/v0.3.0) (2017-06-29)
+
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v0.2.0...v0.3.0)
 
 **Implemented enhancements:**
@@ -83,6 +119,7 @@ All notable changes to this project will be documented in this file.
 - \(SDK-277\) Exit cleanly if pdk commands are run outside of a module [\#100](https://github.com/puppetlabs/pdk/pull/100) ([rodjek](https://github.com/rodjek))
 
 ## [v0.2.0](https://github.com/puppetlabs/pdk/tree/v0.2.0) (2017-06-21)
+
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v0.1.0...v0.2.0)
 
 **Implemented enhancements:**
@@ -103,6 +140,7 @@ All notable changes to this project will be documented in this file.
 - \(maint\) nokogiri: avoid versions without ruby 2.1 support [\#60](https://github.com/puppetlabs/pdk/pull/60) ([DavidS](https://github.com/DavidS))
 
 ## [v0.1.0](https://github.com/puppetlabs/pdk/tree/v0.1.0) (2017-06-05)
+
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/2be9329bed4715c888f273814b99f2cf37ee9341...v0.1.0)
 
 **Implemented enhancements:**
@@ -126,4 +164,4 @@ All notable changes to this project will be documented in this file.
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/README.md

@@ -1,13 +1,51 @@
-# pdk [![Build Status](https://travis-ci.org/puppetlabs/pdk.svg?branch=master)](https://travis-ci.org/puppetlabs/pdk) [![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/x70e2fqllbaootpd?svg=true)](https://ci.appveyor.com/project/puppetlabs/pdk)
+# pdk [![Build Status](https://travis-ci.org/puppetlabs/pdk.svg?branch=master)](https://travis-ci.org/puppetlabs/pdk) [![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/x70e2fqllbaootpd?svg=true)](https://ci.appveyor.com/project/puppetlabs/pdk) [![Coverage Status](https://coveralls.io/repos/github/puppetlabs/pdk/badge.svg?branch=master)](https://coveralls.io/github/puppetlabs/pdk?branch=master)
 
 
-A CLI to facilitate easy, unified development workflows for Puppet modules. pdk is a key part of the Puppet Development Kit, the shortest path to better modules.
+A CLI to facilitate easy, unified development workflows for Puppet modules. `pdk` is a key part of the Puppet Development Kit, the shortest path to better modules.
 
 ## Installation
 
-Download and install the newest package matching your platform from [here](https://drive.google.com/drive/folders/0Bz0tCHSb1u41alR4MmZfRHBTV1k?usp=sharing).
+Download and install the newest package matching your platform from [here](https://drive.google.com/drive/folders/0Bz0tCHSb1u41alR4MmZfRHBTV1k?usp=sharing). If you are using Windows, please remember to close any open PowerShell windows.
 
-On Windows you need to set your script execution policy to [RemoteSigned](https://technet.microsoft.com/en-us/library/ee176961.aspx), to allow the (required) PowerShell integration to work.
+### Windows
+
+On Windows you should run PDK from PowerShell and `pdk` will be available in your PowerShell prompt after installation.
+
+If the `pdk` command does not appear, check that the `PuppetDevelopmentKit` PowerShell module is loaded in your PowerShell prompt:
+
+```
+Get-Module -Name PuppetDevelopmentKit
+```
+
+If no output is returned, load the `PuppetDevelopmentKit` module by running the following command:
+
+```
+Import-Module -Name PuppetDevelopmentKit
+```
+
+> Note: On PowerShell version 3 and above, PowerShell modules are loaded automatically so this step shouldn't be necessary.
+
+You should set your script execution policy to at least [RemoteSigned](https://msdn.microsoft.com/en-us/powershell/reference/5.1/microsoft.powershell.security/set-executionpolicy), if it's not already, to allow the PowerShell integration to work.
+
+You can check your ExecutionPolicy by running the following command from a PowerShell prompt:
+
+```
+Get-ExecutionPolicy
+```
+
+To set the `ExecutionPolicy`, run the following command:
+
+```
+Set-ExecutionPolicy -ExecutionPolicy RemoteSigned
+```
+
+If you can't change the system `ExecutionPolicy`, you can change the `ExecutionPolicy` for just the current session by using the `Scope` paramter:
+
+```
+Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
+```
+
+For more information about PowerShell `ExecutionPolicies` or how to change them, see [about_Execution_Policies](http://go.microsoft.com/fwlink/?LinkID=135170).
 
 ## Usage
 
@@ -98,7 +136,7 @@ Generates a new module.
 Usage:
 
 ```
-pdk new module [--template-url=git_url] [--license=spdx_identifier] [--vcs=vcs_provider] module_name [target_dir]
+pdk new module [--template-url=git_url] [--license=spdx_identifier] module_name [target_dir]
 ```
 
 The `pdk new module` command accepts the following arguments and options. Arguments are optional unless otherwise specified.
@@ -111,10 +149,6 @@ Overrides the template to use for this module. If possible, please contribute yo
 
 Specifies the license this module is written under. See https://spdx.org/licenses/ for a list of open source licenses, or use `proprietary`. Defaults to `Apache-2.0`.
 
-#### `--vcs=vcs_provider`
-
-Specifies the version control driver. Valid values: `git`, `none`. Default: `git`.
-
 #### `--skip-interview`
 
 Suppress interactive queries for initial values. All questions will use the default values.
@@ -166,30 +200,6 @@ to be added to the generated class. Optionally, the data type of the parameter
 can be specified along with the parameter name, separated by a colon. Any
 number of parameters can be provided on the command line.
 
-### `pdk add provider` command
-
-Adds a new resource provider to an existing module.
-
-Usage:
-
-```
-pdk add provider [--template-url=git_url] provider_name [data_type:attribute_name]*
-```
-
-The `pdk add provider` command accepts the following arguments. Arguments are optional unless specified.
-
-#### `--template-url=git_url`
-
-Overrides the template to use for this module. If possible please contribute your improvements back to the default template at [puppetlabs/pdk](https://github.com/puppetlabs/pdk).
-
-#### `provider_name`
-
-**Required**. Specifies the name of the resource provider being created.
-
-#### `data_type:attribute_name`
-
-Specifies a list of attributes with their expected data types, such as `'Enum[absent, present]:ensure'`. If not specified, the data type will have no attributes.
-
 ### `pdk validate` command
 
 Runs all static validations. Any errors are reported to the console in the format requested. The exit code is non-zero when errors occur.
@@ -293,48 +303,21 @@ rake build                 # Build puppet module package
 [...]
 ```
 
-## Contributing
-
-In cases where `pdk` needs to run in a working directory outside the cloned repository, either set `BUNDLE_GEMFILE` to the pdk's Gemfile location, or install and use the [binstubs of bundler](http://bundler.io/v1.15/bundle_binstubs.html), which are small proxy binaries, that set up the environment for running the tool.
-
-```
-# assuming ~/bin is already on your path:
-$ bundle binstubs pdk --path ~/bin
-```
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/puppetlabs/pdk/issues.
+## Module Compatibility
 
-### Running tests
+**PDK Version Compatibility:** modules created with a specific PDK version should validate against and run on all Puppet andRuby version combinations currently under maintenance (see https://docs.puppet.com/puppet/latest/about_agent.html and https://puppet.com/misc/puppet-enterprise-lifecycle)
 
-pdk has three testing rake tasks
+**Module Template Compatibility:** Modules created with a specific version of the PDK will remain compatible to newer versions of the PDK with the following exceptions:
+* access to new PDK functionality might require an update of the module to the current Template version
+* access to a new major PDK version might require an update of the module to the current Template version, after a one year deprecation cycle
+* validation against new Puppet versions might require new PDK functionality, a new major PDK version, and changes to the module itself.
 
-#### spec
+## Upgrading
+* In the common case, Puppet and the PDK will be forward-compatible so that minor Puppet updates will not require a new version of the PDK.
+* Some new Puppet versions will require changes to the PDK. In that case, upgrading the PDK for validation prior to roll-out of Puppet is strongly recommended.
 
-Run unit tests.
 
-#### acceptance:local
 
-Run acceptance tests on the current pdk code. These tests are executed on commits and pull requests to this repo using both travis and appveyor.
-
-#### acceptance:package
-
-Run acceptance tests against a package install. This task is for Puppet's packaging CI, and contributors outside of Puppet, Inc. don't need to worry about executing it. It uses [beaker](https://github.com/puppetlabs/beaker) to provision a VM, fetch and install a pdk installation package, and then run the acceptance tests on that VM.
-It requires some environment variables to be set in order to specify what beaker will set up:
-
-Environment Variable | Usage
----------------------|------
-**SHA** | The SHA or tag of a package build i.e. the folder name on the build server that packages will be found in.
-**TEST_TARGET** | A beaker-hostgenerator string for the OS of the VM you want to test on e.g. _redhat7-64workstation._ or _windows2012r2-64workstation._ (The period character after workstation is required by beaker-hostgenerator).
-**BUILD_SERVER** | (Only required if the tests will run on a Windows VM). The hostname of the build server that hosts packages. A Puppet JIRA ticket ([BKR-1109](https://tickets.puppetlabs.com/browse/BKR-1109)) has been filed to update beaker so this would never be required.
-
-On completion of this testing task, the results from the VM will be available in a folder named _archive_.
-
-### Release Process
+## Contributing
 
-1. Bump the version in `lib/pdk/version.rb`.
-1. In a clean checkout of master, run `bundle exec rake changelog`.
-1. Edit PR titles and tags, until `bundle exec rake changelog` output makes sense.
-1. Commit and PR the changes.
-1. When the PR is merged, get a clean checkout of the merged commit, and run `bundle exec rake release[upstream]` (where "upstream" is your local name of the puppetlabs remote)
-1. Profit!
-1. Update `lib/pdk/version.rb` with `x.y.z.pre` version bump, commit, and PR to prepare for next release.
+See the [CONTRIBUTING.md](CONTRIBUTING.md) file for development notes.

data/exe/pdk

@@ -2,4 +2,9 @@
 
 require 'pdk/cli'
 
-PDK::CLI.run(ARGV)
+begin
+  PDK::CLI.run(ARGV)
+rescue Interrupt
+  warn "\nAborted!"
+  exit 1
+end

data/lib/pdk/answer_file.rb

@@ -13,8 +13,8 @@ module PDK
   #
   # @param path [String] A path on disk to the file where the PDK should store
   #   answers to interactive questions.
-  def self.answer_file=(value)
-    @answer_file = PDK::AnswerFile.new(value)
+  def self.answer_file=(path)
+    @answer_file = PDK::AnswerFile.new(path)
   end
 
   class AnswerFile

data/lib/pdk/cli/exec.rb

@@ -2,6 +2,7 @@ require 'bundler'
 require 'childprocess'
 require 'tempfile'
 require 'tty-spinner'
+require 'tty-which'
 
 require 'pdk/util'
 
@@ -12,22 +13,35 @@ module PDK
         Command.new(*cmd).execute!
       end
 
+      def self.ensure_bin_present!(bin_path, bin_name)
+        message = _('Unable to find `%{name}`. Check that it is installed and try again.') % {
+          name: bin_name,
+        }
+
+        raise PDK::CLI::FatalError, message unless TTY::Which.exist?(bin_path)
+      end
+
       def self.git_bindir
         @git_dir ||= File.join('private', 'git', Gem.win_platform? ? 'cmd' : 'bin')
       end
 
-      def self.git(*args)
+      def self.git_bin
         git_bin = Gem.win_platform? ? 'git.exe' : 'git'
         vendored_bin_path = File.join(git_bindir, git_bin)
 
-        execute(try_vendored_bin(vendored_bin_path, git_bin), *args)
+        try_vendored_bin(vendored_bin_path, git_bin)
+      end
+
+      def self.git(*args)
+        ensure_bin_present!(git_bin, 'git')
+
+        execute(git_bin, *args)
       end
 
       def self.bundle(*args)
-        bundle_bin = Gem.win_platform? ? 'bundle.bat' : 'bundle'
-        vendored_bin_path = File.join('private', 'ruby', '2.1.9', 'bin', bundle_bin)
+        ensure_bin_present!(bundle_bin, 'bundler')
 
-        execute(try_vendored_bin(vendored_bin_path, bundle_bin), *args)
+        execute(bundle_bin, *args)
       end
 
       def self.bundle_bin
@@ -156,6 +170,7 @@ module PDK
             stdout: @stdout.read,
             stderr: @stderr.read,
             exit_code: @process.exit_code,
+            duration: @duration,
           }
 
           return process_data
@@ -169,6 +184,7 @@ module PDK
         def run_process!
           command_string = argv.join(' ')
           PDK.logger.debug(_("Executing '%{command}'") % { command: command_string })
+          start_time = Time.now
           begin
             @process.start
           rescue ChildProcess::LaunchError => e
@@ -185,6 +201,7 @@ module PDK
             # Wait indfinitely if no timeout set.
             @process.wait
           end
+          @duration = Time.now - start_time
         end
       end
 

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

@@ -10,8 +10,6 @@ module PDK::CLI
     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, 'vcs', _("Specifies the version control driver. Valid values: 'git', 'none'. Default: 'git'."), argument: :required
-
     flag nil, 'skip-interview', _('When specified, skips interactive querying of metadata.')
 
     run do |opts, args, _cmd|
@@ -35,7 +33,6 @@ module PDK::CLI
 
       opts[:name] = module_name
       opts[:target_dir] = target_dir.nil? ? module_name : target_dir
-      opts[:vcs] ||= 'git'
 
       PDK.logger.info(_('Creating new module: %{modname}') % { modname: module_name })
       PDK::Generate::Module.invoke(opts)

data/lib/pdk/cli/test/unit.rb

@@ -8,6 +8,7 @@ module PDK::CLI
     summary _('Run unit tests.')
 
     flag nil, :list, _('list all available unit tests and their descriptions')
+    flag nil, :parallel, _('run unit tests in parallel'), hidden: true
 
     option nil, :tests, _('a comma-separated list of tests to run'), argument: :required, default: '' do |values|
       PDK::CLI::Util::OptionValidator.comma_separated_list?(values)

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

@@ -19,7 +19,7 @@ module PDK
         end
 
         def num_questions
-          @questions.count
+          (@questions ||= {}).count
         end
 
         def run

data/lib/pdk/cli/validate.rb

@@ -17,6 +17,11 @@ module PDK::CLI
     flag :a, 'auto-correct', _('automatically correct problems (where possible)')
 
     run do |opts, args, _cmd|
+      if args == ['help']
+        PDK::CLI.run(['validate', '--help'])
+        exit 0
+      end
+
       validator_names = PDK::Validate.validators.map { |v| v.name }
       validators = PDK::Validate.validators
       targets = []
@@ -77,8 +82,8 @@ module PDK::CLI
       PDK::Util::Bundler.ensure_bundle!
 
       validators.each do |validator|
-        exit_code = validator.invoke(report, options)
-        break if exit_code != 0
+        validator_exit_code = validator.invoke(report, options)
+        exit_code = validator_exit_code if validator_exit_code != 0
       end
 
       report_formats.each do |format|

data/lib/pdk/generators/module.rb

@@ -24,6 +24,18 @@ module PDK
           raise PDK::CLI::FatalError, _("The destination directory '%{dir}' already exists") % { dir: target_dir }
         end
 
+        parent_dir = File.dirname(target_dir)
+
+        begin
+          test_file = File.join(parent_dir, '.pdk-test-writable')
+          File.open(test_file, 'w') { |f| f.write('This file was created by the Puppet Development Kit to test if this folder was writable, you can safely remove this file.') }
+          FileUtils.rm_f(test_file)
+        rescue Errno::EACCES
+          raise PDK::CLI::FatalError, _("You do not have permission to write to '%{parent_dir}'") % {
+            parent_dir: parent_dir,
+          }
+        end
+
         metadata = prepare_metadata(opts)
 
         temp_target_dir = PDK::Util.make_tmpdir_name('pdk-module-target')
@@ -50,7 +62,15 @@ module PDK
 
         PDK.answers.update!('template-url' => template_url)
 
-        FileUtils.mv(temp_target_dir, target_dir)
+        begin
+          FileUtils.mv(temp_target_dir, target_dir)
+        rescue Errno::EACCES => e
+          raise PDK::CLI::FatalError, _("Failed to move '%{source}' to '%{target}': %{message}") % {
+            source:  temp_target_dir,
+            target:  target_dir,
+            message: e.message,
+          }
+        end
       end
 
       def self.username_from_login
@@ -97,8 +117,11 @@ module PDK
         ].each do |dir|
           begin
             FileUtils.mkdir_p(dir)
-          rescue SystemCallError
-            raise PDK::CLI::FatalError, _("Unable to create directory '%{dir}'") % { dir: dir }
+          rescue SystemCallError => e
+            raise PDK::CLI::FatalError, _("Unable to create directory '%{dir}': %{message}") % {
+              dir:     dir,
+              message: e.message,
+            }
           end
         end
       end
@@ -165,7 +188,7 @@ module PDK
           },
         ]
 
-        prompt = TTY::Prompt.new
+        prompt = TTY::Prompt.new(help_color: :cyan)
 
         interview = PDK::CLI::Util::Interview.new(prompt)
 

data/lib/pdk/generators/puppet_object.rb

@@ -44,7 +44,7 @@ module PDK
 
       # @abstract Subclass and implement {#template_data} to provide data to
       #   the templates during rendering. Implementations of this method should
-      #   return a Hash[{Symbol => Object}].
+      #   return a Hash!{Symbol => Object}.
       def template_data
         raise NotImplementedError
       end
@@ -79,6 +79,7 @@ module PDK
       # point for the class.
       #
       # @raise [PDK::CLI::FatalError] if the target files already exist.
+      # @raise [PDK::CLI::FatalError] (see #render_file)
       #
       # @api public
       def run
@@ -105,14 +106,33 @@ module PDK
       # @param data [Hash{Object => Object}] The data to be provided to the
       #   template when rendering.
       #
+      # @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 render_file(dest_path, template_path, data)
         PDK.logger.info(_("Creating '%{file}' from template.") % { file: dest_path })
         file_content = PDK::TemplateFile.new(template_path, data).render
-        FileUtils.mkdir_p(File.dirname(dest_path))
+
+        begin
+          FileUtils.mkdir_p(File.dirname(dest_path))
+        rescue SystemCallError => e
+          raise PDK::CLI::FatalError, _("Unable to create directory '%{path}': %{message}") % {
+            path:    File.dirname(dest_path),
+            message: e.message,
+          }
+        end
+
         File.open(dest_path, 'w') { |f| f.write file_content }
+      rescue SystemCallError => e
+        raise PDK::CLI::FatalError, _("Unable to write to file '%{path}': %{message}") % {
+          path:    dest_path,
+          message: e.message,
+        }
       end
 
       # Search the possible template directories in order of preference to find

data/lib/pdk/logger.rb

@@ -7,8 +7,7 @@ module PDK
 
   class Logger < ::Logger
     def initialize
-      # TODO: Decide where log output goes, probably stderr?
-      super(STDOUT)
+      super(STDERR)
 
       # TODO: Decide on output format.
       self.formatter = proc do |severity, _datetime, _progname, msg|

data/lib/pdk/module/metadata.rb

@@ -30,8 +30,8 @@ module PDK
             'operatingsystemrelease' => ['16.04'],
           },
           {
-            'operatingsystem' => 'Windows',
-            'operatingsystemrelease' => ['2016'],
+            'operatingsystem' => 'windows',
+            'operatingsystemrelease' => ['2012 R2'],
           },
         ],
       }.freeze

data/lib/pdk/module/templatedir.rb

@@ -178,7 +178,7 @@ module PDK
         end
 
         unless File.directory?(@moduleroot_dir) # rubocop:disable Style/GuardClause
-          raise ArgumentError, _("The template at '%{path}' does not contain a moduleroot directory") % { path: @path }
+          raise ArgumentError, _("The template at '%{path}' does not contain a 'moduleroot/' directory") % { path: @path }
         end
       end
 

data/lib/pdk/tests/unit.rb

@@ -6,9 +6,16 @@ require 'json'
 module PDK
   module Test
     class Unit
-      def self.cmd(_tests)
+      def self.cmd(_tests, opts = {})
         # TODO: test selection
-        [File.join(PDK::Util.module_root, 'bin', 'rake'), 'spec']
+        rake_task = opts.key?(:parallel) ? 'parallel_spec' : 'spec'
+        [File.join(PDK::Util.module_root, 'bin', 'rake'), rake_task]
+      end
+
+      def self.parallel_with_no_tests?(ran_in_parallel, json_result, result)
+        ran_in_parallel && json_result.empty? &&
+          !result[:exit_code].zero? &&
+          result[:stderr].strip =~ %r{Pass files or folders to run$}
       end
 
       def self.invoke(report, options = {})
@@ -17,12 +24,13 @@ module PDK
 
         tests = options.fetch(:tests)
 
-        cmd_argv = cmd(tests)
+        cmd_argv = cmd(tests, options)
         cmd_argv.unshift('ruby') if Gem.win_platform?
 
         command = PDK::CLI::Exec::Command.new(*cmd_argv).tap do |c|
           c.context = :module
-          c.add_spinner('Running unit tests')
+          spinner_msg = options.key?(:parallel) ? _('Running unit tests in parallel') : _('Running unit tests')
+          c.add_spinner(spinner_msg)
           c.environment['CI_SPEC_OPTIONS'] = '--format j'
         end
 
@@ -30,20 +38,20 @@ module PDK
 
         result = command.execute!
 
-        # TODO: cleanup rspec and/or beaker output
-        # Iterate through possible JSON documents until we find one that is valid.
-        json_result = nil
+        json_result = if options.key?(:parallel)
+                        PDK::Util.find_all_json_in(result[:stdout])
+                      else
+                        PDK::Util.find_first_json_in(result[:stdout])
+                      end
 
-        result[:stdout].scan(%r{\{(?:[^{}]|(?:\g<0>))*\}}x) do |str|
-          begin
-            json_result = JSON.parse(str)
-            break
-          rescue JSON::ParserError
-            next
-          end
+        if parallel_with_no_tests?(options.key?(:parallel), json_result, result)
+          json_result = [{ 'messages' => ['No examples found.'] }]
+          result[:exit_code] = 0
         end
 
-        raise PDK::CLI::FatalError, _('Unit test output did not contain a valid JSON result: %{output}') % { output: result[:stdout] } unless json_result
+        raise PDK::CLI::FatalError, _('Unit test output did not contain a valid JSON result: %{output}') % { output: result[:stdout] } if json_result.nil? || json_result.empty?
+
+        json_result = merge_json_results(json_result, result[:duration]) if options.key?(:parallel)
 
         parse_output(report, json_result)
 
@@ -99,32 +107,68 @@ module PDK
         }
       end
 
+      def self.merge_json_results(json_data, duration)
+        merged_json_result = {}
+
+        # Merge messages
+        message_set = Set.new
+        json_data.each do |json|
+          next unless json['messages']
+          message_set |= json['messages']
+        end
+        merged_json_result['messages'] = message_set.to_a
+
+        # Merge examples
+        all_examples = []
+        json_data.each do |json|
+          next unless json['examples']
+          all_examples.concat json['examples']
+        end
+        merged_json_result['examples'] = all_examples
+
+        # Merge summaries
+        summary_hash = {
+          'duration'      => duration,
+          'example_count' => 0,
+          'failure_count' => 0,
+          'pending_count' => 0,
+        }
+        json_data.each do |json|
+          next unless json['summary']
+          summary_hash['example_count'] += json['summary']['example_count']
+          summary_hash['failure_count'] += json['summary']['failure_count']
+          summary_hash['pending_count'] += json['summary']['pending_count']
+        end
+        merged_json_result['summary'] = summary_hash
+
+        merged_json_result
+      end
+
       # @return array of { :id, :full_description }
       def self.list
         PDK::Util::Bundler.ensure_bundle!
-        PDK::Util::Bundler.ensure_binstubs!('rspec-core')
+        PDK::Util::Bundler.ensure_binstubs!('rake')
 
-        command_argv = [File.join(PDK::Util.module_root, 'bin', 'rspec'), '--dry-run', '--format', 'json']
+        command_argv = [File.join(PDK::Util.module_root, 'bin', 'rake'), 'spec_list_json']
         command_argv.unshift('ruby') if Gem.win_platform?
         list_command = PDK::CLI::Exec::Command.new(*command_argv)
         list_command.context = :module
         output = list_command.execute!
 
-        rspec_json_output = JSON.parse(output[:stdout])
-        if rspec_json_output['examples'].empty?
-          rspec_message = rspec_json_output['messages'][0]
+        rspec_json = PDK::Util.find_first_json_in(output[:stdout])
+        raise PDK::CLI::FatalError, _('Failed to find valid JSON in output from rspec: %{output}' % { output: output[:stdout] }) unless rspec_json
+        if rspec_json['examples'].empty?
+          rspec_message = rspec_json['messages'][0]
           return [] if rspec_message == 'No examples found.'
 
           raise PDK::CLI::FatalError, _('Unable to enumerate examples. rspec reported: %{message}' % { message: rspec_message })
         else
           examples = []
-          rspec_json_output['examples'].each do |example|
+          rspec_json['examples'].each do |example|
             examples << { id: example['id'], full_description: example['full_description'] }
           end
           examples
         end
-      rescue JSON::ParserError => e
-        raise PDK::CLI::FatalError, _('Failed to parse output from rspec: %{message}' % { message: e.message })
       end
     end
   end

data/lib/pdk/util.rb

@@ -100,5 +100,57 @@ module PDK
       end
     end
     module_function :module_root
+
+    # Iterate through possible JSON documents until we find one that is valid.
+    #
+    # @param [String] text the text in which to find a JSON document
+    # @return [Hash, nil] subset of text as Hash of first valid JSON found, or nil if no valid
+    #   JSON found in the text
+    def find_first_json_in(text)
+      find_valid_json_in(text)
+    end
+    module_function :find_first_json_in
+
+    # Iterate through possible JSON documents for all valid JSON
+    #
+    # @param [String] text the text in which to find JSON document(s)
+    # @return [Array<Hash>] subset of text as Array of all JSON object found, empty Array if none are found
+    #   JSON found in the text
+    def find_all_json_in(text)
+      find_valid_json_in(text, break_on_first: false)
+    end
+    module_function :find_all_json_in
+
+    # Iterate through possible JSON documents until we find one that is valid.
+    #
+    # @param [String] text the text in which to find a JSON document
+    # @param [Hash] opts options
+    # @option opts [Boolean] :break_on_first Whether or not to break after valid JSON is found, defaults to true
+    #
+    # @return [Hash, Array<Hash>, nil] subset of text as Hash of first valid JSON found, array of all valid JSON found, or nil if no valid
+    #   JSON found in the text
+    #
+    # @private
+    def find_valid_json_in(text, opts = {})
+      break_on_first = opts.key?(:break_on_first) ? opts[:break_on_first] : true
+
+      json_result = break_on_first ? nil : []
+
+      text.scan(%r{\{(?:[^{}]|(?:\g<0>))*\}}x) do |str|
+        begin
+          if break_on_first
+            json_result = JSON.parse(str)
+            break
+          else
+            json_result.push(JSON.parse(str))
+          end
+        rescue JSON::ParserError
+          next
+        end
+      end
+
+      json_result
+    end
+    module_function :find_valid_json_in
   end
 end

data/lib/pdk/util/bundler.rb

@@ -1,4 +1,5 @@
 require 'bundler'
+require 'fileutils'
 require 'tty-spinner'
 require 'pdk/util'
 require 'pdk/cli/exec'
@@ -22,8 +23,20 @@ module PDK
         end
 
         unless bundle.locked?
-          unless bundle.lock!
-            raise PDK::CLI::FatalError, _('Unable to resolve Gemfile dependencies.')
+          if PDK::Util.package_install?
+            # In packaged installs, try to use vendored Gemfile.lock as a starting point.
+            # The 'bundle install' below will pick up any new dependencies.
+            vendored_gemfile_lock = File.join(PDK::Util.package_cachedir, 'Gemfile.lock')
+
+            if File.exist?(vendored_gemfile_lock)
+              PDK.logger.debug(_("No Gemfile.lock found in module, using vendored Gemfile.lock from '%{source}'") % { source: vendored_gemfile_lock })
+              FileUtils.cp(vendored_gemfile_lock, File.join(PDK::Util.module_root, 'Gemfile.lock'))
+            end
+          else
+            # In non-packaged installs, just let bundler resolve deps as normal.
+            unless bundle.lock!
+              raise PDK::CLI::FatalError, _('Unable to resolve Gemfile dependencies.')
+            end
           end
         end
 
@@ -62,14 +75,12 @@ module PDK
         end
 
         def installed?
+          PDK.logger.debug(_('Checking for missing Gemfile dependencies.'))
+
           argv = ['check', "--gemfile=#{gemfile}"]
           argv << "--path=#{bundle_cachedir}" if PDK::Util.gem_install?
 
-          command = bundle_command(*argv).tap do |c|
-            c.add_spinner(_('Checking for missing Gemfile dependencies'))
-          end
-
-          result = command.execute!
+          result = bundle_command(*argv).execute!
 
           unless result[:exit_code].zero?
             $stderr.puts result[:stdout]

data/lib/pdk/validators/base_validator.rb

@@ -76,7 +76,7 @@ module PDK
           parse_output(report, result, invokation_targets)
         end
 
-        exit_codes.sort.last
+        exit_codes.max
       end
     end
   end

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

@@ -31,6 +31,7 @@ module PDK
 
       def self.parse_options(_options, targets)
         cmd_options = ['--format', 'json']
+        cmd_options << '--strict-dependencies'
 
         cmd_options.concat(targets)
       end

data/lib/pdk/version.rb

@@ -1,3 +1,3 @@
 module PDK
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdk
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-08-08 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: tty-which
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: A key part of the Puppet Development Kit, the shortest path to better modules