puppet_litmus 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e28609c91d2a3572a4e72292212b249ad05690a9c8df799a832ceda621ced3d2
-  data.tar.gz: ec4d39bc2171fbb5d7c507cda0ce88df42e1d33cde941261b41a9772dd632abf
+  metadata.gz: 41776234e4a62f7965314cc8c40d33a91ae86c5718a3af4dc3041713c53b86f0
+  data.tar.gz: a7060ae471bc8f197fc33af71a65bb5dd11cae2d54d139fb607c4e632c6c9590
 SHA512:
-  metadata.gz: 3590e1b153740eea1cfe08ace021e58c48f9052a779ad26b74d99339e98a503054408aecd524f309672dd98dc8e93314239bef45d28e5b8c7f3f9ceca69df232
-  data.tar.gz: 54f137a0a8e21870ccda10bc2a076bfe1bd2f49899729cd0d740ee9e74397aa2d5592e7bec3e1fa378b4943c847407da461f5ae27b8997ced60e426e85bfa1d0
+  metadata.gz: ff8a621cb6df184f8b30af5083fd1eefc945986ae2620df2cc62a8168bf2bee601ce093bbe41baa2ae922bd7796588a3be33413093ba003e1f8b39f72fee1ac0
+  data.tar.gz: 4533bda3c00d1e45463ed4c4f52d90e719610f7895ace22d7b8f2d5d24f4c0407a0280d874dbb554d769e97d06f32e506d1a8a9b1faddde6bb85269417a114e9

data/lib/puppet_litmus/inventory_manipulation.rb

@@ -30,6 +30,7 @@ module PuppetLitmus::InventoryManipulation
             {
               'name' => 'litmus_localhost',
               'config' => { 'transport' => 'local' },
+              'feature' => 'puppet-agent',
             },
           ],
         },

data/lib/puppet_litmus/puppet_helpers.rb

@@ -24,10 +24,10 @@ module PuppetLitmus::PuppetHelpers
   #
   # @param manifest [String] puppet manifest code to be applied.
   # @param opts [Hash] Alters the behaviour of the command. Valid options are:  
-  #  :catch_changes [Boolean] (false) We're after idempotency so allow exit code 0 only.
-  #  :expect_changes [Boolean] (false) We're after changes specifically so allow exit code 2 only.
-  #  :catch_failures [Boolean] (false) We're after only complete success so allow exit codes 0 and 2 only.
-  #  :expect_failures [Boolean] (false) We're after failures specifically so allow exit codes 1, 4, and 6 only.
+  #  :catch_changes [Boolean] (false) We're after idempotency so allow exit code 0 only.  
+  #  :expect_changes [Boolean] (false) We're after changes specifically so allow exit code 2 only.  
+  #  :catch_failures [Boolean] (false) We're after only complete success so allow exit codes 0 and 2 only.  
+  #  :expect_failures [Boolean] (false) We're after failures specifically so allow exit codes 1, 4, and 6 only.  
   #  :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'".  
@@ -171,16 +171,27 @@ module PuppetLitmus::PuppetHelpers
     result
   end
 
+  # rubocop:disable Layout/TrailingWhitespace
+
   # Runs a task against the target system.
   #
   # @param task_name [String] The name of the task to run.
   # @param params [Hash] key : value pairs to be passed to the task.
-  # @param opts [Hash] Alters the behaviour of the command. Valid options are :expect_failures [Boolean] doesnt return an exit code of non-zero if the command failed.
+  # @param opts [Hash] Alters the behaviour of the command. Valid options are  
+  #  :expect_failures [Boolean] doesnt return an exit code of non-zero if the command failed.  
+  #  :inventory_file [String] path to the inventory file to use with the task.
   # @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 = File.exist?('inventory.yaml') ? inventory_hash_from_inventory_file : localhost_inventory_hash
+    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)

data/lib/puppet_litmus/rake_tasks.rb

@@ -208,14 +208,20 @@ namespace :litmus do
       if result['status'] != 'success'
         command_to_run = "bolt task run puppet_agent::install --targets #{result['node']} --inventoryfile inventory.yaml --modulepath #{config_data['modulepath']}"
         raise "Failed on #{result['node']}\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'])
       end
     end
+    # update the inventory with the puppet-agent feature set per node
+    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.each do |result|
       if result['status'] != 'success'
         puts "Failed on #{result['node']}\n#{result}"

data/lib/puppet_litmus/version.rb

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

data/spec/data/jim.yaml

@@ -0,0 +1,16 @@
+---
+groups:
+- name: ssh_nodes
+  nodes:
+  - name: 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: []

data/spec/lib/puppet_litmus/puppet_helpers_spec.rb

@@ -249,6 +249,15 @@ RSpec.describe PuppetLitmus::PuppetHelpers do
         expect { described_class.run_bolt_task(task_name, params, opts: {}) }.not_to raise_error
       end
 
+      it 'does bolt_task_run gives no runtime error for success, for a named inventory file' do
+        stub_const('ENV', ENV.to_hash.merge('TARGET_HOST' => 'some.host'))
+        expect(File).to receive(:exist?).with('jim.yaml').and_return(true)
+        expect(described_class).to receive(:inventory_hash_from_inventory_file).and_return(inventory_hash)
+        expect(described_class).to receive(:target_in_inventory?).and_return(true)
+        expect(described_class).to receive(:run_task).with(task_name, 'some.host', params, config: config_data, inventory: inventory_hash).and_return(result_unstructured_task_success)
+        expect { described_class.run_bolt_task(task_name, params, inventory_file: 'jim.yaml') }.not_to raise_error
+      end
+
       it 'returns stdout for unstructured-data tasks' do
         stub_const('ENV', ENV.to_hash.merge('TARGET_HOST' => 'some.host'))
         expect(File).to receive(:exist?).with('inventory.yaml').and_return(true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_litmus
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt
@@ -107,6 +107,7 @@ files:
 - 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_tasks_spec.rb
@@ -131,17 +132,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.4
 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/puppet_helpers_spec.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_tasks_spec.rb
+- spec/lib/puppet_litmus/version_spec.rb
+- spec/spec_helper.rb