chef-powershell 2.18.5 → 2.18.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36453d0835276a228072f5d76630d75a6d3ecc12a5902b0a973427cc12790fe4
-  data.tar.gz: 19c1a4cb862cda9518f107714dcf6b8f90198339ffb30450391d1aaaa977bcf5
+  metadata.gz: f019aa6ec88c30ebe38c6a43aa2200421ba37f6d0b8205cbd58ddccec496f8e8
+  data.tar.gz: 313478b0ad0850b795de5cf0a54db8a970341b5f8fa06ca39c030cf9135dc82f
 SHA512:
-  metadata.gz: 342c398f8a5ec0259b6c4552708067cf3ecaa38c4f5fbdd0224ca0aa7ac0956b9e9c5740d854e39d7218173cd04d5202f3fc590fc64a2a2a9bf9adf3ad133419
-  data.tar.gz: 5c8ca7ceab568a1f95a2233be781ea7367629fd1ac0c98a257bbe18f664e7e3c2eb044a0d3da5078800b1f2a37afa5a24f3f62146ff12a2316af750a26655dc7
+  metadata.gz: 3e5be4e69ae8804a3eebabbcbf0dd1b39079e28b17d42f6085d67f6832ac0cc52285753fa87109688dd96b79bc4410b3f8b2e2e836b1659aae73a62c3d997b3c
+  data.tar.gz: 5b6952643227ac0dfa25b5818288e5dfed465e871e842d618a46636dd2702153531715fe80f86c0cbebc0d22ba2cd0dc583a537b205f8d2a845e7d91f5a59f8e

data/lib/chef-powershell/powershell.rb

@@ -80,21 +80,25 @@ class ChefPowerShell
         # try parsing the result *first* before returning from the function, and if it fails,
         # return false so that the function can be retried from the C++ side.
         begin
-          #          @@result_string = data.get_bytes(0, size).force_encoding("UTF-16LE").encode("UTF-8")
-          @result_string = data.get_bytes(0, size).force_encoding("UTF-16LE").encode("UTF-8").bytes.reverse.drop_while {|x| x == 0}.reverse.pack("C*")
+          @result_string = data.get_bytes(0, size).force_encoding("UTF-16LE").encode("UTF-8")
           @hashed_outcome = FFI_Yajl::Parser.parse(@result_string)
           @result = FFI_Yajl::Parser.parse(@hashed_outcome["result"])
           @errors = @hashed_outcome["errors"]
           @verbose = @hashed_outcome["verbose"]
           true
-        rescue => e
+        rescue NoMethodError, FFI_Yajl::ParseError => e
           @retry_count += 1
-          puts "#{e.inspect}"
+          # capture exception so that it can be raised later, since otherwise
+          # we will be raising back to C++.
           @exception = e
           return true if @retry_count > 3
           puts "Retrying PowerShell command execution #{@retry_count}"
           sleep 1
           false
+        rescue => e
+          # no retry for other exceptions
+          @exception = e
+          true
         end
       end
 

data/lib/chef-powershell/version.rb

@@ -16,5 +16,5 @@
 
 module ChefPowerShellModule
   CHEFPOWERSHELL_ROOT = File.expand_path("..", __dir__)
-  VERSION = "2.18.5".freeze
+  VERSION = "2.18.6".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-powershell
 version: !ruby/object:Gem::Version
-  version: 2.18.5
+  version: 2.18.6
 platform: ruby
 authors:
 - Chef Software, Inc