vagrantup 1.0.7 → 1.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +91 -0
- data/LICENSE +2 -2
- data/README.md +11 -13
- data/bin/vagrant +29 -5
- data/config/default.rb +14 -9
- data/contrib/bash/completion.sh +3 -0
- data/keys/README.md +3 -3
- data/lib/vagrant.rb +156 -102
- data/lib/vagrant/action.rb +26 -47
- data/lib/vagrant/action/builder.rb +49 -23
- data/lib/vagrant/action/builtin/box_add.rb +85 -0
- data/lib/vagrant/action/builtin/call.rb +67 -0
- data/lib/vagrant/action/builtin/config_validate.rb +30 -0
- data/lib/vagrant/action/builtin/confirm.rb +38 -0
- data/lib/vagrant/action/builtin/env_set.rb +24 -0
- data/lib/vagrant/action/builtin/graceful_halt.rb +73 -0
- data/lib/vagrant/action/builtin/handle_box_url.rb +43 -0
- data/lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb +117 -0
- data/lib/vagrant/action/builtin/lock.rb +57 -0
- data/lib/vagrant/action/builtin/nfs.rb +117 -0
- data/lib/vagrant/action/builtin/provision.rb +70 -0
- data/lib/vagrant/action/builtin/set_hostname.rb +27 -0
- data/lib/vagrant/action/builtin/ssh_exec.rb +42 -0
- data/lib/vagrant/action/builtin/ssh_run.rb +43 -0
- data/lib/vagrant/action/general/package.rb +19 -18
- data/lib/vagrant/action/hook.rb +103 -0
- data/lib/vagrant/action/runner.rb +21 -5
- data/lib/vagrant/action/warden.rb +20 -9
- data/lib/vagrant/box.rb +75 -26
- data/lib/vagrant/box_collection.rb +301 -35
- data/lib/vagrant/cli.rb +20 -14
- data/lib/vagrant/config.rb +23 -9
- data/lib/vagrant/config/loader.rb +131 -36
- data/lib/vagrant/config/v1.rb +9 -0
- data/lib/vagrant/config/v1/dummy_config.rb +13 -0
- data/lib/vagrant/config/v1/loader.rb +105 -0
- data/lib/vagrant/config/v1/root.rb +60 -0
- data/lib/vagrant/config/v2.rb +9 -0
- data/lib/vagrant/config/v2/dummy_config.rb +13 -0
- data/lib/vagrant/config/v2/loader.rb +141 -0
- data/lib/vagrant/config/v2/root.rb +105 -0
- data/lib/vagrant/config/v2/util.rb +21 -0
- data/lib/vagrant/config/version_base.rb +80 -0
- data/lib/vagrant/downloaders/base.rb +0 -3
- data/lib/vagrant/downloaders/file.rb +10 -4
- data/lib/vagrant/downloaders/http.rb +29 -10
- data/lib/vagrant/environment.rb +447 -240
- data/lib/vagrant/errors.rb +138 -97
- data/lib/vagrant/hosts.rb +3 -12
- data/lib/vagrant/machine.rb +325 -0
- data/lib/vagrant/machine_state.rb +45 -0
- data/lib/vagrant/plugin.rb +3 -78
- data/lib/vagrant/plugin/v1.rb +19 -0
- data/lib/vagrant/plugin/v1/command.rb +169 -0
- data/lib/vagrant/plugin/v1/communicator.rb +98 -0
- data/lib/vagrant/plugin/v1/config.rb +112 -0
- data/lib/vagrant/plugin/v1/errors.rb +15 -0
- data/lib/vagrant/plugin/v1/guest.rb +92 -0
- data/lib/vagrant/plugin/v1/host.rb +66 -0
- data/lib/vagrant/plugin/v1/manager.rb +131 -0
- data/lib/vagrant/plugin/v1/plugin.rb +229 -0
- data/lib/vagrant/plugin/v1/provider.rb +68 -0
- data/lib/vagrant/plugin/v1/provisioner.rb +50 -0
- data/lib/vagrant/plugin/v2.rb +22 -0
- data/lib/vagrant/plugin/v2/command.rb +234 -0
- data/lib/vagrant/plugin/v2/communicator.rb +98 -0
- data/lib/vagrant/plugin/v2/components.rb +29 -0
- data/lib/vagrant/plugin/v2/config.rb +101 -0
- data/lib/vagrant/plugin/v2/errors.rb +15 -0
- data/lib/vagrant/plugin/v2/guest.rb +92 -0
- data/lib/vagrant/plugin/v2/host.rb +66 -0
- data/lib/vagrant/plugin/v2/manager.rb +158 -0
- data/lib/vagrant/plugin/v2/plugin.rb +217 -0
- data/lib/vagrant/plugin/v2/provider.rb +69 -0
- data/lib/vagrant/plugin/v2/provisioner.rb +47 -0
- data/lib/vagrant/registry.rb +43 -17
- data/lib/vagrant/ssh.rb +15 -9
- data/lib/vagrant/ui.rb +7 -5
- data/lib/vagrant/util/is_port_open.rb +1 -1
- data/lib/vagrant/util/platform.rb +19 -0
- data/lib/vagrant/util/retryable.rb +8 -2
- data/lib/vagrant/util/safe_exec.rb +2 -2
- data/lib/vagrant/util/scoped_hash_override.rb +45 -0
- data/lib/vagrant/util/ssh.rb +126 -0
- data/lib/vagrant/util/string_block_editor.rb +75 -0
- data/lib/vagrant/util/subprocess.rb +33 -10
- data/lib/vagrant/util/which.rb +43 -0
- data/lib/vagrant/version.rb +1 -1
- data/plugins/README.md +5 -0
- data/plugins/commands/box/command/add.rb +46 -0
- data/plugins/commands/box/command/list.rb +41 -0
- data/plugins/commands/box/command/remove.rb +37 -0
- data/plugins/commands/box/command/repackage.rb +43 -0
- data/plugins/commands/box/command/root.rb +75 -0
- data/plugins/commands/box/plugin.rb +15 -0
- data/plugins/commands/destroy/command.rb +31 -0
- data/plugins/commands/destroy/plugin.rb +18 -0
- data/plugins/commands/halt/command.rb +33 -0
- data/plugins/commands/halt/plugin.rb +18 -0
- data/{lib/vagrant/command/init.rb → plugins/commands/init/command.rb} +4 -4
- data/plugins/commands/init/plugin.rb +18 -0
- data/plugins/commands/package/command.rb +83 -0
- data/plugins/commands/package/plugin.rb +18 -0
- data/plugins/commands/plugin/action.rb +52 -0
- data/plugins/commands/plugin/action/bundler_check.rb +25 -0
- data/plugins/commands/plugin/action/install_gem.rb +70 -0
- data/plugins/commands/plugin/action/license_plugin.rb +54 -0
- data/plugins/commands/plugin/action/list_plugins.rb +54 -0
- data/plugins/commands/plugin/action/prune_gems.rb +149 -0
- data/plugins/commands/plugin/action/uninstall_plugin.rb +23 -0
- data/plugins/commands/plugin/command/base.rb +22 -0
- data/plugins/commands/plugin/command/install.rb +39 -0
- data/plugins/commands/plugin/command/license.rb +31 -0
- data/plugins/commands/plugin/command/list.rb +28 -0
- data/plugins/commands/plugin/command/root.rb +75 -0
- data/plugins/commands/plugin/command/uninstall.rb +28 -0
- data/plugins/commands/plugin/gem_helper.rb +74 -0
- data/plugins/commands/plugin/plugin.rb +22 -0
- data/plugins/commands/plugin/state_file.rb +57 -0
- data/plugins/commands/provision/command.rb +34 -0
- data/plugins/commands/provision/plugin.rb +18 -0
- data/plugins/commands/reload/command.rb +37 -0
- data/plugins/commands/reload/plugin.rb +18 -0
- data/plugins/commands/resume/command.rb +25 -0
- data/plugins/commands/resume/plugin.rb +17 -0
- data/{lib/vagrant/command/ssh.rb → plugins/commands/ssh/command.rb} +17 -41
- data/plugins/commands/ssh/plugin.rb +17 -0
- data/{lib/vagrant/command/ssh_config.rb → plugins/commands/ssh_config/command.rb} +14 -16
- data/plugins/commands/ssh_config/plugin.rb +18 -0
- data/plugins/commands/status/command.rb +39 -0
- data/plugins/commands/status/plugin.rb +18 -0
- data/plugins/commands/suspend/command.rb +25 -0
- data/plugins/commands/suspend/plugin.rb +18 -0
- data/plugins/commands/up/command.rb +45 -0
- data/plugins/commands/up/plugin.rb +17 -0
- data/{lib/vagrant/command → plugins/commands/up}/start_mixins.rb +6 -6
- data/{lib/vagrant/communication/ssh.rb → plugins/communicators/ssh/communicator.rb} +139 -52
- data/plugins/communicators/ssh/plugin.rb +19 -0
- data/plugins/guests/arch/guest.rb +41 -0
- data/plugins/guests/arch/plugin.rb +15 -0
- data/{lib/vagrant/guest/debian.rb → plugins/guests/debian/guest.rb} +21 -13
- data/plugins/guests/debian/plugin.rb +15 -0
- data/{lib/vagrant/guest/fedora.rb → plugins/guests/fedora/guest.rb} +19 -14
- data/plugins/guests/fedora/plugin.rb +15 -0
- data/plugins/guests/freebsd/config.rb +13 -0
- data/plugins/guests/freebsd/guest.rb +70 -0
- data/plugins/guests/freebsd/plugin.rb +20 -0
- data/plugins/guests/gentoo/guest.rb +51 -0
- data/plugins/guests/gentoo/plugin.rb +15 -0
- data/plugins/guests/linux/config.rb +13 -0
- data/{lib/vagrant/guest/linux.rb → plugins/guests/linux/guest.rb} +35 -34
- data/plugins/guests/linux/plugin.rb +20 -0
- data/plugins/guests/openbsd/guest.rb +13 -0
- data/plugins/guests/openbsd/plugin.rb +15 -0
- data/{lib/vagrant/guest/redhat.rb → plugins/guests/redhat/guest.rb} +22 -15
- data/plugins/guests/redhat/plugin.rb +15 -0
- data/plugins/guests/solaris/config.rb +18 -0
- data/plugins/guests/solaris/guest.rb +73 -0
- data/plugins/guests/solaris/plugin.rb +20 -0
- data/plugins/guests/suse/guest.rb +24 -0
- data/plugins/guests/suse/plugin.rb +15 -0
- data/plugins/guests/ubuntu/guest.rb +44 -0
- data/plugins/guests/ubuntu/plugin.rb +15 -0
- data/{lib/vagrant/hosts/arch.rb → plugins/hosts/arch/host.rb} +18 -5
- data/plugins/hosts/arch/plugin.rb +15 -0
- data/{lib/vagrant/hosts/bsd.rb → plugins/hosts/bsd/host.rb} +16 -11
- data/plugins/hosts/bsd/plugin.rb +15 -0
- data/{lib/vagrant/hosts/fedora.rb → plugins/hosts/fedora/host.rb} +8 -4
- data/plugins/hosts/fedora/plugin.rb +15 -0
- data/{lib/vagrant/hosts/freebsd.rb → plugins/hosts/freebsd/host.rb} +10 -8
- data/plugins/hosts/freebsd/plugin.rb +15 -0
- data/{lib/vagrant/hosts/gentoo.rb → plugins/hosts/gentoo/host.rb} +7 -3
- data/plugins/hosts/gentoo/plugin.rb +15 -0
- data/{lib/vagrant/hosts/linux.rb → plugins/hosts/linux/host.rb} +12 -11
- data/plugins/hosts/linux/plugin.rb +15 -0
- data/{lib/vagrant/hosts/opensuse.rb → plugins/hosts/opensuse/host.rb} +8 -4
- data/plugins/hosts/opensuse/plugin.rb +15 -0
- data/{lib/vagrant/hosts/windows.rb → plugins/hosts/windows/host.rb} +5 -4
- data/plugins/hosts/windows/plugin.rb +15 -0
- data/plugins/kernel_v1/config/nfs.rb +20 -0
- data/plugins/kernel_v1/config/package.rb +17 -0
- data/plugins/kernel_v1/config/ssh.rb +46 -0
- data/plugins/kernel_v1/config/vagrant.rb +31 -0
- data/plugins/kernel_v1/config/vm.rb +184 -0
- data/plugins/kernel_v1/plugin.rb +44 -0
- data/plugins/kernel_v2/config/nfs.rb +10 -0
- data/plugins/kernel_v2/config/package.rb +9 -0
- data/plugins/kernel_v2/config/ssh.rb +35 -0
- data/plugins/kernel_v2/config/vagrant.rb +9 -0
- data/plugins/kernel_v2/config/vm.rb +314 -0
- data/plugins/kernel_v2/config/vm_provisioner.rb +40 -0
- data/plugins/kernel_v2/config/vm_subvm.rb +30 -0
- data/plugins/kernel_v2/plugin.rb +44 -0
- data/plugins/providers/virtualbox/action.rb +308 -0
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/boot.rb +12 -16
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/check_accessible.rb +5 -5
- data/plugins/providers/virtualbox/action/check_created.rb +21 -0
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/check_guest_additions.rb +18 -11
- data/plugins/providers/virtualbox/action/check_running.rb +21 -0
- data/plugins/providers/virtualbox/action/check_virtualbox.rb +22 -0
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/clean_machine_folder.rb +5 -5
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/clear_forwarded_ports.rb +4 -4
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/clear_network_interfaces.rb +4 -4
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/clear_shared_folders.rb +4 -5
- data/plugins/providers/virtualbox/action/created.rb +20 -0
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/customize.rb +7 -7
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/destroy.rb +5 -5
- data/plugins/providers/virtualbox/action/destroy_confirm.rb +17 -0
- data/plugins/providers/virtualbox/action/destroy_unused_network_interfaces.rb +16 -0
- data/plugins/providers/virtualbox/action/discard_state.rb +20 -0
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/export.rb +7 -7
- data/plugins/providers/virtualbox/action/forced_halt.rb +25 -0
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/forward_ports.rb +29 -42
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/import.rb +15 -12
- data/plugins/providers/virtualbox/action/is_paused.rb +20 -0
- data/plugins/providers/virtualbox/action/is_running.rb +20 -0
- data/plugins/providers/virtualbox/action/is_saved.rb +20 -0
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/match_mac_address.rb +5 -5
- data/plugins/providers/virtualbox/action/message_not_created.rb +16 -0
- data/plugins/providers/virtualbox/action/message_not_running.rb +16 -0
- data/plugins/providers/virtualbox/action/message_will_not_destroy.rb +17 -0
- data/plugins/providers/virtualbox/action/network.rb +366 -0
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/package.rb +4 -7
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/package_vagrantfile.rb +5 -8
- data/plugins/providers/virtualbox/action/prepare_forwarded_port_collision_params.rb +35 -0
- data/plugins/providers/virtualbox/action/prepare_nfs_settings.rb +51 -0
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/prune_nfs_exports.rb +5 -5
- data/plugins/providers/virtualbox/action/resume.rb +25 -0
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/sane_defaults.rb +41 -32
- data/plugins/providers/virtualbox/action/set_name.rb +40 -0
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/setup_package_files.rb +5 -8
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/share_folders.rb +24 -25
- data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/suspend.rb +5 -5
- data/plugins/providers/virtualbox/config.rb +82 -0
- data/plugins/providers/virtualbox/driver/base.rb +344 -0
- data/plugins/providers/virtualbox/driver/meta.rb +142 -0
- data/plugins/providers/virtualbox/driver/version_4_0.rb +485 -0
- data/plugins/providers/virtualbox/driver/version_4_1.rb +485 -0
- data/plugins/providers/virtualbox/driver/version_4_2.rb +475 -0
- data/plugins/providers/virtualbox/model/forwarded_port.rb +58 -0
- data/plugins/providers/virtualbox/plugin.rb +42 -0
- data/plugins/providers/virtualbox/provider.rb +92 -0
- data/plugins/providers/virtualbox/util/compile_forwarded_ports.rb +31 -0
- data/plugins/provisioners/chef/config/base.rb +65 -0
- data/plugins/provisioners/chef/config/chef_client.rb +39 -0
- data/plugins/provisioners/chef/config/chef_solo.rb +87 -0
- data/plugins/provisioners/chef/plugin.rb +33 -0
- data/plugins/provisioners/chef/provisioner/base.rb +91 -0
- data/plugins/provisioners/chef/provisioner/chef_client.rb +103 -0
- data/plugins/provisioners/chef/provisioner/chef_solo.rb +182 -0
- data/plugins/provisioners/puppet/config/puppet.rb +70 -0
- data/plugins/provisioners/puppet/config/puppet_server.rb +16 -0
- data/plugins/provisioners/puppet/plugin.rb +33 -0
- data/plugins/provisioners/puppet/provisioner/puppet.rb +110 -0
- data/plugins/provisioners/puppet/provisioner/puppet_server.rb +67 -0
- data/plugins/provisioners/shell/config.rb +46 -0
- data/plugins/provisioners/shell/plugin.rb +23 -0
- data/plugins/provisioners/shell/provisioner.rb +66 -0
- data/templates/commands/init/Vagrantfile.erb +33 -21
- data/templates/commands/ssh_config/config.erb +1 -0
- data/templates/config/messages.erb +14 -0
- data/templates/config/validation_failed.erb +3 -3
- data/templates/guests/arch/network_dhcp.erb +4 -7
- data/templates/guests/arch/network_static.erb +6 -7
- data/templates/guests/debian/network_dhcp.erb +5 -0
- data/templates/locales/en.yml +336 -100
- data/templates/rgloader.rb +9 -0
- data/test/acceptance/support/isolated_environment.rb +3 -2
- data/test/support/tempdir.rb +13 -4
- data/test/unit/base.rb +6 -0
- data/test/unit/support/dummy_provider.rb +16 -0
- data/test/unit/support/isolated_environment.rb +132 -0
- data/test/unit/support/shared/base_context.rb +74 -0
- data/test/unit/vagrant/action/builder_test.rb +88 -48
- data/test/unit/vagrant/action/builtin/call_test.rb +145 -0
- data/test/unit/vagrant/action/builtin/confirm_test.rb +36 -0
- data/test/unit/vagrant/action/builtin/env_set_test.rb +20 -0
- data/test/unit/vagrant/action/builtin/graceful_halt_test.rb +61 -0
- data/test/unit/vagrant/action/builtin/lock_test.rb +98 -0
- data/test/unit/vagrant/action/builtin/ssh_exec_test.rb +57 -0
- data/test/unit/vagrant/action/hook_test.rb +101 -0
- data/test/unit/vagrant/action/runner_test.rb +15 -9
- data/test/unit/vagrant/box_collection_test.rb +219 -38
- data/test/unit/vagrant/box_test.rb +94 -19
- data/test/unit/vagrant/cli_test.rb +27 -0
- data/test/unit/vagrant/config/loader_test.rb +154 -49
- data/test/unit/vagrant/config/v1/dummy_config_test.rb +24 -0
- data/test/unit/vagrant/config/v1/loader_test.rb +145 -0
- data/test/unit/vagrant/config/v1/root_test.rb +40 -0
- data/test/unit/vagrant/config/v2/dummy_config_test.rb +24 -0
- data/test/unit/vagrant/config/v2/loader_test.rb +151 -0
- data/test/unit/vagrant/config/v2/root_test.rb +97 -0
- data/test/unit/vagrant/config/v2/util_test.rb +21 -0
- data/test/unit/vagrant/config_test.rb +40 -1
- data/test/unit/vagrant/downloaders/base_test.rb +0 -4
- data/test/unit/vagrant/downloaders/file_test.rb +21 -9
- data/test/unit/vagrant/downloaders/http_test.rb +4 -0
- data/test/unit/vagrant/environment_test.rb +414 -63
- data/test/unit/vagrant/hosts_test.rb +10 -9
- data/test/unit/vagrant/machine_state_test.rb +26 -0
- data/test/unit/vagrant/machine_test.rb +418 -0
- data/test/unit/vagrant/{command/base_test.rb → plugin/v1/command_test.rb} +2 -9
- data/test/unit/vagrant/plugin/v1/communicator_test.rb +9 -0
- data/test/unit/vagrant/plugin/v1/config_test.rb +50 -0
- data/test/unit/vagrant/plugin/v1/host_test.rb +5 -0
- data/test/unit/vagrant/plugin/v1/manager_test.rb +114 -0
- data/test/unit/vagrant/plugin/v1/plugin_test.rb +267 -0
- data/test/unit/vagrant/plugin/v1/provider_test.rb +18 -0
- data/test/unit/vagrant/plugin/v2/command_test.rb +238 -0
- data/test/unit/vagrant/plugin/v2/communicator_test.rb +9 -0
- data/test/unit/vagrant/plugin/v2/components_test.rb +17 -0
- data/test/unit/vagrant/plugin/v2/config_test.rb +60 -0
- data/test/unit/vagrant/plugin/v2/host_test.rb +5 -0
- data/test/unit/vagrant/plugin/v2/manager_test.rb +157 -0
- data/test/unit/vagrant/plugin/v2/plugin_test.rb +287 -0
- data/test/unit/vagrant/plugin/v2/provider_test.rb +18 -0
- data/test/unit/vagrant/registry_test.rb +59 -5
- data/test/unit/vagrant/util/scoped_hash_override_test.rb +48 -0
- data/test/unit/vagrant/util/ssh_test.rb +30 -0
- data/test/unit/vagrant/util/string_block_editor_test.rb +98 -0
- data/test/unit/vagrant/util/which_test.rb +43 -0
- data/test/unit/vagrant_test.rb +42 -13
- data/vagrant.gemspec +6 -7
- data/vagrant.gemspecbak +6 -7
- metadata +273 -358
- data/lib/vagrant/action/box/destroy.rb +0 -25
- data/lib/vagrant/action/box/download.rb +0 -84
- data/lib/vagrant/action/box/package.rb +0 -19
- data/lib/vagrant/action/box/unpackage.rb +0 -61
- data/lib/vagrant/action/box/verify.rb +0 -23
- data/lib/vagrant/action/builtin.rb +0 -171
- data/lib/vagrant/action/env/set.rb +0 -21
- data/lib/vagrant/action/environment.rb +0 -12
- data/lib/vagrant/action/general/check_virtualbox.rb +0 -28
- data/lib/vagrant/action/general/validate.rb +0 -18
- data/lib/vagrant/action/vm/check_box.rb +0 -33
- data/lib/vagrant/action/vm/check_port_collisions.rb +0 -89
- data/lib/vagrant/action/vm/default_name.rb +0 -22
- data/lib/vagrant/action/vm/destroy_unused_network_interfaces.rb +0 -20
- data/lib/vagrant/action/vm/discard_state.rb +0 -22
- data/lib/vagrant/action/vm/halt.rb +0 -32
- data/lib/vagrant/action/vm/host_name.rb +0 -21
- data/lib/vagrant/action/vm/network.rb +0 -403
- data/lib/vagrant/action/vm/nfs.rb +0 -196
- data/lib/vagrant/action/vm/provision.rb +0 -61
- data/lib/vagrant/action/vm/provisioner_cleanup.rb +0 -26
- data/lib/vagrant/action/vm/resume.rb +0 -20
- data/lib/vagrant/command.rb +0 -24
- data/lib/vagrant/command/base.rb +0 -167
- data/lib/vagrant/command/box.rb +0 -58
- data/lib/vagrant/command/box_add.rb +0 -37
- data/lib/vagrant/command/box_list.rb +0 -28
- data/lib/vagrant/command/box_remove.rb +0 -27
- data/lib/vagrant/command/box_repackage.rb +0 -27
- data/lib/vagrant/command/destroy.rb +0 -64
- data/lib/vagrant/command/gem.rb +0 -39
- data/lib/vagrant/command/halt.rb +0 -39
- data/lib/vagrant/command/package.rb +0 -75
- data/lib/vagrant/command/provision.rb +0 -40
- data/lib/vagrant/command/reload.rb +0 -39
- data/lib/vagrant/command/resume.rb +0 -33
- data/lib/vagrant/command/status.rb +0 -36
- data/lib/vagrant/command/suspend.rb +0 -33
- data/lib/vagrant/command/up.rb +0 -40
- data/lib/vagrant/communication.rb +0 -7
- data/lib/vagrant/communication/base.rb +0 -56
- data/lib/vagrant/config/base.rb +0 -82
- data/lib/vagrant/config/error_recorder.rb +0 -19
- data/lib/vagrant/config/nfs.rb +0 -8
- data/lib/vagrant/config/package.rb +0 -7
- data/lib/vagrant/config/ssh.rb +0 -27
- data/lib/vagrant/config/top.rb +0 -72
- data/lib/vagrant/config/vagrant.rb +0 -14
- data/lib/vagrant/config/vm.rb +0 -168
- data/lib/vagrant/config/vm/provisioner.rb +0 -52
- data/lib/vagrant/config/vm/sub_vm.rb +0 -17
- data/lib/vagrant/data_store.rb +0 -92
- data/lib/vagrant/driver.rb +0 -8
- data/lib/vagrant/driver/virtualbox.rb +0 -134
- data/lib/vagrant/driver/virtualbox_4_0.rb +0 -459
- data/lib/vagrant/driver/virtualbox_4_1.rb +0 -459
- data/lib/vagrant/driver/virtualbox_4_2.rb +0 -606
- data/lib/vagrant/driver/virtualbox_base.rb +0 -326
- data/lib/vagrant/guest.rb +0 -18
- data/lib/vagrant/guest/arch.rb +0 -56
- data/lib/vagrant/guest/base.rb +0 -99
- data/lib/vagrant/guest/freebsd.rb +0 -86
- data/lib/vagrant/guest/gentoo.rb +0 -46
- data/lib/vagrant/guest/linux/config.rb +0 -19
- data/lib/vagrant/guest/linux/error.rb +0 -9
- data/lib/vagrant/guest/openbsd.rb +0 -20
- data/lib/vagrant/guest/solaris.rb +0 -118
- data/lib/vagrant/guest/suse.rb +0 -17
- data/lib/vagrant/guest/ubuntu.rb +0 -23
- data/lib/vagrant/hosts/base.rb +0 -66
- data/lib/vagrant/provisioners.rb +0 -12
- data/lib/vagrant/provisioners/base.rb +0 -44
- data/lib/vagrant/provisioners/chef.rb +0 -168
- data/lib/vagrant/provisioners/chef_client.rb +0 -132
- data/lib/vagrant/provisioners/chef_solo.rb +0 -234
- data/lib/vagrant/provisioners/puppet.rb +0 -176
- data/lib/vagrant/provisioners/puppet_server.rb +0 -78
- data/lib/vagrant/provisioners/shell.rb +0 -103
- data/lib/vagrant/vm.rb +0 -195
- data/test/buildbot/README.md +0 -72
- data/test/buildbot/buildbot_config/__init__.py +0 -0
- data/test/buildbot/buildbot_config/config/__init__.py +0 -0
- data/test/buildbot/buildbot_config/config/loader.py +0 -24
- data/test/buildbot/buildbot_config/config/master.py +0 -24
- data/test/buildbot/buildbot_config/config/slave.py +0 -22
- data/test/buildbot/buildbot_config/master/__init__.py +0 -6
- data/test/buildbot/buildbot_config/master/builders.py +0 -78
- data/test/buildbot/buildbot_config/master/buildsteps.py +0 -100
- data/test/buildbot/buildbot_config/master/change_sources.py +0 -8
- data/test/buildbot/buildbot_config/master/schedulers.py +0 -32
- data/test/buildbot/buildbot_config/master/slaves.py +0 -60
- data/test/buildbot/buildbot_config/master/status.py +0 -52
- data/test/buildbot/master/Makefile.sample +0 -28
- data/test/buildbot/master/buildbot.tac +0 -36
- data/test/buildbot/master/master.cfg +0 -67
- data/test/buildbot/master/public_html/bg_gradient.jpg +0 -0
- data/test/buildbot/master/public_html/default.css +0 -545
- data/test/buildbot/master/public_html/favicon.ico +0 -0
- data/test/buildbot/master/public_html/robots.txt +0 -10
- data/test/buildbot/master/public_html/static/css/bootstrap-1.4.0.min.css +0 -356
- data/test/buildbot/master/public_html/static/css/prettify.css +0 -97
- data/test/buildbot/master/public_html/static/css/syntax.css +0 -60
- data/test/buildbot/master/public_html/static/css/vagrant.base.css +0 -205
- data/test/buildbot/master/public_html/static/images/base_box_mac.jpg +0 -0
- data/test/buildbot/master/public_html/static/images/getting-started/success.jpg +0 -0
- data/test/buildbot/master/public_html/static/images/icons/error.png +0 -0
- data/test/buildbot/master/public_html/static/images/vagrant_chilling.png +0 -0
- data/test/buildbot/master/public_html/static/images/vagrant_holding.png +0 -0
- data/test/buildbot/master/public_html/static/images/vagrant_looking.png +0 -0
- data/test/buildbot/master/public_html/static/images/windows/alter_path.jpg +0 -0
- data/test/buildbot/master/public_html/static/images/windows/edit_path.jpg +0 -0
- data/test/buildbot/master/public_html/static/images/windows/environment_variables_button.jpg +0 -0
- data/test/buildbot/master/public_html/static/images/windows/port_and_ppk_path.jpg +0 -0
- data/test/buildbot/master/public_html/static/images/windows/ppk_selection.jpg +0 -0
- data/test/buildbot/master/public_html/static/images/windows/putty_first_screen.jpg +0 -0
- data/test/buildbot/master/public_html/static/images/windows/save_result.jpg +0 -0
- data/test/buildbot/master/public_html/static/images/windows/vbox_manage_default_location.jpg +0 -0
- data/test/buildbot/master/public_html/static/js/bootstrap-tabs.js +0 -80
- data/test/buildbot/master/public_html/static/js/jquery-1.7.min.js +0 -4
- data/test/buildbot/master/templates/authfail.html +0 -9
- data/test/buildbot/master/templates/build.html +0 -205
- data/test/buildbot/master/templates/builder.html +0 -118
- data/test/buildbot/master/templates/builders.html +0 -33
- data/test/buildbot/master/templates/buildslave.html +0 -72
- data/test/buildbot/master/templates/buildslaves.html +0 -70
- data/test/buildbot/master/templates/change.html +0 -15
- data/test/buildbot/master/templates/layouts/base.html +0 -58
- data/test/buildbot/master/templates/macros/box.html +0 -37
- data/test/buildbot/master/templates/macros/build_line.html +0 -50
- data/test/buildbot/master/templates/macros/change.html +0 -81
- data/test/buildbot/master/templates/macros/forms.html +0 -300
- data/test/buildbot/master/templates/root.html +0 -42
- data/test/buildbot/master/templates/waterfall.html +0 -53
- data/test/buildbot/requirements.txt +0 -4
- data/test/buildbot/scripts/deploy.sh +0 -38
- data/test/buildbot/scripts/setup.sh +0 -107
- data/test/buildbot/slave/buildbot.tac +0 -43
- data/test/buildbot/slave/info/admin +0 -1
- data/test/buildbot/slave/info/host +0 -1
- data/test/buildbot/tests/__init__.py +0 -0
- data/test/buildbot/tests/master/__init__.py +0 -0
- data/test/buildbot/tests/master/test_slaves.py +0 -41
- data/test/buildbot/vendor/choices-0.4.0.tar.gz +0 -0
- data/test/unit/vagrant/action/environment_test.rb +0 -16
- data/test/unit/vagrant/config/base_test.rb +0 -48
- data/test/unit/vagrant/config/ssh_test.rb +0 -17
- data/test/unit/vagrant/config/top_test.rb +0 -69
- data/test/unit/vagrant/config/vm_test.rb +0 -71
- data/test/unit/vagrant/data_store_test.rb +0 -79
- data/test/unit_legacy/locales/en.yml +0 -8
- data/test/unit_legacy/test_helper.rb +0 -32
- data/test/unit_legacy/vagrant/action/box/destroy_test.rb +0 -18
- data/test/unit_legacy/vagrant/action/box/download_test.rb +0 -125
- data/test/unit_legacy/vagrant/action/box/package_test.rb +0 -25
- data/test/unit_legacy/vagrant/action/box/unpackage_test.rb +0 -84
- data/test/unit_legacy/vagrant/action/box/verify_test.rb +0 -30
- data/test/unit_legacy/vagrant/action/env/set_test.rb +0 -24
- data/test/unit_legacy/vagrant/action/general/package_test.rb +0 -268
- data/test/unit_legacy/vagrant/action/general/validate_test.rb +0 -31
- data/test/unit_legacy/vagrant/action/vm/boot_test.rb +0 -66
- data/test/unit_legacy/vagrant/action/vm/check_accessible_test.rb +0 -61
- data/test/unit_legacy/vagrant/action/vm/check_box_test.rb +0 -61
- data/test/unit_legacy/vagrant/action/vm/check_guest_additions_test.rb +0 -9
- data/test/unit_legacy/vagrant/action/vm/clean_machine_folder_test.rb +0 -84
- data/test/unit_legacy/vagrant/action/vm/clear_forwarded_ports_test.rb +0 -52
- data/test/unit_legacy/vagrant/action/vm/clear_nfs_exports_test.rb +0 -22
- data/test/unit_legacy/vagrant/action/vm/clear_shared_folders_test.rb +0 -40
- data/test/unit_legacy/vagrant/action/vm/customize_test.rb +0 -37
- data/test/unit_legacy/vagrant/action/vm/destroy_test.rb +0 -25
- data/test/unit_legacy/vagrant/action/vm/destroy_unused_network_interfaces_test.rb +0 -49
- data/test/unit_legacy/vagrant/action/vm/discard_state_test.rb +0 -45
- data/test/unit_legacy/vagrant/action/vm/export_test.rb +0 -107
- data/test/unit_legacy/vagrant/action/vm/forward_ports_helpers_test.rb +0 -77
- data/test/unit_legacy/vagrant/action/vm/forward_ports_test.rb +0 -197
- data/test/unit_legacy/vagrant/action/vm/halt_test.rb +0 -79
- data/test/unit_legacy/vagrant/action/vm/host_name_test.rb +0 -36
- data/test/unit_legacy/vagrant/action/vm/import_test.rb +0 -66
- data/test/unit_legacy/vagrant/action/vm/match_mac_address_test.rb +0 -40
- data/test/unit_legacy/vagrant/action/vm/modify_test.rb +0 -38
- data/test/unit_legacy/vagrant/action/vm/network_test.rb +0 -286
- data/test/unit_legacy/vagrant/action/vm/nfs_helpers_test.rb +0 -26
- data/test/unit_legacy/vagrant/action/vm/nfs_test.rb +0 -260
- data/test/unit_legacy/vagrant/action/vm/package_test.rb +0 -25
- data/test/unit_legacy/vagrant/action/vm/package_vagrantfile_test.rb +0 -46
- data/test/unit_legacy/vagrant/action/vm/provision_test.rb +0 -65
- data/test/unit_legacy/vagrant/action/vm/provisioner_cleanup_test.rb +0 -56
- data/test/unit_legacy/vagrant/action/vm/resume_test.rb +0 -35
- data/test/unit_legacy/vagrant/action/vm/share_folders_test.rb +0 -144
- data/test/unit_legacy/vagrant/action/vm/suspend_test.rb +0 -35
- data/test/unit_legacy/vagrant/action_test.rb +0 -89
- data/test/unit_legacy/vagrant/box_collection_test.rb +0 -45
- data/test/unit_legacy/vagrant/box_test.rb +0 -74
- data/test/unit_legacy/vagrant/cli_test.rb +0 -35
- data/test/unit_legacy/vagrant/command/base_test.rb +0 -23
- data/test/unit_legacy/vagrant/command/group_base_test.rb +0 -15
- data/test/unit_legacy/vagrant/command/helpers_test.rb +0 -88
- data/test/unit_legacy/vagrant/command/init_test.rb +0 -10
- data/test/unit_legacy/vagrant/command/package_test.rb +0 -27
- data/test/unit_legacy/vagrant/config/base_test.rb +0 -52
- data/test/unit_legacy/vagrant/config/error_recorder_test.rb +0 -18
- data/test/unit_legacy/vagrant/config/ssh_test.rb +0 -12
- data/test/unit_legacy/vagrant/config/vagrant_test.rb +0 -35
- data/test/unit_legacy/vagrant/config/vm/provisioner_test.rb +0 -92
- data/test/unit_legacy/vagrant/config/vm_test.rb +0 -47
- data/test/unit_legacy/vagrant/config_test.rb +0 -148
- data/test/unit_legacy/vagrant/downloaders/http_test.rb +0 -93
- data/test/unit_legacy/vagrant/environment_test.rb +0 -539
- data/test/unit_legacy/vagrant/errors_test.rb +0 -42
- data/test/unit_legacy/vagrant/hosts/base_test.rb +0 -46
- data/test/unit_legacy/vagrant/hosts/bsd_test.rb +0 -53
- data/test/unit_legacy/vagrant/hosts/linux_test.rb +0 -54
- data/test/unit_legacy/vagrant/plugin_test.rb +0 -9
- data/test/unit_legacy/vagrant/provisioners/base_test.rb +0 -63
- data/test/unit_legacy/vagrant/provisioners/chef_client_test.rb +0 -190
- data/test/unit_legacy/vagrant/provisioners/chef_solo_test.rb +0 -115
- data/test/unit_legacy/vagrant/provisioners/chef_test.rb +0 -209
- data/test/unit_legacy/vagrant/provisioners/puppet_server_test.rb +0 -68
- data/test/unit_legacy/vagrant/provisioners/puppet_test.rb +0 -182
- data/test/unit_legacy/vagrant/provisioners/shell_test.rb +0 -79
- data/test/unit_legacy/vagrant/ssh/session_test.rb +0 -40
- data/test/unit_legacy/vagrant/ssh_test.rb +0 -304
- data/test/unit_legacy/vagrant/systems/base_test.rb +0 -18
- data/test/unit_legacy/vagrant/systems/linux_test.rb +0 -104
- data/test/unit_legacy/vagrant/util/busy_test.rb +0 -106
- data/test/unit_legacy/vagrant/util/counter_test.rb +0 -29
- data/test/unit_legacy/vagrant/util/platform_test.rb +0 -18
- data/test/unit_legacy/vagrant/util/stacked_proc_runner_test.rb +0 -43
- data/test/unit_legacy/vagrant/util/template_renderer_test.rb +0 -145
- data/test/unit_legacy/vagrant/vm_test.rb +0 -300
- data/vagrant-1.1.4.gem +0 -0
- data/vagrantup-0.1.0.gem +0 -0
- data/vagrantup-0.1.1.gem +0 -0
- data/vagrantup-0.1.2.gem +0 -0
- data/vagrantup-0.1.3.gem +0 -0
- data/vagrantup-0.1.4.gem +0 -0
- data/vagrantup-0.2.0.gem +0 -0
- data/vagrantup-0.3.0.gem +0 -0
- data/vagrantup-0.3.1.gem +0 -0
- data/vagrantup-0.3.2.gem +0 -0
- data/vagrantup-0.3.3.gem +0 -0
- data/vagrantup-0.3.4.gem +0 -0
- data/vagrantup-0.4.0.gem +0 -0
- data/vagrantup-0.4.1.gem +0 -0
- data/vagrantup-0.4.3.dev.gem +0 -0
- data/vagrantup-0.5.0.gem +0 -0
- data/vagrantup-0.5.1.gem +0 -0
- data/vagrantup-0.5.2.gem +0 -0
- data/vagrantup-0.5.3.gem +0 -0
- data/vagrantup-0.5.4.gem +0 -0
- data/vagrantup-0.6.0.gem +0 -0
- data/vagrantup-0.6.1.gem +0 -0
- data/vagrantup-0.6.2.gem +0 -0
- data/vagrantup-0.6.3.gem +0 -0
- data/vagrantup-0.6.4.gem +0 -0
- data/vagrantup-0.6.5.gem +0 -0
- data/vagrantup-0.6.6.gem +0 -0
- data/vagrantup-0.6.7.gem +0 -0
- data/vagrantup-0.6.8.gem +0 -0
- data/vagrantup-0.6.9.gem +0 -0
- data/vagrantup-0.7.0.gem +0 -0
- data/vagrantup-0.7.1.gem +0 -0
- data/vagrantup-0.7.2.gem +0 -0
- data/vagrantup-0.7.3.gem +0 -0
- data/vagrantup-0.7.4.gem +0 -0
- data/vagrantup-0.7.5.gem +0 -0
- data/vagrantup-0.7.6.gem +0 -0
- data/vagrantup-0.7.7.gem +0 -0
- data/vagrantup-0.7.8.gem +0 -0
- data/vagrantup-0.8.0.gem +0 -0
- data/vagrantup-0.8.1.gem +0 -0
- data/vagrantup-0.8.10.gem +0 -0
- data/vagrantup-0.8.2.gem +0 -0
- data/vagrantup-0.8.3.gem +0 -0
- data/vagrantup-0.8.4.gem +0 -0
- data/vagrantup-0.8.5.gem +0 -0
- data/vagrantup-0.8.6.gem +0 -0
- data/vagrantup-0.8.7.gem +0 -0
- data/vagrantup-0.8.8.gem +0 -0
- data/vagrantup-0.8.9.gem +0 -0
- data/vagrantup-0.9.0.gem +0 -0
- data/vagrantup-0.9.1.gem +0 -0
- data/vagrantup-0.9.2.gem +0 -0
- data/vagrantup-0.9.3.gem +0 -0
- data/vagrantup-0.9.4.gem +0 -0
- data/vagrantup-0.9.5.gem +0 -0
- data/vagrantup-0.9.6.gem +0 -0
- data/vagrantup-0.9.7.gem +0 -0
- data/vagrantup-0.9.99.1.gem +0 -0
- data/vagrantup-0.9.99.2.gem +0 -0
- data/vagrantup-1.0.0.gem +0 -0
- data/vagrantup-1.0.1.gem +0 -0
- data/vagrantup-1.0.2.gem +0 -0
- data/vagrantup-1.0.3.gem +0 -0
- data/vagrantup-1.0.4.gem +0 -0
- data/vagrantup-1.0.5.gem +0 -0
- data/vagrantup-1.0.6.gem +0 -0
- data/vagrantup-1.1.4.gem +0 -0
@@ -1,29 +1,77 @@
|
|
1
1
|
require File.expand_path("../../base", __FILE__)
|
2
|
+
require "json"
|
2
3
|
require "pathname"
|
4
|
+
require "tempfile"
|
5
|
+
require "tmpdir"
|
3
6
|
|
4
7
|
require "vagrant/util/file_mode"
|
5
8
|
|
6
|
-
require "support/tempdir"
|
7
|
-
|
8
9
|
describe Vagrant::Environment do
|
9
10
|
include_context "unit"
|
10
11
|
|
11
|
-
let(:
|
12
|
-
|
12
|
+
let(:env) do
|
13
|
+
isolated_environment.tap do |e|
|
14
|
+
e.box2("base", :virtualbox)
|
15
|
+
e.vagrantfile <<-VF
|
16
|
+
Vagrant.configure("2") do |config|
|
17
|
+
config.vm.box = "base"
|
18
|
+
end
|
19
|
+
VF
|
20
|
+
end
|
21
|
+
end
|
22
|
+
|
23
|
+
let(:instance) { env.create_vagrant_env }
|
24
|
+
|
25
|
+
describe "active machines" do
|
26
|
+
it "should be empty if the machines folder doesn't exist" do
|
27
|
+
folder = instance.local_data_path.join("machines")
|
28
|
+
folder.should_not be_exist
|
29
|
+
|
30
|
+
instance.active_machines.should be_empty
|
31
|
+
end
|
32
|
+
|
33
|
+
it "should return the name and provider of active machines" do
|
34
|
+
machines = instance.local_data_path.join("machines")
|
35
|
+
|
36
|
+
# Valid machine, with "foo" and virtualbox
|
37
|
+
machine_foo = machines.join("foo/virtualbox")
|
38
|
+
machine_foo.mkpath
|
39
|
+
machine_foo.join("id").open("w+") { |f| f.write("") }
|
40
|
+
|
41
|
+
# Invalid machine (no ID)
|
42
|
+
machine_bar = machines.join("bar/virtualbox")
|
43
|
+
machine_bar.mkpath
|
44
|
+
|
45
|
+
instance.active_machines.should == [[:foo, :virtualbox]]
|
46
|
+
end
|
47
|
+
end
|
13
48
|
|
14
49
|
describe "current working directory" do
|
15
50
|
it "is the cwd by default" do
|
16
|
-
|
51
|
+
Dir.mktmpdir do |temp_dir|
|
52
|
+
Dir.chdir(temp_dir) do
|
53
|
+
with_temp_env("VAGRANT_CWD" => nil) do
|
54
|
+
described_class.new.cwd.should == Pathname.new(Dir.pwd)
|
55
|
+
end
|
56
|
+
end
|
57
|
+
end
|
17
58
|
end
|
18
59
|
|
19
60
|
it "is set to the cwd given" do
|
20
|
-
|
21
|
-
|
22
|
-
|
61
|
+
Dir.mktmpdir do |directory|
|
62
|
+
instance = described_class.new(:cwd => directory)
|
63
|
+
instance.cwd.should == Pathname.new(directory)
|
64
|
+
end
|
23
65
|
end
|
24
66
|
|
25
67
|
it "is set to the environmental variable VAGRANT_CWD" do
|
26
|
-
|
68
|
+
Dir.mktmpdir do |directory|
|
69
|
+
instance = with_temp_env("VAGRANT_CWD" => directory) do
|
70
|
+
described_class.new
|
71
|
+
end
|
72
|
+
|
73
|
+
instance.cwd.should == Pathname.new(directory)
|
74
|
+
end
|
27
75
|
end
|
28
76
|
|
29
77
|
it "raises an exception if the CWD doesn't exist" do
|
@@ -34,13 +82,20 @@ describe Vagrant::Environment do
|
|
34
82
|
|
35
83
|
describe "home path" do
|
36
84
|
it "is set to the home path given" do
|
37
|
-
|
38
|
-
|
39
|
-
|
85
|
+
Dir.mktmpdir do |dir|
|
86
|
+
instance = described_class.new(:home_path => dir)
|
87
|
+
instance.home_path.should == Pathname.new(dir)
|
88
|
+
end
|
40
89
|
end
|
41
90
|
|
42
91
|
it "is set to the environmental variable VAGRANT_HOME" do
|
43
|
-
|
92
|
+
Dir.mktmpdir do |dir|
|
93
|
+
instance = with_temp_env("VAGRANT_HOME" => dir) do
|
94
|
+
described_class.new
|
95
|
+
end
|
96
|
+
|
97
|
+
instance.home_path.should == Pathname.new(dir)
|
98
|
+
end
|
44
99
|
end
|
45
100
|
|
46
101
|
it "is set to the DEFAULT_HOME by default" do
|
@@ -55,6 +110,80 @@ describe Vagrant::Environment do
|
|
55
110
|
end
|
56
111
|
end
|
57
112
|
|
113
|
+
describe "local data path" do
|
114
|
+
it "is set to the proper default" do
|
115
|
+
default = instance.root_path.join(described_class::DEFAULT_LOCAL_DATA)
|
116
|
+
instance.local_data_path.should == default
|
117
|
+
end
|
118
|
+
|
119
|
+
it "is expanded relative to the cwd" do
|
120
|
+
instance = described_class.new(:local_data_path => "foo")
|
121
|
+
instance.local_data_path.should == instance.cwd.join("foo")
|
122
|
+
end
|
123
|
+
|
124
|
+
it "is set to the given value" do
|
125
|
+
Dir.mktmpdir do |dir|
|
126
|
+
instance = described_class.new(:local_data_path => dir)
|
127
|
+
instance.local_data_path.to_s.should == dir
|
128
|
+
end
|
129
|
+
end
|
130
|
+
|
131
|
+
describe "upgrading V1 dotfiles" do
|
132
|
+
let(:v1_dotfile_tempfile) { Tempfile.new("vagrant") }
|
133
|
+
let(:v1_dotfile) { Pathname.new(v1_dotfile_tempfile.path) }
|
134
|
+
let(:local_data_path) { v1_dotfile_tempfile.path }
|
135
|
+
let(:instance) { described_class.new(:local_data_path => local_data_path) }
|
136
|
+
|
137
|
+
it "should be fine if dotfile is empty" do
|
138
|
+
v1_dotfile.open("w+") do |f|
|
139
|
+
f.write("")
|
140
|
+
end
|
141
|
+
|
142
|
+
expect { instance }.to_not raise_error
|
143
|
+
Pathname.new(local_data_path).should be_directory
|
144
|
+
end
|
145
|
+
|
146
|
+
it "should upgrade all active VMs" do
|
147
|
+
active_vms = {
|
148
|
+
"foo" => "foo_id",
|
149
|
+
"bar" => "bar_id"
|
150
|
+
}
|
151
|
+
|
152
|
+
v1_dotfile.open("w+") do |f|
|
153
|
+
f.write(JSON.dump({
|
154
|
+
"active" => active_vms
|
155
|
+
}))
|
156
|
+
end
|
157
|
+
|
158
|
+
expect { instance }.to_not raise_error
|
159
|
+
|
160
|
+
local_data_pathname = Pathname.new(local_data_path)
|
161
|
+
foo_id_file = local_data_pathname.join("machines/foo/virtualbox/id")
|
162
|
+
foo_id_file.should be_file
|
163
|
+
foo_id_file.read.should == "foo_id"
|
164
|
+
|
165
|
+
bar_id_file = local_data_pathname.join("machines/bar/virtualbox/id")
|
166
|
+
bar_id_file.should be_file
|
167
|
+
bar_id_file.read.should == "bar_id"
|
168
|
+
end
|
169
|
+
|
170
|
+
it "should raise an error if invalid JSON" do
|
171
|
+
v1_dotfile.open("w+") do |f|
|
172
|
+
f.write("bad")
|
173
|
+
end
|
174
|
+
|
175
|
+
expect { instance }.
|
176
|
+
to raise_error(Vagrant::Errors::DotfileUpgradeJSONError)
|
177
|
+
end
|
178
|
+
end
|
179
|
+
end
|
180
|
+
|
181
|
+
describe "default provider" do
|
182
|
+
it "should return virtualbox" do
|
183
|
+
instance.default_provider.should == :virtualbox
|
184
|
+
end
|
185
|
+
end
|
186
|
+
|
58
187
|
describe "copying the private SSH key" do
|
59
188
|
it "copies the SSH key into the home directory" do
|
60
189
|
env = isolated_environment
|
@@ -86,41 +215,61 @@ describe Vagrant::Environment do
|
|
86
215
|
end
|
87
216
|
end
|
88
217
|
|
89
|
-
describe "
|
90
|
-
it "
|
91
|
-
|
218
|
+
describe "#hook" do
|
219
|
+
it "should call the action runner with the proper hook" do
|
220
|
+
hook_name = :foo
|
221
|
+
|
222
|
+
instance.action_runner.should_receive(:run).with do |callable, env|
|
223
|
+
env[:action_name].should == hook_name
|
224
|
+
end
|
225
|
+
|
226
|
+
instance.hook(hook_name)
|
92
227
|
end
|
93
228
|
|
94
|
-
it "should
|
95
|
-
instance.
|
229
|
+
it "should return the result of the action runner run" do
|
230
|
+
instance.action_runner.should_receive(:run).and_return(:foo)
|
231
|
+
|
232
|
+
instance.hook(:bar).should == :foo
|
96
233
|
end
|
97
234
|
end
|
98
235
|
|
99
|
-
describe "primary
|
100
|
-
|
101
|
-
|
102
|
-
# having VirtualBox installed to run tests.
|
103
|
-
Vagrant::Driver::VirtualBox.stub(:new) do |uuid|
|
104
|
-
double("vm-#{uuid}")
|
105
|
-
end
|
236
|
+
describe "primary machine name" do
|
237
|
+
it "should be the only machine if not a multi-machine environment" do
|
238
|
+
instance.primary_machine_name.should == instance.machine_names.first
|
106
239
|
end
|
107
240
|
|
108
|
-
it "should be the
|
109
|
-
|
241
|
+
it "should be the machine marked as the primary" do
|
242
|
+
environment = isolated_environment do |env|
|
243
|
+
env.vagrantfile(<<-VF)
|
244
|
+
Vagrant.configure("2") do |config|
|
245
|
+
config.vm.box = "base"
|
246
|
+
config.vm.define :foo
|
247
|
+
config.vm.define :bar, :primary => true
|
248
|
+
end
|
249
|
+
VF
|
250
|
+
|
251
|
+
env.box2("base", :virtualbox)
|
252
|
+
end
|
253
|
+
|
254
|
+
env = environment.create_vagrant_env
|
255
|
+
env.primary_machine_name.should == :bar
|
110
256
|
end
|
111
257
|
|
112
|
-
it "should be
|
258
|
+
it "should be nil if no primary is specified in a multi-machine environment" do
|
113
259
|
environment = isolated_environment do |env|
|
114
260
|
env.vagrantfile(<<-VF)
|
115
|
-
Vagrant
|
261
|
+
Vagrant.configure("2") do |config|
|
262
|
+
config.vm.box = "base"
|
116
263
|
config.vm.define :foo
|
117
|
-
config.vm.define :bar
|
264
|
+
config.vm.define :bar
|
118
265
|
end
|
119
266
|
VF
|
267
|
+
|
268
|
+
env.box2("base", :virtualbox)
|
120
269
|
end
|
121
270
|
|
122
271
|
env = environment.create_vagrant_env
|
123
|
-
env.
|
272
|
+
env.primary_machine_name.should be_nil
|
124
273
|
end
|
125
274
|
end
|
126
275
|
|
@@ -128,93 +277,295 @@ VF
|
|
128
277
|
it "should load global configuration" do
|
129
278
|
environment = isolated_environment do |env|
|
130
279
|
env.vagrantfile(<<-VF)
|
131
|
-
Vagrant
|
132
|
-
config.
|
280
|
+
Vagrant.configure("2") do |config|
|
281
|
+
config.ssh.port = 200
|
133
282
|
end
|
134
283
|
VF
|
135
284
|
end
|
136
285
|
|
137
286
|
env = environment.create_vagrant_env
|
138
|
-
env.
|
287
|
+
env.config_global.ssh.port.should == 200
|
139
288
|
end
|
140
289
|
|
141
290
|
it "should load from a custom Vagrantfile" do
|
142
291
|
environment = isolated_environment do |env|
|
143
292
|
env.file("non_standard_name", <<-VF)
|
144
|
-
Vagrant
|
145
|
-
config.
|
293
|
+
Vagrant.configure("2") do |config|
|
294
|
+
config.ssh.port = 200
|
146
295
|
end
|
147
296
|
VF
|
148
297
|
end
|
149
298
|
|
150
299
|
env = environment.create_vagrant_env(:vagrantfile_name => "non_standard_name")
|
151
|
-
env.
|
300
|
+
env.config_global.ssh.port.should == 200
|
152
301
|
end
|
153
302
|
|
154
|
-
it "should load
|
303
|
+
it "should load from a custom Vagrantfile specified by env var" do
|
304
|
+
environment = isolated_environment do |env|
|
305
|
+
env.file("some_other_name", <<-VF)
|
306
|
+
Vagrant.configure("2") do |config|
|
307
|
+
config.ssh.port = 400
|
308
|
+
end
|
309
|
+
VF
|
310
|
+
end
|
311
|
+
|
312
|
+
env = with_temp_env("VAGRANT_VAGRANTFILE" => "some_other_name") do
|
313
|
+
environment.create_vagrant_env
|
314
|
+
end
|
315
|
+
|
316
|
+
env.config_global.ssh.port.should == 400
|
317
|
+
end
|
318
|
+
end
|
319
|
+
|
320
|
+
describe "ui" do
|
321
|
+
it "should be a silent UI by default" do
|
322
|
+
described_class.new.ui.should be_kind_of(Vagrant::UI::Silent)
|
323
|
+
end
|
324
|
+
|
325
|
+
it "should be a UI given in the constructor" do
|
326
|
+
# Create a custom UI for our test
|
327
|
+
class CustomUI < Vagrant::UI::Interface; end
|
328
|
+
|
329
|
+
instance = described_class.new(:ui_class => CustomUI)
|
330
|
+
instance.ui.should be_kind_of(CustomUI)
|
331
|
+
end
|
332
|
+
end
|
333
|
+
|
334
|
+
describe "#unload" do
|
335
|
+
it "should run the unload hook" do
|
336
|
+
instance.should_receive(:hook).with(:environment_unload).once
|
337
|
+
instance.unload
|
338
|
+
end
|
339
|
+
end
|
340
|
+
|
341
|
+
describe "getting a machine" do
|
342
|
+
# A helper to register a provider for use in tests.
|
343
|
+
def register_provider(name, config_class=nil)
|
344
|
+
provider_cls = Class.new(Vagrant.plugin("2", :provider))
|
345
|
+
|
346
|
+
register_plugin("2") do |p|
|
347
|
+
p.provider(name) { provider_cls }
|
348
|
+
|
349
|
+
if config_class
|
350
|
+
p.config(name, :provider) { config_class }
|
351
|
+
end
|
352
|
+
end
|
353
|
+
|
354
|
+
provider_cls
|
355
|
+
end
|
356
|
+
|
357
|
+
it "should return a machine object with the correct provider" do
|
358
|
+
# Create a provider
|
359
|
+
foo_provider = register_provider("foo")
|
360
|
+
|
361
|
+
# Create the configuration
|
362
|
+
isolated_env = isolated_environment do |e|
|
363
|
+
e.vagrantfile(<<-VF)
|
364
|
+
Vagrant.configure("2") do |config|
|
365
|
+
config.vm.box = "base"
|
366
|
+
config.vm.define "foo"
|
367
|
+
end
|
368
|
+
VF
|
369
|
+
|
370
|
+
e.box2("base", :foo)
|
371
|
+
end
|
372
|
+
|
373
|
+
# Verify that we can get the machine
|
374
|
+
env = isolated_env.create_vagrant_env
|
375
|
+
machine = env.machine(:foo, :foo)
|
376
|
+
machine.should be_kind_of(Vagrant::Machine)
|
377
|
+
machine.name.should == :foo
|
378
|
+
machine.provider.should be_kind_of(foo_provider)
|
379
|
+
machine.provider_config.should be_nil
|
380
|
+
end
|
381
|
+
|
382
|
+
it "should return a machine object with the machine configuration" do
|
383
|
+
# Create a provider
|
384
|
+
foo_config = Class.new(Vagrant.plugin("2", :config)) do
|
385
|
+
attr_accessor :value
|
386
|
+
end
|
387
|
+
|
388
|
+
foo_provider = register_provider("foo", foo_config)
|
389
|
+
|
390
|
+
# Create the configuration
|
391
|
+
isolated_env = isolated_environment do |e|
|
392
|
+
e.vagrantfile(<<-VF)
|
393
|
+
Vagrant.configure("2") do |config|
|
394
|
+
config.vm.box = "base"
|
395
|
+
config.vm.define "foo"
|
396
|
+
|
397
|
+
config.vm.provider :foo do |fooconfig|
|
398
|
+
fooconfig.value = 100
|
399
|
+
end
|
400
|
+
end
|
401
|
+
VF
|
402
|
+
|
403
|
+
e.box2("base", :foo)
|
404
|
+
end
|
405
|
+
|
406
|
+
# Verify that we can get the machine
|
407
|
+
env = isolated_env.create_vagrant_env
|
408
|
+
machine = env.machine(:foo, :foo)
|
409
|
+
machine.should be_kind_of(Vagrant::Machine)
|
410
|
+
machine.name.should == :foo
|
411
|
+
machine.provider.should be_kind_of(foo_provider)
|
412
|
+
machine.provider_config.value.should == 100
|
413
|
+
end
|
414
|
+
|
415
|
+
it "should cache the machine objects by name and provider" do
|
416
|
+
# Create a provider
|
417
|
+
foo_provider = register_provider("foo")
|
418
|
+
bar_provider = register_provider("bar")
|
419
|
+
|
420
|
+
# Create the configuration
|
421
|
+
isolated_env = isolated_environment do |e|
|
422
|
+
e.vagrantfile(<<-VF)
|
423
|
+
Vagrant.configure("2") do |config|
|
424
|
+
config.vm.box = "base"
|
425
|
+
config.vm.define "vm1"
|
426
|
+
config.vm.define "vm2"
|
427
|
+
end
|
428
|
+
VF
|
429
|
+
|
430
|
+
e.box2("base", :foo)
|
431
|
+
e.box2("base", :bar)
|
432
|
+
end
|
433
|
+
|
434
|
+
env = isolated_env.create_vagrant_env
|
435
|
+
vm1_foo = env.machine(:vm1, :foo)
|
436
|
+
vm1_bar = env.machine(:vm1, :bar)
|
437
|
+
vm2_foo = env.machine(:vm2, :foo)
|
438
|
+
|
439
|
+
vm1_foo.should eql(env.machine(:vm1, :foo))
|
440
|
+
vm1_bar.should eql(env.machine(:vm1, :bar))
|
441
|
+
vm1_foo.should_not eql(vm1_bar)
|
442
|
+
vm2_foo.should eql(env.machine(:vm2, :foo))
|
443
|
+
end
|
444
|
+
|
445
|
+
it "should load a machine without a box" do
|
446
|
+
register_provider("foo")
|
447
|
+
|
155
448
|
environment = isolated_environment do |env|
|
156
449
|
env.vagrantfile(<<-VF)
|
157
|
-
Vagrant
|
158
|
-
config.
|
450
|
+
Vagrant.configure("2") do |config|
|
451
|
+
config.vm.box = "i-dont-exist"
|
159
452
|
end
|
160
453
|
VF
|
161
454
|
end
|
162
455
|
|
163
456
|
env = environment.create_vagrant_env
|
164
|
-
env.
|
457
|
+
machine = env.machine(:default, :foo)
|
458
|
+
machine.box.should be_nil
|
165
459
|
end
|
166
460
|
|
167
|
-
it "should load
|
461
|
+
it "should load the machine configuration" do
|
462
|
+
register_provider("foo")
|
463
|
+
|
168
464
|
environment = isolated_environment do |env|
|
169
465
|
env.vagrantfile(<<-VF)
|
170
|
-
Vagrant
|
171
|
-
config.
|
172
|
-
|
173
|
-
end
|
466
|
+
Vagrant.configure("2") do |config|
|
467
|
+
config.ssh.port = 1
|
468
|
+
config.vm.box = "base"
|
174
469
|
|
175
|
-
config.vm.define
|
176
|
-
|
470
|
+
config.vm.define "vm1" do |inner|
|
471
|
+
inner.ssh.port = 100
|
177
472
|
end
|
178
473
|
end
|
179
474
|
VF
|
475
|
+
|
476
|
+
env.box2("base", :foo)
|
180
477
|
end
|
181
478
|
|
182
479
|
env = environment.create_vagrant_env
|
183
|
-
env.
|
184
|
-
|
480
|
+
machine = env.machine(:vm1, :foo)
|
481
|
+
machine.config.ssh.port.should == 100
|
482
|
+
machine.config.vm.box.should == "base"
|
185
483
|
end
|
186
484
|
|
187
|
-
it "should load box configuration" do
|
485
|
+
it "should load the box configuration for a V2 box" do
|
486
|
+
register_provider("foo")
|
487
|
+
|
188
488
|
environment = isolated_environment do |env|
|
189
489
|
env.vagrantfile(<<-VF)
|
190
|
-
Vagrant
|
490
|
+
Vagrant.configure("2") do |config|
|
191
491
|
config.vm.box = "base"
|
192
492
|
end
|
193
493
|
VF
|
194
494
|
|
195
|
-
env.
|
196
|
-
Vagrant
|
495
|
+
env.box2("base", :foo, :vagrantfile => <<-VF)
|
496
|
+
Vagrant.configure("2") do |config|
|
197
497
|
config.ssh.port = 100
|
198
498
|
end
|
199
499
|
VF
|
200
500
|
end
|
201
501
|
|
202
502
|
env = environment.create_vagrant_env
|
203
|
-
env.
|
503
|
+
machine = env.machine(:default, :foo)
|
504
|
+
machine.config.ssh.port.should == 100
|
505
|
+
end
|
506
|
+
|
507
|
+
it "should reload the cache if refresh is set" do
|
508
|
+
# Create a provider
|
509
|
+
foo_provider = register_provider("foo")
|
510
|
+
|
511
|
+
# Create the configuration
|
512
|
+
isolated_env = isolated_environment do |e|
|
513
|
+
e.vagrantfile(<<-VF)
|
514
|
+
Vagrant.configure("2") do |config|
|
515
|
+
config.vm.box = "base"
|
516
|
+
end
|
517
|
+
VF
|
518
|
+
|
519
|
+
e.box2("base", :foo)
|
520
|
+
end
|
521
|
+
|
522
|
+
env = isolated_env.create_vagrant_env
|
523
|
+
vm1 = env.machine(:default, :foo)
|
524
|
+
vm2 = env.machine(:default, :foo, true)
|
525
|
+
vm3 = env.machine(:default, :foo)
|
526
|
+
|
527
|
+
vm1.should_not eql(vm2)
|
528
|
+
vm2.should eql(vm3)
|
529
|
+
end
|
530
|
+
|
531
|
+
it "should raise an error if the VM is not found" do
|
532
|
+
expect { instance.machine("i-definitely-dont-exist", :virtualbox) }.
|
533
|
+
to raise_error(Vagrant::Errors::MachineNotFound)
|
534
|
+
end
|
535
|
+
|
536
|
+
it "should raise an error if the provider is not found" do
|
537
|
+
expect { instance.machine(:default, :lol_no) }.
|
538
|
+
to raise_error(Vagrant::Errors::ProviderNotFound)
|
204
539
|
end
|
205
540
|
end
|
206
541
|
|
207
|
-
describe "
|
208
|
-
it "should
|
209
|
-
|
542
|
+
describe "getting machine names" do
|
543
|
+
it "should return the default machine if no multi-VM is used" do
|
544
|
+
# Create the config
|
545
|
+
isolated_env = isolated_environment do |e|
|
546
|
+
e.vagrantfile(<<-VF)
|
547
|
+
Vagrant.configure("2") do |config|
|
548
|
+
end
|
549
|
+
VF
|
550
|
+
end
|
551
|
+
|
552
|
+
env = isolated_env.create_vagrant_env
|
553
|
+
env.machine_names.should == [:default]
|
210
554
|
end
|
211
555
|
|
212
|
-
it "should
|
213
|
-
# Create
|
214
|
-
|
556
|
+
it "should return the machine names in order" do
|
557
|
+
# Create the config
|
558
|
+
isolated_env = isolated_environment do |e|
|
559
|
+
e.vagrantfile(<<-VF)
|
560
|
+
Vagrant.configure("2") do |config|
|
561
|
+
config.vm.define "foo"
|
562
|
+
config.vm.define "bar"
|
563
|
+
end
|
564
|
+
VF
|
565
|
+
end
|
215
566
|
|
216
|
-
|
217
|
-
|
567
|
+
env = isolated_env.create_vagrant_env
|
568
|
+
env.machine_names.should == [:foo, :bar]
|
218
569
|
end
|
219
570
|
end
|
220
571
|
end
|