vagrant-solaris10 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01667b843e06f08aa5f3e746b92d57d3d394b98d
-  data.tar.gz: 72b7fa074ff551d7014f870b30dd5b2a3b04d48c
+  metadata.gz: 8fe793851c454fdf9487f7926caeb4315a77694b
+  data.tar.gz: a23a987241ac69f815e8aa308b732e5467e63e36
 SHA512:
-  metadata.gz: ec901eb2c143afa0a074e1d31c2f76f906fc9bf1dc9e24fbc167c5a1145690010546e026bb9f6d1222ac1ba590c64578db4321e4d45fd44382cfe0d42f03aecc
-  data.tar.gz: 2b5960d8797c505478b314471936b46cbce36e6f5eacbdb4333445ca4174e9c39f15910f4b89157f46f75efc9bb746ded46ad30b6f9fe015dabd36c35e06e688
+  metadata.gz: 194c73b855a7bef609f32aedf674e2e4000f9de77ea9bd2f929cc80346778aed199492cac7ac77f2151fdafdc0bb9357c6fda2f4dc561c7bdfd3bd2734f57301
+  data.tar.gz: 4751b5fba00849c604785c02b2796ca1c3d87821e9d94072dcd87a5b3d2dda88a774fcea2bc74af4c5f35f6f3c874635cf7b3e24c4554ccc2eeb8d0673d7e284

data/lib/vagrant-solaris10/cap/mount_nfs_folder.rb

@@ -0,0 +1,47 @@
+# Copyright (c) 2014 Tnarik Innael - adaptation to Solaris and repackaging
+# Copyright (c) 2013-2014 Mitchell Hashimoto - from plugins/guests/darwin/cap/mount_vnfs_folder.rb
+require "vagrant/util/retryable"
+require "vagrant/errors"
+
+module Vagrant
+  module Errors
+    class Vagrant::Errors::SolarisNFSMountFailed < VagrantError
+      error_key(:solaris_nfs_mount_failed)
+    end
+  end
+
+  module Solaris10
+    module Cap
+      class MountNFSFolder
+        extend Vagrant::Util::Retryable
+
+        def self.mount_nfs_folder(machine, ip, folders)
+          folders.each do |name, opts|
+            # Expand the guest path so we can handle things like "~/vagrant"
+            expanded_guest_path = machine.guest.capability(
+              :shell_expand_guest_path, opts[:guestpath])
+  
+            # Create the folder
+            machine.communicate.sudo("mkdir -p #{expanded_guest_path}")
+  
+            # Figure out any options
+            mount_opts = ["vers=#{opts[:nfs_version]}"]
+            if opts[:mount_options]
+              mount_opts = opts[:mount_options].dup
+            end
+  
+            mount_command = "mount -F nfs " +
+              "-o '#{mount_opts.join(",")}' " +
+              "'#{ip}:#{opts[:hostpath]}' '#{expanded_guest_path}'"
+            retryable(on: Vagrant::Errors::SolarisNFSMountFailed, tries: 10, sleep: 5) do
+              machine.communicate.sudo(
+                mount_command,
+                error_class: Vagrant::Errors::SolarisNFSMountFailed)
+            end
+          end
+        end
+        
+      end
+    end
+  end
+end

data/lib/vagrant-solaris10/cap/mount_parallels_shared_folder.rb

@@ -6,7 +6,7 @@ module Vagrant
       class MountParallelsSharedFolder
 
         def self.mount_parallels_shared_folder(machine, name, guestpath, options)
-          p  "mount parallels"
+          machine.ui.warn("Parallels doesn't support shared folders for Solaris")
         end
         
       end

data/lib/vagrant-solaris10/cap/shell_expand_guest_path.rb

@@ -0,0 +1,33 @@
+# Copyright (c) 2014 Tnarik Innael - repackaged
+# Copyright (c) 2014 Mitchell Hashimoto - from plugins/guest/linux/cap/shell_expand_guest_path.rb
+module Vagrant
+  module Solaris10
+    module Cap
+      class ShellExpandGuestPath
+
+        def self.shell_expand_guest_path(machine, path)
+          real_path = nil
+          machine.communicate.execute("echo; printf #{path}") do |type, data|
+            if type == :stdout
+              real_path ||= ""
+              real_path += data
+            end
+          end
+
+          # The last line is the path we care about
+          real_path = real_path.split("\n").last.chomp
+
+          if !real_path
+            # If no real guest path was detected, this is really strange
+            # and we raise an exception because this is a bug.
+            raise ShellExpandFailed
+          end
+
+          # Chomp the string so that any trailing newlines are killed
+          return real_path.chomp
+        end
+        
+      end
+    end
+  end
+end

data/lib/vagrant-solaris10/plugin.rb

@@ -2,7 +2,6 @@ require "vagrant"
 
 module Vagrant
   module Solaris10
-
     class Plugin < Vagrant.plugin("2")
       name "Solaris10 guest"
       description "Solaris10 guest support."
@@ -17,6 +16,11 @@ module Vagrant
         Cap::MountParallelsSharedFolder 
       end
 
+      guest_capability("solaris", "mount_nfs_folder") do
+        require_relative "cap/mount_nfs_folder"
+        Cap::MountNFSFolder
+      end
+
       guest_capability("solaris", "insert_public_key") do
         require_relative "cap/insert_public_key"
         Cap::InsertPublicKey
@@ -27,6 +31,11 @@ module Vagrant
         Cap::RemovePublicKey
       end
 
+      guest_capability("solaris", "shell_expand_guest_path") do
+        require_relative "cap/shell_expand_guest_path"
+        Cap::ShellExpandGuestPath
+      end
+
       guest_capability("solaris", "rsync_post") do
         require_relative "cap/rsync"
         Cap::RSync

data/lib/vagrant-solaris10/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Solaris10
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-solaris10
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tnarik Innael
@@ -55,10 +55,12 @@ files:
 - Rakefile
 - lib/vagrant-solaris10.rb
 - lib/vagrant-solaris10/cap/insert_public_key.rb
+- lib/vagrant-solaris10/cap/mount_nfs_folder.rb
 - lib/vagrant-solaris10/cap/mount_parallels_shared_folder.rb
 - lib/vagrant-solaris10/cap/mount_vmware_shared_folder.rb
 - lib/vagrant-solaris10/cap/remove_public_key.rb
 - lib/vagrant-solaris10/cap/rsync.rb
+- lib/vagrant-solaris10/cap/shell_expand_guest_path.rb
 - lib/vagrant-solaris10/plugin.rb
 - lib/vagrant-solaris10/version.rb
 - vagrant-solaris10.gemspec