simp-beaker-helpers 1.11.3 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b6e130fce3d3a8eee72398b70815453331916db8
-  data.tar.gz: a1b92623b2bae26cccf0c3563c143c71b46655ea
+SHA256:
+  metadata.gz: 72ec3c87384ec91370fa23c4ad597d05d9244ea1489cdbbd0309ad056837fd64
+  data.tar.gz: fb2aec92e7da3523555fd5271c74eaa03c1980192bce56f4db8d814ff1e8b99c
 SHA512:
-  metadata.gz: 8526d0b9b7210537e2e9f2646e169d42befa0ce290072d54a60652ff106ad761ca8e34baeb0c594ca8edba944ea92d7ceb73a2ce5641eced574d77f5079112ce
-  data.tar.gz: af086c7b60267bdbfc730caa535ca1d04fd7e05dd05827ca028a2a4b303be0bfbc3e6be7894ff4cec9349a051d1e98b464b81158368e7bea8ce1da0b26a9b71f
+  metadata.gz: be4a71d244439e6a42eb65482faadc33dd66fb3e23f5dbbf71d81e57b8571fb4fb268292abdeac113a619deda38a7efb22a2ad9270869ca2fff3f4dcd2d2ef92
+  data.tar.gz: 44e06c866ba8ebb50bc730ce389de25c2f64aecca213a18a88df55aa1b60f67aa320c427e3d140078c3d41ce221a901a30a987d734c8a3da4f81c30652fc1e8c

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 1.12.0 / 2018-10-22
+* When using suites, allow users to loop through multiple specified nodesets as
+  a colon delimited list or loop through all nodesets by passing 'ALL'.
+* If 'ALL' is passed, the 'default' suite will be run first.
+
 ### 1.11.3 / 2018-10-22
 * Made the inspec report less confusing overall by noting where checks are
   overridden

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.11.3'
+  VERSION = '1.12.0'
 end

data/lib/simp/rake/beaker.rb

@@ -53,6 +53,9 @@ module Simp::Rake
               * If you set this to `ALL`, all suites will be run
 
             * :nodeset - A specific nodeset to run on within a specific suite
+              * If you set this to `ALL`, all nodesets will be looped through, starting with 'default'
+              * You may also set this to a colon delimited list of short
+                nodeset names that will be run in that order
 
             ## Suite Execution
 
@@ -200,47 +203,62 @@ module Simp::Rake
 
             $stdout.puts("\n\n=== Suite '#{name}' Starting ===\n\n")
 
+            nodesets = Array.new
+            nodeset_path = File.join(suites[ste]['path'],'nodesets')
+
             if nodeset
-              nodeset_yml = File.join(suites[ste]['path'], 'nodesets', "#{nodeset}.yml")
+              if nodeset == 'ALL'
+                nodesets = Dir.glob(File.join(nodeset_path, '*.yml'))
+
+                # Make sure we run the default set first
+                default_set = nodesets.delete(File.join(nodeset_path, 'default.yml'))
+                nodesets.unshift(default_set) if default_set
+              else
+                nodeset.split(':').each do |tgt_nodeset|
+                  nodesets << File.join(nodeset_path, "#{tgt_nodeset.strip}.yml")
+                end
+              end
+            else
+              nodesets << File.join(nodeset_path, 'default.yml')
+            end
+
+            nodesets.each do |nodeset_yml|
               unless File.file?(nodeset_yml)
-                $stdout.puts("=== Suite #{name} Nodeset '#{nodeset}' Not Found, Skipping ===")
+                $stdout.puts("=== Suite #{name} Nodeset '#{File.basename(nodeset_yml, '.yml')}' Not Found, Skipping ===")
                 next
               end
 
               ENV['BEAKER_setfile'] = nodeset_yml
-            else
-              nodeset_yml = File.join(suites[ste]['path'], 'nodesets', 'default.yml')
-
-              ENV['BEAKER_setfile'] = nodeset_yml
-            end
 
-            Rake::Task[:beaker].clear
-            RSpec::Core::RakeTask.new(:beaker) do |tsk|
-              tsk.rspec_opts = ['--color']
-              tsk.pattern = File.join(suites[ste]['path'])
-            end
+              Rake::Task[:beaker].clear
+              RSpec::Core::RakeTask.new(:beaker) do |tsk|
+                tsk.rspec_opts = ['--color']
+                tsk.pattern = File.join(suites[ste]['path'])
+              end
 
-            current_suite_task = Rake::Task[:beaker]
+              current_suite_task = Rake::Task[:beaker]
 
-            if suite_config['fail_fast'] == true
-              current_suite_task.execute
-            else
-              begin
+              if suite_config['fail_fast'] == true
                 current_suite_task.execute
-              rescue SystemExit
-                failures[suites[ste]['name']] = {
-                  'path' => suites[ste]['path']
-                }
+              else
+                begin
+                  current_suite_task.execute
+                rescue SystemExit
+                  failures[suites[ste]['name']] = {
+                    'path'    => suites[ste]['path'],
+                    'nodeset' => File.basename(nodeset_yml, '.yml')
+                  }
+                end
               end
-            end
 
-            $stdout.puts("\n\n=== Suite '#{name}' Complete ===\n\n")
+              $stdout.puts("\n\n=== Suite '#{name}' Complete ===\n\n")
+            end
           end
 
           unless failures.keys.empty?
             $stdout.puts("The following tests had failures:")
             failures.keys.sort.each do |ste|
-              $stdout.puts("  * #{ste} => #{failures[ste]['path']}")
+              $stdout.puts("  * #{ste} => #{failures[ste]['path']} on #{failures[ste]['nodeset']}")
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: 1.12.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -204,25 +204,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: beaker helper methods for SIMP
-test_files:
-- spec/acceptance/nodesets/default.yml
-- spec/acceptance/suites/default/check_puppet_version_spec.rb
-- spec/acceptance/suites/default/enable_fips_spec.rb
-- spec/acceptance/suites/default/fixture_modules_spec.rb
-- spec/acceptance/suites/default/nodesets
-- spec/acceptance/suites/default/pki_tests_spec.rb
-- spec/acceptance/suites/default/set_hieradata_on_spec.rb
-- spec/acceptance/suites/default/write_hieradata_to_spec.rb
-- spec/acceptance/suites/fips_from_fixtures/00_default_spec.rb
-- spec/acceptance/suites/fips_from_fixtures/metadata.yml
-- spec/acceptance/suites/fips_from_fixtures/nodesets
-- spec/acceptance/suites/puppet_collections/00_default_spec.rb
-- spec/acceptance/suites/puppet_collections/metadata.yml
-- spec/acceptance/suites/puppet_collections/nodesets/default.yml
-- spec/lib/simp/beaker_helpers_spec.rb
-- spec/spec_helper.rb
-- spec/spec_helper_acceptance.rb
+test_files: []