puppet_litmus 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5910db3eed130389c917cfb64116897400905e1d66851f57e16be04d1070b95a
-  data.tar.gz: 01066623755c8b944f4362c0829fd46e3aaa13866a206fe17c74a19da3ed8143
+  metadata.gz: 2e545da74266b708eae5c7cb6bab56480b78724ff51a9b8591943cfa98db3d7d
+  data.tar.gz: fd3e61dbc511549ac3ab1c43d834b9fa8e729d5af4bb48a6b4fab50041539428
 SHA512:
-  metadata.gz: 4ce37bbfc92942ee4a50c4cc0831ccd8deac29ec092001c1c82dc3b7a8c57cd1bdb745bb64e224fc0fbc220c458b990b4ea429908a6548a7d18195a63873b3d3
-  data.tar.gz: 49b0a06fdf5772a2ed5104108cc4163b96b6eb500f1bf70259052099ab9231ee7d6b7c56bdfdc3af2708229600eda0c9bd41fb53cf5438db8c5f17309e24728a
+  metadata.gz: 43adad4003cec09ff51204502f1f8f223c379ddd0c5ab93f38cb1285f0868ed965bbbc0117db72f022bc346f12315d9b9bfbb1deeed41c15467c17d2a86ebc43
+  data.tar.gz: c8d670ec75ee889f29a02071be10574027a742575034f3666a348f2bbcb6dca85f5d748fe236a357ffff571eb4d3556d0c32140652d308fc765936b21c1cb8b7

data/lib/puppet_litmus/inventory_manipulation.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+module PuppetLitmus; end # rubocop:disable Style/Documentation
+
 # helper functions for manipulating and reading a bolt inventory file
 module PuppetLitmus::InventoryManipulation
   # Creates an inventory hash from the inventory.yaml.

data/lib/puppet_litmus/rake_helper.rb

@@ -68,18 +68,16 @@ module PuppetLitmus::RakeHelper
     folder_list = Dir.entries(source_folder).reject { |f| File.directory? f }
     module_tars = []
     folder_list.each do |folder|
-      file = File.new(File.join(source_folder, folder))
-      next if File.symlink?(file)
+      folder_handle = Dir.open(File.join(source_folder, folder))
+      next if File.symlink?(folder_handle)
 
-      opts = {}
-      opts[:module_dir] = file.path
-      opts[:'target-dir'] = File.join(Dir.pwd, 'pkg')
-      opts[:force] = true
+      module_dir = folder_handle.path
+      target_dir = File.join(Dir.pwd, 'pkg')
       # remove old build folder if exists, before we build afresh
-      FileUtils.rm_rf(builder.build_dir) if File.directory?(builder.build_dir)
+      FileUtils.rm_rf(target_dir) if File.directory?(target_dir)
 
       # build_module
-      module_tar = build_module(opts)
+      module_tar = build_module(module_dir, target_dir)
       module_tars.push(File.new(module_tar))
     end
     module_tars
@@ -164,15 +162,20 @@ module PuppetLitmus::RakeHelper
     results
   end
 
-  def build_module(opts)
-    # old cli_way
-    # pdk_build_command = 'bundle exec pdk build  --force'
-    # stdout, stderr, _status = Open3.capture3(pdk_build_command)
-    # raise "Failed to run 'pdk_build_command',#{stdout} and #{stderr}" if (stderr =~ %r{completed successfully}).nil?
-    require 'pdk/module/build'
-    require 'pdk/util'
+  # @param opts Hash of options to build the module
+  # @param module_dir [String] The path of the module to build. If missing defaults to Dir.pwd
+  # @param target_dir [String] The path the module will be built into. The default is <source_dir>/pkg
+  # @return [String] The path to the built module
+  def build_module(module_dir = nil, target_dir = nil)
+    require 'puppet/modulebuilder'
+
+    source_dir = module_dir || Dir.pwd
+    dest_dir = target_dir || File.join(source_dir, 'pkg')
+
+    builder = Puppet::Modulebuilder::Builder.new(source_dir, dest_dir, nil)
+    # Force the metadata to be read. Raises if metadata could not be found
+    _metadata = builder.metadata
 
-    builder = PDK::Module::Build.new(opts)
     builder.build
   end
 

data/lib/puppet_litmus/rake_tasks.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
+require 'rake'
+
 namespace :litmus do
+  require 'puppet_litmus/inventory_manipulation'
   require 'puppet_litmus/rake_helper'
+  include PuppetLitmus::InventoryManipulation
   include PuppetLitmus::RakeHelper
   # Prints all supported OSes from metadata.json file.
   desc 'print all supported OSes from metadata'
@@ -228,9 +232,7 @@ namespace :litmus do
       exit 0
     end
 
-    opts = {}
-    opts[:force] = true
-    module_tar = build_module(opts)
+    module_tar = build_module
     puts 'Built'
 
     # module_tar = Dir.glob('pkg/*.tar.gz').max_by { |f| File.mtime(f) }
@@ -324,8 +326,6 @@ namespace :litmus do
   namespace :acceptance do
     require 'rspec/core/rake_task'
     if File.file?('inventory.yaml')
-      require 'puppet_litmus/inventory_manipulation'
-      include PuppetLitmus::InventoryManipulation
       inventory_hash = inventory_hash_from_inventory_file
       targets = find_targets(inventory_hash, nil)
 

data/lib/puppet_litmus/util.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# Helper methods for testing puppet content
+module PuppetLitmus::Util
+  # Ensure that a passed command is base 64 encoded and passed to PowerShell; this obviates the need to
+  # carefully interpolate strings for passing to ruby which will then be passed to PowerShell/CMD which will
+  # then be executed. This also ensures that a single PowerShell command may be specified for Windows targets
+  # leveraging PowerShell as bolt run_shell will use PowerShell against a remote target but CMD against a
+  # localhost target.
+  #
+  # @param :command [String] A PowerShell script block to be converted to base64
+  # @return [String] An invocation for PowerShell with the encoded command which may be passed to run_shell
+  def self.interpolate_powershell(command)
+    encoded_command = Base64.strict_encode64(command.encode('UTF-16LE'))
+    "powershell.exe -NoProfile -EncodedCommand #{encoded_command}"
+  end
+end

data/lib/puppet_litmus/version.rb

@@ -2,5 +2,5 @@
 
 # version of this gem
 module PuppetLitmus
-  VERSION ||= '0.15.0'
+  VERSION ||= '0.16.0'
 end

data/lib/puppet_litmus.rb

@@ -21,16 +21,26 @@ module PuppetLitmus
   process_span = Honeycomb.start_span(name: 'Litmus Testing')
   if ENV['CI'] == 'true' && ENV['TRAVIS'] == 'true'
     process_span.add_field('module_name', ENV['TRAVIS_REPO_SLUG'])
-    process_span.add_field('travis_build_id', ENV['TRAVIS_BUILD_ID'])
-    process_span.add_field('travis_build_web_url', ENV['TRAVIS_BUILD_WEB_URL'])
-    process_span.add_field('travis_commit_message', ENV['TRAVIS_COMMIT_MESSAGE'])
-    process_span.add_field('travis_pull_request_sha', ENV['TRAVIS_PULL_REQUEST_SHA'])
+    process_span.add_field('ci.provider', 'travis')
+    process_span.add_field('ci.build_id', ENV['TRAVIS_BUILD_ID'])
+    process_span.add_field('ci.build_url', ENV['TRAVIS_BUILD_WEB_URL'])
+    process_span.add_field('ci.job_url', ENV['TRAVIS_JOB_WEB_URL'])
+    process_span.add_field('ci.commit_message', ENV['TRAVIS_COMMIT_MESSAGE'])
+    process_span.add_field('ci.sha', ENV['TRAVIS_PULL_REQUEST_SHA'] || ENV['TRAVIS_COMMIT'])
   elsif ENV['CI'] == 'True' && ENV['APPVEYOR'] == 'True'
     process_span.add_field('module_name', ENV['APPVEYOR_PROJECT_SLUG'])
-    process_span.add_field('appveyor_build_id', ENV['APPVEYOR_BUILD_ID'])
-    process_span.add_field('appveyor_url', "https://ci.appveyor.com/project/#{ENV['APPVEYOR_REPO_NAME']}/builds/#{ENV['APPVEYOR_BUILD_ID']}")
-    process_span.add_field('appveyor_repo_commit_message', ENV['APPVEYOR_REPO_COMMIT_MESSAGE'])
-    process_span.add_field('appveyor_pull_request_head_commit', ENV['APPVEYOR_PULL_REQUEST_HEAD_COMMIT'])
+    process_span.add_field('ci.provider', 'appveyor')
+    process_span.add_field('ci.build_id', ENV['APPVEYOR_BUILD_ID'])
+    process_span.add_field('ci.build_url', "https://ci.appveyor.com/project/#{ENV['APPVEYOR_REPO_NAME']}/builds/#{ENV['APPVEYOR_BUILD_ID']}")
+    process_span.add_field('ci.job_url', "https://ci.appveyor.com/project/#{ENV['APPVEYOR_REPO_NAME']}/build/job/#{ENV['APPVEYOR_JOB_ID']}")
+    process_span.add_field('ci.commit_message', ENV['APPVEYOR_REPO_COMMIT_MESSAGE'])
+    process_span.add_field('ci.sha', ENV['APPVEYOR_PULL_REQUEST_HEAD_COMMIT'] || ENV['APPVEYOR_REPO_COMMIT'])
+  elsif ENV['GITHUB_ACTIONS'] == 'true'
+    process_span.add_field('module_name', ENV['GITHUB_REPOSITORY'])
+    process_span.add_field('ci.provider', 'github')
+    process_span.add_field('ci.build_id', ENV['GITHUB_RUN_ID'])
+    process_span.add_field('ci.build_url', "https://github.com/#{ENV['GITHUB_REPOSITORY']}/actions/runs/#{ENV['GITHUB_RUN_ID']}")
+    process_span.add_field('ci.sha', ENV['GITHUB_SHA'])
   end
   at_exit do
     process_span.send

data/spec/lib/puppet_litmus/inventory_manipulation_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-load File.expand_path('../../../lib/puppet_litmus/inventory_manipulation.rb', __dir__)
-include PuppetLitmus::InventoryManipulation # rubocop:disable Style/MixinUsage
 
 RSpec.describe PuppetLitmus::InventoryManipulation do
   context 'with config_from_node' do
@@ -115,11 +113,11 @@ RSpec.describe PuppetLitmus::InventoryManipulation do
     end
 
     it 'no feature exists for the group, and returns hash with feature added' do
-      expect(described_class.add_feature_to_group(no_feature_hash, 'puppet-agent', 'ssh_nodes')).to eq('groups' => [{ 'features' => ['puppet-agent'], 'name' => 'ssh_nodes', 'targets' => [{ 'config' => { 'ssh' => { 'host-key-check' => false, 'password' => 'Qu@lity!', 'user' => 'root' }, 'transport' => 'ssh' }, 'facts' => { 'platform' => 'centos-5-x86_64', 'provisioner' => 'vmpooler' }, 'uri' => 'test.delivery.puppetlabs.net' }] }, { 'name' => 'winrm_nodes', 'targets' => [] }]) # rubocop:disable Metrics/LineLength: Line is too long
+      expect(described_class.add_feature_to_group(no_feature_hash, 'puppet-agent', 'ssh_nodes')).to eq('groups' => [{ 'features' => ['puppet-agent'], 'name' => 'ssh_nodes', 'targets' => [{ 'config' => { 'ssh' => { 'host-key-check' => false, 'password' => 'Qu@lity!', 'user' => 'root' }, 'transport' => 'ssh' }, 'facts' => { 'platform' => 'centos-5-x86_64', 'provisioner' => 'vmpooler' }, 'uri' => 'test.delivery.puppetlabs.net' }] }, { 'name' => 'winrm_nodes', 'targets' => [] }]) # rubocop:disable Layout/LineLength: Line is too long
     end
 
     it 'feature exists for the group, and returns hash with feature removed' do
-      expect(described_class.remove_feature_from_group(feature_hash_group, 'puppet-agent', 'ssh_nodes')).to eq('groups' => [{ 'features' => [], 'name' => 'ssh_nodes', 'targets' => [{ 'config' => { 'ssh' => { 'host-key-check' => false, 'password' => 'Qu@lity!', 'user' => 'root' }, 'transport' => 'ssh' }, 'facts' => { 'platform' => 'centos-5-x86_64', 'provisioner' => 'vmpooler' }, 'uri' => 'test.delivery.puppetlabs.net' }] }, { 'name' => 'winrm_nodes', 'targets' => [] }]) # rubocop:disable Metrics/LineLength: Line is too long
+      expect(described_class.remove_feature_from_group(feature_hash_group, 'puppet-agent', 'ssh_nodes')).to eq('groups' => [{ 'features' => [], 'name' => 'ssh_nodes', 'targets' => [{ 'config' => { 'ssh' => { 'host-key-check' => false, 'password' => 'Qu@lity!', 'user' => 'root' }, 'transport' => 'ssh' }, 'facts' => { 'platform' => 'centos-5-x86_64', 'provisioner' => 'vmpooler' }, 'uri' => 'test.delivery.puppetlabs.net' }] }, { 'name' => 'winrm_nodes', 'targets' => [] }]) # rubocop:disable Layout/LineLength: Line is too long
     end
 
     it 'write from inventory_hash to inventory_yaml file feature_hash_group' do
@@ -127,15 +125,15 @@ RSpec.describe PuppetLitmus::InventoryManipulation do
     end
 
     it 'empty feature exists for the group, and returns hash with feature added' do
-      expect(described_class.add_feature_to_group(empty_feature_hash_group, 'puppet-agent', 'ssh_nodes')).to eq('groups' => [{ 'features' => ['puppet-agent'], 'name' => 'ssh_nodes', 'targets' => [{ 'config' => { 'ssh' => { 'host-key-check' => false, 'password' => 'Qu@lity!', 'user' => 'root' }, 'transport' => 'ssh' }, 'facts' => { 'platform' => 'centos-5-x86_64', 'provisioner' => 'vmpooler' }, 'uri' => 'test.delivery.puppetlabs.net' }] }, { 'name' => 'winrm_nodes', 'targets' => [] }]) # rubocop:disable Metrics/LineLength: Line is too long
+      expect(described_class.add_feature_to_group(empty_feature_hash_group, 'puppet-agent', 'ssh_nodes')).to eq('groups' => [{ 'features' => ['puppet-agent'], 'name' => 'ssh_nodes', 'targets' => [{ 'config' => { 'ssh' => { 'host-key-check' => false, 'password' => 'Qu@lity!', 'user' => 'root' }, 'transport' => 'ssh' }, 'facts' => { 'platform' => 'centos-5-x86_64', 'provisioner' => 'vmpooler' }, 'uri' => 'test.delivery.puppetlabs.net' }] }, { 'name' => 'winrm_nodes', 'targets' => [] }]) # rubocop:disable Layout/LineLength: Line is too long
     end
 
     it 'no feature exists for the node, and returns hash with feature added' do
-      expect(described_class.add_feature_to_node(no_feature_hash, 'puppet-agent', 'test.delivery.puppetlabs.net')).to eq('groups' => [{ 'name' => 'ssh_nodes', 'targets' => [{ 'config' => { 'ssh' => { 'host-key-check' => false, 'password' => 'Qu@lity!', 'user' => 'root' }, 'transport' => 'ssh' }, 'facts' => { 'platform' => 'centos-5-x86_64', 'provisioner' => 'vmpooler' }, 'uri' => 'test.delivery.puppetlabs.net', 'features' => ['puppet-agent'] }] }, { 'name' => 'winrm_nodes', 'targets' => [] }]) # rubocop:disable Metrics/LineLength: Line is too long
+      expect(described_class.add_feature_to_node(no_feature_hash, 'puppet-agent', 'test.delivery.puppetlabs.net')).to eq('groups' => [{ 'name' => 'ssh_nodes', 'targets' => [{ 'config' => { 'ssh' => { 'host-key-check' => false, 'password' => 'Qu@lity!', 'user' => 'root' }, 'transport' => 'ssh' }, 'facts' => { 'platform' => 'centos-5-x86_64', 'provisioner' => 'vmpooler' }, 'uri' => 'test.delivery.puppetlabs.net', 'features' => ['puppet-agent'] }] }, { 'name' => 'winrm_nodes', 'targets' => [] }]) # rubocop:disable Layout/LineLength: Line is too long
     end
 
     it 'feature exists for the node, and returns hash with feature removed' do
-      expect(described_class.remove_feature_from_node(feature_hash_node, 'puppet-agent', 'test.delivery.puppetlabs.net')).to eq('groups' => [{ 'name' => 'ssh_nodes', 'targets' => [{ 'config' => { 'ssh' => { 'host-key-check' => false, 'password' => 'Qu@lity!', 'user' => 'root' }, 'transport' => 'ssh' }, 'facts' => { 'platform' => 'centos-5-x86_64', 'provisioner' => 'vmpooler' }, 'uri' => 'test.delivery.puppetlabs.net', 'features' => [] }] }, { 'name' => 'winrm_nodes', 'targets' => [] }]) # rubocop:disable Metrics/LineLength: Line is too long
+      expect(described_class.remove_feature_from_node(feature_hash_node, 'puppet-agent', 'test.delivery.puppetlabs.net')).to eq('groups' => [{ 'name' => 'ssh_nodes', 'targets' => [{ 'config' => { 'ssh' => { 'host-key-check' => false, 'password' => 'Qu@lity!', 'user' => 'root' }, 'transport' => 'ssh' }, 'facts' => { 'platform' => 'centos-5-x86_64', 'provisioner' => 'vmpooler' }, 'uri' => 'test.delivery.puppetlabs.net', 'features' => [] }] }, { 'name' => 'winrm_nodes', 'targets' => [] }]) # rubocop:disable Layout/LineLength: Line is too long
     end
 
     it 'write from inventory_hash to inventory_yaml file feature_hash_node' do
@@ -143,7 +141,7 @@ RSpec.describe PuppetLitmus::InventoryManipulation do
     end
 
     it 'empty feature exists for the node, and returns hash with feature added' do
-      expect(described_class.add_feature_to_node(empty_feature_hash_node, 'puppet-agent', 'test.delivery.puppetlabs.net')).to eq('groups' => [{ 'name' => 'ssh_nodes', 'targets' => [{ 'config' => { 'ssh' => { 'host-key-check' => false, 'password' => 'Qu@lity!', 'user' => 'root' }, 'transport' => 'ssh' }, 'facts' => { 'platform' => 'centos-5-x86_64', 'provisioner' => 'vmpooler' }, 'uri' => 'test.delivery.puppetlabs.net', 'features' => ['puppet-agent'] }] }, { 'name' => 'winrm_nodes', 'targets' => [] }]) # rubocop:disable Metrics/LineLength: Line is too long
+      expect(described_class.add_feature_to_node(empty_feature_hash_node, 'puppet-agent', 'test.delivery.puppetlabs.net')).to eq('groups' => [{ 'name' => 'ssh_nodes', 'targets' => [{ 'config' => { 'ssh' => { 'host-key-check' => false, 'password' => 'Qu@lity!', 'user' => 'root' }, 'transport' => 'ssh' }, 'facts' => { 'platform' => 'centos-5-x86_64', 'provisioner' => 'vmpooler' }, 'uri' => 'test.delivery.puppetlabs.net', 'features' => ['puppet-agent'] }] }, { 'name' => 'winrm_nodes', 'targets' => [] }]) # rubocop:disable Layout/LineLength: Line is too long
     end
 
     it 'write from inventory_hash to inventory_yaml file no feature_hash' do

data/spec/lib/puppet_litmus/puppet_helpers_spec.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-load File.expand_path('../../../lib/puppet_litmus/puppet_helpers.rb', __dir__)
-
-include PuppetLitmus::PuppetHelpers # rubocop:disable Style/MixinUsage
 
 RSpec.describe PuppetLitmus::PuppetHelpers do
   context 'with idempotent_apply' do
@@ -122,10 +119,10 @@ RSpec.describe PuppetLitmus::PuppetHelpers do
     let(:local) { '/tmp' }
     let(:remote) { '/remote_tmp' }
     # Ignore rubocop because these hashes are representative of output from an external method and editing them leads to test failures.
-    # rubocop:disable Layout/SpaceInsideHashLiteralBraces, Layout/SpaceInsideBlockBraces, Layout/SpaceAroundOperators, Metrics/LineLength, Layout/SpaceAfterComma
+    # rubocop:disable Layout/SpaceInsideHashLiteralBraces, Layout/SpaceInsideBlockBraces, Layout/SpaceAroundOperators, Layout/LineLength, Layout/SpaceAfterComma
     let(:result_success) {[{'node'=>'some.host','target'=>'some.host','action'=>'upload','object'=>'C:\foo\bar.ps1','status'=>'success','result'=>{'_output'=>'Uploaded \'C:\foo\bar.ps1\' to \'some.host:C:\bar\''}}]}
     let(:result_failure) {[{'node'=>'some.host','target'=>'some.host','action'=>nil,'object'=>nil,'status'=>'failure','result'=>{'_error'=>{'kind'=>'puppetlabs.tasks/task_file_error','msg'=>'No such file or directory @ rb_sysopen - /nonexistant/file/path','details'=>{},'issue_code'=>'WRITE_ERROR'}}}]}
-    # rubocop:enable Layout/SpaceInsideHashLiteralBraces, Layout/SpaceInsideBlockBraces, Layout/SpaceAroundOperators, Metrics/LineLength, Layout/SpaceAfterComma
+    # rubocop:enable Layout/SpaceInsideHashLiteralBraces, Layout/SpaceInsideBlockBraces, Layout/SpaceAroundOperators, Layout/LineLength, Layout/SpaceAfterComma
     let(:inventory_hash) { { 'groups' => [{ 'name' => 'local', 'nodes' => [{ 'name' => 'some.host', 'config' => { 'transport' => 'local' } }] }] } }
     let(:localhost_inventory_hash) { { 'groups' => [{ 'name' => 'local', 'nodes' => [{ 'name' => 'litmus_localhost', 'config' => { 'transport' => 'local' } }] }] } }
 
@@ -228,11 +225,11 @@ RSpec.describe PuppetLitmus::PuppetHelpers do
     let(:params) { { 'action' => 'install', 'name' => 'foo' } }
     let(:config_data) { { 'modulepath' => File.join(Dir.pwd, 'spec', 'fixtures', 'modules') } }
     # Ignore rubocop because these hashes are representative of output from an external method and editing them leads to test failures.
-    # rubocop:disable Layout/SpaceInsideHashLiteralBraces, Layout/SpaceBeforeBlockBraces, Layout/SpaceInsideBlockBraces, Layout/SpaceAroundOperators, Metrics/LineLength, Layout/SpaceAfterComma
+    # rubocop:disable Layout/SpaceInsideHashLiteralBraces, Layout/SpaceBeforeBlockBraces, Layout/SpaceInsideBlockBraces, Layout/SpaceAroundOperators, Layout/LineLength, Layout/SpaceAfterComma
     let(:result_unstructured_task_success){ [{'node'=>'some.host','target'=>'some.host','action'=>'task','object'=>'testtask::unstructured','status'=>'success','result'=>{'_output'=>'SUCCESS!'}}]}
     let(:result_structured_task_success){ [{'node'=>'some.host','target'=>'some.host','action'=>'task','object'=>'testtask::structured','status'=>'success','result'=>{'key1'=>'foo','key2'=>'bar'}}]}
     let(:result_failure) {[{'node'=>'some.host','target'=>'some.host','action'=>'task','object'=>'testtask::unstructured','status'=>'failure','result'=>{'_error'=>{'msg'=>'FAILURE!','kind'=>'puppetlabs.tasks/task-error','details'=>{'exitcode'=>123}}}}]}
-    # rubocop:enable Layout/SpaceInsideHashLiteralBraces, Layout/SpaceBeforeBlockBraces, Layout/SpaceInsideBlockBraces, Layout/SpaceAroundOperators, Metrics/LineLength, Layout/SpaceAfterComma
+    # rubocop:enable Layout/SpaceInsideHashLiteralBraces, Layout/SpaceBeforeBlockBraces, Layout/SpaceInsideBlockBraces, Layout/SpaceAroundOperators, Layout/LineLength, Layout/SpaceAfterComma
     let(:inventory_hash) { { 'groups' => [{ 'name' => 'local', 'nodes' => [{ 'name' => 'some.host', 'config' => { 'transport' => 'local' } }] }] } }
 
     it 'responds to bolt_run_task' do

data/spec/lib/puppet_litmus/rake_helper_spec.rb

@@ -2,8 +2,6 @@
 
 require 'spec_helper'
 
-load File.expand_path('../../../lib/puppet_litmus/rake_helper.rb', __dir__)
-
 RSpec.describe PuppetLitmus::RakeHelper do
   context 'with provision_list' do
     let(:provision_hash) { { 'default' => { 'provisioner' => 'docker', 'images' => ['waffleimage/centos7'] } } }

data/spec/lib/puppet_litmus/rake_tasks_spec.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'rake'
-load File.expand_path('../../../lib/puppet_litmus/inventory_manipulation.rb', __dir__)
-include PuppetLitmus::InventoryManipulation # rubocop:disable Style/MixinUsage
+
 describe 'litmus rake tasks' do
   before(:all) do # rubocop:disable RSpec/BeforeAfterAll
     load File.expand_path('../../../lib/puppet_litmus/rake_tasks.rb', __dir__)

data/spec/lib/puppet_litmus/util_spec.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+load File.expand_path('../../../lib/puppet_litmus/util.rb', __dir__)
+
+RSpec.describe PuppetLitmus::Util do
+  context 'when using interpolate_powershell' do
+    it 'interpolates the command' do
+      expect(described_class.interpolate_powershell('foo')).to match(%r{powershell\.exe})
+      expect(described_class.interpolate_powershell('foo')).to match(%r{NoProfile})
+      expect(described_class.interpolate_powershell('foo')).to match(%r{EncodedCommand})
+      expect(described_class.interpolate_powershell('foo')).not_to match(%r{foo})
+    end
+  end
+end

data/spec/lib/puppet_litmus/version_spec.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-load File.expand_path('../../../lib/puppet_litmus/version.rb', __dir__)
-
-include PuppetLitmus # rubocop:disable Style/MixinUsage
 
 RSpec.describe PuppetLitmus do
   it 'has a version number' do

data/spec/spec_helper.rb

@@ -3,6 +3,11 @@
 require 'rspec'
 require 'puppet_litmus'
 
+# Unfortunately this needs to be included as this is
+# how Litmus functions. We only include once here instead
+# of including for every single spec file.
+include PuppetLitmus # rubocop:disable Style/MixinUsage
+
 if ENV['COVERAGE'] == 'yes'
   require 'simplecov'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_litmus
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-03 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt
@@ -31,25 +31,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: pdk
+  name: puppet-modulebuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.10.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +142,7 @@ files:
 - lib/puppet_litmus/rake_helper.rb
 - lib/puppet_litmus/rake_tasks.rb
 - lib/puppet_litmus/spec_helper_acceptance.rb
+- lib/puppet_litmus/util.rb
 - lib/puppet_litmus/version.rb
 - spec/data/doot.tar.gz
 - spec/data/inventory.yaml
@@ -156,6 +151,7 @@ files:
 - spec/lib/puppet_litmus/puppet_helpers_spec.rb
 - spec/lib/puppet_litmus/rake_helper_spec.rb
 - spec/lib/puppet_litmus/rake_tasks_spec.rb
+- spec/lib/puppet_litmus/util_spec.rb
 - spec/lib/puppet_litmus/version_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/puppetlabs/puppet_litmus
@@ -177,18 +173,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Providing a simple command line tool for puppet content creators, to enable
   simple and complex test deployments.
 test_files:
-- spec/data/doot.tar.gz
-- spec/data/inventory.yaml
-- spec/data/jim.yaml
-- spec/lib/puppet_litmus/inventory_manipulation_spec.rb
-- spec/lib/puppet_litmus/puppet_helpers_spec.rb
-- spec/lib/puppet_litmus/rake_helper_spec.rb
+- spec/spec_helper.rb
 - spec/lib/puppet_litmus/rake_tasks_spec.rb
 - spec/lib/puppet_litmus/version_spec.rb
-- spec/spec_helper.rb
+- spec/lib/puppet_litmus/util_spec.rb
+- spec/lib/puppet_litmus/inventory_manipulation_spec.rb
+- spec/lib/puppet_litmus/rake_helper_spec.rb
+- spec/lib/puppet_litmus/puppet_helpers_spec.rb
+- spec/data/doot.tar.gz
+- spec/data/jim.yaml
+- spec/data/inventory.yaml