vagrant 0.7.0.beta → 0.7.0.beta2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/.gitignore +2 -0
- data/CHANGELOG.md +26 -0
- data/Gemfile +0 -8
- data/config/default.rb +1 -2
- data/contrib/README.md +12 -0
- data/contrib/emacs/vagrant.el +8 -0
- data/contrib/vim/vagrantfile.vim +9 -0
- data/lib/vagrant.rb +14 -18
- data/lib/vagrant/action.rb +12 -0
- data/lib/vagrant/action/box.rb +11 -0
- data/lib/vagrant/action/box/download.rb +0 -1
- data/lib/vagrant/action/env.rb +7 -0
- data/lib/vagrant/action/general.rb +8 -0
- data/lib/vagrant/action/vm.rb +30 -0
- data/lib/vagrant/action/vm/boot.rb +3 -2
- data/lib/vagrant/action/vm/check_box.rb +1 -0
- data/lib/vagrant/action/vm/network.rb +1 -1
- data/lib/vagrant/action/vm/nfs.rb +3 -1
- data/lib/vagrant/action/vm/provision.rb +14 -25
- data/lib/vagrant/action/vm/share_folders.rb +11 -4
- data/lib/vagrant/command.rb +25 -0
- data/lib/vagrant/config.rb +78 -128
- data/lib/vagrant/config/base.rb +17 -3
- data/lib/vagrant/config/ssh.rb +1 -0
- data/lib/vagrant/config/top.rb +61 -0
- data/lib/vagrant/config/vagrant.rb +1 -6
- data/lib/vagrant/config/vm.rb +34 -20
- data/lib/vagrant/config/vm/provisioner.rb +56 -0
- data/lib/vagrant/config/vm/sub_vm.rb +17 -0
- data/lib/vagrant/downloaders.rb +7 -0
- data/lib/vagrant/downloaders/file.rb +1 -0
- data/lib/vagrant/downloaders/http.rb +9 -0
- data/lib/vagrant/environment.rb +25 -13
- data/lib/vagrant/errors.rb +0 -15
- data/lib/vagrant/hosts.rb +7 -0
- data/lib/vagrant/provisioners.rb +8 -0
- data/lib/vagrant/provisioners/base.rb +19 -1
- data/lib/vagrant/provisioners/chef.rb +31 -52
- data/lib/vagrant/provisioners/chef_server.rb +34 -10
- data/lib/vagrant/provisioners/chef_solo.rb +31 -9
- data/lib/vagrant/provisioners/puppet.rb +70 -60
- data/lib/vagrant/provisioners/puppet_server.rb +57 -0
- data/lib/vagrant/ssh.rb +3 -72
- data/lib/vagrant/ssh/session.rb +81 -0
- data/lib/vagrant/systems.rb +9 -0
- data/lib/vagrant/systems/base.rb +16 -1
- data/lib/vagrant/systems/debian.rb +26 -0
- data/lib/vagrant/systems/gentoo.rb +27 -0
- data/lib/vagrant/systems/linux.rb +14 -56
- data/lib/vagrant/systems/linux/config.rb +21 -0
- data/lib/vagrant/systems/linux/error.rb +9 -0
- data/lib/vagrant/systems/redhat.rb +31 -0
- data/lib/vagrant/test_helpers.rb +1 -1
- data/lib/vagrant/version.rb +1 -1
- data/lib/vagrant/vm.rb +25 -5
- data/templates/chef_solo_solo.erb +11 -3
- data/templates/locales/en.yml +65 -25
- data/templates/{network_entry.erb → network_entry_debian.erb} +0 -0
- data/templates/network_entry_gentoo.erb +7 -0
- data/templates/network_entry_redhat.erb +8 -0
- data/test/vagrant/action/vm/check_box_test.rb +1 -0
- data/test/vagrant/action/vm/nfs_test.rb +7 -1
- data/test/vagrant/action/vm/provision_test.rb +24 -79
- data/test/vagrant/action/vm/share_folders_test.rb +6 -1
- data/test/vagrant/command/helpers_test.rb +2 -2
- data/test/vagrant/config/base_test.rb +0 -6
- data/test/vagrant/config/vagrant_test.rb +0 -8
- data/test/vagrant/config/vm/provisioner_test.rb +92 -0
- data/test/vagrant/config/vm_test.rb +8 -0
- data/test/vagrant/config_test.rb +49 -89
- data/test/vagrant/downloaders/file_test.rb +18 -4
- data/test/vagrant/environment_test.rb +36 -12
- data/test/vagrant/provisioners/base_test.rb +28 -1
- data/test/vagrant/provisioners/chef_server_test.rb +50 -41
- data/test/vagrant/provisioners/chef_solo_test.rb +39 -16
- data/test/vagrant/provisioners/chef_test.rb +11 -81
- data/test/vagrant/provisioners/puppet_server_test.rb +69 -0
- data/test/vagrant/provisioners/puppet_test.rb +69 -54
- data/test/vagrant/{ssh_session_test.rb → ssh/session_test.rb} +0 -0
- data/test/vagrant/ssh_test.rb +12 -1
- data/test/vagrant/systems/base_test.rb +18 -0
- data/test/vagrant/systems/linux_test.rb +2 -2
- data/test/vagrant/vm_test.rb +33 -5
- data/vagrant.gemspec +6 -5
- metadata +42 -16
- data/lib/vagrant/util/glob_loader.rb +0 -24
@@ -0,0 +1,69 @@
|
|
1
|
+
require "test_helper"
|
2
|
+
|
3
|
+
class PuppetServerProvisionerTest < Test::Unit::TestCase
|
4
|
+
setup do
|
5
|
+
@klass = Vagrant::Provisioners::PuppetServer
|
6
|
+
|
7
|
+
@action_env = Vagrant::Action::Environment.new(vagrant_env.vms[:default].env)
|
8
|
+
|
9
|
+
@config = @klass::Config.new
|
10
|
+
@action = @klass.new(@action_env, @config)
|
11
|
+
@env = @action.env
|
12
|
+
@vm = @action.vm
|
13
|
+
end
|
14
|
+
|
15
|
+
context "provisioning" do
|
16
|
+
should "run the proper sequence of methods in order" do
|
17
|
+
prov_seq = sequence("prov_seq")
|
18
|
+
@action.expects(:verify_binary).with("puppetd").once.in_sequence(prov_seq)
|
19
|
+
@action.expects(:run_puppetd_client).once.in_sequence(prov_seq)
|
20
|
+
@action.provision!
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
context "verifying binary" do
|
25
|
+
setup do
|
26
|
+
@ssh = mock("ssh")
|
27
|
+
@shell = mock("shell")
|
28
|
+
@ssh.stubs(:shell).yields(@shell)
|
29
|
+
@vm.ssh.stubs(:execute).yields(@ssh)
|
30
|
+
end
|
31
|
+
|
32
|
+
should "verify binary exists" do
|
33
|
+
binary = "foo"
|
34
|
+
@shell.expects(:execute).with("sudo -i which #{binary}", anything)
|
35
|
+
@action.verify_binary(binary)
|
36
|
+
end
|
37
|
+
end
|
38
|
+
|
39
|
+
context "running puppetd client" do
|
40
|
+
setup do
|
41
|
+
@cn = "puppet_node"
|
42
|
+
@ssh = mock("ssh")
|
43
|
+
@vm.ssh.stubs(:execute).yields(@ssh)
|
44
|
+
end
|
45
|
+
|
46
|
+
should "run the puppetd client" do
|
47
|
+
@ssh.expects(:exec!).with("sudo -i puppetd --server #{@config.puppet_server} --certname #{@cn}").once
|
48
|
+
@action.run_puppetd_client
|
49
|
+
end
|
50
|
+
|
51
|
+
should "run puppetd with given options when given as an array" do
|
52
|
+
@config.options = ["--modulepath", "modules", "--verbose"]
|
53
|
+
@ssh.expects(:exec!).with("sudo -i puppetd --modulepath modules --verbose --server #{@config.puppet_server} --certname #{@cn}").once
|
54
|
+
@action.run_puppetd_client
|
55
|
+
end
|
56
|
+
|
57
|
+
should "run puppetd with the options when given as a string" do
|
58
|
+
@config.options = "--modulepath modules --verbose"
|
59
|
+
@ssh.expects(:exec!).with("sudo -i puppetd --modulepath modules --verbose --server #{@config.puppet_server} --certname #{@cn}").once
|
60
|
+
@action.run_puppetd_client
|
61
|
+
end
|
62
|
+
|
63
|
+
should "check the exit status if that is given" do
|
64
|
+
@ssh.stubs(:exec!).yields(nil, :exit_status, :foo)
|
65
|
+
@ssh.expects(:check_exit_status).with(:foo, anything).once
|
66
|
+
@action.run_puppetd_client
|
67
|
+
end
|
68
|
+
end
|
69
|
+
end
|
@@ -2,16 +2,71 @@ require "test_helper"
|
|
2
2
|
|
3
3
|
class PuppetProvisionerTest < Test::Unit::TestCase
|
4
4
|
setup do
|
5
|
+
clean_paths
|
6
|
+
|
7
|
+
@klass = Vagrant::Provisioners::Puppet
|
8
|
+
|
5
9
|
@action_env = Vagrant::Action::Environment.new(vagrant_env.vms[:default].env)
|
6
10
|
|
7
|
-
@
|
11
|
+
@config = @klass::Config.new
|
12
|
+
@config.top = Vagrant::Config::Top.new(@action_env.env)
|
13
|
+
@config.top.vm.box = "foo"
|
14
|
+
@action = @klass.new(@action_env, @config)
|
8
15
|
@env = @action.env
|
9
16
|
@vm = @action.vm
|
10
17
|
end
|
11
18
|
|
19
|
+
context "config" do
|
20
|
+
setup do
|
21
|
+
@errors = Vagrant::Config::ErrorRecorder.new
|
22
|
+
|
23
|
+
# Set a box
|
24
|
+
@config.top.vm.box = "foo"
|
25
|
+
|
26
|
+
# Start in a valid state (verified by the first test)
|
27
|
+
@config.expanded_manifests_path.mkdir
|
28
|
+
File.open(@config.expanded_manifests_path.join(@config.computed_manifest_file), "w") { |f| f.puts "HELLO" }
|
29
|
+
end
|
30
|
+
|
31
|
+
should "expand the manifest path relative to the root path" do
|
32
|
+
assert_equal File.expand_path(@config.manifests_path, @env.root_path), @config.expanded_manifests_path.to_s
|
33
|
+
end
|
34
|
+
|
35
|
+
should "default the manifest file to the box name" do
|
36
|
+
assert_equal "#{@config.top.vm.box}.pp", @config.computed_manifest_file
|
37
|
+
end
|
38
|
+
|
39
|
+
should "use the custom manifest file if set" do
|
40
|
+
@config.manifest_file = "woot.pp"
|
41
|
+
assert_equal "woot.pp", @config.computed_manifest_file
|
42
|
+
end
|
43
|
+
|
44
|
+
should "be valid" do
|
45
|
+
@config.validate(@errors)
|
46
|
+
assert @errors.errors.empty?
|
47
|
+
end
|
48
|
+
|
49
|
+
should "be invalid if the manifests path doesn't exist" do
|
50
|
+
@config.expanded_manifests_path.rmtree
|
51
|
+
@config.validate(@errors)
|
52
|
+
assert !@errors.errors.empty?
|
53
|
+
end
|
54
|
+
|
55
|
+
should "be invalid if a custom manifests path doesn't exist" do
|
56
|
+
@config.manifests_path = "dont_exist"
|
57
|
+
@config.validate(@errors)
|
58
|
+
assert !@errors.errors.empty?
|
59
|
+
end
|
60
|
+
|
61
|
+
should "be invalid if the manifest file doesn't exist" do
|
62
|
+
@config.expanded_manifests_path.join(@config.computed_manifest_file).unlink
|
63
|
+
@config.validate(@errors)
|
64
|
+
assert !@errors.errors.empty?
|
65
|
+
end
|
66
|
+
end
|
67
|
+
|
12
68
|
context "preparing" do
|
13
69
|
should "share manifests" do
|
14
|
-
@action.expects(:check_manifest_dir).once
|
15
70
|
@action.expects(:share_manifests).once
|
16
71
|
@action.prepare
|
17
72
|
end
|
@@ -22,29 +77,11 @@ class PuppetProvisionerTest < Test::Unit::TestCase
|
|
22
77
|
prov_seq = sequence("prov_seq")
|
23
78
|
@action.expects(:verify_binary).with("puppet").once.in_sequence(prov_seq)
|
24
79
|
@action.expects(:create_pp_path).once.in_sequence(prov_seq)
|
25
|
-
@action.expects(:set_manifest).once.in_sequence(prov_seq)
|
26
80
|
@action.expects(:run_puppet_client).once.in_sequence(prov_seq)
|
27
81
|
@action.provision!
|
28
82
|
end
|
29
83
|
end
|
30
84
|
|
31
|
-
context "check manifest_dir" do
|
32
|
-
setup do
|
33
|
-
@env.config.puppet.manifests_path = "manifests"
|
34
|
-
end
|
35
|
-
|
36
|
-
should "should not create the manifest directory if it exists" do
|
37
|
-
File.expects(:directory?).with(@env.config.puppet.manifests_path).returns(true)
|
38
|
-
@action.check_manifest_dir
|
39
|
-
end
|
40
|
-
|
41
|
-
should "create the manifest directory if it does not exist" do
|
42
|
-
File.stubs(:directory?).with(@env.config.puppet.manifests_path).returns(false)
|
43
|
-
Dir.expects(:mkdir).with(@env.config.puppet.manifests_path).once
|
44
|
-
@action.check_manifest_dir
|
45
|
-
end
|
46
|
-
end
|
47
|
-
|
48
85
|
context "share manifests folder" do
|
49
86
|
setup do
|
50
87
|
@manifests_path = "manifests"
|
@@ -67,7 +104,7 @@ class PuppetProvisionerTest < Test::Unit::TestCase
|
|
67
104
|
|
68
105
|
should "verify binary exists" do
|
69
106
|
binary = "foo"
|
70
|
-
@ssh.expects(:exec!).with("which #{binary}", anything)
|
107
|
+
@ssh.expects(:exec!).with("sudo -i which #{binary}", anything)
|
71
108
|
@action.verify_binary(binary)
|
72
109
|
end
|
73
110
|
end
|
@@ -76,59 +113,37 @@ class PuppetProvisionerTest < Test::Unit::TestCase
|
|
76
113
|
should "create and chown the folder to the ssh user" do
|
77
114
|
ssh_seq = sequence("ssh_seq")
|
78
115
|
ssh = mock("ssh")
|
79
|
-
ssh.expects(:exec!).with("sudo mkdir -p #{@
|
80
|
-
ssh.expects(:exec!).with("sudo chown #{@env.config.ssh.username} #{@
|
116
|
+
ssh.expects(:exec!).with("sudo mkdir -p #{@config.pp_path}").once.in_sequence(ssh_seq)
|
117
|
+
ssh.expects(:exec!).with("sudo chown #{@env.config.ssh.username} #{@config.pp_path}").once.in_sequence(ssh_seq)
|
81
118
|
@vm.ssh.expects(:execute).yields(ssh)
|
82
119
|
@action.create_pp_path
|
83
120
|
end
|
84
121
|
end
|
85
122
|
|
86
|
-
context "setting the manifest" do
|
87
|
-
setup do
|
88
|
-
@env.config.puppet.stubs(:manifests_path).returns("manifests")
|
89
|
-
@env.config.puppet.stubs(:manifest_file).returns("foo.pp")
|
90
|
-
@env.config.vm.stubs(:box).returns("base")
|
91
|
-
end
|
92
|
-
|
93
|
-
should "set the manifest if it exists" do
|
94
|
-
File.stubs(:exists?).with("#{@env.config.puppet.manifests_path}/#{@env.config.puppet.manifest_file}").returns(true)
|
95
|
-
@action.set_manifest
|
96
|
-
end
|
97
|
-
|
98
|
-
should "raise an error if the manifest does not exist" do
|
99
|
-
File.stubs(:exists?).with("#{@env.config.puppet.manifests_path}/#{@env.config.puppet.manifest_file}").returns(false)
|
100
|
-
assert_raises(Vagrant::Provisioners::PuppetError) {
|
101
|
-
@action.set_manifest
|
102
|
-
}
|
103
|
-
end
|
104
|
-
end
|
105
|
-
|
106
123
|
context "running puppet client" do
|
107
124
|
setup do
|
108
125
|
@ssh = mock("ssh")
|
109
126
|
@vm.ssh.stubs(:execute).yields(@ssh)
|
110
127
|
end
|
111
128
|
|
129
|
+
def expect_puppet_command(command)
|
130
|
+
@ssh.expects(:exec!).with("sudo -i 'cd #{@config.pp_path}; #{command}'")
|
131
|
+
end
|
132
|
+
|
112
133
|
should "cd into the pp_path directory and run puppet" do
|
113
|
-
|
134
|
+
expect_puppet_command("puppet #{@config.computed_manifest_file}")
|
114
135
|
@action.run_puppet_client
|
115
136
|
end
|
116
137
|
|
117
138
|
should "cd into the pp_path directory and run puppet with given options when given as an array" do
|
118
|
-
@
|
119
|
-
|
139
|
+
@config.options = ["--modulepath", "modules", "--verbose"]
|
140
|
+
expect_puppet_command("puppet --modulepath modules --verbose #{@config.computed_manifest_file}")
|
120
141
|
@action.run_puppet_client
|
121
142
|
end
|
122
143
|
|
123
144
|
should "cd into the pp_path directory and run puppet with the options when given as a string" do
|
124
|
-
@
|
125
|
-
|
126
|
-
@action.run_puppet_client
|
127
|
-
end
|
128
|
-
|
129
|
-
should "check the exit status if that is given" do
|
130
|
-
@ssh.stubs(:exec!).yields(nil, :exit_status, :foo)
|
131
|
-
@ssh.expects(:check_exit_status).with(:foo, anything).once
|
145
|
+
@config.options = "--modulepath modules --verbose"
|
146
|
+
expect_puppet_command("puppet --modulepath modules --verbose #{@config.computed_manifest_file}")
|
132
147
|
@action.run_puppet_client
|
133
148
|
end
|
134
149
|
end
|
File without changes
|
data/test/vagrant/ssh_test.rb
CHANGED
@@ -12,7 +12,7 @@ class SshTest < Test::Unit::TestCase
|
|
12
12
|
end
|
13
13
|
|
14
14
|
setup do
|
15
|
-
VirtualBox.stubs(:version).returns("
|
15
|
+
VirtualBox.stubs(:version).returns("4.0.0")
|
16
16
|
end
|
17
17
|
|
18
18
|
context "connecting to external SSH" do
|
@@ -69,6 +69,17 @@ class SshTest < Test::Unit::TestCase
|
|
69
69
|
@ssh.connect
|
70
70
|
end
|
71
71
|
|
72
|
+
should "add forward X11 option if enabled" do
|
73
|
+
@env.config.ssh.forward_x11 = true
|
74
|
+
ssh_exec_expect(@ssh.port,
|
75
|
+
@env.config.ssh.private_key_path,
|
76
|
+
@env.config.ssh.username,
|
77
|
+
@env.config.ssh.host) do |args|
|
78
|
+
assert args =~ /-o ForwardX11=yes/
|
79
|
+
end
|
80
|
+
@ssh.connect
|
81
|
+
end
|
82
|
+
|
72
83
|
context "on leopard" do
|
73
84
|
setup do
|
74
85
|
Vagrant::Util::Platform.stubs(:leopard?).returns(true)
|
@@ -0,0 +1,18 @@
|
|
1
|
+
require "test_helper"
|
2
|
+
|
3
|
+
class BaseSystemTest < Test::Unit::TestCase
|
4
|
+
setup do
|
5
|
+
@klass = Vagrant::Systems::Base
|
6
|
+
|
7
|
+
@vm = mock("vm")
|
8
|
+
@instance = @klass.new(@vm)
|
9
|
+
end
|
10
|
+
|
11
|
+
should "provide access to the VM" do
|
12
|
+
assert_equal @vm, @instance.vm
|
13
|
+
end
|
14
|
+
|
15
|
+
should "error on preparing host only network" do
|
16
|
+
assert_raises(@klass::BaseError) { @instance.prepare_host_only_network }
|
17
|
+
end
|
18
|
+
end
|
@@ -61,7 +61,7 @@ class LinuxSystemTest < Test::Unit::TestCase
|
|
61
61
|
end
|
62
62
|
|
63
63
|
should "execute the proper mount command" do
|
64
|
-
@ssh.expects(:exec!).with("sudo mount -t vboxsf -o uid
|
64
|
+
@ssh.expects(:exec!).with("sudo mount -t vboxsf -o uid=`id -u #{@vm.env.config.ssh.username}`,gid=`id -g #{@vm.env.config.ssh.username}` #{@name} #{@guestpath}").returns(@success_return)
|
65
65
|
mount_folder
|
66
66
|
end
|
67
67
|
|
@@ -107,7 +107,7 @@ class LinuxSystemTest < Test::Unit::TestCase
|
|
107
107
|
|
108
108
|
@vm.stubs(:env).returns(env)
|
109
109
|
|
110
|
-
@ssh.expects(:exec!).with("sudo mount -t vboxsf -o uid
|
110
|
+
@ssh.expects(:exec!).with("sudo mount -t vboxsf -o uid=`id -u #{uid}`,gid=`id -g #{gid}` #{@name} #{@guestpath}").returns(@success_return)
|
111
111
|
mount_folder
|
112
112
|
end
|
113
113
|
end
|
data/test/vagrant/vm_test.rb
CHANGED
@@ -25,6 +25,7 @@ class VMTest < Test::Unit::TestCase
|
|
25
25
|
setup do
|
26
26
|
@vm_name = "foo"
|
27
27
|
@mock_vm = mock("vm")
|
28
|
+
@mock_vm.stubs(:running?).returns(false)
|
28
29
|
@vm = Vagrant::VM.new(:env => @env, :vm => @mock_vm, :name => @vm_name)
|
29
30
|
@mock_vm.stubs(:uuid).returns("foo")
|
30
31
|
end
|
@@ -96,11 +97,14 @@ class VMTest < Test::Unit::TestCase
|
|
96
97
|
}
|
97
98
|
end
|
98
99
|
|
99
|
-
|
100
|
-
|
101
|
-
def initialize(vm); end
|
102
|
-
end
|
100
|
+
should "load the given system if specified" do
|
101
|
+
fake_class = Class.new(Vagrant::Systems::Base)
|
103
102
|
|
103
|
+
assert_nothing_raised { @vm.load_system!(fake_class) }
|
104
|
+
assert @vm.system.is_a?(fake_class)
|
105
|
+
end
|
106
|
+
|
107
|
+
context "with a class" do
|
104
108
|
should "initialize class if given" do
|
105
109
|
@vm.env.config.vm.system = Vagrant::Systems::Linux
|
106
110
|
|
@@ -109,7 +113,7 @@ class VMTest < Test::Unit::TestCase
|
|
109
113
|
end
|
110
114
|
|
111
115
|
should "raise error if class has invalid parent" do
|
112
|
-
@vm.env.config.vm.system =
|
116
|
+
@vm.env.config.vm.system = Class.new
|
113
117
|
assert_raises(Vagrant::Errors::VMSystemError) {
|
114
118
|
@vm.load_system!
|
115
119
|
}
|
@@ -140,6 +144,30 @@ class VMTest < Test::Unit::TestCase
|
|
140
144
|
}
|
141
145
|
end
|
142
146
|
end
|
147
|
+
|
148
|
+
context "loading the distro" do
|
149
|
+
setup do
|
150
|
+
@vm.vm.stubs(:running?).returns(true)
|
151
|
+
end
|
152
|
+
|
153
|
+
should "not replace the distro if it is nil" do
|
154
|
+
@vm.env.config.vm.system = Class.new(Vagrant::Systems::Base)
|
155
|
+
|
156
|
+
@vm.load_system!
|
157
|
+
assert @vm.system.is_a?(@vm.env.config.vm.system)
|
158
|
+
end
|
159
|
+
|
160
|
+
should "replace the distro if it is not nil" do
|
161
|
+
@vm.env.config.vm.system = Class.new(Vagrant::Systems::Base) do
|
162
|
+
def distro_dispatch
|
163
|
+
:linux
|
164
|
+
end
|
165
|
+
end
|
166
|
+
|
167
|
+
@vm.load_system!
|
168
|
+
assert @vm.system.is_a?(Vagrant::Systems::Linux)
|
169
|
+
end
|
170
|
+
end
|
143
171
|
end
|
144
172
|
|
145
173
|
context "uuid" do
|
data/vagrant.gemspec
CHANGED
@@ -1,4 +1,5 @@
|
|
1
|
-
|
1
|
+
$:.unshift File.expand_path("../lib", __FILE__)
|
2
|
+
require "vagrant/version"
|
2
3
|
|
3
4
|
Gem::Specification.new do |s|
|
4
5
|
s.name = "vagrant"
|
@@ -18,10 +19,10 @@ Gem::Specification.new do |s|
|
|
18
19
|
s.add_dependency "json", "~> 1.4.6"
|
19
20
|
s.add_dependency "mario", "~> 0.0.6"
|
20
21
|
s.add_dependency "net-ssh", "~> 2.0.23"
|
21
|
-
s.add_dependency "net-scp", "~> 1.0.
|
22
|
-
s.add_dependency "i18n", "~> 0.
|
23
|
-
s.add_dependency "thor", "~> 0.14.
|
24
|
-
s.add_dependency "virtualbox", "~> 0.8.
|
22
|
+
s.add_dependency "net-scp", "~> 1.0.4"
|
23
|
+
s.add_dependency "i18n", "~> 0.5.0"
|
24
|
+
s.add_dependency "thor", "~> 0.14.6"
|
25
|
+
s.add_dependency "virtualbox", "~> 0.8.1"
|
25
26
|
|
26
27
|
s.add_development_dependency "rake"
|
27
28
|
s.add_development_dependency "contest", ">= 0.1.2"
|
metadata
CHANGED
@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
|
|
6
6
|
- 0
|
7
7
|
- 7
|
8
8
|
- 0
|
9
|
-
-
|
10
|
-
version: 0.7.0.
|
9
|
+
- beta2
|
10
|
+
version: 0.7.0.beta2
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Mitchell Hashimoto
|
@@ -16,7 +16,7 @@ autorequire:
|
|
16
16
|
bindir: bin
|
17
17
|
cert_chain: []
|
18
18
|
|
19
|
-
date:
|
19
|
+
date: 2011-01-13 00:00:00 -08:00
|
20
20
|
default_executable:
|
21
21
|
dependencies:
|
22
22
|
- !ruby/object:Gem::Dependency
|
@@ -104,8 +104,8 @@ dependencies:
|
|
104
104
|
segments:
|
105
105
|
- 1
|
106
106
|
- 0
|
107
|
-
-
|
108
|
-
version: 1.0.
|
107
|
+
- 4
|
108
|
+
version: 1.0.4
|
109
109
|
type: :runtime
|
110
110
|
prerelease: false
|
111
111
|
version_requirements: *id006
|
@@ -118,9 +118,9 @@ dependencies:
|
|
118
118
|
- !ruby/object:Gem::Version
|
119
119
|
segments:
|
120
120
|
- 0
|
121
|
-
-
|
122
|
-
-
|
123
|
-
version: 0.
|
121
|
+
- 5
|
122
|
+
- 0
|
123
|
+
version: 0.5.0
|
124
124
|
type: :runtime
|
125
125
|
prerelease: false
|
126
126
|
version_requirements: *id007
|
@@ -134,8 +134,8 @@ dependencies:
|
|
134
134
|
segments:
|
135
135
|
- 0
|
136
136
|
- 14
|
137
|
-
-
|
138
|
-
version: 0.14.
|
137
|
+
- 6
|
138
|
+
version: 0.14.6
|
139
139
|
type: :runtime
|
140
140
|
prerelease: false
|
141
141
|
version_requirements: *id008
|
@@ -149,8 +149,8 @@ dependencies:
|
|
149
149
|
segments:
|
150
150
|
- 0
|
151
151
|
- 8
|
152
|
-
-
|
153
|
-
version: 0.8.
|
152
|
+
- 1
|
153
|
+
version: 0.8.1
|
154
154
|
type: :runtime
|
155
155
|
prerelease: false
|
156
156
|
version_requirements: *id009
|
@@ -228,12 +228,16 @@ files:
|
|
228
228
|
- Rakefile
|
229
229
|
- bin/vagrant
|
230
230
|
- config/default.rb
|
231
|
+
- contrib/README.md
|
232
|
+
- contrib/emacs/vagrant.el
|
233
|
+
- contrib/vim/vagrantfile.vim
|
231
234
|
- keys/README.md
|
232
235
|
- keys/vagrant
|
233
236
|
- keys/vagrant.ppk
|
234
237
|
- keys/vagrant.pub
|
235
238
|
- lib/vagrant.rb
|
236
239
|
- lib/vagrant/action.rb
|
240
|
+
- lib/vagrant/action/box.rb
|
237
241
|
- lib/vagrant/action/box/destroy.rb
|
238
242
|
- lib/vagrant/action/box/download.rb
|
239
243
|
- lib/vagrant/action/box/package.rb
|
@@ -241,10 +245,13 @@ files:
|
|
241
245
|
- lib/vagrant/action/box/verify.rb
|
242
246
|
- lib/vagrant/action/builder.rb
|
243
247
|
- lib/vagrant/action/builtin.rb
|
248
|
+
- lib/vagrant/action/env.rb
|
244
249
|
- lib/vagrant/action/env/set.rb
|
245
250
|
- lib/vagrant/action/environment.rb
|
251
|
+
- lib/vagrant/action/general.rb
|
246
252
|
- lib/vagrant/action/general/package.rb
|
247
253
|
- lib/vagrant/action/general/validate.rb
|
254
|
+
- lib/vagrant/action/vm.rb
|
248
255
|
- lib/vagrant/action/vm/boot.rb
|
249
256
|
- lib/vagrant/action/vm/check_box.rb
|
250
257
|
- lib/vagrant/action/vm/check_guest_additions.rb
|
@@ -275,6 +282,7 @@ files:
|
|
275
282
|
- lib/vagrant/box.rb
|
276
283
|
- lib/vagrant/box_collection.rb
|
277
284
|
- lib/vagrant/cli.rb
|
285
|
+
- lib/vagrant/command.rb
|
278
286
|
- lib/vagrant/command/base.rb
|
279
287
|
- lib/vagrant/command/box.rb
|
280
288
|
- lib/vagrant/command/destroy.rb
|
@@ -300,32 +308,45 @@ files:
|
|
300
308
|
- lib/vagrant/config/nfs.rb
|
301
309
|
- lib/vagrant/config/package.rb
|
302
310
|
- lib/vagrant/config/ssh.rb
|
311
|
+
- lib/vagrant/config/top.rb
|
303
312
|
- lib/vagrant/config/vagrant.rb
|
304
313
|
- lib/vagrant/config/vm.rb
|
314
|
+
- lib/vagrant/config/vm/provisioner.rb
|
315
|
+
- lib/vagrant/config/vm/sub_vm.rb
|
305
316
|
- lib/vagrant/data_store.rb
|
317
|
+
- lib/vagrant/downloaders.rb
|
306
318
|
- lib/vagrant/downloaders/base.rb
|
307
319
|
- lib/vagrant/downloaders/file.rb
|
308
320
|
- lib/vagrant/downloaders/http.rb
|
309
321
|
- lib/vagrant/environment.rb
|
310
322
|
- lib/vagrant/errors.rb
|
323
|
+
- lib/vagrant/hosts.rb
|
311
324
|
- lib/vagrant/hosts/base.rb
|
312
325
|
- lib/vagrant/hosts/bsd.rb
|
313
326
|
- lib/vagrant/hosts/linux.rb
|
314
327
|
- lib/vagrant/plugin.rb
|
328
|
+
- lib/vagrant/provisioners.rb
|
315
329
|
- lib/vagrant/provisioners/base.rb
|
316
330
|
- lib/vagrant/provisioners/chef.rb
|
317
331
|
- lib/vagrant/provisioners/chef_server.rb
|
318
332
|
- lib/vagrant/provisioners/chef_solo.rb
|
319
333
|
- lib/vagrant/provisioners/puppet.rb
|
334
|
+
- lib/vagrant/provisioners/puppet_server.rb
|
320
335
|
- lib/vagrant/ssh.rb
|
336
|
+
- lib/vagrant/ssh/session.rb
|
337
|
+
- lib/vagrant/systems.rb
|
321
338
|
- lib/vagrant/systems/base.rb
|
339
|
+
- lib/vagrant/systems/debian.rb
|
340
|
+
- lib/vagrant/systems/gentoo.rb
|
322
341
|
- lib/vagrant/systems/linux.rb
|
342
|
+
- lib/vagrant/systems/linux/config.rb
|
343
|
+
- lib/vagrant/systems/linux/error.rb
|
344
|
+
- lib/vagrant/systems/redhat.rb
|
323
345
|
- lib/vagrant/systems/solaris.rb
|
324
346
|
- lib/vagrant/test_helpers.rb
|
325
347
|
- lib/vagrant/ui.rb
|
326
348
|
- lib/vagrant/util.rb
|
327
349
|
- lib/vagrant/util/busy.rb
|
328
|
-
- lib/vagrant/util/glob_loader.rb
|
329
350
|
- lib/vagrant/util/hash_with_indifferent_access.rb
|
330
351
|
- lib/vagrant/util/plain_logger.rb
|
331
352
|
- lib/vagrant/util/platform.rb
|
@@ -340,7 +361,9 @@ files:
|
|
340
361
|
- templates/commands/init/Vagrantfile.erb
|
341
362
|
- templates/config/validation_failed.erb
|
342
363
|
- templates/locales/en.yml
|
343
|
-
- templates/
|
364
|
+
- templates/network_entry_debian.erb
|
365
|
+
- templates/network_entry_gentoo.erb
|
366
|
+
- templates/network_entry_redhat.erb
|
344
367
|
- templates/nfs/exports.erb
|
345
368
|
- templates/nfs/exports_linux.erb
|
346
369
|
- templates/package_Vagrantfile.erb
|
@@ -396,6 +419,7 @@ files:
|
|
396
419
|
- test/vagrant/config/error_recorder_test.rb
|
397
420
|
- test/vagrant/config/ssh_test.rb
|
398
421
|
- test/vagrant/config/vagrant_test.rb
|
422
|
+
- test/vagrant/config/vm/provisioner_test.rb
|
399
423
|
- test/vagrant/config/vm_test.rb
|
400
424
|
- test/vagrant/config_test.rb
|
401
425
|
- test/vagrant/data_store_test.rb
|
@@ -412,9 +436,11 @@ files:
|
|
412
436
|
- test/vagrant/provisioners/chef_server_test.rb
|
413
437
|
- test/vagrant/provisioners/chef_solo_test.rb
|
414
438
|
- test/vagrant/provisioners/chef_test.rb
|
439
|
+
- test/vagrant/provisioners/puppet_server_test.rb
|
415
440
|
- test/vagrant/provisioners/puppet_test.rb
|
416
|
-
- test/vagrant/
|
441
|
+
- test/vagrant/ssh/session_test.rb
|
417
442
|
- test/vagrant/ssh_test.rb
|
443
|
+
- test/vagrant/systems/base_test.rb
|
418
444
|
- test/vagrant/systems/linux_test.rb
|
419
445
|
- test/vagrant/ui_test.rb
|
420
446
|
- test/vagrant/util/busy_test.rb
|
@@ -441,7 +467,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
441
467
|
requirements:
|
442
468
|
- - ">="
|
443
469
|
- !ruby/object:Gem::Version
|
444
|
-
hash:
|
470
|
+
hash: 4588961819893742536
|
445
471
|
segments:
|
446
472
|
- 0
|
447
473
|
version: "0"
|