Merge pull request #458 from chef/ksubrama/win64-split

Pull 64-bit windows support changes into omnibus-chef

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'omnibus', github: 'opscode/omnibus'
-gem 'omnibus-software', github: 'opscode/omnibus-software'
+gem 'omnibus', github: 'chef/omnibus'
+gem 'omnibus-software', github: 'chef/omnibus-software'
 
 # This development group is installed by default when you run `bundle install`,
 # but if you are using Omnibus in a CI-based infrastructure, you do not need
@@ -12,7 +12,7 @@ group :development do
   gem 'berkshelf', '~> 3.0'
 
   # Use Test Kitchen with Vagrant for converging the build environment
-  gem 'test-kitchen',    '~> 1.4.0.rc.1'
-  gem 'kitchen-vagrant', '~> 0.17.0.rc.1'
+  gem 'test-kitchen',    '~> 1.4.0'
+  gem 'kitchen-vagrant', '~> 0.17.0'
   gem 'winrm-transport', '~> 1.0'
 end

Gemfile.lock

@@ -1,19 +1,19 @@
 GIT
-  remote: git://github.com/opscode/omnibus-software.git
-  revision: 05e778b04644c5bb1d1e1fb514587361868a61c6
+  remote: git://github.com/chef/omnibus-software.git
+  revision: 5d2d0f9ffdc9d3997359ceeb447c958bd3bd014f
   specs:
     omnibus-software (4.0.0)
 
 GIT
-  remote: git://github.com/opscode/omnibus.git
-  revision: 3aeac14a9cf08c885b381b962f702ec78ee8e602
+  remote: git://github.com/chef/omnibus.git
+  revision: 41cfeee13cdb77815e5c03fc4ae012419d2bedde
   specs:
     omnibus (4.0.0)
       chef-sugar (~> 3.0)
       cleanroom (~> 1.0)
-      mixlib-shellout (~> 1.4)
+      mixlib-shellout (~> 2.0)
       mixlib-versioning
-      ohai (~> 7.2)
+      ohai (~> 8.0)
       ruby-progressbar (~> 1.7)
       thor (~> 0.18)
       uber-s3
@@ -65,8 +65,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     ffi (1.9.10)
     ffi (1.9.10-x86-mingw32)
-    ffi-yajl (1.4.0)
-      ffi (~> 1.5)
+    ffi-yajl (2.2.2)
       libyajl2 (~> 1.2)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
@@ -85,17 +84,17 @@ GEM
     logging (1.8.2)
       little-plugger (>= 1.1.3)
       multi_json (>= 1.8.4)
-    mime-types (1.25.1)
+    mime-types (2.6.1)
     minitar (0.5.4)
     mixlib-authentication (1.3.0)
       mixlib-log
     mixlib-cli (1.5.0)
     mixlib-config (2.2.1)
     mixlib-log (1.6.0)
-    mixlib-shellout (1.6.1)
-    mixlib-shellout (1.6.1-x86-mingw32)
-      win32-process (~> 0.7.1)
-      windows-pr (~> 1.2.2)
+    mixlib-shellout (2.1.0)
+    mixlib-shellout (2.1.0-universal-mingw32)
+      win32-process (~> 0.7.5)
+      windows-pr (~> 1.2.4)
     mixlib-versioning (1.1.0)
     multi_json (1.11.1)
     multipart-post (2.0.0)
@@ -107,17 +106,19 @@ GEM
     nori (2.6.0)
     octokit (3.8.0)
       sawyer (~> 0.6.0, >= 0.5.3)
-    ohai (7.4.1)
+    ohai (8.5.1)
       ffi (~> 1.9)
-      ffi-yajl (~> 1.1)
+      ffi-yajl (~> 2.2)
       ipaddress
-      mime-types (~> 1.16)
+      mime-types (~> 2.0)
       mixlib-cli
       mixlib-config (~> 2.0)
       mixlib-log
-      mixlib-shellout (~> 1.2)
+      mixlib-shellout (~> 2.0)
+      rake (~> 10.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
+    rake (10.4.2)
     retryable (2.0.1)
     ridley (4.2.0)
       addressable
@@ -148,22 +149,21 @@ GEM
       dep_selector (~> 1.0)
       semverse (~> 1.1)
     systemu (2.6.5)
-    test-kitchen (1.4.1)
+    test-kitchen (1.4.2)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
-      net-ssh (~> 2.7)
+      net-ssh (~> 2.7, < 2.10)
       safe_yaml (~> 1.0)
       thor (~> 0.18)
     thor (0.19.1)
     timers (4.0.1)
       hitimes
-    uber-s3 (0.2.4)
-      mime-types (~> 1.17)
+    uber-s3 (0.1.1)
     uuidtools (2.1.5)
     varia_model (0.4.0)
       buff-extensions (~> 1.0)
       hashie (>= 2.0.2, < 3.0.0)
-    win32-api (1.5.3-x86-mingw32)
+    win32-api (1.5.3-universal-mingw32)
     win32-process (0.7.5)
       ffi (>= 1.0.0)
     windows-api (0.4.4)
@@ -191,8 +191,11 @@ PLATFORMS
 
 DEPENDENCIES
   berkshelf (~> 3.0)
-  kitchen-vagrant (~> 0.17.0.rc.1)
+  kitchen-vagrant (~> 0.17.0)
   omnibus!
   omnibus-software!
-  test-kitchen (~> 1.4.0.rc.1)
+  test-kitchen (~> 1.4.0)
   winrm-transport (~> 1.0)
+
+BUNDLED WITH
+   1.10.6

config/projects/chef.rb

@@ -40,20 +40,14 @@
 
 override :bundler,        version: "1.7.2"
 override :ruby,           version: "2.1.6"
-######
-# Ruby 2.1.3 is currently not working on windows due to:
-# https://github.com/ffi/ffi/issues/375
-# Enable below once above issue is fixed.
-# override :'ruby-windows', version: "2.1.3"
-# override :'ruby-windows-devkit', version: "4.7.2-20130224-1151"
-override :'ruby-windows', version: "2.0.0-p451"
-######
+
+override :'ruby-windows', version: "2.0.0-p645"
 override :rubygems,       version: "2.4.4"
 
 # Chef Release version pinning
 #override :chef, version: "12.4.1"
 #override :ohai, version: "8.5.0"
-override :'openssl-windows', version: '1.0.0r'
+
 
 dependency "preparation"
 dependency "chef"

config/projects/chefdk.rb

@@ -58,7 +58,7 @@
 # https://bugs.ruby-lang.org/issues/11033
 # Going to leave 2.1.5 for now since there is a workaround
 override :'ruby-windows', version: "2.1.6"
-override :'ruby-windows-devkit', version: "4.7.2-20130224-1151"
+override :'ruby-windows-devkit', version: "4.7.2-20130224"
 override :'openssl-windows', version: "1.0.1m"
 ######
 

omnibus.rb

@@ -24,6 +24,11 @@
 # package_dir   './local/omnibus/pkg'
 # package_tmp   './local/omnibus/pkg-tmp'
 
+# Windows architecture defaults - set to x86 unless otherwise specified.
+# ------------------------------
+windows_arch   %w{x86 x64}.include?(ENV['OMNIBUS_WINDOWS_ARCH'].downcase) ?
+                ENV['OMNIBUS_WINDOWS_ARCH'].donwcase.to_sym : :x86
+
 # Disable git caching
 # ------------------------------
 # use_git_caching false