vagrant-omnibus 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6339ef7c56ffa23086bb1c674794b06895f19b82
-  data.tar.gz: 81e5e0ddb782126e02dfb47882c2b79c49b39510
+  metadata.gz: fbae26bb2578c8365aa975504631802baa655471
+  data.tar.gz: 3135aa853c1dd0b902cf1a18bc4b4bcd3b224436
 SHA512:
-  metadata.gz: 70c581641b0fb84bcf7c4c91b6287db28988a041729c45937f05d4f1082adfb39564c84e99e0d19847b213fb5e65c58e7edc157667ceffd6f60fd97604509a97
-  data.tar.gz: 500f99fd96188356ed034b093665ccc1704d02e1d0140c18a402eb65f844a2d27974855ee08294796b208336b79a9e1a11bf5f7c494f844ab6628bf9d9ed73aa
+  metadata.gz: bc51cfb50ab270b05b899f93cae8cc624fc4723f857beff4d348cdc089144fc2ea4df2b1b175892c08e4937db66f31a50e2ebdcc436e69043284b242ce289c02
+  data.tar.gz: 0989b2ad1530a5a5a3346129f7d05a3b14707eb5fc623180063f1f186f5d2f66d101ccaf12036270261b716883d8281805813a33a00fea9b0393e240e1fdf952

data/CHANGELOG.md

@@ -1,7 +1,13 @@
-Chef Sugar Changelog
-====================
+vagrant-omnibus Changelog
+=========================
 This file is used to list changes made in each version of the vagrant-omnibus plugin.
 
+1.4.1 (April 26, 2014)
+----------------------
+### Bug Fixes
+
+- Issue [#79][]: Install command not idempotent on Windows. ([@schisamo][])
+
 1.4.0 (April 25, 2014)
 -------------------------
 ### New Features
@@ -172,6 +178,7 @@ This file is used to list changes made in each version of the vagrant-omnibus pl
 [#67]: https://github.com/schisamo/vagrant-omnibus/issues/67
 [#69]: https://github.com/schisamo/vagrant-omnibus/issues/69
 [#73]: https://github.com/schisamo/vagrant-omnibus/issues/73
+[#79]: https://github.com/schisamo/vagrant-omnibus/issues/79
 [@ampedandwired]: https://github.com/ampedandwired
 [@comutt]: https://github.com/comutt
 [@jarig]: https://github.com/jarig

data/Rakefile

@@ -69,6 +69,11 @@ namespace :test do
     task :virtualbox do
       run_acceptance_tests('virtualbox')
     end
+
+    desc 'Run acceptance tests with VMware provider'
+    task :vmware_fusion do
+      run_acceptance_tests('vmware_fusion')
+    end
   end
 end
 

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

@@ -136,7 +136,7 @@ module VagrantPlugins
           version = nil
           opts = communication_opts
           if windows_guest?
-            command = 'cmd.exe /c chef-solo -v 2>&0'
+            command = 'cmd.exe /c chef-solo -v'
             opts[:error_check] = false
           else
             command = 'echo $(chef-solo -v)'

data/lib/vagrant-omnibus/version.rb

@@ -17,6 +17,6 @@
 module VagrantPlugins
   #
   module Omnibus
-    VERSION = '1.4.0'
+    VERSION = '1.4.1'
   end
 end

data/test/acceptance/virtualbox/Vagrantfile

@@ -7,11 +7,21 @@
 require 'vagrant-omnibus'
 require 'vagrant-windows'
 
+def box_type
+  @box_type ||= begin
+    # Returns `/Users/schisamo/dev/code/schisamo/vagrant-omnibus/test/acceptance/vmware_fusion`
+    full_dir = File.dirname(File.expand_path(__FILE__))
+    # Returns `vmware_fusion`
+    base_dir = full_dir.split('/').last
+    base_dir.split('_').first
+  end
+end
+
 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_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/#{box_type}/opscode_ubuntu-12.04_chef-provisionerless.box'
 
     new_chef_config.omnibus.chef_version = :latest
 
@@ -23,7 +33,7 @@ Vagrant.configure('2') do |config|
 
   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_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/#{box_type}/opscode_centos-6.5_chef-provisionerless.box'
 
     old_chef_config.omnibus.chef_version = '10.24.0'
 
@@ -33,61 +43,51 @@ Vagrant.configure('2') do |config|
     end
   end
 
-  config.vm.define :chef_already_installed do |installed_config|
-    installed_config.vm.box = 'opscode-ubuntu-12.04-chef-11.4.4'
-    installed_config.vm.box_url = 'https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.4.box'
+  # We don't have legacy VMware boxes
+  unless box_type == 'vmware'
+    config.vm.define :chef_already_installed do |installed_config|
+      installed_config.vm.box = 'opscode-ubuntu-12.04-chef-11.4.4'
+      installed_config.vm.box_url = 'https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.4.box'
 
-    installed_config.omnibus.chef_version = '11.4.4'
+      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'
+      installed_config.vm.provision :chef_solo do |chef|
+        chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
+        chef.add_recipe 'chef-inator'
+      end
     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.vm.guest             = :windows
+    win_config.vm.box               = 'win7x64-pro'
+    # build this yourself https://github.com/misheska/basebox-packer
+    # win_config.vm.box_url           = ''
+    win_config.vm.boot_timeout      = 500
+    win_config.winrm.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
 
-  config.vm.define :no_bash_no_chef_run do |c|
-    c.vm.box = 'opscode-freebsd-9.2'
-    c.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2_chef-provisionerless.box'
-    c.omnibus.chef_version = :latest
-
-    c.vm.network 'private_network', ip: '44.44.44.10'
-    c.vm.synced_folder '.', '/vagrant', nfs: true, id: 'vagrant-root'
-  end
-
   config.vm.define :no_bash do |c|
     c.vm.box = 'opscode-freebsd-9.2'
-    c.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2_chef-provisionerless.box'
+    c.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/#{box_type}/opscode_freebsd-9.2_chef-provisionerless.box'
     c.omnibus.chef_version = :latest
 
-    c.vm.network 'private_network', ip: '44.44.44.10'
-    c.vm.synced_folder '.', '/vagrant', nfs: true, id: 'vagrant-root'
+    c.vm.synced_folder '.', '/vagrant', type: 'rsync', id: 'vagrant-root'
 
     # This forces all remote commands to execute under `sh`. If we don't
     # add this config then all `chef` related commands will execute
-    # with `bash`.
+    # with `bash` (which might not be installed).
     c.ssh.shell = 'sh'
 
     c.vm.provision :chef_solo do |chef|
-      chef.synced_folder_type = 'nfs'
+      chef.synced_folder_type = 'rsync'
       chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
       chef.add_recipe 'chef-inator'
     end

data/test/acceptance/vmware_fusion/Vagrantfile

@@ -0,0 +1,95 @@
+# -*- 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'
+
+def box_type
+  @box_type ||= begin
+    # Returns `/Users/schisamo/dev/code/schisamo/vagrant-omnibus/test/acceptance/vmware_fusion`
+    full_dir = File.dirname(File.expand_path(__FILE__))
+    # Returns `vmware_fusion`
+    base_dir = full_dir.split('/').last
+    base_dir.split('_').first
+  end
+end
+
+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/#{box_type}/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'
+    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/#{box_type}/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'
+    end
+  end
+
+  # We don't have legacy VMware boxes
+  unless box_type == 'vmware'
+    config.vm.define :chef_already_installed do |installed_config|
+      installed_config.vm.box = 'opscode-ubuntu-12.04-chef-11.4.4'
+      installed_config.vm.box_url = 'https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.4.box'
+
+      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'
+      end
+    end
+  end
+
+  config.vm.define :chef_on_windows do |win_config|
+    # win_config.vm.guest             = :windows
+    win_config.vm.box               = 'win7x64-pro'
+    # build this yourself https://github.com/misheska/basebox-packer
+    # win_config.vm.box_url           = ''
+    win_config.vm.boot_timeout      = 500
+    win_config.winrm.timeout        = 500
+
+    win_config.omnibus.chef_version = :latest
+
+    win_config.vm.provision :chef_solo do |chef|
+      chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
+      chef.add_recipe 'chef-inator'
+    end
+  end
+
+  config.vm.define :no_bash do |c|
+    c.vm.box = 'opscode-freebsd-9.2'
+    c.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/#{box_type}/opscode_freebsd-9.2_chef-provisionerless.box'
+    c.omnibus.chef_version = :latest
+
+    c.vm.synced_folder '.', '/vagrant', type: 'rsync', id: 'vagrant-root'
+
+    # This forces all remote commands to execute under `sh`. If we don't
+    # add this config then all `chef` related commands will execute
+    # with `bash` (which might not be installed).
+    c.ssh.shell = 'sh'
+
+    c.vm.provision :chef_solo do |chef|
+      chef.synced_folder_type = 'rsync'
+      chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
+      chef.add_recipe 'chef-inator'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-omnibus
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,6 +96,7 @@ files:
 - test/acceptance/digital_ocean/Vagrantfile
 - test/acceptance/rackspace/Vagrantfile
 - test/acceptance/virtualbox/Vagrantfile
+- test/acceptance/vmware_fusion/Vagrantfile
 - test/support/cookbooks/chef-inator/README.md
 - test/support/cookbooks/chef-inator/metadata.rb
 - test/support/cookbooks/chef-inator/recipes/default.rb
@@ -132,6 +133,7 @@ test_files:
 - test/acceptance/digital_ocean/Vagrantfile
 - test/acceptance/rackspace/Vagrantfile
 - test/acceptance/virtualbox/Vagrantfile
+- test/acceptance/vmware_fusion/Vagrantfile
 - test/support/cookbooks/chef-inator/README.md
 - test/support/cookbooks/chef-inator/metadata.rb
 - test/support/cookbooks/chef-inator/recipes/default.rb