puppet_litmus 0.34.0 → 0.34.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffcc48362a02c3dd7edf9442e5c634ef198b0d5f8696458861a1b07b7517e28f
-  data.tar.gz: 77a3d7bda3ff1d2aaba2f43a11461cbcd07dbd6ff3a7c6524e001cc5eca546d7
+  metadata.gz: ec60ae7ab88bc74fccfa22c04a83a89fbabaeab56885811babafcc33ec7aa122
+  data.tar.gz: b60bab49299dec0ec5e6652c4535baf63196cb896680aa637eba98204ea4ac73
 SHA512:
-  metadata.gz: 91b863007d464fb53ff0527b23ca3cd97a1a6b8bfa2599297edc83e5c18e4f2cc515a99c818ceddce967a84403d1f273528f58198cc88b2028686780268eb384
-  data.tar.gz: fa3dd45230cc63f00d7c82e66413ec413cefc86892c7fb518cbffbb5a635ec0ec298a3bb220dd238868eba09ec54092660410197ce7b0dd1af56a225c29bcc44
+  metadata.gz: 79d7c7fd85e94e2e040ca489bae950a2385fc30b7986a3800fc25b4bc29c0d3fb0f1b46b5bb9d02b5d86234dd52ae5cf0a9d79ea60e734d854848a29fa485be9
+  data.tar.gz: 2b67b3847d438a69c6a6518684365ad135b3c59a74ff3227de30dd6d9544a5e124a43855d52e4b88974d09652ae11bae8884e871431eec605e76decf257e50d0

data/README.md

@@ -48,7 +48,7 @@ In order to use this new functionality just simply run:
 
 ## Documentation
 
-For documentation, see our [Litmus Docs Site](https://puppetlabs.github.io/litmus/).
+For documentation, see our [Litmus Docs Site](https://puppetlabs.github.io/content-and-tooling-team/docs/litmus/).
 
 ## Other Resources
 

data/lib/puppet_litmus/rake_tasks.rb

@@ -336,104 +336,109 @@ namespace :litmus do
 
   namespace :acceptance do
     require 'rspec/core/rake_task'
-    if File.file?('spec/fixtures/litmus_inventory.yaml')
+
+    # Run acceptance tests against all machines in the inventory file in parallel.
+    desc 'Run tests in parallel against all machines in the inventory file'
+    task :parallel, [:tag] do |_task, args|
+      args.with_defaults(tag: nil)
+
       inventory_hash = inventory_hash_from_inventory_file
       targets = find_targets(inventory_hash, nil)
 
-      # Run acceptance tests against all machines in the inventory file in parallel.
-      desc 'Run tests in parallel against all machines in the inventory file'
-      task :parallel, [:tag] do |_task, args|
-        args.with_defaults(tag: nil)
-        if targets.empty?
-          puts 'No targets found'
-          exit 0
-        end
-        tag_value = if args[:tag].nil?
-                      nil
-                    else
-                      "--tag #{args[:tag]}"
-                    end
-        payloads = []
-        # Generate list of targets to provision
-        targets.each do |target|
-          test = "bundle exec rspec ./spec/acceptance #{tag_value} --format progress --require rspec_honeycomb_formatter --format RSpecHoneycombFormatter"
-          title = "#{target}, #{facts_from_node(inventory_hash, target)['platform']}"
-          options = {
-            env: {
-              'TARGET_HOST' => target,
-            },
-          }
-          payloads << [title, test, options]
-        end
+      if targets.empty?
+        puts 'No targets found'
+        exit 0
+      end
+      tag_value = if args[:tag].nil?
+                    nil
+                  else
+                    "--tag #{args[:tag]}"
+                  end
+      payloads = []
+      # Generate list of targets to provision
+      targets.each do |target|
+        test = "bundle exec rspec ./spec/acceptance #{tag_value} --format progress --require rspec_honeycomb_formatter --format RSpecHoneycombFormatter"
+        title = "#{target}, #{facts_from_node(inventory_hash, target)['platform']}"
+        options = {
+          env: {
+            'TARGET_HOST' => target,
+          },
+        }
+        payloads << [title, test, options]
+      end
 
-        results = []
-        success_list = []
-        failure_list = []
-        # Provision targets depending on what environment we're in
-        if ENV['CI'] == 'true'
-          # CI systems are strange beasts, we only output a '.' every wee while to keep the terminal alive.
-          puts "Running against #{targets.size} targets.\n"
-          progress = Thread.new do
-            loop do
-              printf '.'
-              sleep(10)
-            end
+      results = []
+      success_list = []
+      failure_list = []
+      # Provision targets depending on what environment we're in
+      if ENV['CI'] == 'true'
+        # CI systems are strange beasts, we only output a '.' every wee while to keep the terminal alive.
+        puts "Running against #{targets.size} targets.\n"
+        progress = Thread.new do
+          loop do
+            printf '.'
+            sleep(10)
           end
+        end
 
-          require 'parallel'
-          results = Parallel.map(payloads) do |title, test, options|
-            # avoid sending the parent process' main span in the sub-processes
-            # https://www.ruby-forum.com/t/at-exit-inherited-across-fork/122473/2
-            at_exit { exit! }
+        require 'parallel'
+        results = Parallel.map(payloads) do |title, test, options|
+          # avoid sending the parent process' main span in the sub-processes
+          # https://www.ruby-forum.com/t/at-exit-inherited-across-fork/122473/2
+          at_exit { exit! }
 
-            env = options[:env].nil? ? {} : options[:env]
-            env['HONEYCOMB_TRACE'] = Honeycomb.current_span.to_trace_header
-            stdout, stderr, status = Open3.capture3(env, test)
-            ["\n================\n#{title}\n", stdout, stderr, status]
+          env = options[:env].nil? ? {} : options[:env]
+          env['HONEYCOMB_TRACE'] = Honeycomb.current_span.to_trace_header
+          stdout, stderr, status = Open3.capture3(env, test)
+          ["\n================\n#{title}\n", stdout, stderr, status]
+        end
+        # because we cannot modify variables inside of Parallel
+        results.each do |result|
+          if result.last.to_i.zero?
+            success_list.push(result.first.scan(%r{.*})[3])
+          else
+            failure_list.push(result.first.scan(%r{.*})[3])
           end
-          # because we cannot modify variables inside of Parallel
-          results.each do |result|
-            if result.last.to_i.zero?
-              success_list.push(result.first.scan(%r{.*})[3])
+        end
+        Thread.kill(progress)
+      else
+        require 'tty-spinner'
+        spinners = TTY::Spinner::Multi.new("[:spinner] Running against #{targets.size} targets.")
+        payloads.each do |title, test, options|
+          env = options[:env].nil? ? {} : options[:env]
+          env['HONEYCOMB_TRACE'] = Honeycomb.current_span.to_trace_header
+          spinners.register("[:spinner] #{title}") do |sp|
+            stdout, stderr, status = Open3.capture3(env, test)
+            if status.to_i.zero?
+              sp.success
+              success_list.push(title)
             else
-              failure_list.push(result.first.scan(%r{.*})[3])
-            end
-          end
-          Thread.kill(progress)
-        else
-          require 'tty-spinner'
-          spinners = TTY::Spinner::Multi.new("[:spinner] Running against #{targets.size} targets.")
-          payloads.each do |title, test, options|
-            env = options[:env].nil? ? {} : options[:env]
-            env['HONEYCOMB_TRACE'] = Honeycomb.current_span.to_trace_header
-            spinners.register("[:spinner] #{title}") do |sp|
-              stdout, stderr, status = Open3.capture3(env, test)
-              if status.to_i.zero?
-                sp.success
-                success_list.push(title)
-              else
-                sp.error
-                failure_list.push(title)
-              end
-              results.push(["================\n#{title}\n", stdout, stderr, status])
+              sp.error
+              failure_list.push(title)
             end
+            results.push(["================\n#{title}\n", stdout, stderr, status])
           end
-          spinners.auto_spin
-          spinners.success
-        end
-
-        # output test results
-        results.each do |result|
-          puts result
         end
+        spinners.auto_spin
+        spinners.success
+      end
 
-        # output test summary
-        puts "Successful on #{success_list.size} nodes: #{success_list}" if success_list.any?
-        puts "Failed on #{failure_list.size} nodes: #{failure_list}" if failure_list.any?
-        Rake::Task['litmus:check_connectivity'].invoke
-        exit 1 if failure_list.any?
+      # output test results
+      results.each do |result|
+        puts result
       end
 
+      # output test summary
+      puts "Successful on #{success_list.size} nodes: #{success_list}" if success_list.any?
+      puts "Failed on #{failure_list.size} nodes: #{failure_list}" if failure_list.any?
+      Rake::Task['litmus:check_connectivity'].invoke
+      exit 1 if failure_list.any?
+    end
+
+    if File.file?('spec/fixtures/litmus_inventory.yaml')
+      inventory_hash = inventory_hash_from_inventory_file
+      targets = find_targets(inventory_hash, nil)
+
       targets.each do |target|
         desc "Run serverspec against #{target}"
         next if target == 'litmus_localhost'

data/lib/puppet_litmus/version.rb

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

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: puppet_litmus
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.34.3
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: puppet-modulebuilder
   requirement: !ruby/object:Gem::Requirement