vagrant-omnibus 1.4.0 → 1.4.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +9 -2
  3. data/Rakefile +5 -0
  4. data/lib/vagrant-omnibus/action/install_chef.rb +1 -1
  5. data/lib/vagrant-omnibus/version.rb +1 -1
  6. data/test/acceptance/virtualbox/Vagrantfile +32 -32
  7. data/test/acceptance/vmware_fusion/Vagrantfile +95 -0
  8. metadata +4 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6339ef7c56ffa23086bb1c674794b06895f19b82
4
- data.tar.gz: 81e5e0ddb782126e02dfb47882c2b79c49b39510
3
+ metadata.gz: fbae26bb2578c8365aa975504631802baa655471
4
+ data.tar.gz: 3135aa853c1dd0b902cf1a18bc4b4bcd3b224436
5
5
  SHA512:
6
- metadata.gz: 70c581641b0fb84bcf7c4c91b6287db28988a041729c45937f05d4f1082adfb39564c84e99e0d19847b213fb5e65c58e7edc157667ceffd6f60fd97604509a97
7
- data.tar.gz: 500f99fd96188356ed034b093665ccc1704d02e1d0140c18a402eb65f844a2d27974855ee08294796b208336b79a9e1a11bf5f7c494f844ab6628bf9d9ed73aa
6
+ metadata.gz: bc51cfb50ab270b05b899f93cae8cc624fc4723f857beff4d348cdc089144fc2ea4df2b1b175892c08e4937db66f31a50e2ebdcc436e69043284b242ce289c02
7
+ data.tar.gz: 0989b2ad1530a5a5a3346129f7d05a3b14707eb5fc623180063f1f186f5d2f66d101ccaf12036270261b716883d8281805813a33a00fea9b0393e240e1fdf952
data/CHANGELOG.md CHANGED
@@ -1,7 +1,13 @@
1
- Chef Sugar Changelog
2
- ====================
1
+ vagrant-omnibus Changelog
2
+ =========================
3
3
  This file is used to list changes made in each version of the vagrant-omnibus plugin.
4
4
 
5
+ 1.4.1 (April 26, 2014)
6
+ ----------------------
7
+ ### Bug Fixes
8
+
9
+ - Issue [#79][]: Install command not idempotent on Windows. ([@schisamo][])
10
+
5
11
  1.4.0 (April 25, 2014)
6
12
  -------------------------
7
13
  ### New Features
@@ -172,6 +178,7 @@ This file is used to list changes made in each version of the vagrant-omnibus pl
172
178
  [#67]: https://github.com/schisamo/vagrant-omnibus/issues/67
173
179
  [#69]: https://github.com/schisamo/vagrant-omnibus/issues/69
174
180
  [#73]: https://github.com/schisamo/vagrant-omnibus/issues/73
181
+ [#79]: https://github.com/schisamo/vagrant-omnibus/issues/79
175
182
  [@ampedandwired]: https://github.com/ampedandwired
176
183
  [@comutt]: https://github.com/comutt
177
184
  [@jarig]: https://github.com/jarig
data/Rakefile CHANGED
@@ -69,6 +69,11 @@ namespace :test do
69
69
  task :virtualbox do
70
70
  run_acceptance_tests('virtualbox')
71
71
  end
72
+
73
+ desc 'Run acceptance tests with VMware provider'
74
+ task :vmware_fusion do
75
+ run_acceptance_tests('vmware_fusion')
76
+ end
72
77
  end
73
78
  end
74
79
 
data/lib/vagrant-omnibus/action/install_chef.rb CHANGED
@@ -136,7 +136,7 @@ module VagrantPlugins
136
136
  version = nil
137
137
  opts = communication_opts
138
138
  if windows_guest?
139
- command = 'cmd.exe /c chef-solo -v 2>&0'
139
+ command = 'cmd.exe /c chef-solo -v'
140
140
  opts[:error_check] = false
141
141
  else
142
142
  command = 'echo $(chef-solo -v)'
data/lib/vagrant-omnibus/version.rb CHANGED
@@ -17,6 +17,6 @@
17
17
  module VagrantPlugins
18
18
  #
19
19
  module Omnibus
20
- VERSION = '1.4.0'
20
+ VERSION = '1.4.1'
21
21
  end
22
22
  end
data/test/acceptance/virtualbox/Vagrantfile CHANGED
@@ -7,11 +7,21 @@
7
7
  require 'vagrant-omnibus'
8
8
  require 'vagrant-windows'
9
9
 
10
+ def box_type
11
+ @box_type ||= begin
12
+ # Returns `/Users/schisamo/dev/code/schisamo/vagrant-omnibus/test/acceptance/vmware_fusion`
13
+ full_dir = File.dirname(File.expand_path(__FILE__))
14
+ # Returns `vmware_fusion`
15
+ base_dir = full_dir.split('/').last
16
+ base_dir.split('_').first
17
+ end
18
+ end
19
+
10
20
  Vagrant.configure('2') do |config|
11
21
 
12
22
  config.vm.define :new_chef do |new_chef_config|
13
23
  new_chef_config.vm.box = 'opscode-ubuntu-12.04'
14
- new_chef_config.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box'
24
+ new_chef_config.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/#{box_type}/opscode_ubuntu-12.04_chef-provisionerless.box'
15
25
 
16
26
  new_chef_config.omnibus.chef_version = :latest
17
27
 
@@ -23,7 +33,7 @@ Vagrant.configure('2') do |config|
23
33
 
24
34
  config.vm.define :old_chef do |old_chef_config|
25
35
  old_chef_config.vm.box = 'opscode-centos-6.5'
26
- old_chef_config.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box'
36
+ old_chef_config.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/#{box_type}/opscode_centos-6.5_chef-provisionerless.box'
27
37
 
28
38
  old_chef_config.omnibus.chef_version = '10.24.0'
29
39
 
@@ -33,61 +43,51 @@ Vagrant.configure('2') do |config|
33
43
  end
34
44
  end
35
45
 
36
- config.vm.define :chef_already_installed do |installed_config|
37
- installed_config.vm.box = 'opscode-ubuntu-12.04-chef-11.4.4'
38
- installed_config.vm.box_url = 'https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.4.box'
46
+ # We don't have legacy VMware boxes
47
+ unless box_type == 'vmware'
48
+ config.vm.define :chef_already_installed do |installed_config|
49
+ installed_config.vm.box = 'opscode-ubuntu-12.04-chef-11.4.4'
50
+ installed_config.vm.box_url = 'https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.4.box'
39
51
 
40
- installed_config.omnibus.chef_version = '11.4.4'
52
+ installed_config.omnibus.chef_version = '11.4.4'
41
53
 
42
- installed_config.vm.provision :chef_solo do |chef|
43
- chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
44
- chef.add_recipe 'chef-inator'
54
+ installed_config.vm.provision :chef_solo do |chef|
55
+ chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
56
+ chef.add_recipe 'chef-inator'
57
+ end
45
58
  end
46
59
  end
47
60
 
48
61
  config.vm.define :chef_on_windows do |win_config|
49
- win_config.vm.box = 'opscode-windows-6.1'
50
- win_config.vm.box_url = 'http://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-windows-6.1.box'
51
- win_config.vm.boot_timeout = 500
62
+ # win_config.vm.guest = :windows
63
+ win_config.vm.box = 'win7x64-pro'
64
+ # build this yourself https://github.com/misheska/basebox-packer
65
+ # win_config.vm.box_url = ''
66
+ win_config.vm.boot_timeout = 500
67
+ win_config.winrm.timeout = 500
52
68
 
53
69
  win_config.omnibus.chef_version = :latest
54
70
 
55
- win_config.vm.network :forwarded_port, guest: 3389, host: 3389
56
- win_config.vm.network :forwarded_port, guest: 5985, host: 5985
57
-
58
- win_config.vm.guest = :windows
59
- win_config.winrm.timeout = 500
60
-
61
71
  win_config.vm.provision :chef_solo do |chef|
62
72
  chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
63
73
  chef.add_recipe 'chef-inator'
64
74
  end
65
75
  end
66
76
 
67
- config.vm.define :no_bash_no_chef_run do |c|
68
- c.vm.box = 'opscode-freebsd-9.2'
69
- c.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2_chef-provisionerless.box'
70
- c.omnibus.chef_version = :latest
71
-
72
- c.vm.network 'private_network', ip: '44.44.44.10'
73
- c.vm.synced_folder '.', '/vagrant', nfs: true, id: 'vagrant-root'
74
- end
75
-
76
77
  config.vm.define :no_bash do |c|
77
78
  c.vm.box = 'opscode-freebsd-9.2'
78
- c.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2_chef-provisionerless.box'
79
+ c.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/#{box_type}/opscode_freebsd-9.2_chef-provisionerless.box'
79
80
  c.omnibus.chef_version = :latest
80
81
 
81
- c.vm.network 'private_network', ip: '44.44.44.10'
82
- c.vm.synced_folder '.', '/vagrant', nfs: true, id: 'vagrant-root'
82
+ c.vm.synced_folder '.', '/vagrant', type: 'rsync', id: 'vagrant-root'
83
83
 
84
84
  # This forces all remote commands to execute under `sh`. If we don't
85
85
  # add this config then all `chef` related commands will execute
86
- # with `bash`.
86
+ # with `bash` (which might not be installed).
87
87
  c.ssh.shell = 'sh'
88
88
 
89
89
  c.vm.provision :chef_solo do |chef|
90
- chef.synced_folder_type = 'nfs'
90
+ chef.synced_folder_type = 'rsync'
91
91
  chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
92
92
  chef.add_recipe 'chef-inator'
93
93
  end
data/test/acceptance/vmware_fusion/Vagrantfile ADDED
@@ -0,0 +1,95 @@
1
+ # -*- mode: ruby -*-
2
+ # vi: set ft=ruby :
3
+
4
+ # rubocop:disable LineLength
5
+
6
+ # plugins don't seem to be auto-loaded from the bundle
7
+ require 'vagrant-omnibus'
8
+ require 'vagrant-windows'
9
+
10
+ def box_type
11
+ @box_type ||= begin
12
+ # Returns `/Users/schisamo/dev/code/schisamo/vagrant-omnibus/test/acceptance/vmware_fusion`
13
+ full_dir = File.dirname(File.expand_path(__FILE__))
14
+ # Returns `vmware_fusion`
15
+ base_dir = full_dir.split('/').last
16
+ base_dir.split('_').first
17
+ end
18
+ end
19
+
20
+ Vagrant.configure('2') do |config|
21
+
22
+ config.vm.define :new_chef do |new_chef_config|
23
+ new_chef_config.vm.box = 'opscode-ubuntu-12.04'
24
+ new_chef_config.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/#{box_type}/opscode_ubuntu-12.04_chef-provisionerless.box'
25
+
26
+ new_chef_config.omnibus.chef_version = :latest
27
+
28
+ new_chef_config.vm.provision :chef_solo do |chef|
29
+ chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
30
+ chef.add_recipe 'chef-inator'
31
+ end
32
+ end
33
+
34
+ config.vm.define :old_chef do |old_chef_config|
35
+ old_chef_config.vm.box = 'opscode-centos-6.5'
36
+ old_chef_config.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/#{box_type}/opscode_centos-6.5_chef-provisionerless.box'
37
+
38
+ old_chef_config.omnibus.chef_version = '10.24.0'
39
+
40
+ old_chef_config.vm.provision :chef_solo do |chef|
41
+ chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
42
+ chef.add_recipe 'chef-inator'
43
+ end
44
+ end
45
+
46
+ # We don't have legacy VMware boxes
47
+ unless box_type == 'vmware'
48
+ config.vm.define :chef_already_installed do |installed_config|
49
+ installed_config.vm.box = 'opscode-ubuntu-12.04-chef-11.4.4'
50
+ installed_config.vm.box_url = 'https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.4.box'
51
+
52
+ installed_config.omnibus.chef_version = '11.4.4'
53
+
54
+ installed_config.vm.provision :chef_solo do |chef|
55
+ chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
56
+ chef.add_recipe 'chef-inator'
57
+ end
58
+ end
59
+ end
60
+
61
+ config.vm.define :chef_on_windows do |win_config|
62
+ # win_config.vm.guest = :windows
63
+ win_config.vm.box = 'win7x64-pro'
64
+ # build this yourself https://github.com/misheska/basebox-packer
65
+ # win_config.vm.box_url = ''
66
+ win_config.vm.boot_timeout = 500
67
+ win_config.winrm.timeout = 500
68
+
69
+ win_config.omnibus.chef_version = :latest
70
+
71
+ win_config.vm.provision :chef_solo do |chef|
72
+ chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
73
+ chef.add_recipe 'chef-inator'
74
+ end
75
+ end
76
+
77
+ config.vm.define :no_bash do |c|
78
+ c.vm.box = 'opscode-freebsd-9.2'
79
+ c.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/#{box_type}/opscode_freebsd-9.2_chef-provisionerless.box'
80
+ c.omnibus.chef_version = :latest
81
+
82
+ c.vm.synced_folder '.', '/vagrant', type: 'rsync', id: 'vagrant-root'
83
+
84
+ # This forces all remote commands to execute under `sh`. If we don't
85
+ # add this config then all `chef` related commands will execute
86
+ # with `bash` (which might not be installed).
87
+ c.ssh.shell = 'sh'
88
+
89
+ c.vm.provision :chef_solo do |chef|
90
+ chef.synced_folder_type = 'rsync'
91
+ chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
92
+ chef.add_recipe 'chef-inator'
93
+ end
94
+ end
95
+ end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-omnibus
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.0
4
+ version: 1.4.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Seth Chisamore
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-04-25 00:00:00.000000000 Z
11
+ date: 2014-04-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -96,6 +96,7 @@ files:
96
96
  - test/acceptance/digital_ocean/Vagrantfile
97
97
  - test/acceptance/rackspace/Vagrantfile
98
98
  - test/acceptance/virtualbox/Vagrantfile
99
+ - test/acceptance/vmware_fusion/Vagrantfile
99
100
  - test/support/cookbooks/chef-inator/README.md
100
101
  - test/support/cookbooks/chef-inator/metadata.rb
101
102
  - test/support/cookbooks/chef-inator/recipes/default.rb
@@ -132,6 +133,7 @@ test_files:
132
133
  - test/acceptance/digital_ocean/Vagrantfile
133
134
  - test/acceptance/rackspace/Vagrantfile
134
135
  - test/acceptance/virtualbox/Vagrantfile
136
+ - test/acceptance/vmware_fusion/Vagrantfile
135
137
  - test/support/cookbooks/chef-inator/README.md
136
138
  - test/support/cookbooks/chef-inator/metadata.rb
137
139
  - test/support/cookbooks/chef-inator/recipes/default.rb