taste_tester 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8206a39afa26db4e27600fa362c26d33d16fcefe6a5e79a4869fe339b9e1e18
-  data.tar.gz: 2eb1a8bdfd58d5713dc1f5197da4b10cd0167542fefa641bfe3d6863c252fc58
+  metadata.gz: a2fa17de1672814a680aa44b592bc649f3b3ec80b057a0199aed9b3ce13e1fe5
+  data.tar.gz: e9150bc89798e17651102239224763468ca8a65affb7706c4080a409577bf108
 SHA512:
-  metadata.gz: 40e15c8cf0858f82e65e0b94e4bdcfa44223b0c891ef9242aa0cbb264c36c6931e033b9b10cf70fcc68b74be4ff4628042872d78466f761bfc367de69f116897
-  data.tar.gz: 28dbed4002b508d4eb7222b3007bc6580dd4c881d4894e456a849bc882339d6b97ccec6858682c5bc71b0dbf8aa03d377de47eefa85e1c5cff09601884ca19bf
+  metadata.gz: 12bf2e2e631987187b455b294bae9db28bd1f50c7aba35bbe9d04b3cbceabec3f65fd665f5ef5c70424bb296438742ebd0a918a5545480ec058ff760ac6f81fa
+  data.tar.gz: 4b6781fe213f7e9447077d6f629c3facc4f2fa596212b8a8f1f8cde40e1f1aba4c66542f1b939b587c87d4e05878320e410e2bd8b9bbec98a40ff97ac52c4806

data/lib/taste_tester/host.rb

@@ -172,8 +172,9 @@ module TasteTester
             }
           }" #{config_file}
         ENDOFSHELLCODE
+        shellcode.chomp!
       end
-      shellcode.chomp
+      shellcode
     end
 
     def keeptesting
@@ -253,7 +254,7 @@ module TasteTester
         '$b64 | Out-File -Encoding ASCII $tmp64 -Force',
 
         # Remove our tmp file before we write to it or certutil crashes...
-        'if (Test-Path $tmp) { rm $tmp }',
+        "#{win_rm_f} $tmp",
         'certutil -decode $tmp64 $tmp',
         'mv $tmp $ttconfig -Force',
 
@@ -291,17 +292,20 @@ module TasteTester
     # Remote untesting commands for Windows
     def add_windows_untest_cmds(transport)
       config_prod = TasteTester::Config.chef_config.split('.').join('-prod.')
+      tt_config =
+        "#{TasteTester::Config.chef_config_path}/#{TASTE_TESTER_CONFIG}"
+      pem_file = "#{TasteTester::Config.chef_config_path}/client-prod.pem"
+      pem_link = "#{TasteTester::Config.chef_config_path}/client.pem"
+
       [
         'New-Item -ItemType SymbolicLink -Force -Value ' +
           "#{TasteTester::Config.chef_config_path}/#{config_prod} " +
           "#{TasteTester::Config.chef_config_path}/" +
           TasteTester::Config.chef_config,
         'New-Item -ItemType SymbolicLink -Force -Value ' +
-          "#{TasteTester::Config.chef_config_path}/client-prod.pem " +
-          "#{TasteTester::Config.chef_config_path}/client.pem",
-        'rm -Force ' +
-          "#{TasteTester::Config.chef_config_path}/#{TASTE_TESTER_CONFIG}",
-        "rm -Force #{TasteTester::Config.timestamp_file}",
+          "#{pem_file} #{pem_link}",
+        "#{win_rm_f} #{tt_config}",
+        "#{win_rm_f} #{TasteTester::Config.timestamp_file}",
         create_eventlog_if_needed_cmd,
         'Write-EventLog -LogName "Application" -Source "taste-tester" ' +
           '-EventID 4 -EntryType Information -Message "Returning server ' +
@@ -328,6 +332,10 @@ module TasteTester
       end
     end
 
+    def win_rm_f
+      'Remove-Item -Force -ErrorAction SilentlyContinue'
+    end
+
     def config
       scheme = TasteTester::Config.use_ssl ? 'https' : 'http'
       if TasteTester::Config.use_ssh_tunnels

data/lib/taste_tester/tunnel.rb

@@ -111,12 +111,18 @@ module TasteTester
       # TODO: pull this from Host.touchcmd
       (Get-Item "$ts").LastWriteTime=("#{TasteTester::Config.testing_end_time}")
 
-      while (1 -eq 1) {
+      while ($true) {
         if (-Not (Test-Path $ts)) {
           # if we are here, we know we've created our source
-          Write-EventLog -LogName "Application" -Source "taste-tester" `
-            -EventID 5 -EntryType Information `
-            -Message "Ending tunnel: timestamp file disappeared"
+          $splat = @{
+            LogName = "Application"
+            Source = "taste-tester"
+            EventID = 5
+            EntryType = "Information"
+            Message = "Ending tunnel: timestamp file disappeared"
+          }
+          Write-EventLog @splat
+          break
         }
         sleep 60
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taste_tester
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Phil Dibowitz
@@ -10,7 +10,7 @@ autorequire:
 bindir:
 - bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: between_meals