beaker-pe 1.40.5 → 1.40.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3dfc737c0733b694f0e90688ad1ea579bce74a8
-  data.tar.gz: b3359e1711e60d6fe7244d5ae09424140fef3504
+  metadata.gz: edf4454eb72e4e157d8744b59bea5e83d6513797
+  data.tar.gz: f0077deaf7ecd87f425c2a387ce7501e4fae9ce5
 SHA512:
-  metadata.gz: 99e45b8fda8ccddf3fe6d2305041bba748c8c19ff3d679a0d00c3634ef0c5223c3d4293638441d225f5e2fcea7655db322347721d9fb8bb285230fd56534f76f
-  data.tar.gz: b87a2b68f1a7f89fbf0a4c425b4b5d92262c1486b8483acfe2d79377674dea52bcac1235dddf90b7e8a477431d83556ebbe761f60ee96d8557fd24e0dc35e8df
+  metadata.gz: f311516f1bac907bef3cc6670c5aa1ae41bbe1d607d85fb1f123da10f595da5473031d8edca206a917fe29bade42a309d353b22cfee6caba23e96ede51bd9d0b
+  data.tar.gz: ceea7a29a4ef52016d1625d692611aeca8a981763d8883bcadf105da6e712ee28382b789fb6bcc4e5094a7dcccc4666a9b0bf8ce4aeb7a8a1b544ad159340235

data/beaker-pe.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   # Testing dependencies
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-its'
-  s.add_development_dependency 'fakefs', '~> 0.6'
+  s.add_development_dependency 'fakefs', '~> 0.6', '< 0.14.0'
   s.add_development_dependency 'rake', '~> 10.1'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'pry', '~> 0.10'

data/lib/beaker-pe/install/pe_utils.rb

@@ -129,6 +129,13 @@ module Beaker
           downloadhost
         end
 
+        #Remove client_datadir on the host
+        #@param [Host] the host
+        def remove_client_datadir(host)
+          client_datadir = host.puppet['client_datadir']
+          on(host, "rm -rf #{client_datadir}")
+        end
+
         # Generate the command line string needed to from a frictionless puppet-agent
         # install on this host in a PE environment.
         #
@@ -807,8 +814,7 @@ module Beaker
                 end
                 #Workaround for windows frictionless install, see BKR-943 for the reason
                 if (host['platform'] =~ /windows/) and (host['roles'].include? 'frictionless')
-                  client_datadir = host.puppet['client_datadir']
-                  on(host , puppet("resource file \"#{client_datadir}\" ensure=absent force=true"))
+                  remove_client_datadir(host)
                 end
               end
             end
@@ -1841,8 +1847,7 @@ module Beaker
 
              #Workaround for windows frictionless install, see BKR-943
              agent_nodes.select {|agent| agent['platform'] =~ /windows/}.each do |agent|
-               client_datadir = agent.puppet['client_datadir']
-               on(agent, puppet("resource file \"#{client_datadir}\" ensure=absent force=true"))
+               remove_client_datadir(agent)
              end
           end
         end

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.40.5'
+        STRING = '1.40.6'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.40.5
+  version: 1.40.6
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -45,6 +45,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +55,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement