Re: [Tails-dev] Support for modern Vagrant

> Path: /home/jvoisin/dev/tails/vagrant/Vagrantfile
> Message: uninitialized constant
> Vagrant::Action::Box<internal:prelude>:10:in `synchronize'
> /home/jvoisin/dev/tails/Rakefile:46:in `new'
> /home/jvoisin/dev/tails/Rakefile:46:in `primary_vm'
> /home/jvoisin/dev/tails/Rakefile:231:in `block (2 levels) in <top
> (required)>'
> Tasks: TOP => build => vm:up
> (See full trace by running task with --trace)
> zsh: exit 1     rake build
> jvoisin@kaa 11:46 ~/dev/tails

---
 Rakefile                                 | 40 +++++++++++++++++++++-----------
 vagrant/Vagrantfile                      | 34 ++++++++++++++++++++-------
 vagrant/lib/tails_build_settings.rb      |  3 +++
 vagrant/lib/vagrant_verified_download.rb | 34 ++++++++++++++++-----------
 vagrant/lib/vagrant_version.rb           | 22 ++++++++++++++++++
 vagrant/provision/setup-tails-builder    |  6 +++++
 6 files changed, 104 insertions(+), 35 deletions(-)
 create mode 100644 vagrant/lib/vagrant_version.rb

-def current_vm_memory
+def primary_vm
   env = Vagrant::Environment.new(:cwd => VAGRANT_PATH, :ui_class => Vagrant::UI::Basic)
-  uuid = env.primary_vm.uuid
-  info = env.primary_vm.driver.execute 'showvminfo', uuid, '--machinereadable'
+  if vagrant_old
+    return env.primary_vm
+  else
+    name = env.primary_machine_name
+    return env.machine(name, env.default_provider)
+  end
+end
+
+def current_vm_memory
+  vm = primary_vm
+  uuid = vm.uuid
+  info = vm.driver.execute 'showvminfo', uuid, '--machinereadable'
   $1.to_i if info =~ /^memory=(\d+)/
 end

 def enough_free_memory?
@@ -197,9 +208,12 @@ desc 'Build Tails'
 task :build => ['parse_build_options', 'ensure_clean_repository', 'validate_http_proxy', 'vm:up'] do
   exported_env = EXPORTED_VARIABLES.select { |k| ENV[k] }.
                   collect { |k| "#{k}='#{ENV[k]}'" }.join(' ')
-
-  env = Vagrant::Environment.new(:cwd => VAGRANT_PATH)
-  status = env.primary_vm.channel.execute("#{exported_env} build-tails",
+  if vagrant_old
+    chan = primary_vm.channel
+  else
+    chan = primary_vm.communicate
+  end
+  status = chan.execute("#{exported_env} build-tails",
                                           :error_check => false) do |fd, data|
     (fd == :stdout ? $stdout : $stderr).write data
   end
@@ -214,8 +228,7 @@ end
 namespace :vm do
   desc 'Start the build virtual machine'
   task :up => ['parse_build_options', 'validate_http_proxy'] do
-    env = Vagrant::Environment.new(:cwd => VAGRANT_PATH, :ui_class => Vagrant::UI::Basic)
-    case env.primary_vm.state
+    case primary_vm.state
     when :not_created
       # Do not use non-existant in-VM proxy to download the basebox
       if ENV['http_proxy'] == INTERNEL_HTTP_PROXY
@@ -268,6 +281,7 @@ namespace :vm do
         abort 'The virtual machine needs to be reloaded to change the number of CPUs. Aborting.'
       end
     end
+    env = Vagrant::Environment.new(:cwd => VAGRANT_PATH, :ui_class => Vagrant::UI::Basic)
     result = env.cli('up')
     abort "'vagrant up' failed" unless result

-Vagrant::Config.run do |config|
-  config.vm.box = 'tails'
-
-  config.vm.box_url = 'http://dl.amnesia.boum.org/tails/project/vagrant/squeeze.box'
-  config.vm.box_checksum = 'ffb3f68f55a3458e007b9abed3eac057f71c518713fcdf982b78f8b59e28318e'
+if vagrant_old
+  Vagrant::Config.run do |config|
+    config.vm.box = 'tails'
+    config.vm.box_url = 'http://dl.amnesia.boum.org/tails/project/vagrant/squeeze.box'
+ 
+    config.vm.provision :shell, :inline => "http_proxy='#{ENV['http_proxy']}' /vagrant/provision/setup-tails-builder"
+
+   config.vm.share_folder 'amnesia', '/amnesia.git', '../.git'
+ 
+   config.vm.customize ['modifyvm', :id, '--memory', mem_size]
+   config.vm.customize ['modifyvm', :id, '--cpus', cpus] unless cpus.nil?
+  end
+else
+  Vagrant.configure("2") do |config|
+    config.vm.box = 'tails'
+    config.vm.box_url = 'http://dl.amnesia.boum.org/tails/project/vagrant/squeeze.box'

-  config.vm.provision :shell, :inline => "http_proxy='#{ENV['http_proxy']}' /vagrant/provision/setup-tails-builder"
+    config.vm.provision "shell",
+      inline: "sudo http_proxy='#{ENV['http_proxy']}' /vagrant/provision/setup-tails-builder"

-  config.vm.share_folder 'amnesia', '/amnesia.git', '../.git'
+    config.vm.synced_folder '../.git', '/amnesia.git'

-  config.vm.customize ['modifyvm', :id, '--memory', mem_size]
-  config.vm.customize ['modifyvm', :id, '--cpus', cpus] unless cpus.nil?
+    config.vm.provider :virtualbox do |vb|
+      vb.customize ['modifyvm', :id, '--memory', mem_size]
+      vb.customize ['modifyvm', :id, '--cpus', cpus] unless cpus.nil?
+    end
+  end
 end
diff --git a/vagrant/lib/tails_build_settings.rb b/vagrant/lib/tails_build_settings.rb
index e2e48ea..8e88030 100644
--- a/vagrant/lib/tails_build_settings.rb
+++ b/vagrant/lib/tails_build_settings.rb
@@ -26,3 +26,6 @@ VM_MEMORY_FOR_RAM_BUILDS = 6 * 1024 + 512 # 6.5 GB

-# The following will monkeypatch Vagrant (successfuly tested against Vagrant
-# 1.0.2) in order to verify the checksum of a downloaded box.
-module Vagrant
-  class Config::VMConfig
-    attr_accessor :box_checksum
+def check(path)
+  checksum = Digest::SHA256.new.file(path).hexdigest
+  if checksum != BOX_CHECKSUM
+    raise Errors::BoxVerificationFailed.new
   end
+end

-  class Action::Box::Download
-    alias :unverified_download :download
-    def download
-      unverified_download
-
-      checksum = Digest::SHA256.new.file(@temp_path).hexdigest
-      if checksum != @env['global_config'].vm.box_checksum
-        raise Errors::BoxVerificationFailed.new
+module Vagrant
+  if vagrant_old
+    class Action::Box::Download
+      alias :unverified_download :download
+      def download
+        unverified_download
+        check(@temp_path)
+      end
+    end
+  else
+    class Util::Downloader
+      alias :unverified_download! :download!
+      def download!
+        unverified_download!
+        check(@destination)
       end
     end
   end
diff --git a/vagrant/lib/vagrant_version.rb b/vagrant/lib/vagrant_version.rb
new file mode 100644
index 0000000..3d61f7d
--- /dev/null
+++ b/vagrant/lib/vagrant_version.rb
@@ -0,0 +1,22 @@
+# Tails: The Amnesic Incognito Live System
+# Copyright © 2012 Tails developers <tails@???>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'vagrant/version'
+
+def vagrant_old
+  version = Vagrant::VERSION.split(".")
+  return version[1].to_i < 2
+end
diff --git a/vagrant/provision/setup-tails-builder b/vagrant/provision/setup-tails-builder
index cd84925..8404668 100755
--- a/vagrant/provision/setup-tails-builder
+++ b/vagrant/provision/setup-tails-builder
@@ -30,6 +30,12 @@ sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/ikiwiki <<EOF
     Pin-Priority: 500
 EOF