Commit Graph

373 Commits

Author SHA1 Message Date
Mitchell Hashimoto c25ff5300a Tab => Spaces 2010-03-22 00:13:48 -07:00
Mitchell Hashimoto bfcc0d3939 Whitespace fixes 2010-03-22 00:09:30 -07:00
John Bender 0c00201a6b switch to File.open for downloader temp file path to prevent minitar issues on windows 2010-03-21 23:50:08 -07:00
Mitchell Hashimoto 35e9fa53d4 Vagrant::Commands moved to instance methods on the environment rather than class methods 2010-03-20 09:15:20 -07:00
Mitchell Hashimoto 881aa833e6 Run VM customizations when restarting a halted machine [closes GH-36] 2010-03-20 01:59:32 -07:00
Mitchell Hashimoto 5bbb84efa7 Chef server validation key path now expands 2010-03-20 01:25:14 -07:00
Mitchell Hashimoto 1d518e2693 Box.find sets environment of found box 2010-03-20 01:04:56 -07:00
Mitchell Hashimoto 36648e7a12 Box#directory properly passes environment to class method 2010-03-20 00:52:28 -07:00
Mitchell Hashimoto ea25f49c63 Pass environment to box.find 2010-03-20 00:50:59 -07:00
Mitchell Hashimoto e8e2c136d3 Finally remove Vagrant::Env 2010-03-19 23:56:36 -07:00
Mitchell Hashimoto fee10c47fd Provisioning redone to use new environment 2010-03-19 22:15:20 -07:00
Mitchell Hashimoto 11780fb618 Converted Box class to use new environment 2010-03-19 21:31:43 -07:00
Mitchell Hashimoto 5db99c04d4 Removing references to Vagrant::Env 2010-03-19 21:15:45 -07:00
Mitchell Hashimoto bafd15661d `vagrant box` uses new Environment 2010-03-19 17:17:51 -07:00
Mitchell Hashimoto fddee1158d `vagrant package` now uses the environment 2010-03-19 17:05:31 -07:00
Mitchell Hashimoto 0641df7563 `vagrant resume` command now uses new environment 2010-03-19 16:53:18 -07:00
Mitchell Hashimoto c7508e91b9 `vagrant suspend` update to work with new environment 2010-03-19 16:51:59 -07:00
Mitchell Hashimoto e68994556c `vagrant reload` uses new Environment 2010-03-19 16:50:54 -07:00
Mitchell Hashimoto b461e0ee8b `vagrant halt` uses new environment 2010-03-19 16:48:36 -07:00
Mitchell Hashimoto 259a3a3836 `vagrant ssh` with new Environment 2010-03-19 16:47:38 -07:00
Mitchell Hashimoto 62de77132c `vagrant up` process converted to new Environment 2010-03-19 16:42:48 -07:00
Mitchell Hashimoto ae43f25cd2 Boot action converted to new Environment 2010-03-19 16:22:20 -07:00
Mitchell Hashimoto d384408782 SharedFolder action converted to new Environment 2010-03-19 16:19:27 -07:00
Mitchell Hashimoto e1c4f91664 ForwardPort action converted to new environment 2010-03-19 16:16:03 -07:00
Mitchell Hashimoto b5daf5ae86 `vagrant down` command and associated actions now use the new environment 2010-03-19 16:08:29 -07:00
Mitchell Hashimoto 59ae16998d Set the environment on the loaded box 2010-03-19 15:53:24 -07:00
Mitchell Hashimoto a2a59b532b `vagrant ssh` will automatically fix permissions on the private key if necessary 2010-03-19 01:57:28 -07:00
Mitchell Hashimoto 260b099dba SSH class converted to instance methods. now loads on the environment 2010-03-19 01:51:27 -07:00
Mitchell Hashimoto 689f69bd4c Loading VMs and created VMs now point back to the environment they belong to 2010-03-19 01:31:44 -07:00
Mitchell Hashimoto 2661845b5d Helper method to create a new VM on an environment. Interim method. 2010-03-19 01:27:40 -07:00
Mitchell Hashimoto 2fef27ec8b Persist/depersist VM methods implemented on new Environment 2010-03-18 18:05:34 -07:00
Mitchell Hashimoto 06947002f7 The require_* methods and check_virtualbox! integrated into new Environment 2010-03-18 17:41:51 -07:00
Mitchell Hashimoto a31bd73587 Environment.load! implemented to load a given environment in a single step 2010-03-18 15:05:46 -07:00
Mitchell Hashimoto cb2513b1ec Environment#load_config! loads from the box directory and home directory as well 2010-03-18 14:54:43 -07:00
Mitchell Hashimoto 047c094e41 Environment#load! implemented to set up an instance of environment 2010-03-18 14:43:17 -07:00
Mitchell Hashimoto 8c314e3e17 New Environment class can load home dir, box, and persisted VM 2010-03-18 14:27:53 -07:00
Mitchell Hashimoto c7f32c8be8 Beginnings of Environment class. Currently loads config partially. 2010-03-18 12:38:01 -07:00
Mitchell Hashimoto e84b17e215 Config#execute! returns the newly loaded configuration 2010-03-18 12:28:58 -07:00
Mitchell Hashimoto a7652244d5 Move stacked proc runner to the util directory 2010-03-18 12:08:33 -07:00
Mitchell Hashimoto 586878a330 Runner uses the proper key/data to output errors 2010-03-17 21:45:20 -07:00
Mitchell Hashimoto f59b255085 ActionExceptions all use the new error strings by key 2010-03-17 21:38:38 -07:00
Mitchell Hashimoto 18f761b015 Unit tests for each error_and_exit now that the message is testable 2010-03-17 21:15:48 -07:00
Mitchell Hashimoto 3c2e1bd80a All errors now go through the errors.yml files 2010-03-17 21:08:26 -07:00
Mitchell Hashimoto ac6c3a4892 Util::Errors class to parse errors from YML and render them via ERB 2010-03-17 20:42:53 -07:00
Mitchell Hashimoto 88cfaf8f27 Added class level method to render string for the TemplateRenderer 2010-03-17 19:09:17 -07:00
Mitchell Hashimoto 37de04eb9b TemplateRenderer can now render strings 2010-03-17 18:09:24 -07:00
Mitchell Hashimoto b1872c4e31 Moved template renderer until the Util namespace 2010-03-17 17:59:25 -07:00
Mitchell Hashimoto 4229b65a81 `vagrant init` now takes an optional parameter to specify the default box [close GH-6] 2010-03-17 17:15:12 -07:00
Mitchell Hashimoto 0614882800 Fix failing template renderer tests 2010-03-17 17:05:05 -07:00
Mitchell Hashimoto edc1bbec8c TemplateRenderer added in preparation for supporting ERB templates for some things... 2010-03-17 17:00:46 -07:00
Mitchell Hashimoto 723c36cb1d Give a useful error if the VirtualBox.xml is not found [close GH-30] 2010-03-17 01:25:02 -07:00
Mitchell Hashimoto ef5e73e950 File box downloader gives a nice error message if the file doesn't exist. 2010-03-15 19:18:00 -07:00
Mitchell Hashimoto dcbfe709f3 VM customization through Vagrantfile (modifying RAM, name, etc.) 2010-03-15 15:41:53 -07:00
Mitchell Hashimoto 83ddfa6695 Shared folder UID/GID now defaults to the SSH username 2010-03-15 15:13:07 -07:00
Mitchell Hashimoto 0062207ab3 Configuration now uses the new StackedProcRunner module 2010-03-15 14:27:34 -07:00
Mitchell Hashimoto 130d584322 StackedProcRunner abstraction which will be used for VM customization (in addition to configuration) 2010-03-15 14:19:28 -07:00
Mitchell Hashimoto 5bdabbc8c8 Can now specify the UID/GID of the shared folders from the Vagrantfile 2010-03-15 12:33:03 -07:00
Mitchell Hashimoto 51116438a7 Port collision detection ignores if the VM is the current VM 2010-03-15 01:00:40 -07:00
Mitchell Hashimoto de54433496 On SSH authentication failure, give a helpful error message outlining what may have gone wrong. 2010-03-15 00:50:23 -07:00
John Bender 5aeee61e83 action dependencies and unique requirement moved to actions/collection 2010-03-14 22:34:48 -07:00
Mitchell Hashimoto f6057bf80a Port collision detection now checks every VirtualBox VM, not just the active list 2010-03-14 17:54:30 -07:00
Mitchell Hashimoto 98d5454936 Collision check is now done in `prepare` of forward port action. 2010-03-14 17:35:58 -07:00
Mitchell Hashimoto c08937d899 Dotfile and active list are now updated when environment is torn down 2010-03-14 16:57:29 -07:00
Mitchell Hashimoto 05c4c2f838 Env.persist_vm also persists UUID to the ActiveList 2010-03-14 16:39:52 -07:00
Mitchell Hashimoto 62d3172e57 VM now has a `uuid` method 2010-03-14 16:28:36 -07:00
Mitchell Hashimoto 575e91e70b ActiveList supports adding/removing and saving of VM UUIDs. 2010-03-14 16:27:22 -07:00
Mitchell Hashimoto 235480fffa Reads of Vagrant::ActiveList to track the active vagrant managed virtual environments. 2010-03-14 16:08:58 -07:00
Mitchell Hashimoto 39a8a5fd94 Vagrant.config.home now returns nil if home is nil, otherwise expands path 2010-03-13 01:53:12 -08:00
Mitchell Hashimoto 98d8c1978b Properly reload configuration once all the basics are loaded 2010-03-13 01:47:48 -08:00
Mitchell Hashimoto e09dbfa367 Vagrantfile in the home path is now injected into the vagrantfile load sequence 2010-03-12 21:03:49 -08:00
Mitchell Hashimoto e9940d83df Change VirtualBox version requirement to 3.1 until virtualbox gem supports 3.0 cleanly 2010-03-12 02:10:05 -08:00
John Bender e35e2fbb04 expand path fix 2010-03-12 01:34:36 -08:00
John Bender 00eecf5bdd moved to key based ssh 2010-03-12 01:19:45 -08:00
Mitchell Hashimoto 9ba0647b64 Merge in 'flexible-provisioning' which supports abstracted provisioners, chef server, additional chef solo features, and better chef configuration overall. Also includes pluggable configuration keys. 2010-03-11 22:52:37 -08:00
Mitchell Hashimoto 3a4881bf2e Chef solo cookbooks paths can now take arrays of folders, in addition to just a single string 2010-03-11 21:59:44 -08:00
Mitchell Hashimoto 9c8db3b48a Revert up-ramping SSH timeout. Doesn't solve issue with SSH.execute slowness on internet-less machines. 2010-03-11 19:29:41 -08:00
Mitchell Hashimoto 0ebebe14a0 Re-added the sleep 2010-03-11 19:26:39 -08:00
Mitchell Hashimoto 2c1483ae80 SSH.up? timeout slowly ramps up based on configuration values, giving later attempts more time. 2010-03-11 17:59:25 -08:00
Mitchell Hashimoto b03af8ccc2 Removed sleeping from waiting for boot since the timeout should handle that 2010-03-11 17:40:27 -08:00
Mitchell Hashimoto df2f76297d Helper methods on chef config `add_recipe` and `add_role` and `run_list` 2010-03-11 01:05:57 -08:00
John Bender 751a8bfa1b file copy fix 2010-03-11 00:02:05 -08:00
Mitchell Hashimoto 5f695d8f4d Added file existence test for the validation key for chef server provisioning 2010-03-10 23:06:20 -08:00
Mitchell Hashimoto 9384917b81 Chef server provisioner works. Added the auto-creation of the client key config. 2010-03-10 22:42:42 -08:00
Mitchell Hashimoto a4428cd201 Added :chef_server provisioner shortcut 2010-03-10 21:58:51 -08:00
Mitchell Hashimoto df2e80140d Chef server provisioner 2010-03-10 21:57:51 -08:00
Mitchell Hashimoto df648803dd Pull out common chef code into its own abstract provisioner 2010-03-10 19:00:49 -08:00
Mitchell Hashimoto 759d904628 Provision action must call "prepare" on the provisioner 2010-03-10 15:12:45 -08:00
Mitchell Hashimoto 86ffbe5d32 Provision class now properly figures out the provisioner and executes it 2010-03-10 14:54:12 -08:00
Mitchell Hashimoto d81e5dc28d Remove all "chef" configuration and moved chef solo provisioning to its own class 2010-03-10 14:27:02 -08:00
Mitchell Hashimoto 6878a3ea4d Merge branch 'master' into flexible-provisioning for new shared folder API 2010-03-10 14:00:51 -08:00
Mitchell Hashimoto a71815df4e Additional shared folders can now be configured through the `config.vm.share_folder` method 2010-03-10 13:49:52 -08:00
Mitchell Hashimoto f86bc912eb Base provisioning class 2010-03-10 12:56:52 -08:00
Mitchell Hashimoto 6cfddb6c38 Tests to verify that the instance method exists for configs 2010-03-10 12:29:51 -08:00
Mitchell Hashimoto 19d00a8802 Config class now allows classes to dynamically register configuration keys. 2010-03-10 12:25:53 -08:00
Mitchell Hashimoto 3daf48b70c Config class now properly uses class variables. Not sure how this one slipped through the cracks. 2010-03-10 01:07:24 -08:00
Mitchell Hashimoto 631580fc8e Make the windows test only run on windows for now until it can pass on unix 2010-03-10 01:02:23 -08:00
John Bender b92efdfe53 windows root path fix 2010-03-10 00:30:28 -08:00
Ewen Cheslack-Postava 1bf70fd4c4 Show helpful error if importing VM fails 2010-03-09 22:00:56 -08:00
Mitchell Hashimoto 47d46d4b12 Now checks for VirtualBox installation and proper version and gives sensible error if not detected. 2010-03-09 21:47:07 -08:00
Mitchell Hashimoto 6c5ddcdf8d Windows root path checking. Interim solution. 2010-03-09 12:33:54 -08:00
Mitchell Hashimoto dfe67d71de Tests for Minitar update. 2010-03-09 11:05:33 -08:00
Mitchell Hashimoto 0c24f0e68f Tests for the init change to not use ftools 2010-03-09 10:52:06 -08:00
Jonathan Rudenberg 145f904ed3 Fix busy test to wait for thread to start 2010-03-09 09:08:11 -08:00
John Bender d550cc3a76 dup action exception and tests 2010-03-08 22:20:17 -08:00
Mitchell Hashimoto f9fff05e37 Reload uses the new 'boot' action 2010-03-08 21:13:03 -08:00
Mitchell Hashimoto d818bf856b SSH timeout is now configurable with `config.ssh.timeout` 2010-03-08 19:30:58 -08:00
Mitchell Hashimoto 2f7de333ec Fix issue with infinite looping on `vagrant resume` 2010-03-08 18:45:59 -08:00
Mitchell Hashimoto db24291b3d Fix bug where dotfile_path is a directory in the project path. Thanks brett_h 2010-03-08 13:12:58 -08:00
Mitchell Hashimoto ce7f7dd168 Refactor Vagrant::Env a bit and requiring root path. 2010-03-08 00:34:15 -08:00
Mitchell Hashimoto efe98df4b0 Added `vagrant box list` command to list added boxes 2010-03-07 21:34:53 -08:00
Mitchell Hashimoto 6194421972 `vagrant box` no longer requires a Vagrantfile in the current directory. 2010-03-07 12:44:00 -08:00
Mitchell Hashimoto 6fd10504e0 Box existence error checking is now in proper 'require_box' 2010-03-06 21:48:39 -08:00
Mitchell Hashimoto 49c98ad8af Mounting a folder now waits for the mount to succeed before continuing. Fixed a race condition between SSH daemon starting and the VBox kernel extensions loading... 2010-03-05 19:16:57 -08:00
Mitchell Hashimoto 41b25e68ec Reload action only halts the machine if its running 2010-03-05 18:03:08 -08:00
Mitchell Hashimoto 06ff3a363c Env.load_box! gives a reasonable error if the box specified in the Vagrantfile doesn't exist now. 2010-03-05 16:58:36 -08:00
Mitchell Hashimoto 0a54ea1464 `vagrant-down` now uses reusable actions (a Down action) 2010-03-05 16:47:47 -08:00
John Bender 0cdc6b5eaa moved hanging dotfile_name under Vagrant.config.vagrant 2010-03-04 23:50:08 -08:00
Mitchell Hashimoto 66bc5a19e2 Revamped provisioning JSON generation which includes the entire configuration tree. Plus better testing all around for JSON generation + configuration. 2010-03-04 22:14:44 -08:00
Mitchell Hashimoto da2150da89 Resume uses the resume action now 2010-03-04 21:22:25 -08:00
Mitchell Hashimoto 0a791d1c58 Suspending moved out to an action, command takes advantage of this action now. 2010-03-04 21:13:17 -08:00
Mitchell Hashimoto 20ed284372 Unpackage now has its own rescue implementation 2010-03-04 21:02:59 -08:00
Mitchell Hashimoto 94be71e527 Nit-pick test formatting. No code changes. 2010-03-04 00:10:15 -08:00
John Bender c952fdaa24 check if a box exists before beginning add action 2010-03-03 23:53:46 -08:00
Mitchell Hashimoto 35af1fa02b Added rescue/cleanup methods to box downloading to cleanup temporary files 2010-03-03 23:00:04 -08:00
Mitchell Hashimoto 8e7621061f vagrant-up and vagrant-halt no longer raise exceptions when the VM is not in the proper state. 2010-03-02 22:19:13 -08:00
Mitchell Hashimoto c7f040f14c vagrant-up now starts the VM if its already created, rather than giving an error. 2010-03-02 22:07:04 -08:00
Mitchell Hashimoto c119a34f0e Added vagrant-halt to forcibly shut down vagrant instance. 2010-03-02 21:53:16 -08:00
Mitchell Hashimoto f5f1405a7c HTTP downloader clears the download line once its complete so that the log output doesn't wrap 2010-02-28 22:34:07 -08:00
Mitchell Hashimoto 3d220ef5c8 HTTP downloader implemented. Boxes can now be added via HTTP! 2010-02-28 22:13:37 -08:00
Mitchell Hashimoto 9913c07ff2 Box download action now uses Vagrant "Downloaders." These are abstractions which will allow me to implement file downloading, http downloading etc. File downloading implemented here. 2010-02-28 21:42:38 -08:00
Mitchell Hashimoto 7c19419ef2 Package uses a reference to the Export action to get the temp path rather than the wonky callback. Implemented Runner#find_action for this. 2010-02-28 20:23:32 -08:00
Mitchell Hashimoto 5dd3e51788 Export action now cleans up and rescues. Package no longer cleans up temporary directory. 2010-02-28 19:56:50 -08:00
Mitchell Hashimoto e50e264747 Actions can now implement the #cleanup method which is called after all other actions have finished executing. 2010-02-28 01:47:42 -08:00
Mitchell Hashimoto dce3c032be If an "ActionException" is raised from an action, the runner will error and exit rather than continuing to raise the exception. 2010-02-28 01:24:11 -08:00
Mitchell Hashimoto 37393986e3 Implemented the "rescue" method for action runners when an exception is raised. Read documentation for more information. 2010-02-28 01:06:01 -08:00
John Bender 3c546ef2c7 check for included files before packaging 2010-02-28 00:13:55 -08:00
Mitchell Hashimoto f316e0c61c Default include files to empty array 2010-02-28 00:03:21 -08:00
John Bender 79718eb4c3 --include added to package tests passing, but still needs manual verification 2010-02-27 22:49:43 -08:00
Mitchell Hashimoto 9e41bd9a34 Moved the root shared folder to load in the start task. 2010-02-25 23:57:50 -08:00
Mitchell Hashimoto 815b253b7e Export test no longer actually hits the filesystem 2010-02-25 19:17:39 -08:00
Mitchell Hashimoto f1fc07e353 Action runner clears actions after execution 2010-02-24 00:39:12 -08:00
Mitchell Hashimoto e4548508f2 Removed some delegated methods on VM to explicitly use `vm` attribute in actions so its more runner-agnostic. 2010-02-24 00:34:54 -08:00
Mitchell Hashimoto 26f9eca141 Reworked `vagrant package` to use the new tmp directory. 2010-02-24 00:30:58 -08:00
Mitchell Hashimoto 71abd76fae If a box contains a Vagrantfile, that is now loaded in the configuration chain between the gem config and the project config. 2010-02-23 21:50:44 -08:00
Mitchell Hashimoto 3b198e208d Config clearing. 2010-02-23 21:39:56 -08:00
Mitchell Hashimoto 1a6f838baa `vagrant up` (specifically Actions::VM::Import) now uses a configured box rather than a base VM. Much cleaner! 2010-02-23 00:05:41 -08:00
Mitchell Hashimoto 10e67e85f0 Removed unpackage VM action (since its part of box now) 2010-02-22 23:09:19 -08:00
Mitchell Hashimoto 5b68f3dd10 Box actions clean up the temporary file after unpackaging 2010-02-22 22:42:31 -08:00
Mitchell Hashimoto c7e21a0c94 Moved the destroy logic out to a re-usable box action. 2010-02-22 21:32:15 -08:00
Mitchell Hashimoto 546db294ca `vagrant box remove` functionality is in 2010-02-22 21:27:57 -08:00