simp-beaker-helpers 1.18.1 → 1.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a6d832bb3c5209324dca4c5e3da93e1ab50027574017f9049d580b1046a1984
-  data.tar.gz: 59f15b22bc608c79506cc75471995157cb14ec31febcf74e135ecc9ec931c1f0
+  metadata.gz: 03e7502836d3999beb48af49d409f757204fa6dc29e2037e035514e397e2dab0
+  data.tar.gz: b96ed98c778d593741e1310a27860d68a91fb5b97a106c36974cb4fa4ebbfa2e
 SHA512:
-  metadata.gz: d36935152c4123658b466037619083d3349b157addcf7d218e21edb94ec192fd7b15154194bccaca91f34787dc1d592e7dcdd0daa2f6bd293dd543693f44a9ef
-  data.tar.gz: ec287fcbfb55380400d322c667999b296542e0c0e40ca5c1a0114d2e8c96726b19472243ac11d87ec7293e8bb6db124ba965d3d9586566cbcacc824927526716
+  metadata.gz: afc42807301347fbac121680a6b63b00f2863eddd6ada9a0028e60dc82cba4b2082c627ecb468600c14a8891f350672789f000ecd2167d13d2aacee974bc3ae1
+  data.tar.gz: 69ac18cd076b980408b42b9983e59a7d96a229278daf776f31488fd20ef4d82f797ae21540845a9d451b8b81f9f239826f1684bf81b0391e18f5371579111029

data/CHANGELOG.md

@@ -1,5 +1,6 @@
 ### 1.18.1 / 2020-02-12
 * Fix gemspec dependencies
+* Fix the windows library loading location
 
 ### 1.18.0 / 2020-02-06
 * Update Windows support

data/lib/simp/beaker_helpers.rb

@@ -11,6 +11,7 @@ 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
@@ -18,9 +19,7 @@ module Simp::BeakerHelpers
     "simp-beaker-helpers-#{t}-#{$$}-#{rand(0x100000000).to_s(36)}.tmp"
   end
 
-  def is_windows?(sut)
-    is_windows = fact_on(sut, 'osfamily').casecmp?('windows')
-
+  def load_windows_requirements
     if is_windows
       begin
         require 'beaker-windows'
@@ -38,6 +37,10 @@ module Simp::BeakerHelpers
     return is_windows
   end
 
+  def is_windows?(sut)
+    is_windows = fact_on(sut, 'osfamily').casecmp?('windows')
+  end
+
   # We can't cache this because it may change during a run
   def fips_enabled(sut)
     return on( sut,

data/lib/simp/beaker_helpers/version.rb

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

data/lib/simp/beaker_helpers/windows.rb

@@ -0,0 +1,16 @@
+module Simp; end
+module Simp::BeakerHelpers; end
+
+module Simp::BeakerHelpers::Windows
+  begin
+    require 'beaker-windows'
+  rescue LoadError
+    logger.error(%{You must include 'beaker-windows' in your Gemfile for windows support})
+    exit 1
+  end
+
+  include BeakerWindows::Path
+  include BeakerWindows::Powershell
+  include BeakerWindows::Registry
+  include BeakerWindows::WindowsFeature
+end

data/simp-beaker-helpers.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |s|
   s.metadata = {
                  'issue_tracker' => 'https://simp-project.atlassian.net'
                }
-  s.add_runtime_dependency 'beaker'                      , ['>= 4.16.0', '< 5.0.0']
+  s.add_runtime_dependency 'beaker'                      , ['>= 4.17.0', '< 5.0.0']
   s.add_runtime_dependency 'beaker-rspec'                , '~> 6.2'
-  s.add_runtime_dependency 'beaker-puppet'               , ['>= 1.18.12', '< 2.0.0']
+  s.add_runtime_dependency 'beaker-puppet'               , ['>= 1.18.14', '< 2.0.0']
   s.add_runtime_dependency 'beaker-docker'               , '~> 0.3'
   s.add_runtime_dependency 'beaker-vagrant'              , ['>= 0.6.4', '< 2.0.0']
   s.add_runtime_dependency 'beaker-puppet_install_helper', '~> 0.9'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.18.1
+  version: 1.18.2
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -17,7 +17,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.16.0
+        version: 4.17.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.16.0
+        version: 4.17.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.12
+        version: 1.18.14
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -61,7 +61,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.12
+        version: 1.18.14
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -183,6 +183,7 @@ files:
 - lib/simp/beaker_helpers/snapshot.rb
 - lib/simp/beaker_helpers/ssg.rb
 - lib/simp/beaker_helpers/version.rb
+- lib/simp/beaker_helpers/windows.rb
 - lib/simp/rake/beaker.rb
 - simp-beaker-helpers.gemspec
 - spec/acceptance/nodesets/default.yml