Update ark cookbook

cookbooks/ark/libraries/sevenzip_command_builder.rb

@@ -9,7 +9,7 @@ module Ark
     end
 
     def cherry_pick
-      "#{sevenzip_command_builder(resource.path, 'e')} -r #{resource.creates}"
+      "#{sevenzip_command_builder(resource.path, 'x')} -r #{resource.creates}"
     end
 
     def initialize(resource)
@@ -20,30 +20,42 @@ module Ark
 
     attr_reader :resource
 
-    # rubocop:disable Metrics/AbcSize
+    def node
+      resource.run_context.node
+    end
+
     def sevenzip_command
       if resource.strip_components <= 0
-        sevenzip_command_builder(resource.path, 'x')
-        return
+        return sevenzip_command_builder(resource.path, 'x')
       end
 
-      tmpdir = make_temp_directory
-      cmd = sevenzip_command_builder(tmpdir, 'e')
+      tmpdir = make_temp_directory.tr('/', '\\')
+      cmd = sevenzip_command_builder(tmpdir, 'x')
 
-      cmd += " && "
-      currdir = tmpdir.tr('/', '\\')
+      cmd += ' && '
+      currdir = tmpdir
 
       1.upto(resource.strip_components).each do |count|
         cmd += "for /f %#{count} in ('dir /ad /b \"#{currdir}\"') do "
         currdir += "\\%#{count}"
       end
 
-      cmd += "xcopy \"#{currdir}\" \"#{resource.home_dir}\" /s /e"
+      cmd += "(\"#{ENV.fetch('SystemRoot')}\\System32\\robocopy\" \"#{currdir}\" \"#{resource.path}\" /s /e) ^& IF %ERRORLEVEL% LEQ 3 cmd /c exit 0"
     end
-    # rubocop:enable Metrics/AbcSize
 
     def sevenzip_binary
-      resource.run_context.node['ark']['tar']
+      @tar_binary ||= "\"#{(node['ark']['sevenzip_binary'] || sevenzip_path_from_registry)}\""
+    end
+
+    def sevenzip_path_from_registry
+      begin
+        basepath = ::Win32::Registry::HKEY_LOCAL_MACHINE.open('SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\7zFM.exe').read_s('Path')
+
+      # users like pretty errors
+      rescue ::Win32::Registry::Error
+        raise 'Failed to find the path of 7zip binary by searching checking HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\7zFM.exe\Path. Make sure to install 7zip before using this resource. If 7zip is installed and you still receive this message you can also specify the 7zip binary path by setting node["ark"]["sevenzip_binary"]'
+      end
+      "#{basepath}7z.exe"
     end
 
     def sevenzip_command_builder(dir, command)
@@ -54,7 +66,7 @@ module Ark
       if resource.extension =~ /tar.gz|tgz|tar.bz2|tbz|tar.xz|txz/
         " -so | #{sevenzip_binary} x -aoa -si -ttar"
       else
-        ""
+        ' -aoa' # force overwrite, Fixes #164
       end
     end