VM shared folders can now be added easily.

lib/hobo/vm.rb

@@ -25,7 +25,6 @@ module Hobo
         SSH.connect
       end
 
-
       # Save the state of the current hobo environment to disk
       def suspend
         Env.require_persisted_vm
@@ -61,14 +60,16 @@ error
     end
 
     def create
+      share_folder("hobo-root", Env.root_path, Hobo.config.vm.project_directory)
+
       import
       move_hd if Hobo.config[:vm][:hd_location]
       persist
       setup_mac_address
       forward_ports
-      setup_shared_folder
+      setup_shared_folders
       start
-      mount_shared_folder
+      mount_shared_folders
     end
 
     def destroy
@@ -132,20 +133,28 @@ error
       @vm.save(true)
     end
 
-    def setup_shared_folder
+    def setup_shared_folders
-      logger.info "Creating shared folders..."
+      logger.info "Creating shared folders metadata..."
+
+      shared_folders.each do |name, hostpath, guestpath|
         folder = VirtualBox::SharedFolder.new
-      folder.name = "hobo-root-path"
+        folder.name = name
-      folder.hostpath = Env.root_path
+        folder.hostpath = hostpath
         @vm.shared_folders << folder
+      end
+
       @vm.save(true)
     end
 
-    def mount_shared_folder
+    def mount_shared_folders
-      HOBO_LOGGER.info "Mounting shared folders..."
+      logger.info "Mounting shared folders..."
+
       Hobo::SSH.execute do |ssh|
-        ssh.exec!("sudo mkdir -p #{Hobo.config.vm.project_directory}")
+        shared_folders.each do |name, hostpath, guestpath|
-        ssh.exec!("sudo mount -t vboxsf hobo-root-path #{Hobo.config.vm.project_directory}")
+          logger.info "-- #{name}: #{guestpath}"
+          ssh.exec!("sudo mkdir -p #{guestpath}")
+          ssh.exec!("sudo mount -t vboxsf #{name} #{guestpath}")
+        end
       end
     end
 
@@ -170,11 +179,26 @@ error
       false
     end
 
-    def saved?; @vm.saved? end
+    def shared_folders(clear=false)
+      @shared_folders = nil if clear
+      @shared_folders ||= []
+    end
 
-    def save_state(errs); @vm.save_state(errs) end
+    def share_folder(name, hostpath, guestpath)
+      shared_folders << [name, hostpath, guestpath]
+    end
+
+    def saved?
+      @vm.saved?
+    end
+
+    def save_state(errs)
+      @vm.save_state(errs)
+    end
 
     # TODO need a better way to which controller is the hd
-    def hd; @vm.storage_controllers.first.devices.first end
+    def hd
+      @vm.storage_controllers.first.devices.first
+    end
   end
 end

test/hobo/vm_test.rb

@@ -78,9 +78,9 @@ class VMTest < Test::Unit::TestCase
         @vm.expects(:persist).in_sequence(create_seq)
         @vm.expects(:setup_mac_address).in_sequence(create_seq)
         @vm.expects(:forward_ports).in_sequence(create_seq)
-        @vm.expects(:setup_shared_folder).in_sequence(create_seq)
+        @vm.expects(:setup_shared_folders).in_sequence(create_seq)
         @vm.expects(:start).in_sequence(create_seq)
-        @vm.expects(:mount_shared_folder).in_sequence(create_seq)
+        @vm.expects(:mount_shared_folders).in_sequence(create_seq)
         @vm.create
       end
     end
@@ -170,31 +170,6 @@ class VMTest < Test::Unit::TestCase
       end
     end
 
-    context "setting up the shared folder" do
-      should "create a shared folder with the root folder for the VM" do
-        shared_folder = mock("shared_folder")
-        shared_folder.stubs(:name=)
-        shared_folder.expects(:hostpath=).with(Hobo::Env.root_path).once
-        shared_folder_collection = mock("collection")
-        shared_folder_collection.expects(:<<).with(shared_folder)
-        VirtualBox::SharedFolder.expects(:new).returns(shared_folder)
-        @mock_vm.expects(:shared_folders).returns(shared_folder_collection)
-        @mock_vm.expects(:save).with(true).once
-        @vm.setup_shared_folder
-      end
-    end
-
-    context "mounting the shared folders" do
-      should "create the directory then mount the shared folder" do
-        mount_seq = sequence("mount_seq")
-        ssh = mock("ssh")
-        ssh.expects(:exec!).with("sudo mkdir -p #{Hobo.config.vm.project_directory}").in_sequence(mount_seq)
-        ssh.expects(:exec!).with("sudo mount -t vboxsf hobo-root-path #{Hobo.config.vm.project_directory}").in_sequence(mount_seq)
-        Hobo::SSH.expects(:execute).yields(ssh)
-        @vm.mount_shared_folder
-      end
-    end
-
     context "suspending and resuming a vm" do
       should "put the vm in a suspended state" do
         saved_state_expectation(false)
@@ -236,8 +211,59 @@ class VMTest < Test::Unit::TestCase
       end
     end
 
-    context "creating a new vm with a specified disk storage location" do
+    context "shared folders" do
+      setup do
+        @mock_vm = mock("mock_vm")
+        @vm = Hobo::VM.new(@mock_vm)
+      end
 
+      should "not have any shared folders initially" do
+        assert @vm.shared_folders.empty?
+      end
+
+      should "be able to add shared folders" do
+        @vm.share_folder("foo", "from", "to")
+        assert_equal 1, @vm.shared_folders.length
+      end
+
+      should "be able to clear shared folders" do
+        @vm.share_folder("foo", "from", "to")
+        assert !@vm.shared_folders.empty?
+        @vm.shared_folders(true)
+        assert @vm.shared_folders.empty?
+      end
+
+      should "add all shared folders to the VM with 'setup_shared_folders'" do
+        @vm.share_folder("foo", "from", "to")
+        @vm.share_folder("bar", "bfrom", "bto")
+
+        share_seq = sequence("share_seq")
+        shared_folders = mock("shared_folders")
+        shared_folders.expects(:<<).in_sequence(share_seq).with() { |sf| sf.name == "foo" && sf.hostpath == "from" }
+        shared_folders.expects(:<<).in_sequence(share_seq).with() { |sf| sf.name == "bar" && sf.hostpath == "bfrom" }
+        @mock_vm.stubs(:shared_folders).returns(shared_folders)
+        @mock_vm.expects(:save).with(true).once
+
+        @vm.setup_shared_folders
+      end
+
+      should "mount all shared folders to the VM with `mount_shared_folders`" do
+        @vm.share_folder("foo", "from", "to")
+        @vm.share_folder("bar", "bfrom", "bto")
+
+        mount_seq = sequence("mount_seq")
+        ssh = mock("ssh")
+        @vm.shared_folders.each do |name, hostpath, guestpath|
+          ssh.expects(:exec!).with("sudo mkdir -p #{guestpath}").in_sequence(mount_seq)
+          ssh.expects(:exec!).with("sudo mount -t vboxsf #{name} #{guestpath}").in_sequence(mount_seq)
+        end
+        Hobo::SSH.expects(:execute).yields(ssh)
+
+        @vm.mount_shared_folders
+      end
+    end
+
+    context "creating a new vm with a specified disk storage location" do
       should "error and exit of the vm is not powered off" do
         # Exit does not prevent method from proceeding in test, so we must set expectations
         vm = move_hd_expectations