puppet_litmus 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 815ccaf832ee6fa876fa73222f64246bf39d1510488cd5c655ea880976e94c32
-  data.tar.gz: 40c94ee82672dd7a48d100d54cdf1091fea06b8b706e69c0382e4dbf5edfdb86
+  metadata.gz: 5910db3eed130389c917cfb64116897400905e1d66851f57e16be04d1070b95a
+  data.tar.gz: 01066623755c8b944f4362c0829fd46e3aaa13866a206fe17c74a19da3ed8143
 SHA512:
-  metadata.gz: 6aa9e819c9d11d3d2f149e29792ee373c715cac86d4f6b2f6620efba1111b27b2fb9756470bed981e3fcf0d9b1897e398390a6dd8215e9d3cced0842311f58bb
-  data.tar.gz: 14fa50906d8122c789d13a380dc245e41da0106c9ee9b1c7993b62b40de2661aa3a700303dcb2f7194756cbb34d3f143b94fb987d620a21cfd31a73bdf243382
+  metadata.gz: 4ce37bbfc92942ee4a50c4cc0831ccd8deac29ec092001c1c82dc3b7a8c57cd1bdb745bb64e224fc0fbc220c458b990b4ea429908a6548a7d18195a63873b3d3
+  data.tar.gz: 49b0a06fdf5772a2ed5104108cc4163b96b6eb500f1bf70259052099ab9231ee7d6b7c56bdfdc3af2708229600eda0c9bd41fb53cf5438db8c5f17309e24728a

data/lib/puppet_litmus.rb

@@ -8,6 +8,7 @@ require 'puppet_litmus/inventory_manipulation'
 require 'puppet_litmus/puppet_helpers'
 require 'puppet_litmus/rake_helper'
 require 'puppet_litmus/spec_helper_acceptance'
+require 'honeycomb-beeline'
 
 # Helper methods for testing puppet content
 module PuppetLitmus
@@ -15,4 +16,23 @@ module PuppetLitmus
   include PuppetLitmus::InventoryManipulation
   include PuppetLitmus::PuppetHelpers
   include PuppetLitmus::RakeHelper
+  Honeycomb.configure do |config|
+  end
+  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'])
+  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'])
+  end
+  at_exit do
+    process_span.send
+  end
 end

data/lib/puppet_litmus/inventory_manipulation.rb

@@ -13,9 +13,11 @@ module PuppetLitmus::InventoryManipulation
                           else
                             inventory_full_path
                           end
-    raise "There is no inventory file at '#{inventory_full_path}'" unless File.exist?(inventory_full_path)
+    raise "There is no inventory file at '#{inventory_full_path}'." unless File.exist?(inventory_full_path)
 
     inventory_hash = YAML.load_file(inventory_full_path)
+    raise "Inventory file is incompatible (version 2 and up). Try the 'bolt project migrate' command." if inventory_hash.dig('version').nil? || (inventory_hash['version'] < 2)
+
     inventory_hash
   end
 
@@ -24,12 +26,13 @@ module PuppetLitmus::InventoryManipulation
   # @return [Hash] inventory.yaml hash containing only an entry for localhost
   def localhost_inventory_hash
     {
+      'version' => 2,
       'groups' => [
         {
           'name' => 'local',
-          'nodes' => [
+          'targets' => [
             {
-              'name' => 'litmus_localhost',
+              'uri' => 'litmus_localhost',
               'config' => { 'transport' => 'local' },
               'feature' => 'puppet-agent',
             },
@@ -45,13 +48,11 @@ 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
-    else
-      targets = [targets]
-    end
+    targets = if targets.nil?
+                inventory_hash.to_s.scan(%r{uri"=>"(\S*)"}).flatten
+              else
+                [targets]
+              end
     targets
   end
 
@@ -66,8 +67,8 @@ module PuppetLitmus::InventoryManipulation
     inventory_hash['groups'].each do |group|
       next unless group['name'] == group_name
 
-      group['nodes'].each do |node|
-        exists = true if node['name'] == node_name
+      group['targets'].each do |node|
+        exists = true if node['uri'] == node_name
       end
     end
     exists
@@ -89,8 +90,8 @@ module PuppetLitmus::InventoryManipulation
   # @return [Hash] config for node of name node_name
   def config_from_node(inventory_hash, node_name)
     inventory_hash['groups'].each do |group|
-      group['nodes'].each do |node|
-        if node['name'] == node_name
+      group['targets'].each do |node|
+        if node['uri'] == node_name
           return node['config']
         end
       end
@@ -105,8 +106,8 @@ module PuppetLitmus::InventoryManipulation
   # @return [Hash] facts for node of name node_name
   def facts_from_node(inventory_hash, node_name)
     inventory_hash['groups'].each do |group|
-      group['nodes'].each do |node|
-        if node['name'] == node_name
+      group['targets'].each do |node|
+        if node['uri'] == node_name
           return node['facts']
         end
       end
@@ -121,8 +122,8 @@ module PuppetLitmus::InventoryManipulation
   # @return [Hash] vars for node of name node_name
   def vars_from_node(inventory_hash, node_name)
     inventory_hash['groups'].each do |group|
-      group['nodes'].each do |node|
-        if node['name'] == node_name
+      group['targets'].each do |node|
+        if node['uri'] == node_name
           return node['vars']
         end
       end
@@ -141,12 +142,12 @@ module PuppetLitmus::InventoryManipulation
     if inventory_hash['groups'].any? { |g| g['name'] == group_name }
       inventory_hash['groups'].each do |group|
         if group['name'] == group_name
-          group['nodes'].push node
+          group['targets'].push node
         end
       end
     else
       # add new group
-      group = { 'name' => group_name, 'nodes' => [node] }
+      group = { 'name' => group_name, 'targets' => [node] }
       inventory_hash['groups'].push group
     end
     inventory_hash
@@ -159,7 +160,7 @@ module PuppetLitmus::InventoryManipulation
   # @return [Hash] inventory_hash with node of node_name removed.
   def remove_node(inventory_hash, node_name)
     inventory_hash['groups'].each do |group|
-      group['nodes'].delete_if { |i| i['name'] == node_name }
+      group['targets'].delete_if { |i| i['uri'] == node_name }
     end
     inventory_hash
   end
@@ -213,13 +214,13 @@ module PuppetLitmus::InventoryManipulation
     group_index = 0
     inventory_hash['groups'].each do |group|
       node_index = 0
-      group['nodes'].each do |node|
-        if node['name'] == node_name
+      group['targets'].each do |node|
+        if node['uri'] == node_name
           if node['features'].nil? == true
             node = node.merge('features' => [])
           end
           node['features'].push feature_name unless node['features'].include?(feature_name)
-          inventory_hash['groups'][group_index]['nodes'][node_index] = node
+          inventory_hash['groups'][group_index]['targets'][node_index] = node
         end
         node_index += 1
       end
@@ -237,8 +238,8 @@ module PuppetLitmus::InventoryManipulation
   # @return [Hash] inventory_hash with feature added to node if node_name exists in inventory hash.
   def remove_feature_from_node(inventory_hash, feature_name, node_name)
     inventory_hash['groups'].each do |group|
-      group['nodes'].each do |node|
-        if node['name'] == node_name && node['features'].nil? != true
+      group['targets'].each do |node|
+        if node['uri'] == node_name && node['features'].nil? != true
           node['features'].delete(feature_name)
         end
       end

data/lib/puppet_litmus/puppet_helpers.rb

@@ -122,19 +122,25 @@ module PuppetLitmus::PuppetHelpers
   # @yieldreturn [Block] this method will yield to a block of code passed by the caller; this can be used for additional validation, etc.
   # @return [Object] A result object from the command.
   def run_shell(command_to_run, opts = {})
-    target_node_name = targeting_localhost? ? 'litmus_localhost' : ENV['TARGET_HOST']
-    inventory_hash = File.exist?('inventory.yaml') ? inventory_hash_from_inventory_file : localhost_inventory_hash
-    raise "Target '#{target_node_name}' not found in inventory.yaml" unless target_in_inventory?(inventory_hash, target_node_name)
-
-    result = run_command(command_to_run, target_node_name, config: nil, inventory: inventory_hash)
-    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?
-    result
+    Honeycomb.start_span(name: 'litmus_runshell') do |span|
+      target_node_name = targeting_localhost? ? 'litmus_localhost' : ENV['TARGET_HOST']
+      inventory_hash = File.exist?('inventory.yaml') ? inventory_hash_from_inventory_file : localhost_inventory_hash
+      raise "Target '#{target_node_name}' not found in inventory.yaml" unless target_in_inventory?(inventory_hash, target_node_name)
+
+      result = run_command(command_to_run, target_node_name, config: nil, inventory: inventory_hash)
+      if result.first['result']['exit_code'] != 0 && opts[:expect_failures] != true
+        span.add_field('litmus_runshellfailure', result)
+        raise "shell failed\n`#{command_to_run}`\n======\n#{result}"
+      end
+
+      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?
+      span.add_field('litmus_runshellsuccess', result)
+      result
+    end
   end
 
   # Copies file to the target, using its respective transport
@@ -145,31 +151,37 @@ module PuppetLitmus::PuppetHelpers
   # @yieldreturn [Block] this method will yield to a block of code passed by the caller; this can be used for additional validation, etc.
   # @return [Object] A result object from the command.
   def bolt_upload_file(source, destination, opts = {}, options = {})
-    target_node_name = targeting_localhost? ? 'litmus_localhost' : ENV['TARGET_HOST']
-    inventory_hash = File.exist?('inventory.yaml') ? inventory_hash_from_inventory_file : localhost_inventory_hash
-    raise "Target '#{target_node_name}' not found in inventory.yaml" unless target_in_inventory?(inventory_hash, target_node_name)
-
-    result = upload_file(source, destination, target_node_name, options: options, config: nil, inventory: inventory_hash)
-
-    result_obj = {
-      exit_code: 0,
-      stdout: result.first['result']['_output'],
-      stderr: nil,
-      result: result.first['result'],
-    }
-
-    if result.first['status'] != 'success'
-      raise "upload file failed\n======\n#{result}" if opts[:expect_failures] != true
-
-      result_obj[:exit_code] = 255
-      result_obj[:stderr]    = result.first['result']['_error']['msg']
+    Honeycomb.start_span(name: 'litmus_uploadfile') do |span|
+      target_node_name = targeting_localhost? ? 'litmus_localhost' : ENV['TARGET_HOST']
+      inventory_hash = File.exist?('inventory.yaml') ? inventory_hash_from_inventory_file : localhost_inventory_hash
+      raise "Target '#{target_node_name}' not found in inventory.yaml" unless target_in_inventory?(inventory_hash, target_node_name)
+
+      result = upload_file(source, destination, target_node_name, options: options, config: nil, inventory: inventory_hash)
+
+      result_obj = {
+        exit_code: 0,
+        stdout: result.first['result']['_output'],
+        stderr: nil,
+        result: result.first['result'],
+      }
+
+      if result.first['status'] != 'success'
+        if opts[:expect_failures] != true
+          span.add_field('litmus_uploadfilefailure', result)
+          raise "upload file failed\n======\n#{result}"
+        end
+
+        result_obj[:exit_code] = 255
+        result_obj[:stderr]    = result.first['result']['_error']['msg']
+      end
+
+      result = OpenStruct.new(exit_code: result_obj[:exit_code],
+                              stdout: result_obj[:stdout],
+                              stderr: result_obj[:stderr])
+      yield result if block_given?
+      span.add_field('litmus_uploadfilesucess', result)
+      result
     end
-
-    result = OpenStruct.new(exit_code: result_obj[:exit_code],
-                            stdout: result_obj[:stdout],
-                            stderr: result_obj[:stderr])
-    yield result if block_given?
-    result
   end
 
   # rubocop:disable Layout/TrailingWhitespace
@@ -184,50 +196,56 @@ module PuppetLitmus::PuppetHelpers
   # @return [Object] A result object from the task.The values available are stdout, stderr and result.
   # rubocop:enable Layout/TrailingWhitespace
   def run_bolt_task(task_name, params = {}, opts = {})
-    config_data = { 'modulepath' => File.join(Dir.pwd, 'spec', 'fixtures', 'modules') }
-    target_node_name = targeting_localhost? ? 'litmus_localhost' : ENV['TARGET_HOST']
-    inventory_hash = if !opts[:inventory_file].nil? && File.exist?(opts[:inventory_file])
-                       inventory_hash_from_inventory_file(opts[:inventory_file])
-                     elsif File.exist?('inventory.yaml')
-                       inventory_hash_from_inventory_file('inventory.yaml')
-                     else
-                       localhost_inventory_hash
-                     end
-    raise "Target '#{target_node_name}' not found in inventory.yaml" unless target_in_inventory?(inventory_hash, target_node_name)
-
-    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: result.first['result'],
-    }
-
-    if result.first['status'] == 'success'
-      # stdout returns unstructured data if structured data is not available
-      result_obj[:stdout] = if result.first['result']['_output'].nil?
-                              result.first['result'].to_s
-                            else
-                              result.first['result']['_output']
-                            end
-
-    else
-      raise "task failed\n`#{task_name}`\n======\n#{result}" if opts[:expect_failures] != true
-
-      result_obj[:exit_code] = if result.first['result']['_error']['details'].nil?
-                                 255
-                               else
-                                 result.first['result']['_error']['details'].fetch('exitcode', 255)
-                               end
-      result_obj[:stderr]    = result.first['result']['_error']['msg']
+    Honeycomb.start_span(name: 'litmus_runtask') do |span|
+      config_data = { 'modulepath' => File.join(Dir.pwd, 'spec', 'fixtures', 'modules') }
+      target_node_name = targeting_localhost? ? 'litmus_localhost' : ENV['TARGET_HOST']
+      inventory_hash = if !opts[:inventory_file].nil? && File.exist?(opts[:inventory_file])
+                         inventory_hash_from_inventory_file(opts[:inventory_file])
+                       elsif File.exist?('inventory.yaml')
+                         inventory_hash_from_inventory_file('inventory.yaml')
+                       else
+                         localhost_inventory_hash
+                       end
+      raise "Target '#{target_node_name}' not found in inventory.yaml" unless target_in_inventory?(inventory_hash, target_node_name)
+
+      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: result.first['result'],
+      }
+
+      if result.first['status'] == 'success'
+        # stdout returns unstructured data if structured data is not available
+        result_obj[:stdout] = if result.first['result']['_output'].nil?
+                                result.first['result'].to_s
+                              else
+                                result.first['result']['_output']
+                              end
+
+      else
+        if opts[:expect_failures] != true
+          span.add_field('litmus_runtaskfailure', result)
+          raise "task failed\n`#{task_name}`\n======\n#{result}"
+        end
+
+        result_obj[:exit_code] = if result.first['result']['_error']['details'].nil?
+                                   255
+                                 else
+                                   result.first['result']['_error']['details'].fetch('exitcode', 255)
+                                 end
+        result_obj[:stderr]    = result.first['result']['_error']['msg']
+      end
+
+      result = OpenStruct.new(exit_code: result_obj[:exit_code],
+                              stdout: result_obj[:stdout],
+                              stderr: result_obj[:stderr],
+                              result: result_obj[:result])
+      yield result if block_given?
+      span.add_field('litmus_runtasksuccess', result)
+      result
     end
-
-    result = OpenStruct.new(exit_code: result_obj[:exit_code],
-                            stdout: result_obj[:stdout],
-                            stderr: result_obj[:stderr],
-                            result: result_obj[:result])
-    yield result if block_given?
-    result
   end
 
   # Runs a script against the target system.
@@ -238,19 +256,25 @@ module PuppetLitmus::PuppetHelpers
   # @yieldreturn [Block] this method will yield to a block of code passed by the caller; this can be used for additional validation, etc.
   # @return [Object] A result object from the script run.
   def bolt_run_script(script, opts = {}, arguments: [])
-    target_node_name = targeting_localhost? ? 'litmus_localhost' : ENV['TARGET_HOST']
-    inventory_hash = File.exist?('inventory.yaml') ? inventory_hash_from_inventory_file : localhost_inventory_hash
-    raise "Target '#{target_node_name}' not found in inventory.yaml" unless target_in_inventory?(inventory_hash, target_node_name)
-
-    result = run_script(script, target_node_name, arguments, options: opts, config: nil, inventory: inventory_hash)
-
-    raise "script run failed\n`#{script}`\n======\n#{result}" if result.first['result']['exit_code'] != 0 && opts[:expect_failures] != true
-
-    result = OpenStruct.new(exit_code: result.first['result']['exit_code'],
-                            stdout: result.first['result']['stdout'],
-                            stderr: result.first['result']['stderr'])
-    yield result if block_given?
-    result
+    Honeycomb.start_span(name: 'litmus_runscript') do |span|
+      target_node_name = targeting_localhost? ? 'litmus_localhost' : ENV['TARGET_HOST']
+      inventory_hash = File.exist?('inventory.yaml') ? inventory_hash_from_inventory_file : localhost_inventory_hash
+      raise "Target '#{target_node_name}' not found in inventory.yaml" unless target_in_inventory?(inventory_hash, target_node_name)
+
+      result = run_script(script, target_node_name, arguments, options: opts, config: nil, inventory: inventory_hash)
+
+      if result.first['result']['exit_code'] != 0 && opts[:expect_failures] != true
+        span.add_field('litmus_runscriptfailure', result)
+        raise "script run failed\n`#{script}`\n======\n#{result}"
+      end
+
+      result = OpenStruct.new(exit_code: result.first['result']['exit_code'],
+                              stdout: result.first['result']['stdout'],
+                              stderr: result.first['result']['stderr'])
+      yield result if block_given?
+      span.add_field('litmus_runscriptsuccess', result)
+      result
+    end
   end
 
   # Determines if the current execution is targeting localhost or not

data/lib/puppet_litmus/rake_helper.rb

@@ -150,7 +150,8 @@ module PuppetLitmus::RakeHelper
              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)
+    # 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)
   end
 
   def configure_path(inventory_hash)

data/lib/puppet_litmus/rake_tasks.rb

@@ -135,6 +135,33 @@ namespace :litmus do
     end
   end
 
+  # Add a given feature to a selection of nodes
+  #
+  # @param :target_node_name [Array] nodes on which to add the feature.
+  # @param :added_feature [String] the feature which you wish to add.
+  desc 'add_feature, [:added_feature, :target_node_name]'
+  task :add_feature, [:added_feature, :target_node_name] do |_task, args|
+    inventory_hash = inventory_hash_from_inventory_file
+    targets = find_targets(inventory_hash, args[:target_node_name])
+    if targets.empty?
+      puts 'No targets found'
+      exit 0
+    end
+    if args[:added_feature].nil? || args[:added_feature] == ''
+      puts 'No feature given'
+      exit 0
+    end
+    puts 'add_feature'
+
+    targets.each do |target|
+      inventory_hash = add_feature_to_node(inventory_hash, args[:added_feature], target)
+    end
+
+    write_to_inventory_file(inventory_hash, 'inventory.yaml')
+
+    puts 'Feature added'
+  end
+
   # Install the puppet modules from a source directory to nodes. It does not install dependencies.
   #
   # @param :source [String] source directory to look in (ignores symlinks) defaults do './spec/fixtures/modules'.
@@ -400,6 +427,7 @@ namespace :litmus do
     host = 'localhost'
     RSpec::Core::RakeTask.new(host.to_sym) do |t|
       t.pattern = 'spec/acceptance/**{,/*/**}/*_spec.rb'
+      Rake::Task['spec_prep'].invoke
       ENV['TARGET_HOST'] = host
     end
   end

data/lib/puppet_litmus/version.rb

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

data/spec/data/inventory.yaml

@@ -1,8 +1,8 @@
 ---
 groups:
 - name: ssh_nodes
-  nodes:
-  - name: test.delivery.puppetlabs.net
+  targets:
+  - uri: test.delivery.puppetlabs.net
     config:
       transport: ssh
       ssh:
@@ -13,4 +13,4 @@ groups:
       provisioner: vmpooler
       platform: centos-5-x86_64
 - name: winrm_nodes
-  nodes: []
+  targets: []

data/spec/data/jim.yaml

@@ -1,8 +1,8 @@
 ---
 groups:
 - name: ssh_nodes
-  nodes:
-  - name: test.delivery.puppetlabs.net
+  targets:
+  - uri: test.delivery.puppetlabs.net
     config:
       transport: ssh
       ssh:

data/spec/lib/puppet_litmus/inventory_manipulation_spec.rb

@@ -9,27 +9,27 @@ RSpec.describe PuppetLitmus::InventoryManipulation do
     let(:no_config_hash) do
       { 'groups' =>
   [{ 'name' => 'ssh_nodes',
-     'nodes' =>
-     [{ 'name' => 'test.delivery.puppetlabs.net',
+     'targets' =>
+     [{ 'uri' => 'test.delivery.puppetlabs.net',
         'facts' => { 'provisioner' => 'vmpooler', 'platform' => 'centos-5-x86_64' } }] },
-   { 'name' => 'winrm_nodes', 'nodes' => [] }] }
+   { 'name' => 'winrm_nodes', 'targets' => [] }] }
     end
 
     let(:no_docker_hash) do
       { 'groups' =>
-        [{ 'name' => 'ssh_nodes', 'nodes' => [] },
-         { 'name' => 'winrm_nodes', 'nodes' => [] }] }
+        [{ 'name' => 'ssh_nodes', 'targets' => [] },
+         { 'name' => 'winrm_nodes', 'targets' => [] }] }
     end
 
     let(:config_hash) do
       { 'groups' =>
   [{ 'name' => 'ssh_nodes',
-     'nodes' =>
-     [{ 'name' => 'test.delivery.puppetlabs.net',
+     'targets' =>
+     [{ 'uri' => 'test.delivery.puppetlabs.net',
         'config' => { 'transport' => 'ssh', 'ssh' => { 'user' => 'root', 'password' => 'Qu@lity!', 'host-key-check' => false } },
         'facts' => { 'provisioner' => 'vmpooler', 'platform' => 'centos-5-x86_64' },
         'vars' => { 'role' => 'agent' } }] },
-   { 'name' => 'winrm_nodes', 'nodes' => [] }] }
+   { 'name' => 'winrm_nodes', 'targets' => [] }] }
     end
 
     let(:inventory_full_path) { 'spec/data/inventory.yaml' }
@@ -37,59 +37,59 @@ RSpec.describe PuppetLitmus::InventoryManipulation do
     let(:no_feature_hash) do
       { 'groups' =>
   [{ 'name' => 'ssh_nodes',
-     'nodes' =>
-     [{ 'name' => 'test.delivery.puppetlabs.net',
+     'targets' =>
+     [{ 'uri' => 'test.delivery.puppetlabs.net',
         'config' => { 'transport' => 'ssh', 'ssh' => { 'user' => 'root', 'password' => 'Qu@lity!', 'host-key-check' => false } },
         'facts' => { 'provisioner' => 'vmpooler', 'platform' => 'centos-5-x86_64' } }] },
-   { 'name' => 'winrm_nodes', 'nodes' => [] }] }
+   { 'name' => 'winrm_nodes', 'targets' => [] }] }
     end
 
     let(:feature_hash_group) do
       { 'groups' =>
   [{ 'name' => 'ssh_nodes',
-     'nodes' =>
-     [{ 'name' => 'test.delivery.puppetlabs.net',
+     'targets' =>
+     [{ 'uri' => 'test.delivery.puppetlabs.net',
         'config' => { 'transport' => 'ssh', 'ssh' => { 'user' => 'root', 'password' => 'Qu@lity!', 'host-key-check' => false } },
         'facts' => { 'provisioner' => 'vmpooler', 'platform' => 'centos-5-x86_64' } }],
      'features' => ['puppet-agent'] },
-   { 'name' => 'winrm_nodes', 'nodes' => [] }] }
+   { 'name' => 'winrm_nodes', 'targets' => [] }] }
     end
 
     let(:empty_feature_hash_group) do
       { 'groups' =>
   [{ 'name' => 'ssh_nodes',
-     'nodes' =>
-     [{ 'name' => 'test.delivery.puppetlabs.net',
+     'targets' =>
+     [{ 'uri' => 'test.delivery.puppetlabs.net',
         'config' => { 'transport' => 'ssh', 'ssh' => { 'user' => 'root', 'password' => 'Qu@lity!', 'host-key-check' => false } },
         'facts' => { 'provisioner' => 'vmpooler', 'platform' => 'centos-5-x86_64' } }],
      'features' => [] },
-   { 'name' => 'winrm_nodes', 'nodes' => [] }] }
+   { 'name' => 'winrm_nodes', 'targets' => [] }] }
     end
 
     let(:feature_hash_node) do
       { 'groups' =>
   [{ 'name' => 'ssh_nodes',
-     'nodes' =>
-     [{ 'name' => 'test.delivery.puppetlabs.net',
+     'targets' =>
+     [{ 'uri' => 'test.delivery.puppetlabs.net',
         'config' => { 'transport' => 'ssh', 'ssh' => { 'user' => 'root', 'password' => 'Qu@lity!', 'host-key-check' => false } },
         'facts' => { 'provisioner' => 'vmpooler', 'platform' => 'centos-5-x86_64' },
         'features' => ['puppet-agent'] }] },
-   { 'name' => 'winrm_nodes', 'nodes' => [] }] }
+   { 'name' => 'winrm_nodes', 'targets' => [] }] }
     end
 
     let(:empty_feature_hash_node) do
       { 'groups' =>
   [{ 'name' => 'ssh_nodes',
-     'nodes' =>
-     [{ 'name' => 'test.delivery.puppetlabs.net',
+     'targets' =>
+     [{ 'uri' => 'test.delivery.puppetlabs.net',
         'config' => { 'transport' => 'ssh', 'ssh' => { 'user' => 'root', 'password' => 'Qu@lity!', 'host-key-check' => false } },
         'facts' => { 'provisioner' => 'vmpooler', 'platform' => 'centos-5-x86_64' },
         'features' => [] }] },
-   { 'name' => 'winrm_nodes', 'nodes' => [] }] }
+   { 'name' => 'winrm_nodes', 'targets' => [] }] }
     end
 
     let(:foo_node) do
-      { 'name' => 'foo',
+      { 'uri' => 'foo',
         'facts' => { 'provisioner' => 'bar', 'platform' => 'ubuntu' } }
     end
 
@@ -115,11 +115,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', 'nodes' => [{ 'config' => { 'ssh' => { 'host-key-check' => false, 'password' => 'Qu@lity!', 'user' => 'root' }, 'transport' => 'ssh' }, 'facts' => { 'platform' => 'centos-5-x86_64', 'provisioner' => 'vmpooler' }, 'name' => 'test.delivery.puppetlabs.net' }] }, { 'name' => 'winrm_nodes', 'nodes' => [] }]) # 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 Metrics/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', 'nodes' => [{ 'config' => { 'ssh' => { 'host-key-check' => false, 'password' => 'Qu@lity!', 'user' => 'root' }, 'transport' => 'ssh' }, 'facts' => { 'platform' => 'centos-5-x86_64', 'provisioner' => 'vmpooler' }, 'name' => 'test.delivery.puppetlabs.net' }] }, { 'name' => 'winrm_nodes', 'nodes' => [] }]) # 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 Metrics/LineLength: Line is too long
     end
 
     it 'write from inventory_hash to inventory_yaml file feature_hash_group' do
@@ -127,15 +127,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', 'nodes' => [{ 'config' => { 'ssh' => { 'host-key-check' => false, 'password' => 'Qu@lity!', 'user' => 'root' }, 'transport' => 'ssh' }, 'facts' => { 'platform' => 'centos-5-x86_64', 'provisioner' => 'vmpooler' }, 'name' => 'test.delivery.puppetlabs.net' }] }, { 'name' => 'winrm_nodes', 'nodes' => [] }]) # 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 Metrics/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', 'nodes' => [{ 'config' => { 'ssh' => { 'host-key-check' => false, 'password' => 'Qu@lity!', 'user' => 'root' }, 'transport' => 'ssh' }, 'facts' => { 'platform' => 'centos-5-x86_64', 'provisioner' => 'vmpooler' }, 'name' => 'test.delivery.puppetlabs.net', 'features' => ['puppet-agent'] }] }, { 'name' => 'winrm_nodes', 'nodes' => [] }]) # 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 Metrics/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', 'nodes' => [{ 'config' => { 'ssh' => { 'host-key-check' => false, 'password' => 'Qu@lity!', 'user' => 'root' }, 'transport' => 'ssh' }, 'facts' => { 'platform' => 'centos-5-x86_64', 'provisioner' => 'vmpooler' }, 'name' => 'test.delivery.puppetlabs.net', 'features' => [] }] }, { 'name' => 'winrm_nodes', 'nodes' => [] }]) # 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 Metrics/LineLength: Line is too long
     end
 
     it 'write from inventory_hash to inventory_yaml file feature_hash_node' do
@@ -143,7 +143,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', 'nodes' => [{ 'config' => { 'ssh' => { 'host-key-check' => false, 'password' => 'Qu@lity!', 'user' => 'root' }, 'transport' => 'ssh' }, 'facts' => { 'platform' => 'centos-5-x86_64', 'provisioner' => 'vmpooler' }, 'name' => 'test.delivery.puppetlabs.net', 'features' => ['puppet-agent'] }] }, { 'name' => 'winrm_nodes', 'nodes' => [] }]) # 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 Metrics/LineLength: Line is too long
     end
 
     it 'write from inventory_hash to inventory_yaml file no feature_hash' do
@@ -153,12 +153,12 @@ RSpec.describe PuppetLitmus::InventoryManipulation do
 
     it 'group does not exist in inventory, and returns hash with group added' do
       expect(described_class.add_node_to_group(no_docker_hash, foo_node, 'docker_nodes')).to eq('groups' =>
-        [{ 'name' => 'ssh_nodes', 'nodes' => [] }, { 'name' => 'winrm_nodes', 'nodes' => [] }, { 'name' => 'docker_nodes', 'nodes' => [foo_node] }])
+        [{ 'name' => 'ssh_nodes', 'targets' => [] }, { 'name' => 'winrm_nodes', 'targets' => [] }, { 'name' => 'docker_nodes', 'targets' => [foo_node] }])
     end
 
     it 'group exists in inventory, and returns hash with node added' do
       expect(described_class.add_node_to_group(no_docker_hash, foo_node, 'ssh_nodes')).to eq('groups' =>
-        [{ 'name' => 'ssh_nodes', 'nodes' => [foo_node] }, { 'name' => 'winrm_nodes', 'nodes' => [] }])
+        [{ 'name' => 'ssh_nodes', 'targets' => [foo_node] }, { 'name' => 'winrm_nodes', 'targets' => [] }])
     end
   end
 end

data/spec/lib/puppet_litmus/rake_helper_spec.rb

@@ -31,8 +31,8 @@ RSpec.describe PuppetLitmus::RakeHelper do
   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' } }] }] }
+        [{ 'name' => 'ssh_nodes', 'targets' =>
+          [{ 'uri' => '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 } }
@@ -47,8 +47,8 @@ RSpec.describe PuppetLitmus::RakeHelper do
   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' } }] }] }
+        [{ 'name' => 'ssh_nodes', 'targets' =>
+          [{ 'uri' => 'some.host', 'facts' => { 'provisioner' => 'docker', 'container_name' => 'foo', 'platform' => 'some.host' } }] }] }
     end
     let(:targets) { ['some.host'] }
     let(:params) { { 'collection' => 'puppet6' } }
@@ -62,9 +62,10 @@ RSpec.describe PuppetLitmus::RakeHelper do
 
   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' } }] }] }
+      { 'version' => 2,
+        'groups' =>
+        [{ 'name' => 'ssh_nodes', 'targets' =>
+          [{ 'uri' => 'some.host', 'facts' => { 'provisioner' => 'docker', 'container_name' => 'foo', 'platform' => 'some.host' } }] }] }
     end
     let(:module_tar) { '/tmp/foo.tar.gz' }
     let(:targets) { ['some.host'] }
@@ -81,8 +82,8 @@ RSpec.describe PuppetLitmus::RakeHelper do
   context 'with check_connectivity' do
     let(:inventory_hash) do
       { 'groups' =>
-        [{ 'name' => 'ssh_nodes', 'nodes' =>
-          [{ 'name' => 'some.host', 'facts' => { 'provisioner' => 'docker', 'container_name' => 'foo', 'platform' => 'some.host' } }] }] }
+        [{ 'name' => 'ssh_nodes', 'targets' =>
+          [{ 'uri' => 'some.host', 'facts' => { 'provisioner' => 'docker', 'container_name' => 'foo', 'platform' => 'some.host' } }] }] }
     end
     let(:targets) { ['some.host'] }
     let(:command) { 'cd .' }
@@ -102,8 +103,8 @@ RSpec.describe PuppetLitmus::RakeHelper do
   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' } }] }] }
+        [{ 'name' => 'ssh_nodes', 'targets' =>
+          [{ 'uri' => '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' }

data/spec/lib/puppet_litmus/rake_tasks_spec.rb

@@ -2,6 +2,8 @@
 
 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__)
@@ -27,7 +29,7 @@ describe 'litmus rake tasks' do
   end
 
   context 'with litmus:install_modules_from_directory' do
-    let(:inventory_hash) { { 'groups' => [{ 'name' => 'ssh_nodes', 'nodes' => [{ 'name' => 'some.host' }] }] } }
+    let(:inventory_hash) { { 'groups' => [{ 'name' => 'ssh_nodes', 'nodes' => [{ 'uri' => 'some.host' }] }] } }
     let(:target_folder) { File.join(Dir.pwd, 'spec/fixtures/modules') }
     let(:dummy_tar) { File.new('spec/data/doot.tar.gz') }
 
@@ -47,10 +49,10 @@ describe 'litmus rake tasks' do
 
   context 'with litmus:provision_install task' do
     it 'happy path' do
-      expect(Rake::Task['spec_prep']).to receive(:invoke).and_return('').once
-      expect(Rake::Task['litmus:provision_list']).to receive(:invoke).with('default').once
-      expect(Rake::Task['litmus:install_agent']).to receive(:invoke).with('puppet6').once
-      expect(Rake::Task['litmus:install_module']).to receive(:invoke).once
+      expect(Rake::Task['spec_prep']).to receive(:invoke).and_return('')
+      expect(Rake::Task['litmus:provision_list']).to receive(:invoke).with('default')
+      expect(Rake::Task['litmus:install_agent']).to receive(:invoke).with('puppet6')
+      expect(Rake::Task['litmus:install_module']).to receive(:invoke)
       Rake::Task['litmus:provision_install'].invoke('default', 'puppet6')
     end
   end
@@ -92,4 +94,12 @@ describe 'litmus rake tasks' do
       Rake::Task['litmus:check_connectivity'].invoke
     end
   end
+
+  context 'with litmus:acceptance:localhost task' do
+    it 'calls spec_prep' do
+      expect(Rake::Task['spec_prep']).to receive(:invoke).and_return('')
+      expect_any_instance_of(RSpec::Core::RakeTask).to receive(:run_task)
+      Rake::Task['litmus:acceptance:localhost'].invoke
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_litmus
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-23 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt
@@ -118,6 +118,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: honeycomb-beeline
+  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:
@@ -163,19 +177,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.6
 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/spec_helper.rb
-- spec/lib/puppet_litmus/rake_tasks_spec.rb
-- spec/lib/puppet_litmus/version_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
+- 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