simp-beaker-helpers 1.18.2 → 1.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03e7502836d3999beb48af49d409f757204fa6dc29e2037e035514e397e2dab0
-  data.tar.gz: b96ed98c778d593741e1310a27860d68a91fb5b97a106c36974cb4fa4ebbfa2e
+  metadata.gz: 36231d0862e7ae76a3675efc9bc5339527b2704ead1dbbf41e2df3ce962439d4
+  data.tar.gz: 83d88bae5f3822c2e13754ee79fe1cc98a34b0f04c885861b61f76a1a32219ae
 SHA512:
-  metadata.gz: afc42807301347fbac121680a6b63b00f2863eddd6ada9a0028e60dc82cba4b2082c627ecb468600c14a8891f350672789f000ecd2167d13d2aacee974bc3ae1
-  data.tar.gz: 69ac18cd076b980408b42b9983e59a7d96a229278daf776f31488fd20ef4d82f797ae21540845a9d451b8b81f9f239826f1684bf81b0391e18f5371579111029
+  metadata.gz: 174f5a6496239de911c55a42d5ad08ee21fa54de6fbf244c1a6c167ccbd83780d9520ae51ccb8301f86ed45ddca7f97651126453af3c2d9a80caa288e6166457
+  data.tar.gz: f059ace7f23bbd687c5af6870f7d294230009984ef02b75a1e77fcfe710b1edd23c1ef4dc24f81efea2d7ac39c02217faea0542ea754d945767a881b2edaebf8

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 1.18.3 / 2020-02-24
+* Fix the Windows library loading location.
+  * No longer attempt to load windows libraries by default unless the system is
+    actually Windows
+
+### 1.18.2 / 2020-02-24
+
+* The previous location for loading the Windows libraries would not work in a
+  `:before` block. This moves it into its own module space.
+* Bump to the working version of beaker and beaker-puppet
+
 ### 1.18.1 / 2020-02-12
 * Fix gemspec dependencies
 * Fix the windows library loading location

data/lib/simp/beaker_helpers.rb

@@ -11,7 +11,6 @@ module Simp::BeakerHelpers
   require 'simp/beaker_helpers/snapshot'
   require 'simp/beaker_helpers/ssg'
   require 'simp/beaker_helpers/version'
-  require 'simp/beaker_helpers/windows'
 
   # Stealing this from the Ruby 2.5 Dir::Tmpname workaround from Rails
   def self.tmpname
@@ -19,26 +18,8 @@ module Simp::BeakerHelpers
     "simp-beaker-helpers-#{t}-#{$$}-#{rand(0x100000000).to_s(36)}.tmp"
   end
 
-  def load_windows_requirements
-    if is_windows
-      begin
-        require 'beaker-windows'
-      rescue LoadError
-        logger.error(%{You must include 'beaker-windows' in your Gemfile for windows support on #{host}})
-        exit 1
-      end
-
-      include BeakerWindows::Path
-      include BeakerWindows::Powershell
-      include BeakerWindows::Registry
-      include BeakerWindows::WindowsFeature
-    end
-
-    return is_windows
-  end
-
   def is_windows?(sut)
-    is_windows = fact_on(sut, 'osfamily').casecmp?('windows')
+    sut[:platform] =~ /windows/i
   end
 
   # We can't cache this because it may change during a run
@@ -299,7 +280,7 @@ module Simp::BeakerHelpers
     parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
 
     block_on(suts, :run_in_parallel => parallel) do |sut|
-      if sut[:platform] =~ /windows/
+      if is_windows?(sut)
         puts "  -- SKIPPING #{sut} because it is windows"
         next
       end
@@ -625,7 +606,10 @@ module Simp::BeakerHelpers
   def fix_errata_on( suts = hosts )
     parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
     block_on(suts, :run_in_parallel => parallel) do |sut|
-      if sut[:platform] =~ /windows/
+      if is_windows?(sut)
+        # Load the Windows requirements
+        require 'simp/beaker_helpers/windows'
+
         # Install the necessary windows certificate for testing
         #
         # https://petersouter.xyz/testing-windows-with-beaker-without-cygwin/

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.18.2'
+  VERSION = '1.18.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.18.2
+  version: 1.18.3
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-23 00:00:00.000000000 Z
+date: 2020-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker