1369 - Integrate ensure_dependencies.py

Vagrantfile

 VAGRANTFILE_API_VERSION = "2"
-system("python ensure_dependencies.py")

[Wladimir Palant, 2014/09/18 13:24:46]

This assumes that Vagrantfile is located in the current work directory. However,
vagrant will also find Vagrantfile in the parent of the current work directory -
plus there is a VAGRANT_CWD environment variable that will change that even
further. Please make sure to resolve the path to ensure_dependencies.py relative
to __FILE__.

Also, please make sure to pass in multiple parameters rather than a shell
command - no point getting the shell involved here (potential security hazard).

Finally, a failure in ensure_dependencies.py should not be ignored - we don't
want to produce a broken VM. So it should be something like:

  raise "ensure_dependencies.py failed" if not system("python", deps)

[mathias, 2014/09/18 14:11:20]

Done.

+REPOSITORY_DIR = File.dirname(__FILE__)
+DEPENDENCY_SCRIPT = File.join(REPOSITORY_DIR, "ensure_dependencies.py")
+
+if !system("python", DEPENDENCY_SCRIPT)
+  error = Vagrant::Errors::VagrantError
+  error.error_message("Failed to ensure dependencies being up-to-date!")
+  raise error
+end
 
 def define_standard_vm(config, host_name, ip)
   config.vm.define host_name do |config|
     config.vm.box = 'precise64'
     config.vm.box_url = 'http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box'
     config.vm.host_name = "#{host_name}.adblockplus.org"
     config.vm.network :private_network, ip: ip
     config.vm.provider :virtualbox do |vb|
       vb.customize ["modifyvm", :id, "--cpus", 1]
 
@@ skipping 55 matching lines @@
   define_standard_vm config, 'filter10', '10.8.0.136'
   define_standard_vm config, 'filter11', '10.8.0.137'
   define_standard_vm config, 'filter12', '10.8.0.138'
   define_standard_vm config, 'filter13', '10.8.0.139'
   define_standard_vm config, 'filter14', '10.8.0.140'
   define_standard_vm config, 'filter15', '10.8.0.141'
   define_standard_vm config, 'filter16', '10.8.0.142'
   define_standard_vm config, 'filter17', '10.8.0.143'
   define_standard_vm config, 'filter18', '10.8.0.144'
 end