Merge pull request #4748 from chef/lcg/testing

Bump omnibus ruby to ruby 2.2.4

4 files changed, 10 insertions, 5 deletions

diff --git a/Gemfile b/Gemfile
index e39a50a586..f1d3168ad8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,6 +8,9 @@ gem "chef-config", path: "chef-config" if File.exist?(File.expand_path("../chef-
 # Ensure that we can always install rake, regardless of gem groups
 gem "rake"
 
+# we can go back to mainline when https://github.com/ffi/ffi/pull/490 is merged
+gem "ffi", github: "lamont-granquist/ffi", branch: "lcg/rb_gc_guard_ptr" if RUBY_PLATFORM.downcase =~ /aix/
+
 group(:docgen) do
   gem "yard"
 end
diff --git a/appveyor.yml b/appveyor.yml
index d6459b6b96..38c9e8be82 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,7 @@ environment:
   matrix:
     # 21-x64 is failing right now
     #- ruby_version: "21-x64"
-    - ruby_version: "21"
+    - ruby_version: "22"
 
 clone_folder: c:\projects\chef
 clone_depth: 1
diff --git a/lib/chef/win32/registry.rb b/lib/chef/win32/registry.rb
index bccd2e3c72..613994295c 100644
--- a/lib/chef/win32/registry.rb
+++ b/lib/chef/win32/registry.rb
@@ -61,7 +61,9 @@ class Chef
       end
 
       def set_value(key_path, value)
-        Chef::Log.debug("Updating value #{value[:name]} in registry key #{key_path} with type #{value[:type]} and data #{value[:data]}")
+        data = value[:data]
+        data = data.to_s if value[:type] == :string
+        Chef::Log.debug("Updating value #{value[:name]} in registry key #{key_path} with type #{value[:type]} and data #{data}")
         key_exists!(key_path)
         hive, key = get_hive_and_key(key_path)
         if value_exists?(key_path, value)
@@ -70,13 +72,13 @@ class Chef
             return false
           else
             hive.open(key, ::Win32::Registry::KEY_SET_VALUE | ::Win32::Registry::KEY_QUERY_VALUE | registry_system_architecture) do |reg|
-              reg.write(value[:name], get_type_from_name(value[:type]), value[:data])
+              reg.write(value[:name], get_type_from_name(value[:type]), data)
             end
             Chef::Log.debug("Value #{value[:name]} in registry key #{key_path} updated")
           end
         else
           hive.open(key, ::Win32::Registry::KEY_SET_VALUE | ::Win32::Registry::KEY_QUERY_VALUE | registry_system_architecture) do |reg|
-            reg.write(value[:name], get_type_from_name(value[:type]), value[:data])
+            reg.write(value[:name], get_type_from_name(value[:type]), data)
           end
           Chef::Log.debug("Value #{value[:name]} in registry key #{key_path} created")
         end
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index a5de689927..ae27cac435 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -34,7 +34,7 @@ else
   install_dir "#{default_root}/#{name}"
 end
 
-override :ruby, version: "2.1.8"
+override :ruby, version: "2.2.4"
 # Leave dev-kit pinned to 4.5 because 4.7 is 20MB larger and we don't want
 # to unnecessarily make the client any fatter.
 override :'ruby-windows-devkit', version: "4.5.2-20111229-1559" if windows? && windows_arch_i386?