vagrant-omnibus 1.2.1 → 1.3.0

data/.rubocop.yml

@@ -4,5 +4,7 @@ AllCops:
     - bin/**
 Encoding:
   Enabled: false
+ClassLength:
+  Enabled: false
 MethodLength:
-  Max: 30
+  Enabled: false

data/.travis.yml

@@ -3,6 +3,6 @@ bundler_args: --without=acceptance
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
 script:
-  - rake test:unit
-  - rake rubocop
+  - rake travis:ci

data/CHANGELOG.md

@@ -1,8 +1,24 @@
+## 1.3.0 (February 24, 2014)
+
+FEATURES:
+
+* PR [#59][], PR [#60][]: Windows guest support! ([@jarig][])([@schisamo][])
+
+IMPROVEMENTS:
+
+* PR [#61][]: Make detection of currently installed Chef version more robust. ([@ampedandwired][])
+* Create explicit tasks for supported provider acceptance tests. ([@schisamo][])
+* Add Ruby 2.1.0 to the Travis CI test matrix. ([@schisamo][])
+
+BUG FIXES:
+
+* Issue [#13][]: Perform config validation at action execution time. ([@schisamo][])
+
 ## 1.2.1 (December 17, 2013)
 
 IMPROVEMENTS:
 
-* Acceptance test coverage that verifies Chef is not reinstalled into a system where the desired version of Chef already exists.
+* Acceptance test coverage that verifies Chef is not reinstalled into a system where the desired version of Chef already exists. ([@schisamo][])
 
 BUG FIXES:
 
@@ -18,7 +34,7 @@ IMPROVEMENTS:
 
 * PR [#48][]: Don't install Chef if `--no-provision` is specified. ([@tmatilai][])
 * PR [#50][]: Update README.md with vagrant-parallels compatibility. ([@wizonesolutions][])
-* PR [#56][]: Add Rubocop support.
+* PR [#56][]: Add Rubocop support and fix style errors. ([@schisamo][])
 
 BUG FIXES:
 
@@ -100,6 +116,7 @@ BUG FIXES:
 [#8]: https://github.com/schisamo/vagrant-omnibus/issues/8
 [#10]: https://github.com/schisamo/vagrant-omnibus/issues/10
 [#12]: https://github.com/schisamo/vagrant-omnibus/issues/12
+[#13]: https://github.com/schisamo/vagrant-omnibus/issues/13
 [#15]: https://github.com/schisamo/vagrant-omnibus/issues/15
 [#17]: https://github.com/schisamo/vagrant-omnibus/issues/17
 [#19]: https://github.com/schisamo/vagrant-omnibus/issues/19
@@ -121,7 +138,12 @@ BUG FIXES:
 [#53]: https://github.com/schisamo/vagrant-omnibus/issues/53
 [#56]: https://github.com/schisamo/vagrant-omnibus/issues/56
 [#57]: https://github.com/schisamo/vagrant-omnibus/issues/57
+[#59]: https://github.com/schisamo/vagrant-omnibus/issues/59
+[#60]: https://github.com/schisamo/vagrant-omnibus/issues/60
+[#61]: https://github.com/schisamo/vagrant-omnibus/issues/61
+[@ampedandwired]: https://github.com/ampedandwired
 [@comutt]: https://github.com/comutt
+[@jarig]: https://github.com/jarig
 [@matsu911]: https://github.com/matsu911
 [@michfield]: https://github.com/michfield
 [@petecheslock]: https://github.com/petecheslock

data/Gemfile

@@ -6,17 +6,18 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.3.5"
+  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.4.3'
+  gem 'vagrant-windows', '~> 1.5'
 end
 
 group :acceptance do
-  gem "vagrant-digitalocean", "~> 0.4.0"
-  gem "vagrant-aws", "~> 0.4.0"
-  gem "vagrant-rackspace", "~> 0.1.4"
+  gem 'vagrant-digitalocean', '~> 0.5'
+  gem 'vagrant-aws', '~> 0.4'
+  gem 'vagrant-rackspace', '~> 0.1'
 end
 
 group :docs do
-  gem "yard", "~> 0.8.5"
-  gem "redcarpet", "~> 2.2.2"
-  gem "github-markup", "~> 0.7.5"
+  gem 'yard', '~> 0.8'
+  gem 'redcarpet', '~> 2.2'
+  gem 'github-markup', '~> 0.7'
 end

data/README.md

@@ -112,14 +112,14 @@ The test are also executed by Travis CI every time code is pushed to GitHub.
 Currently this repo ships with a set of basic acceptance tests that will:
 
 * Provision a Vagrant instance.
-* Attempt to install Chef 11.4.0 using this plugin.
+* Attempt to install Chef using this plugin.
 * Perform a very basic chef-solo run to ensure Chef is in fact installed.
 
-The acceptance tests are run against the Vagrant providers mentioned above. The
-acceptance tests can be run with:
+The acceptance tests can be run against a subset of the Vagrant providers 
+listed above. The acceptance tests can be run with:
 
 ```
-rake test:acceptance
+rake test:acceptance:PROVIDER_NAME
 ```
 
 And as expected, all acceptance tests only uses provisioner-less baseboxes and

data/Rakefile

@@ -4,49 +4,78 @@ require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 require 'yard'
 
-Rubocop::RakeTask.new
+# rubocop:disable LineLength
+
+def run_acceptance_tests(provider = 'virtualbox')
+  puts '=================================================================='
+  puts "Running acceptance tests against '#{provider}' provider..."
+  puts '=================================================================='
+
+  Dir.chdir("test/acceptance/#{provider}") do
+    system('vagrant destroy -f')
+    system("vagrant up --provider=#{provider}")
+    system('vagrant destroy -f')
+  end
+end
+
 YARD::Rake::YardocTask.new
 
+namespace :style do
+  require 'rubocop/rake_task'
+  desc 'Run Ruby style checks'
+  Rubocop::RakeTask.new(:ruby) do |task|
+    task.patterns = [
+      '**/*.rb',
+      '**/Vagrantfile',
+      '*.gemspec',
+      'Gemfile',
+      'Rakefile'
+    ]
+  end
+end
+
 namespace :test do
 
   RSpec::Core::RakeTask.new(:unit) do |t|
-    t.pattern = "test/unit/**/*_spec.rb"
+    t.pattern = 'test/unit/**/*_spec.rb'
   end
 
-  desc "Run acceptance tests..these actually launch Vagrant sessions."
-  task :acceptance, :provider do |t, args|
-
-    # ensure all required dummy boxen are installed
-    %w{ aws rackspace }.each do |provider|
-      unless system("vagrant box list | grep 'dummy\s*(#{provider})' &>/dev/null")
-        system("vagrant box add dummy https://github.com/mitchellh/vagrant-#{provider}/raw/master/dummy.box")
+  namespace :acceptance do
+    desc 'Run acceptance tests with AWS provider'
+    task :aws do
+      unless system("vagrant box list | grep 'dummy\s*(aws)' &>/dev/null")
+        system('vagrant box add dummy https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box')
       end
+      run_acceptance_tests('aws')
     end
 
-    unless system("vagrant box list | grep 'digital_ocean' &>/dev/null")
-      system("vagrant box add digital_ocean https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box")
+    desc 'Run acceptance tests with Digital Ocean provider'
+    task 'digital_ocean' do
+      unless system("vagrant box list | grep 'digital_ocean' &>/dev/null")
+        system('vagrant box add digital_ocean https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box')
+      end
     end
 
-    all_providers = Dir["test/acceptance/*"].map{|dir| File.basename(File.expand_path(dir))}
-
-    # If a provider wasn't passed to the task run acceptance tests against
-    # ALL THE PROVIDERS!
-    providers = if args[:provider] && all_providers.include?(args[:provider])
-                  [args[:provider]]
-                else
-                  all_providers
-                end
-
-    providers.each do |provider|
-      puts "=================================================================="
-      puts "Running acceptance tests against '#{provider}' provider..."
-      puts "=================================================================="
-
-      Dir.chdir("test/acceptance/#{provider}") do
-        system("vagrant destroy -f")
-        system("vagrant up --provider=#{provider}")
-        system("vagrant destroy -f")
+    desc 'Run acceptance tests with Rackspace provider'
+    task :rackspace do
+      unless system("vagrant box list | grep 'dummy\s*(rackspace)' &>/dev/null")
+        system('vagrant box add dummy https://github.com/mitchellh/vagrant-rackspace/raw/master/dummy.box')
       end
+      run_acceptance_tests('aws')
+    end
+
+    desc 'Run acceptance tests with VirtualBox provider'
+    task :virtualbox do
+      run_acceptance_tests('virtualbox')
     end
   end
 end
+
+# We cannot run Test Kitchen on Travis CI yet...
+namespace :travis do
+  desc 'Run tests on Travis'
+  task ci: ['style:ruby', 'test:unit']
+end
+
+# The default rake task should just run it all
+task default: ['style:ruby', 'test:unit', 'test:acceptance:virtualbox']

data/lib/vagrant-omnibus/action/install_chef.rb

@@ -26,24 +26,21 @@ module VagrantPlugins
       #
       # This action installs Chef Omnibus packages at the desired version.
       class InstallChef
-        INSTALL_SH = "#{ENV['OMNIBUS_INSTALL_URL'] ||
-          'https://www.opscode.com/chef/install.sh'}"
-
         def initialize(app, env)
           @app = app
           @logger =
             Log4r::Logger.new('vagrantplugins::omnibus::action::installchef')
           @machine = env[:machine]
-          # Config#finalize! SHOULD be called automatically
-          @machine.config.omnibus.finalize!
+          @install_script = find_install_script
         end
 
         def call(env)
           @app.call(env)
 
-          return if !@machine.communicate.ready? ||
-                    !provision_enabled?(env) ||
-                    windows_guest?(env)
+          return unless @machine.communicate.ready? && provision_enabled?(env)
+
+          # Perform delayed validation
+          @machine.config.omnibus.validate!(@machine)
 
           desired_version = @machine.config.omnibus.chef_version
           unless desired_version.nil?
@@ -53,7 +50,7 @@ module VagrantPlugins
                 version: desired_version
               )
             else
-              fetch_install_sh(env)
+              fetch_or_create_install_script(env)
               env[:ui].info I18n.t(
                 'vagrant-omnibus.action.installing',
                 version: desired_version
@@ -66,8 +63,28 @@ module VagrantPlugins
 
         private
 
-        def windows_guest?(env)
-          env[:machine].config.vm.guest.eql?(:windows)
+        # Determines what flavor of install script should be used to
+        # install Omnibus Chef package.
+        def find_install_script
+          if !ENV['OMNIBUS_INSTALL_URL'].nil?
+            ENV['OMNIBUS_INSTALL_URL']
+          elsif windows_guest?
+            'http://www.getchef.com/chef/install.msi'
+          else
+            'https://www.getchef.com/chef/install.sh'
+          end
+        end
+
+        def install_script_name
+          if windows_guest?
+            'install.bat'
+          else
+            'install.sh'
+          end
+        end
+
+        def windows_guest?
+          @machine.config.vm.guest.eql?(:windows)
         end
 
         def provision_enabled?(env)
@@ -76,26 +93,38 @@ module VagrantPlugins
 
         def installed_version
           version = nil
-          command = 'echo $(chef-solo -v)'
-          @machine.communicate.sudo(command) do |type, data|
+          opts = nil
+          if windows_guest?
+            command = 'cmd.exe /c chef-solo -v 2>&0'
+            opts = { shell: :cmd, error_check: false }
+          else
+            command = 'echo $(chef-solo -v)'
+          end
+          @machine.communicate.sudo(command, opts) do |type, data|
             if [:stderr, :stdout].include?(type)
-              next if data =~ /stdin: is not a tty/
-              v = data.chomp
-              version ||= v.split[1] unless v.empty?
+              version_match = data.match(/^Chef: (.+)/)
+              version = version_match.captures[0].strip if version_match
             end
           end
           version
         end
 
-        # Uploads install.sh from Host's Vagrant TMP directory to guest
+        #
+        # Upload install script from Host's Vagrant TMP directory to guest
         # and executes.
+        #
         def install(version, env)
           shell_escaped_version = Shellwords.escape(version)
 
           @machine.communicate.tap do |comm|
-            comm.upload(@install_sh_temp_path, 'install.sh')
-            # TODO: Execute with `sh` once install.sh removes it's bash-isms.
-            install_cmd = "bash install.sh -v #{shell_escaped_version} 2>&1"
+            comm.upload(@script_tmp_path, install_script_name)
+            if windows_guest?
+              install_cmd = "cmd.exe /c #{install_script_name} #{version}"
+            else
+              # TODO: Execute with `sh` once install.sh removes it's bash-isms.
+              install_cmd =
+                "bash #{install_script_name} -v #{shell_escaped_version} 2>&1"
+            end
             comm.sudo(install_cmd) do |type, data|
               if [:stderr, :stdout].include?(type)
                 next if data =~ /stdin: is not a tty/
@@ -105,18 +134,18 @@ module VagrantPlugins
           end
         end
 
-        # Fetches install.sh file to the Host's Vagrant TMP directory.
-        #
-        # Mostly lifted from:
         #
-        #   mitchellh/vagrant/blob/master/lib/vagrant/action/builtin/box_add.rb
+        # Fetches or creates a platform specific install script to the Host's
+        # Vagrant TMP directory.
         #
-        def fetch_install_sh(env)
-          @install_sh_temp_path =
-            env[:tmp_path].join(Time.now.to_i.to_s + '-install.sh')
-          @logger.info("Downloading install.sh to: #{@install_sh_temp_path}")
+        def fetch_or_create_install_script(env)
+          @script_tmp_path =
+            env[:tmp_path].join("#{Time.now.to_i.to_s}-#{install_script_name}")
+
+          @logger.info("Generating install script at: #{@script_tmp_path}")
+
+          url = @install_script
 
-          url = INSTALL_SH
           if File.file?(url) || url !~ /^[a-z0-9]+:.*$/i
             @logger.info('Assuming URL is a file.')
             file_path = File.expand_path(url)
@@ -124,18 +153,37 @@ module VagrantPlugins
             url = "file:#{file_path}"
           end
 
-          downloader_options = {}
-          # downloader_options[:insecure] = env[:box_download_insecure]
-          # downloader_options[:ui] = env[:ui]
-
-          # Download the install.sh file to a temporary path. We store
-          # the temporary path as an instance variable so that the
-          # `#recover` method can access it.
+          # Download the install.sh or create install.bat file to a temporary
+          # path. We store the temporary path as an instance variable so that
+          # the `#recover` method can access it.
           begin
-            downloader = Vagrant::Util::Downloader.new(url,
-                                                       @install_sh_temp_path,
-                                                       downloader_options)
-            downloader.download!
+            if windows_guest?
+              # generate a install.bat file at the `@script_tmp_path` location
+              #
+              # We'll also disable Rubocop for this embedded PowerShell code:
+              #
+              # rubocop:disable LineLength, SpaceAroundBlockBraces
+              #
+              File.open(@script_tmp_path, 'w') do |f|
+                f.puts <<-EOH.gsub(/^\s{18}/, '')
+                  @echo off
+                  set version=%1
+                  set dest=%~dp0chef-client-%version%-1.windows.msi
+                  echo Downloading Chef %version% for Windows...
+                  powershell -command "(New-Object System.Net.WebClient).DownloadFile('#{url}?v=%version%', '%dest%')"
+                  echo Installing Chef %version%
+                  msiexec /q /i %dest%
+                EOH
+              end
+              # rubocop:enable LineLength, SpaceAroundBlockBraces
+            else
+              downloader = Vagrant::Util::Downloader.new(
+                url,
+                @script_tmp_path,
+                {}
+              )
+              downloader.download!
+            end
           rescue Vagrant::Errors::DownloaderInterrupted
             # The downloader was interrupted, so just return, because that
             # means we were interrupted as well.
@@ -145,8 +193,8 @@ module VagrantPlugins
         end
 
         def recover(env)
-          if @install_sh_temp_path && File.exist?(@install_sh_temp_path)
-            File.unlink(@install_sh_temp_path)
+          if @script_tmp_path && File.exist?(@script_tmp_path)
+            File.unlink(@script_tmp_path)
           end
         end
       end

data/lib/vagrant-omnibus/config.rb

@@ -17,6 +17,8 @@
 require 'rubygems/dependency'
 require 'rubygems/dependency_installer'
 require 'vagrant'
+require 'vagrant/errors'
+require 'vagrant/util/template_renderer'
 
 module VagrantPlugins
   #
@@ -41,19 +43,33 @@ module VagrantPlugins
         end
       end
 
-      def validate(machine)
+      #
+      # Performs validation and immediately raises an exception for any
+      # detected errors.
+      #
+      # @raise [Vagrant::Errors::ConfigInvalid]
+      #   if validation fails
+      #
+      def validate!(machine)
+        finalize!
         errors = []
 
         unless valid_chef_version?(chef_version)
           msg = <<-EOH
-'#{chef_version}' is not a valid version of Chef.
+'#{ chef_version }' is not a valid version of Chef.
 
 A list of valid versions can be found at: http://www.opscode.com/chef/install/
           EOH
           errors << msg
         end
 
-        { 'Omnibus Plugin' => errors }
+        if errors.any?
+          rendered_errors = Vagrant::Util::TemplateRenderer.render(
+                              'config/validation_failed',
+                              errors: { 'vagrant-omnibus' => errors }
+                            )
+          fail Vagrant::Errors::ConfigInvalid, errors: rendered_errors
+        end
       end
 
       private

data/lib/vagrant-omnibus/version.rb

@@ -17,6 +17,6 @@
 module VagrantPlugins
   #
   module Omnibus
-    VERSION = '1.2.1'
+    VERSION = '1.3.0'
   end
 end

data/test/acceptance/aws/Vagrantfile

@@ -5,24 +5,25 @@
 require 'vagrant-omnibus'
 require 'vagrant-aws'
 
-Vagrant.configure("2") do |config|
-  config.omnibus.chef_version = "11.4.0"
+Vagrant.configure('2') do |config|
+  config.omnibus.chef_version = '11.4.0'
 
-  config.vm.box = "dummy"
+  config.vm.box = 'dummy'
   config.vm.provider :aws do |aws, override|
     aws.access_key_id = ENV['DEV_AWS_ACCESS_KEY_ID']
     aws.secret_access_key = ENV['DEV_AWS_SECRET_ACCESS_KEY']
     aws.keypair_name = ENV['USER']
 
-    aws.instance_type = "m1.large"
-    aws.ami = "ami-2efa9d47" # Ubuntu 12.04 LTS 64-bit instance root store
+    aws.instance_type = 'm1.large'
+    aws.ami = 'ami-2efa9d47' # Ubuntu 12.04 LTS 64-bit instance root store
 
-    override.ssh.username = "ubuntu"
-    override.ssh.private_key_path = "~/.ssh/id_rsa"
+    override.ssh.username = 'ubuntu'
+    override.ssh.private_key_path = '~/.ssh/id_rsa'
   end
 
   config.vm.provision :chef_solo do |chef|
-    chef.cookbooks_path = File.expand_path("../../../support/cookbooks", __FILE__)
-    chef.add_recipe "chef-inator"
+    chef.cookbooks_path =
+      File.expand_path('../../../support/cookbooks', __FILE__)
+    chef.add_recipe 'chef-inator'
   end
 end

data/test/acceptance/digital_ocean/Vagrantfile

@@ -5,7 +5,7 @@ Vagrant.configure('2') do |config|
   config.omnibus.chef_version = :latest
 
   config.vm.box = 'digital_ocean'
-  config.vm.synced_folder '.', '/vagrant', :disabled => true
+  config.vm.synced_folder '.', '/vagrant', disabled: true
 
   config.vm.provider :digital_ocean do |provider, override|
     provider.client_id = ENV['DO_CLIENT_ID']
@@ -17,7 +17,8 @@ Vagrant.configure('2') do |config|
   end
 
   config.vm.provision :chef_solo do |chef|
-    chef.cookbooks_path = File.expand_path("../../../support/cookbooks", __FILE__)
-    chef.add_recipe "chef-inator"
+    chef.cookbooks_path =
+      File.expand_path('../../../support/cookbooks', __FILE__)
+    chef.add_recipe 'chef-inator'
   end
 end

data/test/acceptance/rackspace/Vagrantfile

@@ -5,23 +5,24 @@
 require 'vagrant-omnibus'
 require 'vagrant-rackspace'
 
-Vagrant.configure("2") do |config|
+Vagrant.configure('2') do |config|
   config.omnibus.chef_version = '11.4.0'
 
-  config.vm.box = "dummy"
+  config.vm.box = 'dummy'
   config.vm.provider :rackspace do |rackspace|
     rackspace.username = ENV['DEV_RACKSPACE_USERNAME']
     rackspace.api_key = ENV['DEV_RACKSPACE_API_KEY']
     rackspace.flavor = /512MB/
     rackspace.image = /Ubuntu 12.04/
-    rackspace.public_key_path = "~/.ssh/id_rsa.pub"
-    # TODO - switch this to the `override.ssh.private_key_path` syntax once
+    rackspace.public_key_path = '~/.ssh/id_rsa.pub'
+    # TODO: switch this to the `override.ssh.private_key_path` syntax once
     # `vagrant-rackspace` is updated.
-    config.ssh.private_key_path = "~/.ssh/id_rsa"
+    config.ssh.private_key_path = '~/.ssh/id_rsa'
   end
 
   config.vm.provision :chef_solo do |chef|
-    chef.cookbooks_path = File.expand_path("../../../support/cookbooks", __FILE__)
-    chef.add_recipe "chef-inator"
+    chef.cookbooks_path =
+      File.expand_path('../../../support/cookbooks', __FILE__)
+    chef.add_recipe 'chef-inator'
   end
 end

data/test/acceptance/virtualbox/Vagrantfile

@@ -1,32 +1,35 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+# rubocop:disable LineLength
+
 # plugins don't seem to be auto-loaded from the bundle
 require 'vagrant-omnibus'
+require 'vagrant-windows'
 
-Vagrant.configure("2") do |config|
+Vagrant.configure('2') do |config|
 
   config.vm.define :new_chef do |new_chef_config|
-    new_chef_config.vm.box = "opscode-ubuntu-12.04"
-    new_chef_config.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box"
+    new_chef_config.vm.box = 'opscode-ubuntu-12.04'
+    new_chef_config.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box'
 
     new_chef_config.omnibus.chef_version = :latest
 
     new_chef_config.vm.provision :chef_solo do |chef|
-      chef.cookbooks_path = File.expand_path("../../../support/cookbooks", __FILE__)
-      chef.add_recipe "chef-inator"
+      chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
+      chef.add_recipe 'chef-inator'
     end
   end
 
   config.vm.define :old_chef do |old_chef_config|
-    old_chef_config.vm.box = "opscode-centos-6.5"
-    old_chef_config.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box"
+    old_chef_config.vm.box = 'opscode-centos-6.5'
+    old_chef_config.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box'
 
     old_chef_config.omnibus.chef_version = '10.24.0'
 
     old_chef_config.vm.provision :chef_solo do |chef|
-      chef.cookbooks_path = File.expand_path("../../../support/cookbooks", __FILE__)
-      chef.add_recipe "chef-inator"
+      chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
+      chef.add_recipe 'chef-inator'
     end
   end
 
@@ -37,8 +40,27 @@ Vagrant.configure("2") do |config|
     installed_config.omnibus.chef_version = '11.4.4'
 
     installed_config.vm.provision :chef_solo do |chef|
-      chef.cookbooks_path = File.expand_path("../../../support/cookbooks", __FILE__)
-      chef.add_recipe "chef-inator"
+      chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
+      chef.add_recipe 'chef-inator'
+    end
+  end
+
+  config.vm.define :chef_on_windows do |win_config|
+    win_config.vm.box = 'opscode-windows-6.1'
+    win_config.vm.box_url = 'http://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-windows-6.1.box'
+    win_config.vm.boot_timeout = 500
+
+    win_config.omnibus.chef_version = :latest
+
+    win_config.vm.network :forwarded_port, guest: 3389, host: 3389
+    win_config.vm.network :forwarded_port, guest: 5985, host: 5985
+
+    win_config.vm.guest = :windows
+    win_config.winrm.timeout = 500
+
+    win_config.vm.provision :chef_solo do |chef|
+      chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
+      chef.add_recipe 'chef-inator'
     end
   end
 end

data/test/unit/vagrant-omnibus/config_spec.rb

@@ -6,7 +6,10 @@
 #
 require_relative '../spec_helper'
 
+# rubocop:disable LineLength
+
 describe VagrantPlugins::Omnibus::Config do
+  let(:machine) { double('machine') }
   let(:instance) { described_class.new }
 
   subject(:config) do
@@ -26,17 +29,13 @@ describe VagrantPlugins::Omnibus::Config do
     its(:chef_version) { should match(/\d*\.\d*\.\d*/) }
   end
 
-  describe '#validate' do
-    let(:machine) { double('machine') }
-    let(:error_hash_key) { 'Omnibus Plugin' }
-    let(:result) { subject.validate(machine) }
-    let(:errors) { result[error_hash_key] }
-
-    it 'returns a Hash with an `Omnibus Plugin` key' do
-      result.should be_a(Hash)
-      result.should have_key(error_hash_key)
+  describe 'validate' do
+    it 'should be no-op' do
+      expect(subject.validate(machine)).to eq('VagrantPlugins::Omnibus::Config' => [])
     end
+  end
 
+  describe '#validate!' do
     describe 'chef_version validation' do
       {
         '11.4.0' => {
@@ -56,11 +55,11 @@ describe VagrantPlugins::Omnibus::Config do
           let(:chef_version) { version_string }
           if opts[:valid]
             it 'passes' do
-              errors.should be_empty
+              expect { subject.validate!(machine) }.to_not raise_error
             end
           else
             it 'fails' do
-              errors.should_not be_empty
+              expect { subject.validate!(machine) }.to raise_error(Vagrant::Errors::ConfigInvalid)
             end
           end
         end

data/vagrant-omnibus.gemspec

@@ -4,22 +4,24 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'vagrant-omnibus/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "vagrant-omnibus"
+  spec.name          = 'vagrant-omnibus'
   spec.version       = VagrantPlugins::Omnibus::VERSION
-  spec.authors       = ["Seth Chisamore"]
-  spec.email         = ["schisamo@opscode.com"]
-  spec.description   = %q{A Vagrant plugin that ensures the desired version of Chef is installed via the platform-specific Omnibus packages.}
+  spec.authors       = ['Seth Chisamore']
+  spec.email         = ['schisamo@opscode.com']
+  spec.description   = 'A Vagrant plugin that ensures the desired version of' \
+                       ' Chef is installed via the platform-specific Omnibus' \
+                       ' packages.'
   spec.summary       = spec.description
-  spec.homepage      = "https://github.com/schisamo/vagrant-omnibus"
-  spec.license       = "Apache 2.0"
+  spec.homepage      = 'https://github.com/schisamo/vagrant-omnibus'
+  spec.license       = 'Apache 2.0'
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency 'rubocop', '~> 0.15.0'
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-omnibus
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,17 +64,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '0'
 description: A Vagrant plugin that ensures the desired version of Chef is installed
   via the platform-specific Omnibus packages.
 email:
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2839676175019097960
+      hash: 128509343253395990
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2839676175019097960
+      hash: 128509343253395990
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23