puppet_litmus 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41776234e4a62f7965314cc8c40d33a91ae86c5718a3af4dc3041713c53b86f0
-  data.tar.gz: a7060ae471bc8f197fc33af71a65bb5dd11cae2d54d139fb607c4e632c6c9590
+  metadata.gz: 8fc34d2ba2485c4d4e6cedecc99642a4f1acf98c0861598af4f63b732b1de088
+  data.tar.gz: 12cc1dec19bf0ef86b9941870939d0bf2b9cc6251495543be40a33481e747be7
 SHA512:
-  metadata.gz: ff8a621cb6df184f8b30af5083fd1eefc945986ae2620df2cc62a8168bf2bee601ce093bbe41baa2ae922bd7796588a3be33413093ba003e1f8b39f72fee1ac0
-  data.tar.gz: 4533bda3c00d1e45463ed4c4f52d90e719610f7895ace22d7b8f2d5d24f4c0407a0280d874dbb554d769e97d06f32e506d1a8a9b1faddde6bb85269417a114e9
+  metadata.gz: 0c1532fb9b58f22974322d139e0775b4821993b5bb03748d7dbff4b1704ea4b400e80e755225a9a410ae7f96c0d1489c59f58bf988923a612c26e8f190c78718
+  data.tar.gz: d88135655e933a2ce8da0b4edf552fca12a85ed552a3d02338e61538d80686b6333eee5ba3411071a41e0459a2437337a9687d471ed99972ab4234203f15c6c0

data/lib/puppet_litmus.rb

@@ -6,10 +6,13 @@ module PuppetLitmus; end
 require 'bolt_spec/run'
 require 'puppet_litmus/inventory_manipulation'
 require 'puppet_litmus/puppet_helpers'
+require 'puppet_litmus/rake_helper'
+require 'puppet_litmus/spec_helper_acceptance'
 
 # Helper methods for testing puppet content
 module PuppetLitmus
   include BoltSpec::Run
   include PuppetLitmus::InventoryManipulation
   include PuppetLitmus::PuppetHelpers
+  include PuppetLitmus::RakeHelper
 end

data/lib/puppet_litmus/inventory_manipulation.rb

@@ -7,6 +7,7 @@ module PuppetLitmus::InventoryManipulation
   # @param inventory_full_path [String] path to the inventory.yaml file
   # @return [Hash] hash of the inventory.yaml file.
   def inventory_hash_from_inventory_file(inventory_full_path = nil)
+    require 'yaml'
     inventory_full_path = if inventory_full_path.nil?
                             'inventory.yaml'
                           else
@@ -44,6 +45,7 @@ module PuppetLitmus::InventoryManipulation
   # @param targets [Array]
   # @return [Array] array of targets.
   def find_targets(inventory_hash, targets)
+    require 'bolt/inventory'
     if targets.nil?
       inventory = Bolt::Inventory.new(inventory_hash, nil)
       targets = inventory.node_names.to_a
@@ -250,6 +252,6 @@ module PuppetLitmus::InventoryManipulation
   #  @param inventory_hash [Hash] hash of the inventory.yaml file
   #  @return inventory.yaml file with feature added to group.
   def write_to_inventory_file(inventory_hash, inventory_full_path)
-    File.open(inventory_full_path, 'w+') { |f| f.write(inventory_hash.to_yaml) }
+    File.open(inventory_full_path, 'wb+') { |f| f.write(inventory_hash.to_yaml) }
   end
 end

data/lib/puppet_litmus/puppet_helpers.rb

@@ -130,6 +130,7 @@ module PuppetLitmus::PuppetHelpers
     raise "shell failed\n`#{command_to_run}`\n======\n#{result}" if result.first['result']['exit_code'] != 0 && opts[:expect_failures] != true
 
     result = OpenStruct.new(exit_code: result.first['result']['exit_code'],
+                            exit_status: result.first['result']['exit_code'],
                             stdout: result.first['result']['stdout'],
                             stderr: result.first['result']['stderr'])
     yield result if block_given?
@@ -266,13 +267,13 @@ module PuppetLitmus::PuppetHelpers
   # @param command [String] The puppet command causing the error.
   # @param result  [Array] The result struct containing the result
   def report_puppet_apply_error(command, result, acceptable_exit_codes)
-    puppet_apply_error = <<-ERROR
-apply manifest failed
-`#{command}`
-with exit code #{result.first['result']['exit_code']} (expected: #{acceptable_exit_codes})
-====== Start output of failed Puppet apply ======
-#{puppet_output(result)}
-====== End output of failed Puppet apply ======
+    puppet_apply_error = <<~ERROR
+      apply manifest failed
+      `#{command}`
+      with exit code #{result.first['result']['exit_code']} (expected: #{acceptable_exit_codes})
+      ====== Start output of failed Puppet apply ======
+      #{puppet_output(result)}
+      ====== End output of failed Puppet apply ======
     ERROR
     raise puppet_apply_error
   end
@@ -282,12 +283,12 @@ with exit code #{result.first['result']['exit_code']} (expected: #{acceptable_ex
   # @param command [String] The puppet command causing the error.
   # @param result  [Array] The result struct containing the result
   def report_puppet_apply_change(command, result)
-    puppet_apply_changes = <<-ERROR
-apply manifest expected no changes
-`#{command}`
-====== Start output of Puppet apply with unexpected changes ======
-#{puppet_output(result)}
-====== End output of Puppet apply with unexpected changes ======
+    puppet_apply_changes = <<~ERROR
+      apply manifest expected no changes
+      `#{command}`
+      ====== Start output of Puppet apply with unexpected changes ======
+      #{puppet_output(result)}
+      ====== End output of Puppet apply with unexpected changes ======
     ERROR
     raise puppet_apply_changes
   end

data/lib/puppet_litmus/rake_helper.rb

@@ -0,0 +1,210 @@
+# frozen_string_literal: true
+
+module PuppetLitmus; end # rubocop:disable Style/Documentation
+
+# helper methods for the litmus rake tasks
+module PuppetLitmus::RakeHelper
+  DEFAULT_CONFIG_DATA ||= { 'modulepath' => File.join(Dir.pwd, 'spec', 'fixtures', 'modules') }.freeze
+  VALID_PROVISIONERS ||= %w[abs docker docker_exp vagrant vmpooler].freeze
+
+  # Gets a string representing the operating system and version.
+  #
+  # @param metadata [Hash] metadata to parse for operating system info
+  # @return [String] the operating system string with version info for use in provisioning.
+  def get_metadata_operating_systems(metadata)
+    return unless metadata.is_a?(Hash)
+    return unless metadata['operatingsystem_support'].is_a?(Array)
+
+    metadata['operatingsystem_support'].each do |os_info|
+      next unless os_info['operatingsystem'] && os_info['operatingsystemrelease']
+
+      os_name = case os_info['operatingsystem']
+                when 'Amazon', 'Archlinux', 'AIX', 'OSX'
+                  next
+                when 'OracleLinux'
+                  'oracle'
+                when 'Windows'
+                  'win'
+                else
+                  os_info['operatingsystem'].downcase
+                end
+
+      os_info['operatingsystemrelease'].each do |release|
+        version = case os_name
+                  when 'ubuntu', 'osx'
+                    release.sub('.', '')
+                  when 'sles'
+                    release.gsub(%r{ SP[14]}, '')
+                  when 'win'
+                    release = release.delete('.') if release.include? '8.1'
+                    release.sub('Server', '').sub('10', '10-pro')
+                  else
+                    release
+                  end
+
+        yield "#{os_name}-#{version.downcase}-x86_64".delete(' ')
+      end
+    end
+  end
+
+  # Executes a command on the test runner.
+  #
+  # @param command [String] command to execute.
+  # @return [Object] the standard out stream.
+  def run_local_command(command)
+    require 'open3'
+    stdout, stderr, status = Open3.capture3(command)
+    error_message = "Attempted to run\ncommand:'#{command}'\nstdout:#{stdout}\nstderr:#{stderr}"
+    raise error_message unless status.to_i.zero?
+
+    stdout
+  end
+
+  # Builds all the modules in a specified module
+  #
+  # @param source_folder [String] the folder to get the modules from
+  # @return [Array] an array of module tar's
+  def build_modules_in_folder(source_folder)
+    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)
+
+      opts = {}
+      opts[:module_dir] = file.path
+      opts[:'target-dir'] = File.join(Dir.pwd, 'pkg')
+      opts[:force] = true
+      # remove old build folder if exists, before we build afresh
+      FileUtils.rm_rf(builder.build_dir) if File.directory?(builder.build_dir)
+
+      # build_module
+      module_tar = build_module(opts)
+      module_tars.push(File.new(module_tar))
+    end
+    module_tars
+  end
+
+  def provision(provisioner, platform, inventory_vars)
+    require 'bolt_spec/run'
+    include BoltSpec::Run
+    raise "the provision module was not found in #{DEFAULT_CONFIG_DATA['modulepath']}, please amend the .fixtures.yml file" unless
+      File.directory?(File.join(DEFAULT_CONFIG_DATA['modulepath'], 'provision'))
+
+    unless VALID_PROVISIONERS.include?(provisioner)
+      raise "Unknown provisioner '#{provisioner}', try #{VALID_PROVISIONERS.join('/')}"
+    end
+
+    params = if inventory_vars.nil?
+               { 'action' => 'provision', 'platform' => platform, 'inventory' => Dir.pwd }
+             else
+               { 'action' => 'provision', 'platform' => platform, 'inventory' => Dir.pwd, 'vars' => inventory_vars }
+             end
+    run_task("provision::#{provisioner}", 'localhost', params, config: DEFAULT_CONFIG_DATA, inventory: nil)
+  end
+
+  def provision_list(provision_hash, key)
+    provisioner = provision_hash[key]['provisioner']
+    inventory_vars = provision_hash[key]['vars']
+    # Splat the params into environment variables to pass to the provision task but only in this runspace
+    provision_hash[key]['params']&.each { |k, value| ENV[k.upcase] = value.to_s }
+    results = []
+    provision_hash[key]['images'].each do |image|
+      results << provision(provisioner, image, inventory_vars)
+    end
+    results
+  end
+
+  def tear_down_nodes(targets, inventory_hash)
+    require 'bolt_spec/run'
+    include BoltSpec::Run
+    config_data = { 'modulepath' => File.join(Dir.pwd, 'spec', 'fixtures', 'modules') }
+    raise "the provision module was not found in #{config_data['modulepath']}, please amend the .fixtures.yml file" unless File.directory?(File.join(config_data['modulepath'], 'provision'))
+
+    results = {}
+    targets.each do |node_name|
+      next if node_name == 'litmus_localhost'
+
+      result = tear_down(node_name, inventory_hash)
+      results[node_name] = result unless result == []
+    end
+    results
+  end
+
+  def tear_down(node_name, inventory_hash)
+    # how do we know what provisioner to use
+    node_facts = facts_from_node(inventory_hash, node_name)
+    return [] unless VALID_PROVISIONERS.include?(node_facts['provisioner'])
+
+    params = { 'action' => 'tear_down', 'node_name' => node_name, 'inventory' => Dir.pwd }
+    run_task("provision::#{node_facts['provisioner']}", 'localhost', params, config: DEFAULT_CONFIG_DATA, inventory: nil)
+  end
+
+  def install_agent(collection, targets, inventory_hash)
+    require 'bolt_spec/run'
+    include BoltSpec::Run
+    params = if collection.nil?
+               {}
+             else
+               { 'collection' => collection }
+             end
+    raise "puppet_agent was not found in #{DEFAULT_CONFIG_DATA['modulepath']}, please amend the .fixtures.yml file" unless File.directory?(File.join(DEFAULT_CONFIG_DATA['modulepath'], 'puppet_agent'))
+
+    run_task('puppet_agent::install', targets, params, config: DEFAULT_CONFIG_DATA, inventory: inventory_hash)
+  end
+
+  def configure_path(inventory_hash)
+    results = []
+    # fix the path on ssh_nodes
+    unless inventory_hash['groups'].select { |group| group['name'] == 'ssh_nodes' }.size.zero?
+      results = run_command('echo PATH="$PATH:/opt/puppetlabs/puppet/bin" > /etc/environment',
+                            'ssh_nodes', config: nil, inventory: inventory_hash)
+    end
+    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'
+
+    builder = PDK::Module::Build.new(opts)
+    builder.build
+  end
+
+  def install_module(inventory_hash, target_node_name, module_tar)
+    require 'bolt_spec/run'
+    include BoltSpec::Run
+    target_nodes = find_targets(inventory_hash, target_node_name)
+    target_string = if target_node_name.nil?
+                      'all'
+                    else
+                      target_node_name
+                    end
+    run_local_command("bundle exec bolt file upload \"#{module_tar}\" /tmp/#{File.basename(module_tar)} --nodes #{target_string} --inventoryfile inventory.yaml")
+    install_module_command = "puppet module install /tmp/#{File.basename(module_tar)}"
+    run_command(install_module_command, target_nodes, config: nil, inventory: inventory_hash)
+  end
+
+  def metadata_module_name
+    require 'json'
+    raise 'Could not find metadata.json' unless File.exist?(File.join(Dir.pwd, 'metadata.json'))
+
+    metadata = JSON.parse(File.read(File.join(Dir.pwd, 'metadata.json')))
+    raise 'Could not read module name from metadata.json' if metadata['name'].nil?
+
+    metadata['name']
+  end
+
+  def uninstall_module(inventory_hash, target_node_name, module_to_remove = nil)
+    require 'bolt_spec/run'
+    include BoltSpec::Run
+    module_name = module_to_remove || metadata_module_name
+    target_nodes = find_targets(inventory_hash, target_node_name)
+    install_module_command = "puppet module uninstall #{module_name}"
+    run_command(install_module_command, target_nodes, config: nil, inventory: inventory_hash)
+  end
+end

data/lib/puppet_litmus/rake_tasks.rb

@@ -1,100 +1,8 @@
 # frozen_string_literal: true
 
-require 'rspec/core/rake_task'
-require 'puppet_litmus'
-require 'bolt_spec/run'
-require 'open3'
-require 'pdk'
-require 'json'
-require 'parallel'
-require 'tty-spinner'
-
-# helper methods for the litmus rake tasks
-module LitmusRakeHelper
-  # Gets a string representing the operating system and version.
-  #
-  # @param metadata [Hash] metadata to parse for operating system info
-  # @return [String] the operating system string with version info for use in provisioning.
-  def get_metadata_operating_systems(metadata)
-    return unless metadata.is_a?(Hash)
-    return unless metadata['operatingsystem_support'].is_a?(Array)
-
-    metadata['operatingsystem_support'].each do |os_info|
-      next unless os_info['operatingsystem'] && os_info['operatingsystemrelease']
-
-      os_name = case os_info['operatingsystem']
-                when 'Amazon', 'Archlinux', 'AIX', 'OSX'
-                  next
-                when 'OracleLinux'
-                  'oracle'
-                when 'Windows'
-                  'win'
-                else
-                  os_info['operatingsystem'].downcase
-                end
-
-      os_info['operatingsystemrelease'].each do |release|
-        version = case os_name
-                  when 'ubuntu', 'osx'
-                    release.sub('.', '')
-                  when 'sles'
-                    release.gsub(%r{ SP[14]}, '')
-                  when 'win'
-                    release = release.delete('.') if release.include? '8.1'
-                    release.sub('Server', '').sub('10', '10-pro')
-                  else
-                    release
-                  end
-
-        yield "#{os_name}-#{version.downcase}-x86_64".delete(' ')
-      end
-    end
-  end
-
-  # Executes a command on the test runner.
-  #
-  # @param command [String] command to execute.
-  # @return [Object] the standard out stream.
-  def run_local_command(command)
-    stdout, stderr, status = Open3.capture3(command)
-    error_message = "Attempted to run\ncommand:'#{command}'\nstdout:#{stdout}\nstderr:#{stderr}"
-    raise error_message unless status.to_i.zero?
-
-    stdout
-  end
-
-  # Builds all the modules in a specified module
-  #
-  # @param source_folder [String] the folder to get the modules from
-  # @return [Array] an array of module tar's
-  def build_modules_in_folder(source_folder)
-    require 'pdk/module/build'
-    require 'pdk/util'
-    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)
-
-      opts = {}
-      opts[:module_dir] = file.path
-      opts[:'target-dir'] = File.join(Dir.pwd, 'pkg')
-      opts[:force] = true
-      builder = PDK::Module::Build.new(opts)
-
-      # remove old build folder if exists, before we build afresh
-      FileUtils.rm_rf(builder.build_dir) if File.directory?(builder.build_dir)
-
-      # build_module
-      module_tar = builder.build
-      module_tars.push(File.new(module_tar))
-    end
-    module_tars
-  end
-end
-
 namespace :litmus do
-  include LitmusRakeHelper
+  require 'puppet_litmus/rake_helper'
+  include PuppetLitmus::RakeHelper
   # Prints all supported OSes from metadata.json file.
   desc 'print all supported OSes from metadata'
   task :metadata do
@@ -115,23 +23,43 @@ namespace :litmus do
     provision_hash = YAML.load_file('./provision.yaml')
     raise "No key #{args[:key]} in ./provision.yaml, see https://github.com/puppetlabs/puppet_litmus/wiki/Overview-of-Litmus#provisioning-via-yaml for examples" if provision_hash[args[:key]].nil?
 
+    Rake::Task['spec_prep'].invoke
+
     provisioner = provision_hash[args[:key]]['provisioner']
     inventory_vars = provision_hash[args[:key]]['vars']
     # Splat the params into environment variables to pass to the provision task but only in this runspace
-    provision_hash[args[:key]]['params']&.each { |key, value| ENV[key.upcase] = value.to_s }
+    provision_hash[args[:key]]['params']&.each { |k, value| ENV[k.upcase] = value.to_s }
+    results = []
     failed_image_message = ''
     provision_hash[args[:key]]['images'].each do |image|
-      # this is the only way to capture the stdout from the rake task, it will affect pry
-      capture_rake_output = StringIO.new
-      $stdout = capture_rake_output
-      Rake::Task['litmus:provision'].invoke(provisioner, image, inventory_vars)
-      if $stdout.string =~ %r{.status.=>.failure}
-        failed_image_message += "=====\n#{image}\n#{$stdout.string}\n"
+      if (ENV['CI'] == 'true') || !ENV['DISTELLI_BUILDNUM'].nil?
+        progress = Thread.new do
+          loop do
+            printf '.'
+            sleep(10)
+          end
+        end
+      else
+        require 'tty-spinner'
+        spinner = TTY::Spinner.new("Provisioning #{image} using #{provisioner} provisioner.[:spinner]")
+        spinner.auto_spin
+      end
+      result = provision(provisioner, image, inventory_vars)
+
+      if (ENV['CI'] == 'true') || !ENV['DISTELLI_BUILDNUM'].nil?
+        Thread.kill(progress)
       else
-        STDOUT.puts $stdout.string
+        spinner.success
       end
-      Rake::Task['litmus:provision'].reenable
+
+      if result.first['status'] != 'success'
+        failed_image_message += "=====\n#{result.first['node']}\n#{result.first['result']['_output']}\n"
+      else
+        STDOUT.puts "#{result.first['result']['node_name']}, #{image}"
+      end
+      results << result
     end
+
     raise "Failed to provision with '#{provisioner}'\n #{failed_image_message}" unless failed_image_message.empty?
   end
 
@@ -141,21 +69,7 @@ namespace :litmus do
   # @param :platform [String] OS platform for container or VM to use.
   desc "provision container/VM - abs/docker/vagrant/vmpooler eg 'bundle exec rake 'litmus:provision[vmpooler, ubuntu-1604-x86_64]'"
   task :provision, [:provisioner, :platform, :inventory_vars] do |_task, args|
-    include BoltSpec::Run
     Rake::Task['spec_prep'].invoke
-    config_data = { 'modulepath' => File.join(Dir.pwd, 'spec', 'fixtures', 'modules') }
-    raise "the provision module was not found in #{config_data['modulepath']}, please amend the .fixtures.yml file" unless File.directory?(File.join(config_data['modulepath'], 'provision'))
-
-    unless %w[abs docker docker_exp vagrant vmpooler].include?(args[:provisioner])
-      raise "Unknown provisioner '#{args[:provisioner]}', try abs/docker/docker_exp/vagrant/vmpooler"
-    end
-
-    params = if args[:inventory_vars].nil?
-               { 'action' => 'provision', 'platform' => args[:platform], 'inventory' => Dir.pwd }
-             else
-               { 'action' => 'provision', 'platform' => args[:platform], 'inventory' => Dir.pwd, 'vars' => args[:inventory_vars] }
-             end
-
     if (ENV['CI'] == 'true') || !ENV['DISTELLI_BUILDNUM'].nil?
       progress = Thread.new do
         loop do
@@ -164,10 +78,11 @@ namespace :litmus do
         end
       end
     else
+      require 'tty-spinner'
       spinner = TTY::Spinner.new("Provisioning #{args[:platform]} using #{args[:provisioner]} provisioner.[:spinner]")
       spinner.auto_spin
     end
-    results = run_task("provision::#{args[:provisioner]}", 'localhost', params, config: config_data, inventory: nil)
+    results = provision(args[:provisioner], args[:platform], args[:inventory_vars])
     if results.first['status'] != 'success'
       raise "Failed provisioning #{args[:platform]} using #{args[:provisioner]}\n#{results.first}"
     end
@@ -193,17 +108,11 @@ namespace :litmus do
       exit 0
     end
     puts 'install_agent'
+    require 'bolt_spec/run'
     include BoltSpec::Run
     Rake::Task['spec_prep'].invoke
-    config_data = { 'modulepath' => File.join(Dir.pwd, 'spec', 'fixtures', 'modules') }
-    params = if args[:collection].nil?
-               {}
-             else
-               { 'collection' => args[:collection] }
-             end
-    raise "puppet_agent was not found in #{config_data['modulepath']}, please amend the .fixtures.yml file" unless File.directory?(File.join(config_data['modulepath'], 'puppet_agent'))
-
-    results = run_task('puppet_agent::install', targets, params, config: config_data, inventory: inventory_hash)
+
+    results = install_agent(args[:collection], targets, inventory_hash)
     results.each do |result|
       if result['status'] != 'success'
         command_to_run = "bolt task run puppet_agent::install --targets #{result['node']} --inventoryfile inventory.yaml --modulepath #{config_data['modulepath']}"
@@ -217,10 +126,7 @@ namespace :litmus do
     write_to_inventory_file(inventory_hash, 'inventory.yaml')
 
     # fix the path on ssh_nodes
-    unless inventory_hash['groups'].select { |group| group['name'] == 'ssh_nodes' }.size.zero?
-      results = run_command('echo PATH="$PATH:/opt/puppetlabs/puppet/bin" > /etc/environment',
-                            'ssh_nodes', config: nil, inventory: inventory_hash)
-    end
+    results = configure_path(inventory_hash)
 
     results.each do |result|
       if result['status'] != 'success'
@@ -253,6 +159,7 @@ namespace :litmus do
     module_tars.each do |module_tar|
       print "#{File.basename(module_tar)} "
     end
+    require 'bolt_spec/run'
     include BoltSpec::Run
     puts "\nSending"
     module_tars.each do |module_tar|
@@ -279,33 +186,18 @@ namespace :litmus do
       puts 'No targets found'
       exit 0
     end
-    include BoltSpec::Run
-    # 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'
 
     opts = {}
     opts[:force] = true
-    builder = PDK::Module::Build.new(opts)
-    module_tar = builder.build
+    module_tar = build_module(opts)
     puts 'Built'
 
     # module_tar = Dir.glob('pkg/*.tar.gz').max_by { |f| File.mtime(f) }
     raise "Unable to find package in 'pkg/*.tar.gz'" if module_tar.nil?
 
-    target_string = if args[:target_node_name].nil?
-                      'all'
-                    else
-                      args[:target_node_name]
-                    end
-    run_local_command("bundle exec bolt file upload \"#{module_tar}\" /tmp/#{File.basename(module_tar)} --nodes #{target_string} --inventoryfile inventory.yaml")
-    install_module_command = "puppet module install /tmp/#{File.basename(module_tar)}"
-    result = run_command(install_module_command, target_nodes, config: nil, inventory: inventory_hash)
+    result = install_module(inventory_hash, args[:target_node_name], module_tar)
 
-    raise "Failed trying to run '#{install_module_command}' against inventory." unless result.is_a?(Array)
+    raise "Failed trying to run 'puppet module install /tmp/#{File.basename(module_tar)}' against inventory." unless result.is_a?(Array)
 
     result.each do |node|
       puts "#{node['node']} failed #{node['result']}" if node['status'] != 'success'
@@ -337,25 +229,14 @@ namespace :litmus do
       puts 'No targets found'
       exit 0
     end
-    include BoltSpec::Run
     Rake::Task['spec_prep'].invoke
-    config_data = { 'modulepath' => File.join(Dir.pwd, 'spec', 'fixtures', 'modules') }
-    raise "the provision module was not found in #{config_data['modulepath']}, please amend the .fixtures.yml file" unless File.directory?(File.join(config_data['modulepath'], 'provision'))
-
     bad_results = []
-    targets.each do |node_name|
-      next if node_name == 'litmus_localhost'
-
-      # how do we know what provisioner to use
-      node_facts = facts_from_node(inventory_hash, node_name)
-      next unless %w[abs docker docker_exp vagrant vmpooler].include?(node_facts['provisioner'])
-
-      params = { 'action' => 'tear_down', 'node_name' => node_name, 'inventory' => Dir.pwd }
-      result = run_task("provision::#{node_facts['provisioner']}", 'localhost', params, config: config_data, inventory: nil)
+    results = tear_down_nodes(targets, inventory_hash)
+    results.each do |node, result|
       if result.first['status'] != 'success'
-        bad_results << "#{node_name}, #{result.first['result']['_error']['msg']}"
+        bad_results << "#{node}, #{result.first['result']['_error']['msg']}"
       else
-        print "#{node_name}, "
+        puts "#{node}: #{result.first['status']}"
       end
     end
     puts ''
@@ -366,9 +247,44 @@ namespace :litmus do
     end
   end
 
+  # Uninstall the puppet module under test on a collection of nodes
+  #
+  # @param :target_node_name [Array] nodes on which to install a puppet module for testing.
+  # @param :module_name [String] module name to be uninstalled
+  desc 'uninstall_module - uninstall module'
+  task :uninstall_module, [:target_node_name, :module_name] do |_task, args|
+    inventory_hash = inventory_hash_from_inventory_file
+    target_nodes = find_targets(inventory_hash, args[:target_node_name])
+    if target_nodes.empty?
+      puts 'No targets found'
+      exit 0
+    end
+
+    result = uninstall_module(inventory_hash, args[:target_node_name], args[:module_name])
+
+    raise "Failed trying to run 'puppet module uninstall #{module_name}' against inventory." unless result.is_a?(Array)
+
+    result.each do |node|
+      puts "#{node['node']} failed #{node['result']}" if node['status'] != 'success'
+    end
+
+    puts 'Uninstalled'
+  end
+
+  # Reinstall the puppet module under test on a collection of nodes
+  #
+  # @param :target_node_name [Array] nodes on which to install a puppet module for testing.
+  desc 'reinstall_module - reinstall module'
+  task :reinstall_module, [:target_node_name] do |_task, args|
+    Rake::Task['litmus:uninstall_module'].invoke(args[:target_node_name])
+    Rake::Task['litmus:install_module'].invoke(args[:target_node_name])
+  end
+
   namespace :acceptance do
-    include PuppetLitmus::InventoryManipulation
+    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)
 
@@ -406,6 +322,7 @@ namespace :litmus do
             end
           end
 
+          require 'parallel'
           results = Parallel.map(payloads) do |title, test, options|
             env = options[:env].nil? ? {} : options[:env]
             stdout, stderr, status = Open3.capture3(env, test)
@@ -421,6 +338,7 @@ namespace :litmus do
           end
           Thread.kill(progress)
         else
+          require 'tty-spinner'
           spinners = TTY::Spinner::Multi.new("[:spinner] Running against #{targets.size} targets.")
           payloads.each do |title, test, options|
             env = options[:env].nil? ? {} : options[:env]

data/lib/puppet_litmus/spec_helper_acceptance.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+# Helper methods for testing puppet content
+module PuppetLitmus
+  extend PuppetLitmus::InventoryManipulation
+
+  def self.configure!
+    require 'serverspec'
+
+    RSpec.configure do |config|
+      config.include PuppetLitmus
+    end
+
+    if ENV['TARGET_HOST'].nil? || ENV['TARGET_HOST'] == 'localhost'
+      puts 'Running tests against this machine !'
+      if Gem.win_platform?
+        set :backend, :cmd
+      else
+        set :backend, :exec
+      end
+    else
+      # load inventory
+      inventory_hash = inventory_hash_from_inventory_file
+      node_config = config_from_node(inventory_hash, ENV['TARGET_HOST'])
+
+      if target_in_group(inventory_hash, ENV['TARGET_HOST'], 'docker_nodes')
+        host = ENV['TARGET_HOST']
+        set :backend, :docker
+        set :docker_container, host
+      elsif target_in_group(inventory_hash, ENV['TARGET_HOST'], 'ssh_nodes')
+        set :backend, :ssh
+        options = Net::SSH::Config.for(host)
+        options[:user] = node_config.dig('ssh', 'user') unless node_config.dig('ssh', 'user').nil?
+        options[:port] = node_config.dig('ssh', 'port') unless node_config.dig('ssh', 'port').nil?
+        options[:keys] = node_config.dig('ssh', 'private-key') unless node_config.dig('ssh', 'private-key').nil?
+        options[:password] = node_config.dig('ssh', 'password') unless node_config.dig('ssh', 'password').nil?
+        # Support both net-ssh 4 and 5.
+        # rubocop:disable Metrics/BlockNesting
+        options[:verify_host_key] = if node_config.dig('ssh', 'host-key-check').nil?
+                                      # Fall back to SSH behavior. This variable will only be set in net-ssh 5.3+.
+                                      if @strict_host_key_checking.nil? || @strict_host_key_checking
+                                        Net::SSH::Verifiers::Always.new
+                                      else
+                                        # SSH's behavior with StrictHostKeyChecking=no: adds new keys to known_hosts.
+                                        # If known_hosts points to /dev/null, then equivalent to :never where it
+                                        # accepts any key beacuse they're all new.
+                                        Net::SSH::Verifiers::AcceptNewOrLocalTunnel.new
+                                      end
+                                    elsif node_config.dig('ssh', 'host-key-check')
+                                      if defined?(Net::SSH::Verifiers::Always)
+                                        Net::SSH::Verifiers::Always.new
+                                      else
+                                        Net::SSH::Verifiers::Secure.new
+                                      end
+                                    elsif defined?(Net::SSH::Verifiers::Never)
+                                      Net::SSH::Verifiers::Never.new
+                                    else
+                                      Net::SSH::Verifiers::Null.new
+                                    end
+        # rubocop:enable Metrics/BlockNesting
+        host = if ENV['TARGET_HOST'].include?(':')
+                 ENV['TARGET_HOST'].split(':').first
+               else
+                 ENV['TARGET_HOST']
+               end
+        set :host,        options[:host_name] || host
+        set :ssh_options, options
+        set :request_pty, true
+      elsif target_in_group(inventory_hash, ENV['TARGET_HOST'], 'winrm_nodes')
+        require 'winrm'
+
+        set :backend, :winrm
+        set :os, family: 'windows'
+        user = node_config.dig('winrm', 'user') unless node_config.dig('winrm', 'user').nil?
+        pass = node_config.dig('winrm', 'password') unless node_config.dig('winrm', 'password').nil?
+        endpoint = "http://#{ENV['TARGET_HOST']}:5985/wsman"
+
+        opts = {
+          user: user,
+          password: pass,
+          endpoint: endpoint,
+          operation_timeout: 300,
+        }
+
+        winrm = WinRM::Connection.new opts
+        Specinfra.configuration.winrm = winrm
+      end
+    end
+  end
+end

data/lib/puppet_litmus/version.rb

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

data/spec/lib/puppet_litmus/puppet_helpers_spec.rb

@@ -87,7 +87,7 @@ RSpec.describe PuppetLitmus::PuppetHelpers do
 
   describe '.run_shell' do
     let(:command_to_run) { "puts 'doot'" }
-    let(:result) { ['result' => { 'exit_code' => 0, 'stdout' => nil, 'stderr' => nil }] }
+    let(:result) { ['result' => { 'exit_code' => 0, 'exit_status' => 0, 'stdout' => nil, 'stderr' => nil }] }
     let(:inventory_hash) { { 'groups' => [{ 'name' => 'ssh_nodes', 'nodes' => [{ 'name' => 'some.host' }] }] } }
     let(:localhost_inventory_hash) { { 'groups' => [{ 'name' => 'local', 'nodes' => [{ 'name' => 'litmus_localhost', 'config' => { 'transport' => 'local' } }] }] } }
 

data/spec/lib/puppet_litmus/rake_helper_spec.rb

@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+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'] } } }
+    let(:results) { [] }
+
+    it 'calls function' do
+      expect(described_class).to receive(:provision).with('docker', 'waffleimage/centos7', nil).and_return(results)
+      described_class.provision_list(provision_hash, 'default')
+    end
+  end
+
+  context 'with provision' do
+    let(:provision_hash) { { 'default' => { 'provisioner' => 'docker', 'images' => ['waffleimage/centos7'] } } }
+    let(:results) { [] }
+    let(:params) { { 'action' => 'provision', 'platform' => 'waffleimage/centos7', 'inventory' => Dir.pwd } }
+
+    it 'calls function' do
+      allow(File).to receive(:directory?).and_call_original
+      allow(File).to receive(:directory?).with(File.join(DEFAULT_CONFIG_DATA['modulepath'], 'provision')).and_return(true)
+      allow_any_instance_of(BoltSpec::Run).to receive(:run_task).with('provision::docker', 'localhost', params, config: DEFAULT_CONFIG_DATA, inventory: nil).and_return(results)
+      described_class.provision('docker', 'waffleimage/centos7', nil)
+    end
+  end
+
+  context 'with tear_down' do
+    let(:inventory_hash) do
+      { 'groups' =>
+        [{ 'name' => 'ssh_nodes', 'nodes' =>
+          [{ 'name' => 'some.host', 'facts' => { 'provisioner' => 'docker', 'container_name' => 'foo', 'platform' => 'some.host' } }] }] }
+    end
+    let(:targets) { ['some.host'] }
+    let(:params) { { 'action' => 'tear_down', 'node_name' => 'some.host', 'inventory' => Dir.pwd } }
+
+    it 'calls function' do
+      allow(File).to receive(:directory?).with(File.join(DEFAULT_CONFIG_DATA['modulepath'], 'provision')).and_return(true)
+      allow_any_instance_of(BoltSpec::Run).to receive(:run_task).with('provision::docker', 'localhost', params, config: DEFAULT_CONFIG_DATA, inventory: nil).and_return([])
+      described_class.tear_down_nodes(targets, inventory_hash)
+    end
+  end
+
+  context 'with install_agent' do
+    let(:inventory_hash) do
+      { 'groups' =>
+        [{ 'name' => 'ssh_nodes', 'nodes' =>
+          [{ 'name' => 'some.host', 'facts' => { 'provisioner' => 'docker', 'container_name' => 'foo', 'platform' => 'some.host' } }] }] }
+    end
+    let(:targets) { ['some.host'] }
+    let(:params) { { 'collection' => 'puppet6' } }
+
+    it 'calls function' do
+      allow(File).to receive(:directory?).with(File.join(DEFAULT_CONFIG_DATA['modulepath'], 'puppet_agent')).and_return(true)
+      allow_any_instance_of(BoltSpec::Run).to receive(:run_task).with('puppet_agent::install', targets, params, config: DEFAULT_CONFIG_DATA, inventory: inventory_hash).and_return([])
+      described_class.install_agent('puppet6', targets, inventory_hash)
+    end
+  end
+
+  context 'with install_module' do
+    let(:inventory_hash) do
+      { 'groups' =>
+        [{ 'name' => 'ssh_nodes', 'nodes' =>
+          [{ 'name' => 'some.host', 'facts' => { 'provisioner' => 'docker', 'container_name' => 'foo', 'platform' => 'some.host' } }] }] }
+    end
+    let(:module_tar) { '/tmp/foo.tar.gz' }
+    let(:targets) { ['some.host'] }
+    let(:install_module_command) { "puppet module install /tmp/#{File.basename(module_tar)}" }
+
+    it 'calls function' do
+      allow(Open3).to receive(:capture3).with("bundle exec bolt file upload \"#{module_tar}\" /tmp/#{File.basename(module_tar)} --nodes all --inventoryfile inventory.yaml")
+                                        .and_return(['success', '', 0])
+      allow_any_instance_of(BoltSpec::Run).to receive(:run_command).with(install_module_command, targets, config: nil, inventory: inventory_hash).and_return([])
+      described_class.install_module(inventory_hash, nil, module_tar)
+    end
+  end
+
+  context 'with uninstall module' do
+    let(:inventory_hash) do
+      { 'groups' =>
+        [{ 'name' => 'ssh_nodes', 'nodes' =>
+          [{ 'name' => 'some.host', 'facts' => { 'provisioner' => 'docker', 'container_name' => 'foo', 'platform' => 'some.host' } }] }] }
+    end
+    let(:targets) { ['some.host'] }
+    let(:uninstall_module_command) { 'puppet module uninstall foo-bar' }
+
+    it 'uninstalls module' do
+      allow_any_instance_of(BoltSpec::Run).to receive(:run_command).with(uninstall_module_command, targets, config: nil, inventory: inventory_hash).and_return([])
+      expect(described_class).to receive(:metadata_module_name).and_return('foo-bar')
+      described_class.uninstall_module(inventory_hash, nil)
+    end
+
+    it 'and custom name' do
+      allow_any_instance_of(BoltSpec::Run).to receive(:run_command).with(uninstall_module_command, targets, config: nil, inventory: inventory_hash).and_return([])
+      described_class.uninstall_module(inventory_hash, nil, 'foo-bar')
+    end
+  end
+
+  context 'with module name' do
+    let(:metadata) { '{ "name" : "foo-bar" }' }
+
+    it 'reads module name' do
+      allow(File).to receive(:exist?).with(File.join(Dir.pwd, 'metadata.json')).and_return(true)
+      allow(File).to receive(:read).with(File.join(Dir.pwd, 'metadata.json')).and_return(metadata)
+      name = described_class.metadata_module_name
+      expect(name).to eq('foo-bar')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_litmus
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt
@@ -90,6 +90,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "    Providing a simple command line tool for puppet content creators,
   to enable simple and complex test deployments.\n"
 email:
@@ -103,13 +131,16 @@ files:
 - lib/puppet_litmus.rb
 - lib/puppet_litmus/inventory_manipulation.rb
 - lib/puppet_litmus/puppet_helpers.rb
+- lib/puppet_litmus/rake_helper.rb
 - lib/puppet_litmus/rake_tasks.rb
+- lib/puppet_litmus/spec_helper_acceptance.rb
 - lib/puppet_litmus/version.rb
 - 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/lib/puppet_litmus/rake_tasks_spec.rb
 - spec/lib/puppet_litmus/version_spec.rb
 - spec/spec_helper.rb
@@ -143,6 +174,7 @@ test_files:
 - 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/lib/puppet_litmus/rake_tasks_spec.rb
 - spec/lib/puppet_litmus/version_spec.rb
 - spec/spec_helper.rb