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,38 +0,0 @@
|
|
1
|
-
#!/bin/sh
|
2
|
-
#
|
3
|
-
# This shell script deploys the buildmaster by downloading an
|
4
|
-
# up-to-date tar.gz from GitHub and setting up the proper environment.
|
5
|
-
|
6
|
-
#----------------------------------------------------------------------
|
7
|
-
# Update the source
|
8
|
-
#----------------------------------------------------------------------
|
9
|
-
# Download the Vagrant source, extract it
|
10
|
-
cd /tmp
|
11
|
-
rm -rf vagrant
|
12
|
-
rm -rf mitchellh-vagrant-*
|
13
|
-
wget https://github.com/mitchellh/vagrant/tarball/master -O vagrant.tar.gz
|
14
|
-
tar xvzf vagrant.tar.gz
|
15
|
-
mv mitchellh-vagrant-* vagrant
|
16
|
-
|
17
|
-
# Move the code into place
|
18
|
-
cp -R vagrant/test/buildbot/* /srv/buildmaster/
|
19
|
-
|
20
|
-
# Setup the virtualenv
|
21
|
-
cd /srv/buildmaster
|
22
|
-
virtualenv --no-site-packages env
|
23
|
-
|
24
|
-
# Activate the environment
|
25
|
-
. env/bin/activate
|
26
|
-
|
27
|
-
# Install dependencies
|
28
|
-
pip install -r requirements.txt
|
29
|
-
|
30
|
-
#----------------------------------------------------------------------
|
31
|
-
# Update the buildmaster
|
32
|
-
#----------------------------------------------------------------------
|
33
|
-
# Setup environmental variables that are required
|
34
|
-
export BUILDBOT_CONFIG=/etc/buildmaster/master.cfg
|
35
|
-
export PYTHONPATH=/srv/buildmaster
|
36
|
-
|
37
|
-
# Restart the buildmaster
|
38
|
-
buildbot restart master/
|
@@ -1,107 +0,0 @@
|
|
1
|
-
#!/bin/sh
|
2
|
-
#
|
3
|
-
# This shell script installs and prepares all the software necessary
|
4
|
-
# to run the build master. This script is expected to be run as root.
|
5
|
-
# This script is made to be run only on Ubuntu 10.04 LTS at the moment.
|
6
|
-
|
7
|
-
# Update the source list
|
8
|
-
apt-get update
|
9
|
-
|
10
|
-
# Install the basic sysadmin stuff
|
11
|
-
apt-get install -y htop
|
12
|
-
|
13
|
-
# Fix the mountall bug in the AMI
|
14
|
-
sed -i -e 's/nobootwait,//' /etc/fstab
|
15
|
-
|
16
|
-
#----------------------------------------------------------------------
|
17
|
-
# Python Setup
|
18
|
-
#----------------------------------------------------------------------
|
19
|
-
# Install Python and pip
|
20
|
-
apt-get install -y python python-dev python-setuptools
|
21
|
-
easy_install pip
|
22
|
-
|
23
|
-
# Install virtualenv
|
24
|
-
pip install virtualenv
|
25
|
-
|
26
|
-
#----------------------------------------------------------------------
|
27
|
-
# Deploy Setup
|
28
|
-
#----------------------------------------------------------------------
|
29
|
-
# Install Git, which is used for all the deploys of the build master
|
30
|
-
apt-get install -y git-core
|
31
|
-
|
32
|
-
# Create the user/group for the buildmaster
|
33
|
-
groupadd buildmaster
|
34
|
-
useradd -d /home/buildmaster -g buildmaster -s /bin/bash buildmaster
|
35
|
-
mkdir /home/buildmaster
|
36
|
-
chown -R buildmaster:buildmaster /home/buildmaster
|
37
|
-
|
38
|
-
# Make the folder which will contain the buildmaster code
|
39
|
-
mkdir -p /srv/buildmaster
|
40
|
-
chown buildmaster:buildmaster /srv/buildmaster
|
41
|
-
|
42
|
-
# Make the folder which will contain the configuration for the
|
43
|
-
# buildmaster
|
44
|
-
mkdir -p /etc/buildmaster
|
45
|
-
chown buildmaster:buildmaster /etc/buildmaster
|
46
|
-
|
47
|
-
#----------------------------------------------------------------------
|
48
|
-
# Nginx Setup
|
49
|
-
#----------------------------------------------------------------------
|
50
|
-
# Install Nginx
|
51
|
-
apt-get install -y nginx
|
52
|
-
|
53
|
-
# Setup the basic directories
|
54
|
-
mkdir -p /etc/nginx/conf.d
|
55
|
-
mkdir -p /etc/nginx/sites-available
|
56
|
-
mkdir -p /etc/nginx/sites-enabled
|
57
|
-
|
58
|
-
# Setup the configuration
|
59
|
-
cat <<EOF > /etc/nginx/nginx.conf
|
60
|
-
user www-data;
|
61
|
-
worker_processes 1;
|
62
|
-
|
63
|
-
# Raise the limit on open file descriptors
|
64
|
-
worker_rlimit_nofile 30000;
|
65
|
-
|
66
|
-
error_log /var/log/nginx/error.log;
|
67
|
-
pid /var/run/nginx.pid;
|
68
|
-
|
69
|
-
events {
|
70
|
-
worker_connections 1024;
|
71
|
-
use epoll;
|
72
|
-
}
|
73
|
-
|
74
|
-
http {
|
75
|
-
include /etc/nginx/mime.types;
|
76
|
-
default_type application/octet-stream;
|
77
|
-
|
78
|
-
access_log /var/log/nginx/access.log;
|
79
|
-
|
80
|
-
sendfile on;
|
81
|
-
tcp_nopush on;
|
82
|
-
tcp_nodelay on;
|
83
|
-
|
84
|
-
keepalive_timeout 65;
|
85
|
-
|
86
|
-
include /etc/nginx/conf.d/*.conf;
|
87
|
-
include /etc/nginx/sites-enabled/*;
|
88
|
-
}
|
89
|
-
EOF
|
90
|
-
|
91
|
-
# Setup the buildbot site
|
92
|
-
cat <<EOF > /etc/nginx/sites-available/buildmaster.conf
|
93
|
-
server {
|
94
|
-
listen 80;
|
95
|
-
|
96
|
-
location / {
|
97
|
-
proxy_pass http://localhost:8000;
|
98
|
-
}
|
99
|
-
}
|
100
|
-
EOF
|
101
|
-
|
102
|
-
# Activate the buildbot site, remove the default
|
103
|
-
rm /etc/nginx/sites-enabled/default
|
104
|
-
ln -f -s /etc/nginx/sites-available/buildmaster.conf /etc/nginx/sites-enabled/buildmaster.conf
|
105
|
-
|
106
|
-
# Restart nginx
|
107
|
-
/etc/init.d/nginx restart
|
@@ -1,43 +0,0 @@
|
|
1
|
-
import os
|
2
|
-
|
3
|
-
from twisted.application import service
|
4
|
-
from buildslave.bot import BuildSlave
|
5
|
-
|
6
|
-
from buildbot_config.config.slave import options
|
7
|
-
|
8
|
-
basedir = r'.'
|
9
|
-
rotateLength = 10000000
|
10
|
-
maxRotatedFiles = 10
|
11
|
-
|
12
|
-
# if this is a relocatable tac file, get the directory containing the TAC
|
13
|
-
if basedir == '.':
|
14
|
-
import os.path
|
15
|
-
basedir = os.path.abspath(os.path.dirname(__file__))
|
16
|
-
|
17
|
-
# note: this line is matched against to check that this is a buildslave
|
18
|
-
# directory; do not edit it.
|
19
|
-
application = service.Application('buildslave')
|
20
|
-
|
21
|
-
try:
|
22
|
-
from twisted.python.logfile import LogFile
|
23
|
-
from twisted.python.log import ILogObserver, FileLogObserver
|
24
|
-
logfile = LogFile.fromFullPath(os.path.join(basedir, "twistd.log"), rotateLength=rotateLength,
|
25
|
-
maxRotatedFiles=maxRotatedFiles)
|
26
|
-
application.setComponent(ILogObserver, FileLogObserver(logfile).emit)
|
27
|
-
except ImportError:
|
28
|
-
# probably not yet twisted 8.2.0 and beyond, can't set log yet
|
29
|
-
pass
|
30
|
-
|
31
|
-
buildmaster_host = options.master_host
|
32
|
-
port = options.master_port
|
33
|
-
slavename = options.name
|
34
|
-
passwd = options.password
|
35
|
-
keepalive = 600
|
36
|
-
usepty = 0
|
37
|
-
umask = None
|
38
|
-
maxdelay = 300
|
39
|
-
|
40
|
-
s = BuildSlave(buildmaster_host, port, slavename, passwd, basedir,
|
41
|
-
keepalive, usepty, umask=umask, maxdelay=maxdelay)
|
42
|
-
s.setServiceParent(application)
|
43
|
-
|
@@ -1 +0,0 @@
|
|
1
|
-
Buildslave Admin <foo@bar.com>
|
@@ -1 +0,0 @@
|
|
1
|
-
Please put a description of this build host here
|
File without changes
|
File without changes
|
@@ -1,41 +0,0 @@
|
|
1
|
-
from buildbot.buildslave import BuildSlave
|
2
|
-
|
3
|
-
from buildbot_config.master.slaves import (
|
4
|
-
BuildSlavesFromSlaveConfigs,
|
5
|
-
SlaveConfig,
|
6
|
-
SlaveListFromConfig)
|
7
|
-
|
8
|
-
class TestSlaveListFromConfig(object):
|
9
|
-
Klass = SlaveListFromConfig
|
10
|
-
|
11
|
-
def test_parse_single(self):
|
12
|
-
"""
|
13
|
-
Tests that the config parser can parse a single
|
14
|
-
slave.
|
15
|
-
"""
|
16
|
-
instance = self.Klass("foo:bar")
|
17
|
-
assert 1 == len(instance)
|
18
|
-
assert SlaveConfig("foo", "bar") == instance[0]
|
19
|
-
|
20
|
-
def test_parse_multiple(self):
|
21
|
-
"""
|
22
|
-
Tests that the config parser can parse multiple
|
23
|
-
slaves.
|
24
|
-
"""
|
25
|
-
instance = self.Klass("foo:bar,bar:baz")
|
26
|
-
expected = [SlaveConfig("foo", "bar"), SlaveConfig("bar", "baz")]
|
27
|
-
|
28
|
-
assert 2 == len(instance)
|
29
|
-
assert expected == instance
|
30
|
-
|
31
|
-
class TestBuildSlavesFromSlaveConfig(object):
|
32
|
-
Klass = BuildSlavesFromSlaveConfigs
|
33
|
-
|
34
|
-
def test_returns_build_slaves(self):
|
35
|
-
"""
|
36
|
-
Tests that build slaves are properly returned for each
|
37
|
-
slave configuration.
|
38
|
-
"""
|
39
|
-
instance = self.Klass([SlaveConfig("foo", "bar")])
|
40
|
-
assert 1 == len(instance)
|
41
|
-
assert isinstance(instance[0], BuildSlave)
|
Binary file
|
@@ -1,16 +0,0 @@
|
|
1
|
-
require File.expand_path("../../../base", __FILE__)
|
2
|
-
|
3
|
-
describe Vagrant::Action::Environment do
|
4
|
-
let(:instance) { described_class.new }
|
5
|
-
|
6
|
-
it "should be a hash" do
|
7
|
-
instance.should be_empty
|
8
|
-
instance["foo"] = "bar"
|
9
|
-
instance["foo"].should == "bar"
|
10
|
-
end
|
11
|
-
|
12
|
-
it "should be a hash accessible by string or symbol" do
|
13
|
-
instance["foo"] = "bar"
|
14
|
-
instance[:foo].should == "bar"
|
15
|
-
end
|
16
|
-
end
|
@@ -1,48 +0,0 @@
|
|
1
|
-
require File.expand_path("../../../base", __FILE__)
|
2
|
-
|
3
|
-
describe Vagrant::Config::Base do
|
4
|
-
include_context "unit"
|
5
|
-
|
6
|
-
let(:foo_class) do
|
7
|
-
Class.new(described_class) do
|
8
|
-
attr_accessor :one
|
9
|
-
attr_accessor :two
|
10
|
-
end
|
11
|
-
end
|
12
|
-
|
13
|
-
it "should merge by default by simply copying each instance variable" do
|
14
|
-
one = foo_class.new
|
15
|
-
one.one = 2
|
16
|
-
one.two = 1
|
17
|
-
|
18
|
-
two = foo_class.new
|
19
|
-
two.two = 5
|
20
|
-
|
21
|
-
result = one.merge(two)
|
22
|
-
result.one.should == 2
|
23
|
-
result.two.should == 5
|
24
|
-
end
|
25
|
-
|
26
|
-
it "doesn't merge values that start with a double underscore" do
|
27
|
-
bar_class = Class.new(foo_class) do
|
28
|
-
class_variable_set(:@@counter, 0)
|
29
|
-
|
30
|
-
def initialize
|
31
|
-
@__test = self.class.send(:class_variable_get, :@@counter)
|
32
|
-
self.class.send(:class_variable_set, :@@counter, @__test + 1)
|
33
|
-
end
|
34
|
-
end
|
35
|
-
|
36
|
-
one = bar_class.new
|
37
|
-
one.one = 2
|
38
|
-
one.two = 1
|
39
|
-
|
40
|
-
two = bar_class.new
|
41
|
-
two.two = 5
|
42
|
-
|
43
|
-
# Verify the counters
|
44
|
-
one.instance_variable_get(:@__test).should == 0
|
45
|
-
two.instance_variable_get(:@__test).should == 1
|
46
|
-
one.merge(two).instance_variable_get(:@__test).should == 2
|
47
|
-
end
|
48
|
-
end
|
@@ -1,17 +0,0 @@
|
|
1
|
-
require File.expand_path("../../../base", __FILE__)
|
2
|
-
|
3
|
-
describe Vagrant::Config::SSHConfig do
|
4
|
-
include_context "unit"
|
5
|
-
|
6
|
-
[:forward_agent, :forward_x11].each do |bool_setting|
|
7
|
-
it "merges boolean #{bool_setting} properly" do
|
8
|
-
a = described_class.new
|
9
|
-
a.send("#{bool_setting}=", true)
|
10
|
-
|
11
|
-
b = described_class.new
|
12
|
-
|
13
|
-
c = a.merge(b)
|
14
|
-
c.send(bool_setting).should be
|
15
|
-
end
|
16
|
-
end
|
17
|
-
end
|
@@ -1,69 +0,0 @@
|
|
1
|
-
require File.expand_path("../../../base", __FILE__)
|
2
|
-
|
3
|
-
require "vagrant/registry"
|
4
|
-
|
5
|
-
describe Vagrant::Config::Top do
|
6
|
-
include_context "unit"
|
7
|
-
|
8
|
-
let(:registry) { Vagrant::Registry.new }
|
9
|
-
let(:instance) { described_class.new(registry) }
|
10
|
-
|
11
|
-
it "should load in the proper config class" do
|
12
|
-
registry.register(:foo, Object)
|
13
|
-
|
14
|
-
instance.foo.should be_kind_of(Object)
|
15
|
-
end
|
16
|
-
|
17
|
-
it "should load the proper config class only once" do
|
18
|
-
registry.register(:foo, Object)
|
19
|
-
|
20
|
-
obj = instance.foo
|
21
|
-
instance.foo.should eql(obj)
|
22
|
-
end
|
23
|
-
|
24
|
-
it "still raises a method missing error if invalid key" do
|
25
|
-
expect { instance.foo }.to raise_error(NoMethodError)
|
26
|
-
end
|
27
|
-
|
28
|
-
describe "merging" do
|
29
|
-
let(:foo_class) do
|
30
|
-
Class.new do
|
31
|
-
attr_accessor :one
|
32
|
-
attr_accessor :two
|
33
|
-
|
34
|
-
def merge(other)
|
35
|
-
result = self.class.new
|
36
|
-
result.one = other.one || one
|
37
|
-
result.two = other.two || two
|
38
|
-
result
|
39
|
-
end
|
40
|
-
end
|
41
|
-
end
|
42
|
-
|
43
|
-
it "merges each key by calling `merge` on the class" do
|
44
|
-
registry.register(:foo, foo_class)
|
45
|
-
|
46
|
-
instance.foo.one = 1
|
47
|
-
instance.foo.two = 2
|
48
|
-
|
49
|
-
another = described_class.new(registry)
|
50
|
-
another.foo.one = 2
|
51
|
-
|
52
|
-
result = instance.merge(another)
|
53
|
-
result.foo.one.should == 2
|
54
|
-
result.foo.two.should == 2
|
55
|
-
end
|
56
|
-
|
57
|
-
it "merges keys that aren't in the source instance" do
|
58
|
-
reg = Vagrant::Registry.new
|
59
|
-
reg.register(:foo, foo_class)
|
60
|
-
|
61
|
-
another = described_class.new(reg)
|
62
|
-
another.foo.one = 2
|
63
|
-
|
64
|
-
result = instance.merge(another)
|
65
|
-
result.foo.one.should == 2
|
66
|
-
result.foo.two.should be_nil
|
67
|
-
end
|
68
|
-
end
|
69
|
-
end
|
@@ -1,71 +0,0 @@
|
|
1
|
-
require File.expand_path("../../../base", __FILE__)
|
2
|
-
|
3
|
-
describe Vagrant::Config::VMConfig do
|
4
|
-
include_context "unit"
|
5
|
-
|
6
|
-
it "merges by appending forwarded ports" do
|
7
|
-
a = described_class.new
|
8
|
-
a.forward_port 80, 8080
|
9
|
-
|
10
|
-
b = described_class.new
|
11
|
-
b.forward_port 100, 1000
|
12
|
-
|
13
|
-
c = a.merge(b)
|
14
|
-
c.forwarded_ports.length.should == 2
|
15
|
-
c.forwarded_ports[0][:guestport].should == 80
|
16
|
-
c.forwarded_ports[0][:hostport].should == 8080
|
17
|
-
c.forwarded_ports[1][:guestport].should == 100
|
18
|
-
c.forwarded_ports[1][:hostport].should == 1000
|
19
|
-
end
|
20
|
-
|
21
|
-
it "merges by merging shared folders" do
|
22
|
-
a = described_class.new
|
23
|
-
a.share_folder "a", "/guest", "/host"
|
24
|
-
a.share_folder "b", "/guest", "/host"
|
25
|
-
|
26
|
-
b = described_class.new
|
27
|
-
b.share_folder "c", "/guest", "/host"
|
28
|
-
|
29
|
-
c = a.merge(b)
|
30
|
-
c.shared_folders.has_key?("a").should be
|
31
|
-
c.shared_folders.has_key?("b").should be
|
32
|
-
c.shared_folders.has_key?("c").should be
|
33
|
-
end
|
34
|
-
|
35
|
-
it "merges by appending networks" do
|
36
|
-
a = described_class.new
|
37
|
-
a.network :hostonly, "192.168.33.10"
|
38
|
-
|
39
|
-
b = described_class.new
|
40
|
-
b.network :hostonly, "192.168.33.11"
|
41
|
-
|
42
|
-
c = a.merge(b)
|
43
|
-
c.networks.length.should == 2
|
44
|
-
c.networks[0].should == [:hostonly, ["192.168.33.10"]]
|
45
|
-
c.networks[1].should == [:hostonly, ["192.168.33.11"]]
|
46
|
-
end
|
47
|
-
|
48
|
-
it "merges by appending provisioners" do
|
49
|
-
a = described_class.new
|
50
|
-
a.provision :foo
|
51
|
-
|
52
|
-
b = described_class.new
|
53
|
-
b.provision :bar
|
54
|
-
|
55
|
-
c = a.merge(b)
|
56
|
-
c.provisioners.length.should == 2
|
57
|
-
c.provisioners[0].shortcut.should == :foo
|
58
|
-
c.provisioners[1].shortcut.should == :bar
|
59
|
-
end
|
60
|
-
|
61
|
-
it "merges by appending customizations" do
|
62
|
-
a = described_class.new
|
63
|
-
a.customize "a"
|
64
|
-
|
65
|
-
b = described_class.new
|
66
|
-
b.customize "b"
|
67
|
-
|
68
|
-
c = a.merge(b)
|
69
|
-
c.customizations.should == ["a", "b"]
|
70
|
-
end
|
71
|
-
end
|