simp-beaker-helpers 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8882ab90efc503edf3b79dd740f67113638742a
-  data.tar.gz: 503cc5f3e423d32ac0e18bf5408f43e20a9dfa5d
+  metadata.gz: c5f010fc7c285530d86bc638c6d5bfbc417aa859
+  data.tar.gz: 3634d944e794eb9ddcba53540bb474a93d8385b2
 SHA512:
-  metadata.gz: e64b7f85a079395c428a05a8724b98a6811b1d51787b951d778a5c5f6f1cb1722371bd13f06c9feaf7a382c5853c5ac65913edb345044d057bcaec860d6e25bd
-  data.tar.gz: 857d0014ca8bf6b79036a7cf9cf80cb3bd82328f016198efeb10a33824dc220228cb1604eb01eb46fb6247e3d7cc793073a0617a9a19ba942af9cdc3d18916d0
+  metadata.gz: d7a9de47d6d22f0035a0e98153517a48f820861fb2dc7ef7633e930fde5d8e6974155be36cf0578dba2885be53d6061b299644ac9abbcff1aff63b51c3960f89
+  data.tar.gz: f4e2109ddae74fc105d9ad46871ee4363e6c4dc66f36e42f3fb9aae1424a0ac69a44ed4aa21854eb8ae661f55bfadb8c091fca01dfb7c6f7ae73351fafa04a8d

data/lib/simp/beaker_helpers.rb

@@ -1,7 +1,7 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.5.1'
+  VERSION = '1.5.2'
 
   # use the `puppet fact` face to look up facts on an SUT
   def pfact_on(sut, fact_name)

data/lib/simp/rake/beaker.rb

@@ -116,6 +116,17 @@ module Simp::Rake
 
           raise("Error: Suites Directory at '#{suite_basedir}'!") unless File.directory?(suite_basedir)
 
+          unless File.directory?(File.join(suite_basedir, suite))
+            STDERR.puts("Error: Could not find suite '#{suite}'")
+            STDERR.puts("Available Suites:")
+            STDERR.puts('  * ' + Dir.glob(
+              File.join(suite_basedir, '*')).sort.map{ |x|
+                File.basename(x)
+              }.join("\n  * ")
+            )
+            exit(1)
+          end
+
           suite_config = {
             'fail_fast' => true
           }
@@ -127,6 +138,8 @@ module Simp::Rake
           suites = Hash.new
           if suite
             suites[suite] = Hash.new
+            # If a suite was set, make sure it runs.
+            suites[suite]['default_run'] = true
           else
             Dir.glob(File.join(suite_basedir,'*')) do |file|
               if File.directory?(file)
@@ -178,12 +191,17 @@ module Simp::Rake
             $stdout.puts("\n\n=== Suite '#{name}' Starting ===\n\n")
 
             if nodeset
-              unless File.file?(File.join(suites[ste]['path'],"#{nodeset}.yml"))
+              nodeset_yml = File.join(suites[ste]['path'], 'nodesets', "#{nodeset}.yml")
+              unless File.file?(nodeset_yml)
                 $stdout.puts("=== Suite #{name} Nodeset '#{nodeset}' Not Found, Skipping ===")
                 next
               end
 
-              ENV['BEAKER_set'] = nodeset
+              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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker