simp-beaker-helpers 1.14.5 → 1.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f1908432bd03c448aa27313d77556a1dea6e7c228f672cff99c67aceeb9c308
-  data.tar.gz: d5556f6d36ac4d9cb951062ff8647ba3c12b7f6a0c2e721fee1c27c52055f97c
+  metadata.gz: f28b475b5b09702f9b3d263fc5b614101d49d86ebb85917865112083eedd646e
+  data.tar.gz: e32eab2aefc888c2cc3627235504f1df1433561fe50788ccb6a70714a0d4a756
 SHA512:
-  metadata.gz: ec3f1a10a50c2613e4ab83334a006794af68d1e036c6f0ad176ee7d694480f6b0b736b72acbd8c6df2a6d065f73891ee84cf230a291cbf554a1e8dde9caf4ad7
-  data.tar.gz: 00ba85614b6352c17d4ad08d5aa1ebfb7c2b674daa9f3f97e0b95b5534a273bfc811847b2c3c64aebe0e5eec33c78ab05c9d0fc3aa503e277fbe8310149a579e
+  metadata.gz: 9de41c37f6ca213ed06d465e8db1722d1006c11621b0dd9078535eb065f35b52f883491a3179ccb7ad5da69c45700ce2f3b87ed7f7b419b95ac7eccdebcf3b77
+  data.tar.gz: 35d8c62641e3403396732824e222177017c9a6692dff3ad01aff67218ce3169e6005e1ba1a18c71b8b10ddf71bc6c205144de844698a93ff3d3024bf6803226f

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 1.14.6 / 2019-08-15
+* Add Windows client support to the beaker helpers functions
+  * Added an `is_windows?(sut)` function
+  * Work around issues with calling `sut.puppet` on Windows SUTs
+  * Update `copy_fixture_modules_to` to support Windows (slow copy)
+  * Add Windows support to `puppet_modulepath_on`
+
 ### 1.14.5 / 2019-08-14
 * Update the CentOS SSG hooks to properly work with CentOS 6
 

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.14.5'
+  VERSION = '1.14.6'
 end

data/lib/simp/beaker_helpers.rb

@@ -18,6 +18,10 @@ module Simp::BeakerHelpers
     "simp-beaker-helpers-#{t}-#{$$}-#{rand(0x100000000).to_s(36)}.tmp"
   end
 
+  def is_windows?(sut)
+    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,
@@ -95,7 +99,10 @@ module Simp::BeakerHelpers
 
   # Returns the modulepath on the SUT, as an Array
   def puppet_modulepath_on(sut, environment='production')
-    sut.puppet['modulepath'].split(':')
+    splitchar = ':'
+    splitchar = ';' if is_windows?(sut)
+
+    sut.puppet_configprint['modulepath'].split(splitchar)
   end
 
   # Return the path to the 'spec/fixtures' directory
@@ -203,24 +210,37 @@ module Simp::BeakerHelpers
           mod_root = File.expand_path( "spec/fixtures/modules", File.dirname( fixtures_yml_path ))
 
           Dir.chdir(mod_root) do
-            begin
-              tarfile = "#{Simp::BeakerHelpers.tmpname}.tar"
+            # Have to do things the slow way on Windows
+            if is_windows?(sut)
+              Dir.glob('*') do |module_dir|
+                if File.directory?(module_dir)
+                  copy_module_to( sut, {
+                    :source             => module_dir,
+                    :module_name        => module_dir,
+                    :target_module_path => target_module_path
+                  })
+                end
+              end
+            else
+              begin
+                tarfile = "#{Simp::BeakerHelpers.tmpname}.tar"
 
-              excludes = PUPPET_MODULE_INSTALL_IGNORE.map do |x|
-                x = "--exclude '*/#{x}'"
-              end.join(' ')
+                excludes = PUPPET_MODULE_INSTALL_IGNORE.map do |x|
+                  x = "--exclude '*/#{x}'"
+                end.join(' ')
 
-              %x(tar -ch #{excludes} -f #{tarfile} *)
+                %x(tar -ch #{excludes} -f #{tarfile} *)
 
-              if File.exist?(tarfile)
-                copy_to(sut, tarfile, target_module_path, opts)
-              else
-                fail("Error: module tar file '#{tarfile}' could not be created at #{mod_root}")
-              end
+                if File.exist?(tarfile)
+                  copy_to(sut, tarfile, target_module_path, opts)
+                else
+                  fail("Error: module tar file '#{tarfile}' could not be created at #{mod_root}")
+                end
 
-              on(sut, "cd #{target_module_path} && tar -xf #{File.basename(tarfile)}")
-            ensure
-              FileUtils.remove_entry(tarfile, true)
+                on(sut, "cd #{target_module_path} && tar -xf #{File.basename(tarfile)}")
+              ensure
+                FileUtils.remove_entry(tarfile, true)
+              end
             end
           end
         end
@@ -735,11 +755,11 @@ done
     # This output lets us know where Hiera is configured to look on the system
     puppet_lookup_info = on(sut, 'puppet lookup --explain test__simp__test').output.strip.lines
 
-    if sut.puppet['manifest'].nil? || sut.puppet['manifest'].empty?
+    if sut.puppet_configprint['manifest'].nil? || sut.puppet_configprint['manifest'].empty?
       fail("No output returned from `puppet config print manifest` on #{sut}")
     end
 
-    puppet_env_path = File.dirname(sut.puppet['manifest'])
+    puppet_env_path = File.dirname(sut.puppet_configprint['manifest'])
 
     # We'll just take the first match since Hiera will find things there
     puppet_lookup_info = puppet_lookup_info.grep(/Path "/).grep(Regexp.new(puppet_env_path))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.14.5
+  version: 1.14.6
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker