vagrant 0.4.1 → 0.4.2
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +1 -1
- data/VERSION +1 -1
- data/config/default.rb +10 -4
- data/lib/vagrant/actions/vm/forward_ports.rb +10 -32
- data/lib/vagrant/actions/vm/network.rb +29 -0
- data/lib/vagrant/actions/vm/package.rb +2 -0
- data/lib/vagrant/actions/vm/shared_folders.rb +50 -13
- data/lib/vagrant/config.rb +11 -23
- data/lib/vagrant/environment.rb +1 -1
- data/lib/vagrant/ssh.rb +6 -12
- data/lib/vagrant/systems/base.rb +7 -0
- data/lib/vagrant/systems/linux.rb +21 -26
- data/lib/vagrant/util/template_renderer.rb +1 -1
- data/templates/strings.yml +17 -1
- data/templates/unison/crontab_entry.erb +1 -0
- data/templates/unison/script.erb +71 -0
- data/test/test_helper.rb +5 -4
- data/test/vagrant/actions/vm/forward_ports_test.rb +39 -85
- data/test/vagrant/actions/vm/network_test.rb +67 -13
- data/test/vagrant/actions/vm/package_test.rb +5 -0
- data/test/vagrant/actions/vm/shared_folders_test.rb +113 -44
- data/test/vagrant/config_test.rb +0 -33
- data/test/vagrant/environment_test.rb +4 -4
- data/test/vagrant/ssh_test.rb +2 -13
- data/test/vagrant/systems/linux_test.rb +38 -33
- data/test/vagrant/util/template_renderer_test.rb +6 -0
- data/vagrant.gemspec +53 -53
- metadata +69 -52
- data/templates/crontab_entry.erb +0 -1
- data/templates/sync.erb +0 -14
@@ -7,9 +7,21 @@ class SharedFoldersActionTest < Test::Unit::TestCase
|
|
7
7
|
end
|
8
8
|
|
9
9
|
def stub_shared_folders
|
10
|
-
|
11
|
-
|
12
|
-
|
10
|
+
env = mock_environment do |config|
|
11
|
+
config.vm.shared_folders.clear
|
12
|
+
|
13
|
+
if block_given?
|
14
|
+
yield config
|
15
|
+
else
|
16
|
+
folders = [%w{foo fooguest foohost}, %w{bar barguest barhost}]
|
17
|
+
folders.each do |data|
|
18
|
+
config.vm.share_folder(*data)
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
|
23
|
+
@runner.stubs(:env).returns(env)
|
24
|
+
env.config.vm.shared_folders
|
13
25
|
end
|
14
26
|
|
15
27
|
context "before boot" do
|
@@ -21,47 +33,80 @@ class SharedFoldersActionTest < Test::Unit::TestCase
|
|
21
33
|
end
|
22
34
|
end
|
23
35
|
|
36
|
+
context "after boot" do
|
37
|
+
should "mount folders then setup unison" do
|
38
|
+
seq = sequence("after")
|
39
|
+
@action.expects(:mount_shared_folders).once.in_sequence(seq)
|
40
|
+
@action.expects(:setup_unison).once.in_sequence(seq)
|
41
|
+
@action.after_boot
|
42
|
+
end
|
43
|
+
end
|
44
|
+
|
24
45
|
context "collecting shared folders" do
|
25
46
|
setup do
|
26
47
|
File.stubs(:expand_path).returns("baz")
|
27
48
|
end
|
28
49
|
|
29
|
-
should "
|
30
|
-
|
50
|
+
should "return a hash of the shared folders" do
|
51
|
+
data = {
|
52
|
+
"foo" => %W[bar baz],
|
53
|
+
"bar" => %W[foo baz]
|
54
|
+
}
|
55
|
+
|
56
|
+
stub_shared_folders do |config|
|
57
|
+
data.each do |name, value|
|
58
|
+
config.vm.share_folder(name, *value)
|
59
|
+
end
|
60
|
+
end
|
31
61
|
|
32
|
-
result =
|
33
|
-
assert_equal
|
62
|
+
result = @action.shared_folders
|
63
|
+
assert_equal data.length, result.length
|
64
|
+
data.each do |name, value|
|
65
|
+
guest, host = value
|
66
|
+
assert_equal guest, result[name][:guestpath]
|
67
|
+
assert_equal host, result[name][:hostpath]
|
68
|
+
end
|
34
69
|
end
|
35
70
|
|
36
|
-
should "
|
37
|
-
|
71
|
+
should "append sync suffix if sync enabled to a folder" do
|
72
|
+
name = "foo"
|
73
|
+
guest = "bar"
|
74
|
+
host = "baz"
|
38
75
|
|
39
|
-
|
40
|
-
config.vm.
|
41
|
-
config.vm.share_folder("foo", "bar", "baz")
|
76
|
+
stub_shared_folders do |config|
|
77
|
+
config.vm.share_folder(name, guest, host, :sync => true)
|
42
78
|
end
|
43
79
|
|
44
|
-
@
|
45
|
-
|
46
|
-
|
47
|
-
assert_equal result, @action.shared_folders
|
80
|
+
result = @action.shared_folders
|
81
|
+
assert_equal "#{guest}#{@runner.env.config.unison.folder_suffix}", result[name][:guestpath]
|
82
|
+
assert_equal guest, result[name][:original][:guestpath]
|
48
83
|
end
|
49
84
|
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
assert_equal [["foo", "baz", "bar-sync", "bar"]], @action.shared_folders
|
85
|
+
should "not destroy original hash" do
|
86
|
+
@folders = stub_shared_folders do |config|
|
87
|
+
config.vm.share_folder("foo", "bar", "baz", :sync => true)
|
55
88
|
end
|
89
|
+
|
90
|
+
folder = @folders["foo"].dup
|
91
|
+
|
92
|
+
@action.shared_folders
|
93
|
+
assert_equal folder, @runner.env.config.vm.shared_folders["foo"]
|
56
94
|
end
|
95
|
+
end
|
57
96
|
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
config.vm.share_folder("foo", "bar", "baz",
|
97
|
+
context "unison shared folders" do
|
98
|
+
setup do
|
99
|
+
@folders = stub_shared_folders do |config|
|
100
|
+
config.vm.share_folder("foo", "bar", "baz", :sync => true)
|
101
|
+
config.vm.share_folder("bar", "foo", "baz")
|
62
102
|
end
|
103
|
+
end
|
63
104
|
|
64
|
-
|
105
|
+
should "only return the folders marked for syncing" do
|
106
|
+
result = @action.unison_folders
|
107
|
+
assert_equal 1, result.length
|
108
|
+
assert result.has_key?("foo")
|
109
|
+
assert !result.has_key?("bar")
|
65
110
|
end
|
66
111
|
end
|
67
112
|
|
@@ -91,14 +136,19 @@ class SharedFoldersActionTest < Test::Unit::TestCase
|
|
91
136
|
|
92
137
|
context "setting up shared folder metadata" do
|
93
138
|
setup do
|
94
|
-
|
139
|
+
stub_shared_folders
|
95
140
|
end
|
96
141
|
|
97
142
|
should "add all shared folders to the VM" do
|
98
|
-
|
99
|
-
|
100
|
-
shared_folders.expects(:<<).
|
101
|
-
|
143
|
+
shared_folders = []
|
144
|
+
data = %W[foo bar]
|
145
|
+
shared_folders.expects(:<<).times(data.length).with() do |sf|
|
146
|
+
hostpath = File.expand_path("#{sf.name}host", @runner.env.root_path)
|
147
|
+
assert data.include?(sf.name)
|
148
|
+
assert_equal hostpath, sf.host_path
|
149
|
+
true
|
150
|
+
end
|
151
|
+
|
102
152
|
@vm.stubs(:shared_folders).returns(shared_folders)
|
103
153
|
@vm.expects(:save).once
|
104
154
|
|
@@ -116,27 +166,46 @@ class SharedFoldersActionTest < Test::Unit::TestCase
|
|
116
166
|
|
117
167
|
should "mount all shared folders to the VM" do
|
118
168
|
mount_seq = sequence("mount_seq")
|
119
|
-
@folders.each do |name,
|
120
|
-
@runner.system.expects(:mount_shared_folder).with(@ssh, name, guestpath).in_sequence(mount_seq)
|
169
|
+
@folders.each do |name, data|
|
170
|
+
@runner.system.expects(:mount_shared_folder).with(@ssh, name, data[:guestpath]).in_sequence(mount_seq)
|
121
171
|
end
|
122
172
|
|
123
|
-
@action.
|
173
|
+
@action.mount_shared_folders
|
124
174
|
end
|
175
|
+
end
|
125
176
|
|
126
|
-
|
127
|
-
|
128
|
-
@
|
129
|
-
|
177
|
+
context "setting up unison" do
|
178
|
+
setup do
|
179
|
+
@ssh = mock("ssh")
|
180
|
+
@runner.ssh.stubs(:execute).yields(@ssh)
|
181
|
+
|
182
|
+
@folders = stub_shared_folders do |config|
|
183
|
+
config.vm.share_folder("foo", "bar", "baz", :sync => true)
|
184
|
+
config.vm.share_folder("bar", "foo", "baz")
|
130
185
|
end
|
131
|
-
|
186
|
+
end
|
132
187
|
|
133
|
-
|
188
|
+
should "do nothing if unison folders is empty" do
|
189
|
+
@action.stubs(:unison_folders).returns({})
|
190
|
+
@runner.ssh.expects(:execute).never
|
191
|
+
@action.setup_unison
|
134
192
|
end
|
135
|
-
end
|
136
193
|
|
137
|
-
|
138
|
-
|
139
|
-
|
194
|
+
should "prepare unison then create for each folder" do
|
195
|
+
seq = sequence("unison seq")
|
196
|
+
@runner.system.expects(:prepare_unison).with(@ssh).once.in_sequence(seq)
|
197
|
+
@action.unison_folders.each do |name, data|
|
198
|
+
if data[:sync]
|
199
|
+
@runner.system.expects(:create_unison).with do |ssh, opts|
|
200
|
+
assert_equal @ssh, ssh
|
201
|
+
assert_equal data, opts
|
202
|
+
|
203
|
+
true
|
204
|
+
end
|
205
|
+
end
|
206
|
+
end
|
207
|
+
|
208
|
+
@action.setup_unison
|
140
209
|
end
|
141
210
|
end
|
142
211
|
end
|
data/test/vagrant/config_test.rb
CHANGED
@@ -262,39 +262,6 @@ class ConfigTest < Test::Unit::TestCase
|
|
262
262
|
end
|
263
263
|
end
|
264
264
|
|
265
|
-
context "syncd folders" do
|
266
|
-
should "set the syncpath to nil by default" do
|
267
|
-
share_with_opts
|
268
|
-
assert !@config.shared_folders['foo'][:syncpath]
|
269
|
-
end
|
270
|
-
|
271
|
-
should "append sync to directory name when boolean" do
|
272
|
-
share_with_opts(:sync => true)
|
273
|
-
assert_equal @config.shared_folders['foo'][:syncpath], 'foo-dir'
|
274
|
-
assert_equal @config.shared_folders['foo'][:guestpath], 'foo-dir-sync'
|
275
|
-
end
|
276
|
-
|
277
|
-
should "use the specified sync directory" do
|
278
|
-
share_with_opts(:sync => 'bar-baz')
|
279
|
-
assert_equal @config.shared_folders['foo'][:syncpath], 'bar-baz'
|
280
|
-
end
|
281
|
-
|
282
|
-
should "raise an exception an exception if the guestpath and syncpath are the same" do
|
283
|
-
assert_raise Exception do
|
284
|
-
share_with_opts(:sync => 'foo-dir-sync')
|
285
|
-
end
|
286
|
-
end
|
287
|
-
|
288
|
-
should "set the sync required flag to true" do
|
289
|
-
share_with_opts(:sync => true)
|
290
|
-
assert @config.sync_required
|
291
|
-
end
|
292
|
-
|
293
|
-
def share_with_opts(opts={})
|
294
|
-
@config.share_folder('foo', 'foo-dir', '', opts)
|
295
|
-
end
|
296
|
-
end
|
297
|
-
|
298
265
|
context "uid/gid" do
|
299
266
|
should "return the shared folder UID if set" do
|
300
267
|
@config.shared_folder_uid = "foo"
|
@@ -7,7 +7,7 @@ class EnvironmentTest < Test::Unit::TestCase
|
|
7
7
|
end
|
8
8
|
|
9
9
|
should "not error and exit if everything is good" do
|
10
|
-
VirtualBox.expects(:version).returns("3.
|
10
|
+
VirtualBox.expects(:version).returns("3.2.4")
|
11
11
|
Vagrant::Environment.expects(:error_and_exit).never
|
12
12
|
Vagrant::Environment.check_virtualbox!
|
13
13
|
end
|
@@ -18,15 +18,15 @@ class EnvironmentTest < Test::Unit::TestCase
|
|
18
18
|
Vagrant::Environment.check_virtualbox!
|
19
19
|
end
|
20
20
|
|
21
|
-
should "error and exit if VirtualBox is lower than version 3.
|
22
|
-
version = "3.
|
21
|
+
should "error and exit if VirtualBox is lower than version 3.2" do
|
22
|
+
version = "3.1.12r1041"
|
23
23
|
Vagrant::Environment.expects(:error_and_exit).with(:virtualbox_invalid_version, :version => version.to_s).once
|
24
24
|
VirtualBox.expects(:version).returns(version)
|
25
25
|
Vagrant::Environment.check_virtualbox!
|
26
26
|
end
|
27
27
|
|
28
28
|
should "error and exit for OSE VirtualBox" do
|
29
|
-
version = "3.
|
29
|
+
version = "3.2.6_OSE"
|
30
30
|
Vagrant::Environment.expects(:error_and_exit).with(:virtualbox_invalid_ose, :version => version.to_s).once
|
31
31
|
VirtualBox.expects(:version).returns(version)
|
32
32
|
Vagrant::Environment.check_virtualbox!
|
data/test/vagrant/ssh_test.rb
CHANGED
@@ -7,8 +7,9 @@ class SshTest < Test::Unit::TestCase
|
|
7
7
|
end
|
8
8
|
|
9
9
|
@forwarded_ports = []
|
10
|
+
@network_adapters = []
|
10
11
|
@vm = mock("vm")
|
11
|
-
@vm.stubs(:
|
12
|
+
@vm.stubs(:network_adapters).returns(@network_adapters)
|
12
13
|
|
13
14
|
@env.stubs(:vm).returns(mock_vm(@env))
|
14
15
|
@env.vm.stubs(:vm).returns(@vm)
|
@@ -213,18 +214,6 @@ class SshTest < Test::Unit::TestCase
|
|
213
214
|
mock_ssh
|
214
215
|
end
|
215
216
|
|
216
|
-
should "return the configured port by default in VB 3.1.x" do
|
217
|
-
VirtualBox.stubs(:version).returns("3.1.4")
|
218
|
-
|
219
|
-
port = 2222
|
220
|
-
fp = mock("fp")
|
221
|
-
fp.stubs(:name).returns(@env.config.ssh.forwarded_port_key)
|
222
|
-
fp.stubs(:hostport).returns(port)
|
223
|
-
@forwarded_ports << fp
|
224
|
-
|
225
|
-
assert_equal port, @ssh.port
|
226
|
-
end
|
227
|
-
|
228
217
|
should "return the port given in options if it exists" do
|
229
218
|
assert_equal "47", @ssh.port({ :port => "47" })
|
230
219
|
end
|
@@ -43,63 +43,68 @@ class LinuxSystemTest < Test::Unit::TestCase
|
|
43
43
|
end
|
44
44
|
end
|
45
45
|
|
46
|
-
context "preparing
|
46
|
+
context "preparing unison" do
|
47
47
|
setup do
|
48
48
|
@ssh.stubs(:exec!)
|
49
|
+
@ssh.stubs(:upload!)
|
49
50
|
@vm.stubs(:ssh).returns(@ssh)
|
50
|
-
@vm.ssh.stubs(:upload!)
|
51
51
|
end
|
52
52
|
|
53
|
-
should "upload the
|
54
|
-
@vm.ssh.expects(:upload!).with do |
|
55
|
-
|
53
|
+
should "upload the script" do
|
54
|
+
@vm.ssh.expects(:upload!).with do |script, path|
|
55
|
+
assert_equal @mock_env.config.unison.script, path
|
56
|
+
true
|
56
57
|
end
|
57
58
|
|
58
|
-
@instance.
|
59
|
+
@instance.prepare_unison(@ssh)
|
59
60
|
end
|
60
61
|
|
61
|
-
should "
|
62
|
-
@ssh.expects(:exec!).with("sudo
|
63
|
-
@instance.
|
62
|
+
should "make the script executable" do
|
63
|
+
@ssh.expects(:exec!).with("sudo chmod +x #{@mock_env.config.unison.script}").once
|
64
|
+
@instance.prepare_unison(@ssh)
|
64
65
|
end
|
65
66
|
|
66
|
-
should "
|
67
|
-
@ssh.expects(:exec!).with("sudo
|
68
|
-
@instance.
|
67
|
+
should "remove old crontab entry file" do
|
68
|
+
@ssh.expects(:exec!).with("sudo rm #{@mock_env.config.unison.crontab_entry_file}", :error_check => false).once
|
69
|
+
@instance.prepare_unison(@ssh)
|
69
70
|
end
|
70
71
|
end
|
71
72
|
|
72
|
-
context "
|
73
|
+
context "creating unison entry" do
|
73
74
|
setup do
|
74
75
|
@ssh.stubs(:exec!)
|
76
|
+
@options = {
|
77
|
+
:guestpath => "foo",
|
78
|
+
:original => { :guestpath => "bar!" }
|
79
|
+
}
|
75
80
|
end
|
76
81
|
|
77
|
-
should "
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
@instance.create_sync(@ssh, {})
|
82
|
+
should "render the crontab entry with proper variables" do
|
83
|
+
variables = {
|
84
|
+
:from => @options[:guestpath],
|
85
|
+
:to => @options[:original][:guestpath],
|
86
|
+
:options => @mock_env.config.unison.options,
|
87
|
+
:script => @mock_env.config.unison.script,
|
88
|
+
:log_file => @mock_env.config.unison.log_file % "bar-"
|
89
|
+
}
|
90
|
+
Vagrant::Util::TemplateRenderer.expects(:render).with('/unison/crontab_entry',
|
91
|
+
variables).once
|
92
|
+
@instance.create_unison(@ssh, @options)
|
89
93
|
end
|
90
94
|
|
91
|
-
should "
|
92
|
-
@ssh.expects(:exec!).with("
|
93
|
-
@instance.
|
95
|
+
should "remove the .unison directory" do
|
96
|
+
@ssh.expects(:exec!).with("sudo rm -rf ~/.unison")
|
97
|
+
@instance.create_unison(@ssh, @options)
|
94
98
|
end
|
95
99
|
|
96
|
-
should "
|
97
|
-
@
|
98
|
-
@instance.
|
100
|
+
should "remove the original guestpath" do
|
101
|
+
@ssh.expects(:exec!).with("sudo rm -rf #{@options[:original][:guestpath]}")
|
102
|
+
@instance.create_unison(@ssh, @options)
|
99
103
|
end
|
100
104
|
|
101
|
-
should "
|
102
|
-
|
105
|
+
should "enable the crontab file" do
|
106
|
+
@ssh.expects(:exec!).with("crontab #{@mock_env.config.unison.crontab_entry_file}")
|
107
|
+
@instance.create_unison(@ssh, @options)
|
103
108
|
end
|
104
109
|
end
|
105
110
|
|
@@ -75,6 +75,12 @@ class TemplateRendererUtilTest < Test::Unit::TestCase
|
|
75
75
|
result = File.join(PROJECT_ROOT, "templates", "#{@template}.erb")
|
76
76
|
assert_equal result, @r.full_template_path
|
77
77
|
end
|
78
|
+
|
79
|
+
should "remove duplicate path separators" do
|
80
|
+
@r.template = "foo///bar"
|
81
|
+
result = File.join(PROJECT_ROOT, "templates", "foo", "bar.erb")
|
82
|
+
assert_equal result, @r.full_template_path
|
83
|
+
end
|
78
84
|
end
|
79
85
|
|
80
86
|
context "class methods" do
|
data/vagrant.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{vagrant}
|
8
|
-
s.version = "0.4.
|
8
|
+
s.version = "0.4.2"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Mitchell Hashimoto", "John Bender"]
|
12
|
-
s.date = %q{2010-
|
12
|
+
s.date = %q{2010-07-02}
|
13
13
|
s.default_executable = %q{vagrant}
|
14
14
|
s.description = %q{Vagrant is a tool for building and distributing virtualized development environments.}
|
15
15
|
s.email = ["mitchell.hashimoto@gmail.com", "john.m.bender@gmail.com"]
|
@@ -106,12 +106,12 @@ Gem::Specification.new do |s|
|
|
106
106
|
"templates/Vagrantfile.erb",
|
107
107
|
"templates/chef_server_client.erb",
|
108
108
|
"templates/chef_solo_solo.erb",
|
109
|
-
"templates/crontab_entry.erb",
|
110
109
|
"templates/network_entry.erb",
|
111
110
|
"templates/package_Vagrantfile.erb",
|
112
111
|
"templates/ssh_config.erb",
|
113
112
|
"templates/strings.yml",
|
114
|
-
"templates/
|
113
|
+
"templates/unison/crontab_entry.erb",
|
114
|
+
"templates/unison/script.erb",
|
115
115
|
"test/test_helper.rb",
|
116
116
|
"test/vagrant/actions/base_test.rb",
|
117
117
|
"test/vagrant/actions/box/add_test.rb",
|
@@ -186,93 +186,93 @@ Gem::Specification.new do |s|
|
|
186
186
|
s.homepage = %q{http://github.com/mitchellh/vagrant}
|
187
187
|
s.rdoc_options = ["--charset=UTF-8"]
|
188
188
|
s.require_paths = ["lib"]
|
189
|
-
s.rubygems_version = %q{1.3.
|
189
|
+
s.rubygems_version = %q{1.3.7}
|
190
190
|
s.summary = %q{Vagrant is a tool for building and distributing virtualized development environments.}
|
191
191
|
s.test_files = [
|
192
192
|
"test/test_helper.rb",
|
193
|
-
"test/vagrant/vm_test.rb",
|
194
|
-
"test/vagrant/command_test.rb",
|
195
|
-
"test/vagrant/environment_test.rb",
|
196
|
-
"test/vagrant/util_test.rb",
|
197
|
-
"test/vagrant/box_test.rb",
|
198
|
-
"test/vagrant/busy_test.rb",
|
199
|
-
"test/vagrant/provisioners/base_test.rb",
|
200
|
-
"test/vagrant/provisioners/chef_test.rb",
|
201
|
-
"test/vagrant/provisioners/chef_server_test.rb",
|
202
|
-
"test/vagrant/provisioners/chef_solo_test.rb",
|
203
|
-
"test/vagrant/systems/linux_test.rb",
|
204
|
-
"test/vagrant/config_test.rb",
|
205
193
|
"test/vagrant/actions/base_test.rb",
|
206
|
-
"test/vagrant/actions/runner_test.rb",
|
207
|
-
"test/vagrant/actions/box/verify_test.rb",
|
208
|
-
"test/vagrant/actions/box/destroy_test.rb",
|
209
194
|
"test/vagrant/actions/box/add_test.rb",
|
210
|
-
"test/vagrant/actions/box/
|
195
|
+
"test/vagrant/actions/box/destroy_test.rb",
|
211
196
|
"test/vagrant/actions/box/download_test.rb",
|
197
|
+
"test/vagrant/actions/box/unpackage_test.rb",
|
198
|
+
"test/vagrant/actions/box/verify_test.rb",
|
212
199
|
"test/vagrant/actions/collection_test.rb",
|
213
|
-
"test/vagrant/actions/
|
214
|
-
"test/vagrant/actions/vm/suspend_test.rb",
|
200
|
+
"test/vagrant/actions/runner_test.rb",
|
215
201
|
"test/vagrant/actions/vm/boot_test.rb",
|
216
|
-
"test/vagrant/actions/vm/
|
217
|
-
"test/vagrant/actions/vm/down_test.rb",
|
218
|
-
"test/vagrant/actions/vm/shared_folders_test.rb",
|
202
|
+
"test/vagrant/actions/vm/customize_test.rb",
|
219
203
|
"test/vagrant/actions/vm/destroy_test.rb",
|
204
|
+
"test/vagrant/actions/vm/down_test.rb",
|
205
|
+
"test/vagrant/actions/vm/export_test.rb",
|
206
|
+
"test/vagrant/actions/vm/forward_ports_test.rb",
|
220
207
|
"test/vagrant/actions/vm/halt_test.rb",
|
221
208
|
"test/vagrant/actions/vm/import_test.rb",
|
222
|
-
"test/vagrant/actions/vm/customize_test.rb",
|
223
|
-
"test/vagrant/actions/vm/start_test.rb",
|
224
|
-
"test/vagrant/actions/vm/network_test.rb",
|
225
209
|
"test/vagrant/actions/vm/move_hard_drive_test.rb",
|
226
|
-
"test/vagrant/actions/vm/
|
227
|
-
"test/vagrant/actions/vm/
|
210
|
+
"test/vagrant/actions/vm/network_test.rb",
|
211
|
+
"test/vagrant/actions/vm/package_test.rb",
|
228
212
|
"test/vagrant/actions/vm/provision_test.rb",
|
213
|
+
"test/vagrant/actions/vm/reload_test.rb",
|
229
214
|
"test/vagrant/actions/vm/resume_test.rb",
|
230
|
-
"test/vagrant/actions/vm/
|
215
|
+
"test/vagrant/actions/vm/shared_folders_test.rb",
|
216
|
+
"test/vagrant/actions/vm/start_test.rb",
|
217
|
+
"test/vagrant/actions/vm/suspend_test.rb",
|
218
|
+
"test/vagrant/actions/vm/up_test.rb",
|
231
219
|
"test/vagrant/active_list_test.rb",
|
220
|
+
"test/vagrant/box_test.rb",
|
221
|
+
"test/vagrant/busy_test.rb",
|
222
|
+
"test/vagrant/command_test.rb",
|
232
223
|
"test/vagrant/commands/base_test.rb",
|
233
|
-
"test/vagrant/commands/reload_test.rb",
|
234
|
-
"test/vagrant/commands/ssh_config_test.rb",
|
235
|
-
"test/vagrant/commands/suspend_test.rb",
|
236
|
-
"test/vagrant/commands/package_test.rb",
|
237
|
-
"test/vagrant/commands/status_test.rb",
|
238
|
-
"test/vagrant/commands/init_test.rb",
|
239
|
-
"test/vagrant/commands/destroy_test.rb",
|
240
|
-
"test/vagrant/commands/halt_test.rb",
|
241
|
-
"test/vagrant/commands/box/remove_test.rb",
|
242
224
|
"test/vagrant/commands/box/add_test.rb",
|
243
225
|
"test/vagrant/commands/box/list_test.rb",
|
244
|
-
"test/vagrant/commands/
|
226
|
+
"test/vagrant/commands/box/remove_test.rb",
|
227
|
+
"test/vagrant/commands/destroy_test.rb",
|
228
|
+
"test/vagrant/commands/halt_test.rb",
|
229
|
+
"test/vagrant/commands/init_test.rb",
|
230
|
+
"test/vagrant/commands/package_test.rb",
|
245
231
|
"test/vagrant/commands/provision_test.rb",
|
232
|
+
"test/vagrant/commands/reload_test.rb",
|
246
233
|
"test/vagrant/commands/resume_test.rb",
|
234
|
+
"test/vagrant/commands/ssh_config_test.rb",
|
247
235
|
"test/vagrant/commands/ssh_test.rb",
|
248
|
-
"test/vagrant/
|
236
|
+
"test/vagrant/commands/status_test.rb",
|
237
|
+
"test/vagrant/commands/suspend_test.rb",
|
238
|
+
"test/vagrant/commands/up_test.rb",
|
239
|
+
"test/vagrant/config_test.rb",
|
249
240
|
"test/vagrant/downloaders/base_test.rb",
|
250
241
|
"test/vagrant/downloaders/file_test.rb",
|
251
242
|
"test/vagrant/downloaders/http_test.rb",
|
252
|
-
"test/vagrant/
|
243
|
+
"test/vagrant/environment_test.rb",
|
244
|
+
"test/vagrant/provisioners/base_test.rb",
|
245
|
+
"test/vagrant/provisioners/chef_server_test.rb",
|
246
|
+
"test/vagrant/provisioners/chef_solo_test.rb",
|
247
|
+
"test/vagrant/provisioners/chef_test.rb",
|
248
|
+
"test/vagrant/resource_logger_test.rb",
|
249
|
+
"test/vagrant/ssh_session_test.rb",
|
250
|
+
"test/vagrant/ssh_test.rb",
|
251
|
+
"test/vagrant/systems/linux_test.rb",
|
252
|
+
"test/vagrant/util/error_helper_test.rb",
|
253
253
|
"test/vagrant/util/output_helper_test.rb",
|
254
|
+
"test/vagrant/util/plain_logger_test.rb",
|
255
|
+
"test/vagrant/util/platform_test.rb",
|
256
|
+
"test/vagrant/util/stacked_proc_runner_test.rb",
|
254
257
|
"test/vagrant/util/template_renderer_test.rb",
|
255
258
|
"test/vagrant/util/translator_test.rb",
|
256
|
-
"test/vagrant/
|
257
|
-
"test/vagrant/
|
258
|
-
"test/vagrant/util/plain_logger_test.rb",
|
259
|
-
"test/vagrant/ssh_session_test.rb",
|
260
|
-
"test/vagrant/ssh_test.rb"
|
259
|
+
"test/vagrant/util_test.rb",
|
260
|
+
"test/vagrant/vm_test.rb"
|
261
261
|
]
|
262
262
|
|
263
263
|
if s.respond_to? :specification_version then
|
264
264
|
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
|
265
265
|
s.specification_version = 3
|
266
266
|
|
267
|
-
if Gem::Version.new(Gem::
|
268
|
-
s.add_runtime_dependency(%q<virtualbox>, ["~> 0.7.
|
267
|
+
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
268
|
+
s.add_runtime_dependency(%q<virtualbox>, ["~> 0.7.3"])
|
269
269
|
s.add_runtime_dependency(%q<net-ssh>, [">= 2.0.19"])
|
270
270
|
s.add_runtime_dependency(%q<net-scp>, [">= 1.0.2"])
|
271
271
|
s.add_runtime_dependency(%q<json>, [">= 1.2.0"])
|
272
272
|
s.add_runtime_dependency(%q<archive-tar-minitar>, ["= 0.5.2"])
|
273
273
|
s.add_runtime_dependency(%q<mario>, ["~> 0.0.6"])
|
274
274
|
else
|
275
|
-
s.add_dependency(%q<virtualbox>, ["~> 0.7.
|
275
|
+
s.add_dependency(%q<virtualbox>, ["~> 0.7.3"])
|
276
276
|
s.add_dependency(%q<net-ssh>, [">= 2.0.19"])
|
277
277
|
s.add_dependency(%q<net-scp>, [">= 1.0.2"])
|
278
278
|
s.add_dependency(%q<json>, [">= 1.2.0"])
|
@@ -280,7 +280,7 @@ Gem::Specification.new do |s|
|
|
280
280
|
s.add_dependency(%q<mario>, ["~> 0.0.6"])
|
281
281
|
end
|
282
282
|
else
|
283
|
-
s.add_dependency(%q<virtualbox>, ["~> 0.7.
|
283
|
+
s.add_dependency(%q<virtualbox>, ["~> 0.7.3"])
|
284
284
|
s.add_dependency(%q<net-ssh>, [">= 2.0.19"])
|
285
285
|
s.add_dependency(%q<net-scp>, [">= 1.0.2"])
|
286
286
|
s.add_dependency(%q<json>, [">= 1.2.0"])
|