puppet_litmus 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c81ccd0186b54db2eb71534a0cc10e5191e1b6103201e8ef44231cc017cf5faa
-  data.tar.gz: dd027dff77884a4b09b66447c966c3636a2cf237e21c1b4f0ec1d28182188937
+  metadata.gz: b57432738dbfa9e3c83c891565286c43703437df4d4b8f3a1c09431012dd869d
+  data.tar.gz: 7d4213842c29f689b943dea1a89fc1ea5c4cda272a67fad70c2d55a9b74114a8
 SHA512:
-  metadata.gz: 38db1fa85c7ca655540aad80563bd095c8de46b492e618541a9dbd42b4a9305447ce2538c4ed30882f87582f4a21ebac7d0a1352288f3920d33b42af4d53fa4d
-  data.tar.gz: 849c989f388d9b1b4dde8a44a2788657c015c50bbfb8ff399255d64c3390557bca7e319939134a2bb2918f3ffc48b0c59a27c29ab7d0779d480c07f9a392a3dc
+  metadata.gz: 01344ef395005540dc7ae2d109b19e6bf94064f0a27031e886c2f114cdaec8c33c6cbcd71c57a0c164b4724cc5014fb17b7b8ddf12220189f2e10bb22ead26b7
+  data.tar.gz: 4f6a4144f1785e618d40560463de94e874d03208c1a35ba2ca3d031752e9791b133466105f45b50e4ef59f0f12a3e0736e606d2140d0e517b63c633a0dd7aae6

data/README.md

@@ -8,27 +8,23 @@
 </div>
 
 ## Overview
-Litmus provides a simple command line tool for Puppet content creators, to enable both simple and complex test deployments against specifically configured target systems. It is available as a gem, and can be installed by running ```gem install puppet_litmus```.
 
-Litmus allows Puppet module developers to:
-* provision targets to test against,
-* install the Puppet Agent, 
-* install a module,
-* run tests, and
-* tear down the infrastructure.
+Litmus is a command line tool that allows you to run acceptance tests against Puppet modules.
 
-The tool facilitates parallel test runs, running tests in isolation, and each step is standalone, allowing other operations between test runs, such as debugging, or configuration updates on the test targets.
+Litmus allows you to:
+* Provision targets to test against
+* Install a Puppet agent
+* Install a module
+* Run tests
+* Tear down the infrastructure
 
-## Documentation
+Litmus also facilitates parallel test runs and running tests in isolation. Each step is standalone, allowing other operations between test runs, such as debugging or configuration updates on the test targets.
+
+Install Litmus as a gem by running ```gem install puppet_litmus```.
 
-All our documentation is currently available in the [Wiki](https://github.com/puppetlabs/puppet_litmus/wiki).
+## Documentation
 
-* [Overview](https://github.com/puppetlabs/puppet_litmus/wiki/Overview-of-Litmus) of the main functions
-* [Architecture](https://github.com/puppetlabs/puppet_litmus/wiki/Architecture-of-puppet-litmus) with an explanation of what's going on under the hood
-* [Step-by-step guide](https://github.com/puppetlabs/puppet_litmus/wiki/Tutorial:-use-Litmus-to-execute-acceptance-tests-with-a-sample-module-(MoTD)) of how to use Litmus with the popular and simple [MoTD Puppet module](https://forge.puppet.com/puppetlabs/motd).
-* [How to guide](https://github.com/puppetlabs/puppet_litmus/wiki/Converting-a-module-to-use-Litmus) walking through how to use Litmus in a module
-* [Helper functions](https://github.com/puppetlabs/puppet_litmus/wiki/Helper-Functions-for-Litmus) a guide to the various helper functions within Litmus.
-## Known issues
+For documentation, see our [Litmus Wiki](https://github.com/puppetlabs/puppet_litmus/wiki).
 
 ## Other Resources
 

data/lib/puppet_litmus.rb

@@ -4,6 +4,7 @@
 module PuppetLitmus; end
 
 require 'bolt_spec/run'
+require 'puppet_litmus/honeycomb_utils'
 require 'puppet_litmus/inventory_manipulation'
 require 'puppet_litmus/puppet_helpers'
 require 'puppet_litmus/rake_helper'

data/lib/puppet_litmus/honeycomb_utils.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module PuppetLitmus; end # rubocop:disable Style/Documentation
+
+# a set of semi-private utility functions that should not contaminate the global namespace
+module PuppetLitmus::HoneycombUtils
+  module_function
+
+  def add_platform_field(inventory_hash, target_node_name)
+    facts = facts_from_node(inventory_hash, target_node_name)
+    Honeycomb.current_span.add_field('litmus.platform', facts&.dig('platform'))
+  end
+end

data/lib/puppet_litmus/inventory_manipulation.rb

@@ -37,7 +37,6 @@ module PuppetLitmus::InventoryManipulation
               'uri' => 'litmus_localhost',
               'config' => { 'transport' => 'local' },
               'feature' => 'puppet-agent',
-              'facts' => { 'platform' => 'localhost' },
             },
           ],
         },

data/lib/puppet_litmus/puppet_helpers.rb

@@ -32,6 +32,7 @@ module PuppetLitmus::PuppetHelpers
   #  :manifest_file_location [Path] The place on the target system.
   #  :hiera_config [Path] The path to the hiera.yaml configuration on the runner.
   #  :prefix_command [String] prefixes the puppet apply command; eg "export LANGUAGE='ja'".
+  #  :trace [Boolean] run puppet apply with the trace flag (defaults to `true`).
   #  :debug [Boolean] run puppet apply with the debug flag.
   #  :noop [Boolean] run puppet apply with the noop flag.
   # @yieldreturn [Block] this method will yield to a block of code passed by the caller; this can be used for additional validation, etc.
@@ -48,6 +49,8 @@ module PuppetLitmus::PuppetHelpers
       raise 'please specify only one of `catch_changes`, `expect_changes`, `catch_failures` or `expect_failures`' if
         [opts[:catch_changes], opts[:expect_changes], opts[:catch_failures], opts[:expect_failures]].compact.length > 1
 
+      opts = { trace: true }.merge(opts)
+
       if opts[:catch_changes]
         use_detailed_exit_codes = true
         acceptable_exit_codes = [0]
@@ -70,9 +73,10 @@ module PuppetLitmus::PuppetHelpers
       raise "Target '#{target_node_name}' not found in inventory.yaml" unless target_in_inventory?(inventory_hash, target_node_name)
 
       span.add_field('litmus.node_name', target_node_name)
-      span.add_field('litmus.platform', facts_from_node(inventory_hash, target_node_name)['platform'])
+      PuppetLitmus::HoneycombUtils.add_platform_field(inventory_hash, target_node_name)
 
       command_to_run = "#{opts[:prefix_command]} puppet apply #{manifest_file_location}"
+      command_to_run += ' --trace' if !opts[:trace].nil? && (opts[:trace] == true)
       command_to_run += " --modulepath #{Dir.pwd}/spec/fixtures/modules" if target_node_name == 'litmus_localhost'
       command_to_run += " --hiera_config='#{opts[:hiera_config]}'" unless opts[:hiera_config].nil?
       command_to_run += ' --debug' if !opts[:debug].nil? && (opts[:debug] == true)
@@ -84,9 +88,9 @@ module PuppetLitmus::PuppetHelpers
       bolt_result = run_command(command_to_run, target_node_name, config: nil, inventory: inventory_hash)
       span.add_field('litmus.bolt_result', bolt_result)
 
-      result = OpenStruct.new(exit_code: bolt_result.first['result']['exit_code'],
-                              stdout: bolt_result.first['result']['stdout'],
-                              stderr: bolt_result.first['result']['stderr'])
+      result = OpenStruct.new(exit_code: bolt_result.first['value']['exit_code'],
+                              stdout: bolt_result.first['value']['stdout'],
+                              stderr: bolt_result.first['value']['stderr'])
       span.add_field('litmus.result', result.to_h)
 
       status = result.exit_code
@@ -129,12 +133,12 @@ module PuppetLitmus::PuppetHelpers
         # transfer to TARGET_HOST
         inventory_hash = inventory_hash_from_inventory_file
         span.add_field('litmus.node_name', target_node_name)
-        span.add_field('litmus.platform', facts_from_node(inventory_hash, target_node_name)['platform'])
+        PuppetLitmus::HoneycombUtils.add_platform_field(inventory_hash, target_node_name)
 
         manifest_file_location = "/tmp/#{File.basename(manifest_file)}"
         bolt_result = upload_file(manifest_file.path, manifest_file_location, target_node_name, options: {}, config: nil, inventory: inventory_hash)
         span.add_field('litmus.bolt_result', bolt_result)
-        raise bolt_result.first['result'].to_s unless bolt_result.first['status'] == 'success'
+        raise bolt_result.first['value'].to_s unless bolt_result.first['status'] == 'success'
       end
 
       span.add_field('litmus.manifest_file_location', manifest_file_location)
@@ -160,19 +164,19 @@ module PuppetLitmus::PuppetHelpers
       raise "Target '#{target_node_name}' not found in inventory.yaml" unless target_in_inventory?(inventory_hash, target_node_name)
 
       span.add_field('litmus.node_name', target_node_name)
-      span.add_field('litmus.platform', facts_from_node(inventory_hash, target_node_name)['platform'])
+      PuppetLitmus::HoneycombUtils.add_platform_field(inventory_hash, target_node_name)
 
       bolt_result = run_command(command_to_run, target_node_name, config: nil, inventory: inventory_hash)
       span.add_field('litmus.bolt_result', bolt_result)
 
-      if bolt_result.first['result']['exit_code'] != 0 && opts[:expect_failures] != true
+      if bolt_result.first['value']['exit_code'] != 0 && opts[:expect_failures] != true
         raise "shell failed\n`#{command_to_run}`\n======\n#{bolt_result}"
       end
 
-      result = OpenStruct.new(exit_code: bolt_result.first['result']['exit_code'],
-                              exit_status: bolt_result.first['result']['exit_code'],
-                              stdout: bolt_result.first['result']['stdout'],
-                              stderr: bolt_result.first['result']['stderr'])
+      result = OpenStruct.new(exit_code: bolt_result.first['value']['exit_code'],
+                              exit_status: bolt_result.first['value']['exit_code'],
+                              stdout: bolt_result.first['value']['stdout'],
+                              stderr: bolt_result.first['value']['stderr'])
       span.add_field('litmus.result', result.to_h)
       yield result if block_given?
       result
@@ -199,16 +203,16 @@ module PuppetLitmus::PuppetHelpers
       raise "Target '#{target_node_name}' not found in inventory.yaml" unless target_in_inventory?(inventory_hash, target_node_name)
 
       span.add_field('litmus.node_name', target_node_name)
-      span.add_field('litmus.platform', facts_from_node(inventory_hash, target_node_name)['platform'])
+      PuppetLitmus::HoneycombUtils.add_platform_field(inventory_hash, target_node_name)
 
       bolt_result = upload_file(source, destination, target_node_name, options: options, config: nil, inventory: inventory_hash)
       span.add_field('litmus.bolt_result', bolt_result)
 
       result_obj = {
         exit_code: 0,
-        stdout: bolt_result.first['result']['_output'],
+        stdout: bolt_result.first['value']['_output'],
         stderr: nil,
-        result: bolt_result.first['result'],
+        result: bolt_result.first['value'],
       }
 
       if bolt_result.first['status'] != 'success'
@@ -218,7 +222,7 @@ module PuppetLitmus::PuppetHelpers
         end
 
         result_obj[:exit_code] = 255
-        result_obj[:stderr]    = bolt_result.first['result']['_error']['msg']
+        result_obj[:stderr]    = bolt_result.first['value']['_error']['msg']
       end
 
       result = OpenStruct.new(exit_code: result_obj[:exit_code],
@@ -257,22 +261,22 @@ module PuppetLitmus::PuppetHelpers
       raise "Target '#{target_node_name}' not found in inventory.yaml" unless target_in_inventory?(inventory_hash, target_node_name)
 
       span.add_field('litmus.node_name', target_node_name)
-      span.add_field('litmus.platform', facts_from_node(inventory_hash, target_node_name)['platform'])
+      PuppetLitmus::HoneycombUtils.add_platform_field(inventory_hash, target_node_name)
 
       bolt_result = run_task(task_name, target_node_name, params, config: config_data, inventory: inventory_hash)
       result_obj = {
         exit_code: 0,
         stdout: nil,
         stderr: nil,
-        result: bolt_result.first['result'],
+        result: bolt_result.first['value'],
       }
 
       if bolt_result.first['status'] == 'success'
         # stdout returns unstructured data if structured data is not available
-        result_obj[:stdout] = if bolt_result.first['result']['_output'].nil?
-                                bolt_result.first['result'].to_s
+        result_obj[:stdout] = if bolt_result.first['value']['_output'].nil?
+                                bolt_result.first['value'].to_s
                               else
-                                bolt_result.first['result']['_output']
+                                bolt_result.first['value']['_output']
                               end
 
       else
@@ -281,12 +285,12 @@ module PuppetLitmus::PuppetHelpers
           raise "task failed\n`#{task_name}`\n======\n#{bolt_result}"
         end
 
-        result_obj[:exit_code] = if bolt_result.first['result']['_error']['details'].nil?
+        result_obj[:exit_code] = if bolt_result.first['value']['_error']['details'].nil?
                                    255
                                  else
-                                   bolt_result.first['result']['_error']['details'].fetch('exitcode', 255)
+                                   bolt_result.first['value']['_error']['details'].fetch('exitcode', 255)
                                  end
-        result_obj[:stderr]    = bolt_result.first['result']['_error']['msg']
+        result_obj[:stderr]    = bolt_result.first['value']['_error']['msg']
       end
 
       result = OpenStruct.new(exit_code: result_obj[:exit_code],
@@ -318,18 +322,18 @@ module PuppetLitmus::PuppetHelpers
       raise "Target '#{target_node_name}' not found in inventory.yaml" unless target_in_inventory?(inventory_hash, target_node_name)
 
       span.add_field('litmus.node_name', target_node_name)
-      span.add_field('litmus.platform', facts_from_node(inventory_hash, target_node_name)['platform'])
+      PuppetLitmus::HoneycombUtils.add_platform_field(inventory_hash, target_node_name)
 
       bolt_result = run_script(script, target_node_name, arguments, options: opts, config: nil, inventory: inventory_hash)
 
-      if bolt_result.first['result']['exit_code'] != 0 && opts[:expect_failures] != true
+      if bolt_result.first['value']['exit_code'] != 0 && opts[:expect_failures] != true
         span.add_field('litmus_runscriptfailure', bolt_result)
         raise "script run failed\n`#{script}`\n======\n#{bolt_result}"
       end
 
-      result = OpenStruct.new(exit_code: bolt_result.first['result']['exit_code'],
-                              stdout: bolt_result.first['result']['stdout'],
-                              stderr: bolt_result.first['result']['stderr'])
+      result = OpenStruct.new(exit_code: bolt_result.first['value']['exit_code'],
+                              stdout: bolt_result.first['value']['stdout'],
+                              stderr: bolt_result.first['value']['stderr'])
       yield result if block_given?
       span.add_field('litmus.result', result.to_h)
       result
@@ -353,7 +357,7 @@ module PuppetLitmus::PuppetHelpers
     puppet_apply_error = <<~ERROR
       apply manifest failed
       `#{command}`
-      with exit code #{bolt_result.first['result']['exit_code']} (expected: #{acceptable_exit_codes})
+      with exit code #{bolt_result.first['value']['exit_code']} (expected: #{acceptable_exit_codes})
       ====== Start output of failed Puppet apply ======
       #{puppet_output(bolt_result)}
       ====== End output of failed Puppet apply ======
@@ -378,8 +382,8 @@ module PuppetLitmus::PuppetHelpers
 
   # Return the stdout of the puppet run
   def puppet_output(bolt_result)
-    bolt_result.dig(0, 'result', 'stderr').to_s << \
-      bolt_result.dig(0, 'result', 'stdout').to_s
+    bolt_result.dig(0, 'value', 'stderr').to_s << \
+      bolt_result.dig(0, 'value', 'stdout').to_s
   end
 
   # Checks a puppet return status and returns true if it both

data/lib/puppet_litmus/rake_helper.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
-module PuppetLitmus; end # rubocop:disable Style/Documentation
-
+require 'bolt_spec/run'
 require 'honeycomb-beeline'
+require 'puppet_litmus/honeycomb_utils'
 Honeycomb.configure do |config|
+  # override client if no configuration is provided, so that the pesky libhoney warning about lack of configuration is not shown
+  unless ENV['HONEYCOMB_WRITEKEY'] && ENV['HONEYCOMB_DATASET']
+    config.client = Libhoney::NullClient.new
+  end
 end
 process_span = Honeycomb.start_span(name: 'Litmus Testing', serialized_trace: ENV['HTTP_X_HONEYCOMB_TRACE'])
 ENV['HTTP_X_HONEYCOMB_TRACE'] = process_span.to_trace_header unless ENV['HTTP_X_HONEYCOMB_TRACE']
@@ -37,7 +41,8 @@ end
 
 # helper methods for the litmus rake tasks
 module PuppetLitmus::RakeHelper
-  DEFAULT_CONFIG_DATA ||= { 'modulepath' => File.join(Dir.pwd, 'spec', 'fixtures', 'modules') }.freeze
+  # DEFAULT_CONFIG_DATA should be frozen for our safety, but it needs to work around https://github.com/puppetlabs/bolt/pull/1696
+  DEFAULT_CONFIG_DATA ||= { 'modulepath' => File.join(Dir.pwd, 'spec', 'fixtures', 'modules') } # .freeze # rubocop:disable Style/MutableConstant
   SUPPORTED_PROVISIONERS ||= %w[abs docker docker_exp vagrant vmpooler].freeze
 
   # Gets a string representing the operating system and version.
@@ -99,32 +104,8 @@ module PuppetLitmus::RakeHelper
     end
   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|
-      folder_handle = Dir.open(File.join(source_folder, folder))
-      next if File.symlink?(folder_handle)
-
-      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(target_dir) if File.directory?(target_dir)
-
-      # build_module
-      module_tar = build_module(module_dir, target_dir)
-      module_tars.push(File.new(module_tar))
-    end
-    module_tars
-  end
-
   def provision(provisioner, platform, inventory_vars)
-    require 'bolt_spec/run'
-    include BoltSpec::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'))
 
@@ -140,7 +121,7 @@ module PuppetLitmus::RakeHelper
 
       bolt_result = run_task(provisioner_task(provisioner), 'localhost', params, config: DEFAULT_CONFIG_DATA, inventory: nil)
 
-      span.add_field('litmus.node_name', bolt_result&.first&.dig('result', 'node_name'))
+      span.add_field('litmus.node_name', bolt_result&.first&.dig('value', 'node_name'))
 
       bolt_result
     end
@@ -165,8 +146,7 @@ module PuppetLitmus::RakeHelper
       ENV['HTTP_X_HONEYCOMB_TRACE'] = span.to_trace_header unless ENV['HTTP_X_HONEYCOMB_TRACE']
       span.add_field('litmus.targets', targets)
 
-      require 'bolt_spec/run'
-      include BoltSpec::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'))
 
@@ -185,12 +165,12 @@ module PuppetLitmus::RakeHelper
     Honeycomb.start_span(name: 'litmus.tear_down') do |span|
       ENV['HTTP_X_HONEYCOMB_TRACE'] = span.to_trace_header unless ENV['HTTP_X_HONEYCOMB_TRACE']
       # how do we know what provisioner to use
-      node_facts = facts_from_node(inventory_hash, node_name)
 
       span.add_field('litmus.node_name', node_name)
-      span.add_field('litmus.platform', node_facts['platform'])
+      PuppetLitmus::HoneycombUtils.add_platform_field(inventory_hash, node_name)
 
       params = { 'action' => 'tear_down', 'node_name' => node_name, 'inventory' => Dir.pwd }
+      node_facts = facts_from_node(inventory_hash, node_name)
       run_task(provisioner_task(node_facts['provisioner']), 'localhost', params, config: DEFAULT_CONFIG_DATA, inventory: nil)
     end
   end
@@ -201,8 +181,7 @@ module PuppetLitmus::RakeHelper
       span.add_field('litmus.collection', collection)
       span.add_field('litmus.targets', targets)
 
-      require 'bolt_spec/run'
-      include BoltSpec::Run
+      include ::BoltSpec::Run
       params = if collection.nil?
                  {}
                else
@@ -213,7 +192,9 @@ module PuppetLitmus::RakeHelper
        unless File.directory?(File.join(DEFAULT_CONFIG_DATA['modulepath'], 'puppet_agent'))
 
       # using boltspec, when the runner is called it changes the inventory_hash dropping the version field. The clone works around this
-      run_task('puppet_agent::install', targets, params, config: DEFAULT_CONFIG_DATA, inventory: inventory_hash.clone)
+      bolt_result = run_task('puppet_agent::install', targets, params, config: DEFAULT_CONFIG_DATA, inventory: inventory_hash.clone)
+      raise_bolt_errors(bolt_result, 'Installation of agent failed.')
+      bolt_result
     end
   end
 
@@ -244,26 +225,57 @@ module PuppetLitmus::RakeHelper
     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)}"
+  def install_module(inventory_hash, target_node_name, module_tar, module_repository = 'https://forgeapi.puppetlabs.com')
     Honeycomb.start_span(name: 'install_module') do |span|
       ENV['HTTP_X_HONEYCOMB_TRACE'] = span.to_trace_header unless ENV['HTTP_X_HONEYCOMB_TRACE']
-      span.add_field('litmus.install_module_command', install_module_command)
+      span.add_field('litmus.target_node_name', target_node_name)
+      span.add_field('litmus.module_tar', module_tar)
+
+      # make sure the target module is not installed
+      # otherwise `puppet module install` might silently skip it
+      uninstall_module(inventory_hash.clone, target_node_name, force: true)
+
+      include ::BoltSpec::Run
+
+      target_nodes = find_targets(inventory_hash, target_node_name)
       span.add_field('litmus.target_nodes', target_nodes)
+      bolt_result = upload_file(module_tar, "/tmp/#{File.basename(module_tar)}", target_nodes, options: {}, config: nil, inventory: inventory_hash.clone)
+      raise_bolt_errors(bolt_result, 'Failed to upload module.')
+
+      install_module_command = "puppet module install --module_repository '#{module_repository}' /tmp/#{File.basename(module_tar)}"
+      span.add_field('litmus.install_module_command', install_module_command)
 
-      run_command(install_module_command, target_nodes, config: nil, inventory: inventory_hash)
+      bolt_result = run_command(install_module_command, target_nodes, config: nil, inventory: inventory_hash.clone)
+      raise_bolt_errors(bolt_result, "Installation of package #{module_tar} failed.")
+      bolt_result
     end
   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 = []
+
+    target_dir = File.join(Dir.pwd, 'pkg')
+    # remove old build folder if exists, before we build afresh
+    FileUtils.rm_rf(target_dir) if File.directory?(target_dir)
+
+    folder_list.each do |folder|
+      folder_handle = Dir.open(File.join(source_folder, folder))
+      next if File.symlink?(folder_handle)
+
+      module_dir = folder_handle.path
+
+      # build_module
+      module_tar = build_module(module_dir, target_dir)
+      module_tars.push(File.new(module_tar))
+    end
+    module_tars
+  end
+
   def metadata_module_name
     require 'json'
     raise 'Could not find metadata.json' unless File.exist?(File.join(Dir.pwd, 'metadata.json'))
@@ -274,12 +286,12 @@ module PuppetLitmus::RakeHelper
     metadata['name']
   end
 
-  def uninstall_module(inventory_hash, target_node_name, module_to_remove = nil)
-    require 'bolt_spec/run'
-    include BoltSpec::Run
+  def uninstall_module(inventory_hash, target_node_name, module_to_remove = nil, **opts)
+    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}"
+    install_module_command += ' --force' if opts[:force]
     run_command(install_module_command, target_nodes, config: nil, inventory: inventory_hash)
   end
 
@@ -289,11 +301,10 @@ module PuppetLitmus::RakeHelper
       # if we're only checking connectivity for a single node
       if target_node_name
         span.add_field('litmus.node_name', target_node_name)
-        span.add_field('litmus.platform', facts_from_node(inventory_hash, target_node_name)['platform'])
+        PuppetLitmus::HoneycombUtils.add_platform_field(inventory_hash, target_node_name)
       end
 
-      require 'bolt_spec/run'
-      include BoltSpec::Run
+      include ::BoltSpec::Run
       target_nodes = find_targets(inventory_hash, target_node_name)
       results = run_command('cd .', target_nodes, config: nil, inventory: inventory_hash)
       span.add_field('litmus.bolt_result', results)
@@ -316,4 +327,38 @@ module PuppetLitmus::RakeHelper
       provisioner.to_s
     end
   end
+
+  # Parse out errors messages in result set returned by Bolt command.
+  #
+  # @param result_set [Array] result set returned by Bolt command.
+  # @return [Hash] Error messages grouped by target.
+  def check_bolt_errors(result_set)
+    errors = {}
+    # iterate through each error
+    result_set.each do |target_result|
+      status = target_result['status']
+      # jump to the next one when there is not fail
+      next if status != 'failure'
+
+      target = target_result['target']
+      # get some info from error
+      error_msg = target_result['value']['_error']['msg']
+      errors[target] = error_msg
+    end
+    errors
+  end
+
+  # Parse out errors messages in result set returned by Bolt command. If there are errors, raise them.
+  #
+  # @param result_set [Array] result set returned by Bolt command.
+  # @param error_msg [String] error message to raise when errors are detected. The actual errors will be appended.
+  def raise_bolt_errors(result_set, error_msg)
+    errors = check_bolt_errors(result_set)
+
+    unless errors.empty?
+      raise "#{error_msg}\nErrors: #{errors}"
+    end
+
+    nil
+  end
 end

data/lib/puppet_litmus/rake_tasks.rb

@@ -57,9 +57,9 @@ namespace :litmus do
       end
 
       if result.first['status'] != 'success'
-        failed_image_message += "=====\n#{result.first['node']}\n#{result.first['result']['_output']}\n#{result.inspect}"
+        failed_image_message += "=====\n#{result.first['target']}\n#{result.first['value']['_output']}\n#{result.inspect}"
       else
-        STDOUT.puts "#{result.first['result']['node_name']}, #{image}"
+        STDOUT.puts "#{result.first['value']['node_name']}, #{image}"
       end
       results << result
     end
@@ -96,7 +96,7 @@ namespace :litmus do
     else
       spinner.success
     end
-    puts "#{results.first['result']['node_name']}, #{args[:platform]}"
+    puts "#{results.first['value']['node_name']}, #{args[:platform]}"
   end
 
   # Install puppet agent on a collection of nodes
@@ -119,11 +119,11 @@ namespace :litmus do
     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 #{DEFAULT_CONFIG_DATA['modulepath']}"
-        raise "Failed on #{result['node']}\n#{result}\ntry running '#{command_to_run}'"
+        command_to_run = "bolt task run puppet_agent::install --targets #{result['target']} --inventoryfile inventory.yaml --modulepath #{DEFAULT_CONFIG_DATA['modulepath']}"
+        raise "Failed on #{result['target']}\n#{result}\ntry running '#{command_to_run}'"
       else
         # add puppet-agent feature to successful nodes
-        inventory_hash = add_feature_to_node(inventory_hash, 'puppet-agent', result['node'])
+        inventory_hash = add_feature_to_node(inventory_hash, 'puppet-agent', result['target'])
       end
     end
     # update the inventory with the puppet-agent feature set per node
@@ -134,7 +134,7 @@ namespace :litmus do
 
     results.each do |result|
       if result['status'] != 'success'
-        puts "Failed on #{result['node']}\n#{result}"
+        puts "Failed on #{result['target']}\n#{result}"
       end
     end
   end
@@ -171,7 +171,8 @@ namespace :litmus do
   # @param :source [String] source directory to look in (ignores symlinks) defaults do './spec/fixtures/modules'.
   # @param :target_node_name [Array] nodes on which to install a puppet module for testing.
   desc 'install_module - build and install module'
-  task :install_modules_from_directory, [:source, :target_node_name] do |_task, args|
+  task :install_modules_from_directory, [:source, :target_node_name, :module_repository] do |_task, args|
+    args.with_defaults(source: nil, target_node_name: nil, module_repository: 'https://forgeapi.puppetlabs.com')
     inventory_hash = inventory_hash_from_inventory_file
     target_nodes = find_targets(inventory_hash, args[:target_node_name])
     if target_nodes.empty?
@@ -185,24 +186,15 @@ namespace :litmus do
                     end
     raise "Source folder doesnt exist #{source_folder}" unless File.directory?(source_folder)
 
-    module_tars = build_modules_in_folder(source_folder)
     puts 'Building'
-    module_tars.each do |module_tar|
-      print "#{File.basename(module_tar)} "
-    end
+    module_tars = build_modules_in_folder(source_folder)
     require 'bolt_spec/run'
     include BoltSpec::Run
-    puts "\nSending"
-    module_tars.each do |module_tar|
-      upload_file(module_tar.path, "/tmp/#{File.basename(module_tar)}", target_nodes, options: {}, config: nil, inventory: inventory_hash)
-      print "#{File.basename(module_tar)} "
-    end
     puts "\nInstalling"
     module_tars.each do |module_tar|
-      # install_module
-      install_module_command = "puppet module install --force /tmp/#{File.basename(module_tar)}"
-      run_command(install_module_command, target_nodes, config: nil, inventory: inventory_hash)
-      print "#{File.basename(module_tar)} "
+      target_nodes.each do |target_node_name|
+        install_module(inventory_hash, target_node_name, module_tar, args[:module_repository])
+      end
     end
   end
 
@@ -224,7 +216,8 @@ namespace :litmus do
   #
   # @param :target_node_name [Array] nodes on which to install a puppet module for testing.
   desc 'install_module - build and install module'
-  task :install_module, [:target_node_name] do |_task, args|
+  task :install_module, [:target_node_name, :module_repository] do |_task, args|
+    args.with_defaults(target_node_name: nil, module_repository: 'https://forgeapi.puppetlabs.com')
     inventory_hash = inventory_hash_from_inventory_file
     target_nodes = find_targets(inventory_hash, args[:target_node_name])
     if target_nodes.empty?
@@ -238,13 +231,7 @@ namespace :litmus do
     # 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?
 
-    result = install_module(inventory_hash, args[:target_node_name], module_tar)
-
-    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'
-    end
+    install_module(inventory_hash, args[:target_node_name], module_tar, args[:module_repository])
 
     puts 'Installed'
   end
@@ -254,11 +241,12 @@ namespace :litmus do
   # @param :key [String] key that maps to a value for a provisioner and an image to be used for each OS provisioned.
   # @param :collection [String] parameters to pass to the puppet agent install command.
   desc 'provision_install - provision a list of machines, install an agent, and the module.'
-  task :provision_install, [:key, :collection] do |_task, args|
+  task :provision_install, [:key, :collection, :module_repository] do |_task, args|
+    args.with_defaults(module_repository: 'https://forgeapi.puppetlabs.com')
     Rake::Task['spec_prep'].invoke
     Rake::Task['litmus:provision_list'].invoke(args[:key])
     Rake::Task['litmus:install_agent'].invoke(args[:collection])
-    Rake::Task['litmus:install_module'].invoke
+    Rake::Task['litmus:install_module'].invoke(nil, args[:module_repository])
   end
 
   # Decommissions test machines.
@@ -277,7 +265,7 @@ namespace :litmus do
     results = tear_down_nodes(targets, inventory_hash)
     results.each do |node, result|
       if result.first['status'] != 'success'
-        bad_results << "#{node}, #{result.first['result']['_error']['msg']}"
+        bad_results << "#{node}, #{result.first['value']['_error']['msg']}"
       else
         puts "#{node}: #{result.first['status']}"
       end
@@ -308,7 +296,7 @@ namespace :litmus do
     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'
+      puts "#{node['target']} failed #{node['value']}" if node['status'] != 'success'
     end
 
     puts 'Uninstalled'
@@ -318,9 +306,10 @@ namespace :litmus do
   #
   # @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|
+  task :reinstall_module, [:target_node_name, :module_repository] do |_task, args|
+    args.with_defaults(target_node_name: nil, module_repository: 'https://forgeapi.puppetlabs.com')
     Rake::Task['litmus:uninstall_module'].invoke(args[:target_node_name])
-    Rake::Task['litmus:install_module'].invoke(args[:target_node_name])
+    Rake::Task['litmus:install_module'].invoke(args[:target_node_name], args[:module_repository])
   end
 
   namespace :acceptance do

data/lib/puppet_litmus/version.rb

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

data/spec/lib/puppet_litmus/puppet_helpers_spec.rb

@@ -23,8 +23,8 @@ RSpec.describe PuppetLitmus::PuppetHelpers do
   describe '.apply_manifest' do
     context 'when specifying a hiera config' do
       let(:manifest) { "include '::doot'" }
-      let(:result) { ['result' => { 'exit_code' => 0, 'stdout' => nil, 'stderr' => nil }] }
-      let(:command) { " puppet apply /bla.pp --modulepath #{Dir.pwd}/spec/fixtures/modules --hiera_config='/hiera.yaml'" }
+      let(:result) { ['value' => { 'exit_code' => 0, 'stdout' => nil, 'stderr' => nil }] }
+      let(:command) { " puppet apply /bla.pp --trace --modulepath #{Dir.pwd}/spec/fixtures/modules --hiera_config='/hiera.yaml'" }
 
       it 'passes the --hiera_config flag if the :hiera_config opt is specified' do
         expect(File).to receive(:exist?).with('inventory.yaml').and_return(false)
@@ -38,8 +38,8 @@ RSpec.describe PuppetLitmus::PuppetHelpers do
 
     context 'when using detailed-exitcodes' do
       let(:manifest) { "include '::doot'" }
-      let(:result) { ['result' => { 'exit_code' => 0, 'stdout' => nil, 'stderr' => nil }] }
-      let(:command) { " puppet apply /bla.pp --modulepath #{Dir.pwd}/spec/fixtures/modules --detailed-exitcodes" }
+      let(:result) { ['value' => { 'exit_code' => 0, 'stdout' => nil, 'stderr' => nil }] }
+      let(:command) { " puppet apply /bla.pp --trace --modulepath #{Dir.pwd}/spec/fixtures/modules --detailed-exitcodes" }
 
       it 'uses detailed-exitcodes with expect_failures' do
         expect(File).to receive(:exist?).with('inventory.yaml').and_return(false)
@@ -86,7 +86,7 @@ RSpec.describe PuppetLitmus::PuppetHelpers do
 
   describe '.run_shell' do
     let(:command_to_run) { "puts 'doot'" }
-    let(:result) { ['result' => { 'exit_code' => 0, 'exit_status' => 0, 'stdout' => nil, 'stderr' => nil }] }
+    let(:result) { ['value' => { 'exit_code' => 0, 'exit_status' => 0, 'stdout' => nil, 'stderr' => nil }] }
 
     it 'responds to run_shell' do
       expect(described_class).to respond_to(:run_shell).with(1..2).arguments
@@ -120,8 +120,8 @@ RSpec.describe PuppetLitmus::PuppetHelpers do
     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, 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'}}}]}
+    let(:result_success) {[{'target'=>'some.host','action'=>'upload','object'=>'C:\foo\bar.ps1','status'=>'success','value'=>{'_output'=>'Uploaded \'C:\foo\bar.ps1\' to \'some.host:C:\bar\''}}]}
+    let(:result_failure) {[{'target'=>'some.host','action'=>nil,'object'=>nil,'status'=>'failure','value'=>{'_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, Layout/LineLength, Layout/SpaceAfterComma
 
     it 'responds to run_shell' do
@@ -174,7 +174,7 @@ RSpec.describe PuppetLitmus::PuppetHelpers do
 
   describe '.bolt_run_script' do
     let(:script) { '/tmp/script.sh' }
-    let(:result) { ['result' => { 'exit_code' => 0, 'stdout' => nil, 'stderr' => nil }] }
+    let(:result) { ['value' => { 'exit_code' => 0, 'stdout' => nil, 'stderr' => nil }] }
 
     it 'responds to bolt_run_script' do
       expect(described_class).to respond_to(:bolt_run_script).with(1..2).arguments
@@ -222,9 +222,9 @@ RSpec.describe PuppetLitmus::PuppetHelpers do
     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, 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}}}}]}
+    let(:result_unstructured_task_success){ [{'target'=>'some.host','action'=>'task','object'=>'testtask::unstructured','status'=>'success','value'=>{'_output'=>'SUCCESS!'}}]}
+    let(:result_structured_task_success){ [{'target'=>'some.host','action'=>'task','object'=>'testtask::structured','status'=>'success','value'=>{'key1'=>'foo','key2'=>'bar'}}]}
+    let(:result_failure) {[{'target'=>'some.host','action'=>'task','object'=>'testtask::unstructured','status'=>'failure','value'=>{'_error'=>{'msg'=>'FAILURE!','kind'=>'puppetlabs.tasks/task-error','details'=>{'exitcode'=>123}}}}]}
     # rubocop:enable Layout/SpaceInsideHashLiteralBraces, Layout/SpaceBeforeBlockBraces, Layout/SpaceInsideBlockBraces, Layout/SpaceAroundOperators, Layout/LineLength, Layout/SpaceAfterComma
 
     it 'responds to bolt_run_task' do

data/spec/lib/puppet_litmus/rake_helper_spec.rb

@@ -102,11 +102,16 @@ RSpec.describe PuppetLitmus::RakeHelper do
     end
     let(:module_tar) { '/tmp/foo.tar.gz' }
     let(:targets) { ['some.host'] }
-    let(:install_module_command) { "puppet module install /tmp/#{File.basename(module_tar)}" }
+    let(:uninstall_module_command) { 'puppet module uninstall foo --force' }
+    let(:install_module_command) { "puppet module install --module_repository 'https://forgeapi.puppetlabs.com' #{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")
+      allow_any_instance_of(BoltSpec::Run).to receive(:upload_file).with(module_tar, module_tar, targets, options: {}, config: nil, inventory: inventory_hash).and_return([])
+      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(JSON.dump({ name: 'foo' }))
+      allow(Open3).to receive(:capture3).with("bundle exec bolt file upload \"#{module_tar}\" /tmp/#{File.basename(module_tar)} --targets all --inventoryfile inventory.yaml")
                                         .and_return(['success', '', 0])
+      allow_any_instance_of(BoltSpec::Run).to receive(:run_command).with(uninstall_module_command, targets, config: nil, inventory: inventory_hash).and_return([])
       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

data/spec/lib/puppet_litmus/rake_tasks_spec.rb

@@ -32,15 +32,17 @@ describe 'litmus rake tasks' do
     let(:dummy_tar) { File.new('spec/data/doot.tar.gz') }
 
     it 'happy path' 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(JSON.dump({ name: 'foo' }))
+
       stub_const('ENV', ENV.to_hash.merge('TARGET_HOST' => 'some.host'))
       expect_any_instance_of(PuppetLitmus::InventoryManipulation).to receive(:inventory_hash_from_inventory_file).and_return(inventory_hash)
       expect(File).to receive(:directory?).with(target_folder).and_return(true)
       expect_any_instance_of(Object).to receive(:build_modules_in_folder).with(target_folder).and_return([dummy_tar])
       expect(STDOUT).to receive(:puts).with('Building')
-      expect(STDOUT).to receive(:puts).with("\nSending")
-      expect_any_instance_of(Object).to receive(:upload_file).once
+      expect_any_instance_of(Object).to receive(:upload_file).once.and_return([])
       expect(STDOUT).to receive(:puts).with("\nInstalling")
-      expect_any_instance_of(Object).to receive(:run_command).once
+      expect_any_instance_of(Object).to receive(:run_command).twice.and_return([])
       Rake::Task['litmus:install_modules_from_directory'].invoke('./spec/fixtures/modules')
     end
   end
@@ -57,12 +59,11 @@ describe 'litmus rake tasks' do
 
   context 'with litmus:provision task' do
     it 'happy path' do
-      results = [{ 'node' => 'localhost',
-                   'target' => 'localhost',
+      results = [{ 'target' => 'localhost',
                    'action' => 'task',
                    'object' => 'provision::docker',
                    'status' => 'success',
-                   'result' => { 'status' => 'ok', 'node_name' => 'localhost:2222' } }]
+                   'value' => { 'status' => 'ok', 'node_name' => 'localhost:2222' } }]
 
       allow(File).to receive(:directory?).with(any_args).and_return(true)
       allow_any_instance_of(BoltSpec::Run).to receive(:run_task).with(any_args).and_return(results)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_litmus
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: 2.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: 2.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: puppet-modulebuilder
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +151,7 @@ files:
 - LICENSE
 - README.md
 - lib/puppet_litmus.rb
+- lib/puppet_litmus/honeycomb_utils.rb
 - lib/puppet_litmus/inventory_manipulation.rb
 - lib/puppet_litmus/puppet_helpers.rb
 - lib/puppet_litmus/rake_helper.rb
@@ -197,10 +198,10 @@ 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/rake_tasks_spec.rb
 - spec/lib/puppet_litmus/util_spec.rb
 - spec/lib/puppet_litmus/version_spec.rb
-- spec/lib/puppet_litmus/puppet_helpers_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/lib/puppet_litmus/rake_tasks_spec.rb
 - spec/spec_helper.rb