COOK-710, COOK-711 Refactor of registry provider

windows/providers/auto_run.rb

@@ -19,13 +19,15 @@
 #
 
 action :create do
-  windows_registry 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run' do
+  windows_registry "CreateAutoRun #{new_resource.program} #{new_resource.args}" do
+  	key_name 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run'
     values new_resource.name => "\"#{new_resource.program}\" #{new_resource.args}"
   end
 end
 
 action :remove do 
-  windows_registry 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run' do
+  windows_registry "RemoveAutoRun #{new_resource.program} #{new_resource.args}" do
+    key_name 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run'
     values new_resource.name => ''
     action :remove
   end

windows/providers/path.rb

@@ -18,37 +18,20 @@
 # limitations under the License.
 #
 
-action :add do
-  path = ENV['PATH'].split(';')
-  if !path.include?(new_resource.path)
-    path.insert(-1,new_resource.path)
-  end
 
-  windows_registry Windows::KeyHelper::ENV_KEY do
-    values 'Path' => path.join(';')
+action :add do
+  env "PATH" do
+  	action :create
+  	delim ";"
+  	value new_resource.path
   end
-  timeoutVars
+
 end
 
 action :remove do
-  path = ENV['PATH'].split(';')
-  path.delete(new_resource.path)
-  windows_registry Windows::KeyHelper::ENV_KEY do
-    values 'Path' => path.join(';')
+  env "PATH" do
+  	action :delete
+  	delim ";"
+  	value new_resource.path
   end
-  timeoutVars
-end
-
-private 
-# Notify all processes that the environmental variables have been updated.
-def timeoutVars
-  # Dosent seem to work... You may need to re-login
-  Chef::Log.debug("Telling other processes that the env vars have been updated")
-  require 'Win32API'
-  sendMessageTimeout = Win32API.new('user32', 'SendMessageTimeout', 'LLLPLLP', 'L') 
-  hwnd_broadcast = 0xffff
-  wm_settingchange = 0x001A
-  smto_abortifhung = 2
-  result = 0
-  sendMessageTimeout.call(hwnd_broadcast, wm_settingchange, 0, 'Environment', smto_abortifhung, 5000, result)
 end

windows/resources/registry.rb

@@ -22,11 +22,11 @@
 
 actions :create, :modify, :force_modify, :remove
 
-attribute :key_name, :kind_of => String, :name_attribute => true
-attribute :values, :kind_of => Hash
+attribute :name, :kind_of => String, :name_attribute => true
+attribute :key_name, :kind_of => String, :required => true
+attribute :values, :kind_of => Hash, :required => true
 
 def initialize(name, run_context=nil)
   super
   @action = :modify
-  @key_name = name
 end