vagrant-winnfsd 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e53d68888b912d54bee041bb9d5529d5b24877eb
-  data.tar.gz: 514bc4778d3c8c36e10a2b6ef6f117c76bb7ee3d
+  metadata.gz: e8620dbab8fea3cd1cdf0ecaee44b87e75ef3e5c
+  data.tar.gz: 6be27a72134652b4d3ab744cf715cac8eee39c58
 SHA512:
-  metadata.gz: 08344c308000f6e04603f881d80465597215bb20933ad3f1c4647e4036150bbd4f5159f55b7608146e1c18ca58d02117c4492cace1fc03309fc27db30811726c
-  data.tar.gz: 390d49b9030e2646816f6e7dd32cff5d54aae5fb0636a362b4c5c2ea77654f2ca1d47f7d5d2f1765e0292a76c427f035a2c03ea942a094631bcab16e4ee55b41
+  metadata.gz: 45cfaa8e10f551f7fa7f8cc0c64c30e44a3d1972602aa15d14d2b6b8c1a7bf9c17d8fdfa5fbd2e4e48f0c77ac0a8f7016f909a2e439d9c9d091ed21f3e3c9881
+  data.tar.gz: 329da393120d4832ed73bf6a6cf30099cc34c099036a7d15cccc7487f11a96855c21b36bf83f0fc4f9dbe19cd9ecd31df47f8e91e1d56c61808cea337caab6d7

data/CHANGELOG

@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+1.0.7
+-----
+
+Add uid and gid support
+Add support for multiple boxes
+
+
 1.0.6
 -----
 

data/README.md

@@ -4,7 +4,7 @@ Manage and adds support for NFS on windows.
 
 ## Supported Platforms
 
-As of version 1.0.0 or later Vagrant 1.4 is required.
+As of version 1.0.6 or later Vagrant 1.5 is required. For vagrant 1.4 please use the plugin version 1.0.5 or lower.
 
 Supported guests:
 
@@ -24,4 +24,17 @@ The plugin extends vagrant in the way that you can use NFS also with windows. So
 
 ```
 Windows users: NFS folders do not work on Windows hosts. Vagrant will ignore your request for NFS synced folders on Windows.
-```
+```
+
+## Settings
+
+You can set the uid and the gid. Example:
+
+```
+Vagrant.configure('2') do |config|
+    config.winnfsd.uid = 1
+    config.winnfsd.gid = 1
+end
+```
+
+Note that will be set global, that means the uid and gid is taken from the first box which starts the nfs daemon. If a box with an other uid or gid is started after that the option will be ignored.

data/bin/nfsservice.bat

@@ -28,7 +28,7 @@ if %1==start (
     if %result%==winnfsd.exe (
         echo already running
     ) else (
-        start "" "%~dp0winnfsd" -log off -pathFile %2
+        start "" "%~dp0winnfsd" -log off -pathFile %2 -id %3 %4
         echo started
     )
     

data/lib/vagrant-winnfsd.rb

@@ -1,18 +1,16 @@
-module VagrantPlugins
-  module VagrantWinNFSd
-    require 'vagrant-winnfsd/version'
-    require 'vagrant-winnfsd/plugin'
+module VagrantWinNFSd
+  require 'vagrant-winnfsd/version'
+  require 'vagrant-winnfsd/plugin'
 
-    def self.source_root
-      @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))
-    end
+  def self.source_root
+    @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
+  end
 
-    def self.get_binary_path
-      source_root.join("bin")
-    end
+  def self.get_binary_path
+    source_root.join('bin')
+  end
 
-    def self.get_path_for_file(file)
-      get_binary_path.join(file).to_s.gsub('/', '\\')
-    end
+  def self.get_path_for_file(file)
+    get_binary_path.join(file).to_s.gsub('/', '\\')
   end
-end
+end

data/lib/vagrant-winnfsd/cap/nfs.rb

@@ -1,58 +1,106 @@
-require Vagrant.source_root.join("plugins/hosts/windows/cap/nfs")
-
-module VagrantPlugins
-  module VagrantWinNFSd
-    module Cap
-      class NFS < Vagrant.plugin("2", :host)
-        @logger = Log4r::Logger.new("vagrant::hosts::windows")
-
-        executable = VagrantWinNFSd.get_path_for_file("nfsservice.bat")
-        @nfs_check_command = "\"#{executable}\" status"
-        @nfs_start_command = "\"#{executable}\" start"
-        @nfs_stop_command = "\"#{executable}\" halt"
-        @nfs_path_file = ".vagrant\\nfspaths"
-
-        def self.nfs_export(env, ui, id, ips, folders)
-          ui.info I18n.t("vagrant_winnfsd.hosts.windows.nfs_export")
-          sleep 0.5
-
-          folders.each do |k, opts|
-            hostpath = opts[:hostpath].dup
-            hostpath.gsub!("'", "'\\\\''")
-            hostpath.gsub('/', '\\')
-            system("echo #{hostpath} >>#@nfs_path_file")
-          end
+require Vagrant.source_root.join('plugins/hosts/windows/cap/nfs')
 
-          system("#@nfs_start_command .\\#@nfs_path_file")
-          sleep 2
-        end
+module VagrantWinNFSd
+  module Cap
+    class NFS < Vagrant.plugin('2', :host)
+      @logger = Log4r::Logger.new('vagrant::hosts::windows')
+
+      executable = VagrantWinNFSd.get_path_for_file('nfsservice.bat')
+      @nfs_check_command = "\"#{executable}\" status"
+      @nfs_start_command = "\"#{executable}\" start"
+      @nfs_stop_command = "\"#{executable}\" halt"
+      @nfs_path_file = "#{Vagrant.source_root}/nfspaths"
 
-        def self.nfs_prune(environment, ui, valid_ids)
-          ui.info I18n.t("vagrant_winnfsd.hosts.windows.nfs_prune")
-          @logger.info("Pruning invalid NFS entries...")
-          self.nfs_cleanup
+      def self.nfs_export(env, ui, id, ips, folders)
+        ui.info I18n.t('vagrant_winnfsd.hosts.windows.nfs_export')
+        sleep 0.5
+
+        self.nfs_cleanup(id)
+        nfs_file_lines = []
+
+        nfs_file_lines.push("# VAGRANT-BEGIN: #{Process.uid} #{id}")
+        folders.each do |k, opts|
+          hostpath = opts[:hostpath].dup
+          hostpath.gsub!("'", "'\\\\''")
+          hostpath.gsub('/', '\\')
+          nfs_file_lines.push("#{hostpath}")
         end
+        nfs_file_lines.push("# VAGRANT-END: #{Process.uid} #{id}")
 
-        def self.nfs_installed(env)
-          true
+        File.open(@nfs_path_file, 'a') do |f|
+          f.puts(nfs_file_lines)
         end
 
-        protected
 
-        def self.nfs_running?
-          system("#@nfs_check_command")
+
+        unless self.nfs_running?
+          gid = env.vagrantfile.config.winnfsd.gid
+          uid = env.vagrantfile.config.winnfsd.uid
+          system("#{@nfs_start_command} #{@nfs_path_file} #{uid} #{gid}")
+          sleep 2
         end
+      end
+
+      def self.nfs_prune(environment, ui, valid_ids)
+        return unless File.exist?(@nfs_path_file)
+
+        @logger.info('Pruning invalid NFS entries...')
+
+        output = false
+        user = Process.uid
+
+        File.read(@nfs_path_file).lines.each do |line|
+          id = line[/^# VAGRANT-BEGIN:( #{user})? ([A-Za-z0-9-]+?)$/, 2]
 
-        def self.nfs_cleanup
-          if nfs_running?
-            system("#@nfs_stop_command")
+          if id
+            if valid_ids.include?(id)
+              @logger.debug("Valid ID: #{id}")
+            else
+              unless output
+                # We want to warn the user but we only want to output once
+                ui.info I18n.t('vagrant_winnfsd.hosts.windows.nfs_prune')
+                output = true
+              end
+
+              @logger.info("Invalid ID, pruning: #{id}")
+              self.nfs_cleanup(id)
+            end
           end
+        end
+      end
+
+      def self.nfs_installed(environment)
+        true
+      end
+
+      protected
 
-          if !nfs_running? && File.exist?(@nfs_path_file)
-            File.delete(@nfs_path_file)
+      def self.nfs_running?
+        system("#{@nfs_check_command}")
+      end
+
+      def self.nfs_cleanup(id)
+        return unless File.exist?(@nfs_path_file)
+
+        user = Regexp.escape(Process.uid.to_s)
+        id   = Regexp.escape(id.to_s)
+        skip = false
+        new_file_lines = []
+
+        File.read(@nfs_path_file).lines.each do |line|
+          if line[/^# VAGRANT-BEGIN: #{user} #{id}$/]
+            skip = true
+          elsif line[/^# VAGRANT-END: #{user} #{id}$/]
+            skip = false
+          elsif !skip
+             new_file_lines.push(line)
           end
         end
+
+        File.open(@nfs_path_file, 'w+') do |f|
+          f.puts(new_file_lines)
+        end
       end
     end
   end
-end
+end

data/lib/vagrant-winnfsd/{config.rb → config/config.rb}

@@ -1,8 +1,8 @@
 require 'vagrant'
-require Vagrant.source_root.join("plugins/kernel_v2/config/vm")
+require Vagrant.source_root.join('plugins/kernel_v2/config/vm')
 
-module VagrantPlugins
-  module VagrantWinNFSd
+module VagrantWinNFSd
+  module Config
     class Config < VagrantPlugins::Kernel_V2::VMConfig
       def finalize!
         switch_back = {}

data/lib/vagrant-winnfsd/config/winnfsd.rb

@@ -0,0 +1,29 @@
+require 'vagrant'
+
+module VagrantWinNFSd
+  module Config
+    class WinNFSd < Vagrant.plugin('2', :config)
+      attr_accessor :uid
+      attr_accessor :gid
+
+      def initialize
+        @uid = UNSET_VALUE
+        @gid = UNSET_VALUE
+      end
+
+      def validate(machine)
+        errors = []
+
+        errors << 'winnfsd.uid cannot be nil.' if machine.config.winnfsd.uid.nil?
+        errors << 'winnfsd.gid cannot be nil.' if machine.config.winnfsd.gid.nil?
+
+        { "WinNFSd" => errors }
+      end
+
+      def finalize!
+        @uid = 0 if @uid == UNSET_VALUE
+        @gid = 0 if @gid == UNSET_VALUE
+      end
+    end
+  end
+end

data/lib/vagrant-winnfsd/plugin.rb

@@ -8,66 +8,70 @@ if Vagrant::VERSION < "1.5.0"
   raise "The Vagrant AWS plugin is only compatible with Vagrant 1.5.0+"
 end
 
-module VagrantPlugins
-  module VagrantWinNFSd
-    class Plugin < Vagrant.plugin(2)
-      name 'WinNFSd'
 
-      description <<-DESC
-      This plugin adds NFS support on Windows for Vagrant.
-      DESC
+module VagrantWinNFSd
+  class Plugin < Vagrant.plugin('2')
+    name 'WinNFSd'
 
-      action_hook(:init_i18n, :environment_load) { init_plugin }
+    description <<-DESC
+    This plugin adds NFS support on Windows for Vagrant.
+    DESC
 
-      config("vm") do |env|
-        require_relative "config"
-        Config
-      end
+    action_hook(:init_i18n, :environment_load) { init_plugin }
 
-      synced_folder("nfs") do
-        require_relative "synced_folder"
-        SyncedFolder
-      end
+    config('vm') do
+      require_relative 'config/config'
+      @config = VagrantWinNFSd::Config::Config
+    end
 
-      host_capability("windows", "nfs_export") do
-        require_relative "cap/nfs"
-        Cap::NFS
-      end
+    config(:winnfsd) do
+      require_relative 'config/winnfsd'
+      VagrantWinNFSd::Config::WinNFSd
+    end
 
-      host_capability("windows", "nfs_installed") do
-        require_relative "cap/nfs"
-        Cap::NFS
-      end
+    synced_folder('nfs') do
+      require_relative 'synced_folder'
+      VagrantWinNFSd::SyncedFolder
+    end
 
-      host_capability("windows", "nfs_prune") do
-        require_relative "cap/nfs"
-        Cap::NFS
-      end
+    host_capability('windows', 'nfs_export') do
+      require_relative 'cap/nfs'
+      Cap::NFS
+    end
 
-      def self.init_plugin
-        I18n.load_path << File.expand_path('locales/en.yml', VagrantWinNFSd.source_root)
-        I18n.reload!
+    host_capability('windows', 'nfs_installed') do
+      require_relative 'cap/nfs'
+      Cap::NFS
+    end
 
-        rule_name = "VagrantWinNFSd-".concat(VagrantPlugins::VagrantWinNFSd::VERSION)
-        program = VagrantWinNFSd.get_path_for_file("winnfsd.exe")
-        rule_exist = "netsh advfirewall firewall show rule name=\"%s\">nul"
+    host_capability('windows', 'nfs_prune') do
+      require_relative 'cap/nfs'
+      Cap::NFS
+    end
 
-        unless system(sprintf(rule_exist, rule_name))
-          cleanup_rule = "advfirewall firewall delete rule name=\"winnfsd.exe\""
-          rule = "advfirewall firewall add rule name=\"%s\" dir=\"%s\" action=allow protocol=any program=\"%s\" profile=any"
-          in_rule = sprintf(rule, rule_name, 'in', program)
-          out_rule = sprintf(rule, rule_name, 'out', program)
+    def self.init_plugin
+      I18n.load_path << File.expand_path('locales/en.yml', VagrantWinNFSd.source_root)
+      I18n.reload!
 
-          firewall_script = VagrantWinNFSd.get_path_for_file("setupfirewall.vbs")
-          firewall_rule = "cscript //nologo #{firewall_script} \"#{cleanup_rule}\" \"#{in_rule}\" \"#{out_rule}\""
+      rule_name = 'VagrantWinNFSd-'.concat(VagrantWinNFSd::VERSION)
+      program = VagrantWinNFSd.get_path_for_file("winnfsd.exe")
+      rule_exist = "netsh advfirewall firewall show rule name=\"%s\">nul"
 
-          unless system(firewall_rule)
-            puts I18n.t("vagrant_winnfsd.firewall.error")
-            puts "netsh #{in_rule}\n"
-            puts "netsh #{out_rule}\n"
-          end
+      unless system(sprintf(rule_exist, rule_name))
+        cleanup_rule = "advfirewall firewall delete rule name=\"winnfsd.exe\""
+        rule = "advfirewall firewall add rule name=\"%s\" dir=\"%s\" action=allow protocol=any program=\"%s\" profile=any"
+        in_rule = sprintf(rule, rule_name, 'in', program)
+        out_rule = sprintf(rule, rule_name, 'out', program)
+
+        firewall_script = VagrantWinNFSd.get_path_for_file('setupfirewall.vbs')
+        firewall_rule = "cscript //nologo #{firewall_script} \"#{cleanup_rule}\" \"#{in_rule}\" \"#{out_rule}\""
+
+        unless system(firewall_rule)
+          puts I18n.t('vagrant_winnfsd.firewall.error')
+          puts "netsh #{in_rule}\n"
+          puts "netsh #{out_rule}\n"
         end
       end
     end
   end
-end
+end

data/lib/vagrant-winnfsd/synced_folder.rb

@@ -1,80 +1,78 @@
 require 'vagrant'
 require Vagrant.source_root.join("plugins/synced_folders/nfs/synced_folder")
 
-module VagrantPlugins
-  module VagrantWinNFSd
-    class SyncedFolder < VagrantPlugins::SyncedFolderNFS::SyncedFolder
-      def enable(machine, folders, nfsopts)
-        raise Vagrant::Errors::NFSNoHostIP if !nfsopts[:nfs_host_ip]
-        raise Vagrant::Errors::NFSNoGuestIP if !nfsopts[:nfs_machine_ip]
+module VagrantWinNFSd
+  class SyncedFolder < VagrantPlugins::SyncedFolderNFS::SyncedFolder
+    def enable(machine, folders, nfsopts)
+      raise Vagrant::Errors::NFSNoHostIP unless nfsopts[:nfs_host_ip]
+      raise Vagrant::Errors::NFSNoGuestIP unless nfsopts[:nfs_machine_ip]
 
-        if machine.guest.capability?(:nfs_client_installed)
-          installed = machine.guest.capability(:nfs_client_installed)
-          if !installed
-            can_install = machine.guest.capability?(:nfs_client_install)
-            raise Vagrant::Errors::NFSClientNotInstalledInGuest if !can_install
-            machine.ui.info I18n.t("vagrant.actions.vm.nfs.installing")
-            machine.guest.capability(:nfs_client_install)
-          end
+      if machine.guest.capability?(:nfs_client_installed)
+        installed = machine.guest.capability(:nfs_client_installed)
+        unless installed
+          can_install = machine.guest.capability?(:nfs_client_install)
+          raise Vagrant::Errors::NFSClientNotInstalledInGuest unless can_install
+          machine.ui.info I18n.t("vagrant.actions.vm.nfs.installing")
+          machine.guest.capability(:nfs_client_install)
         end
+      end
 
-        machine_ip = nfsopts[:nfs_machine_ip]
-        machine_ip = [machine_ip] if !machine_ip.is_a?(Array)
+      machine_ip = nfsopts[:nfs_machine_ip]
+      machine_ip = [machine_ip] unless machine_ip.is_a?(Array)
 
-        # Prepare the folder, this means setting up various options
-        # and such on the folder itself.
-        folders.each { |id, opts| prepare_folder(machine, opts) }
+      # Prepare the folder, this means setting up various options
+      # and such on the folder itself.
+      folders.each { |id, opts| prepare_folder(machine, opts) }
 
-        # Determine what folders we'll export
-        export_folders = folders.dup
-        export_folders.keys.each do |id|
-          opts = export_folders[id]
-          if opts.has_key?(:nfs_export) && !opts[:nfs_export]
-            export_folders.delete(id)
-          end
+      # Determine what folders we'll export
+      export_folders = folders.dup
+      export_folders.keys.each do |id|
+        opts = export_folders[id]
+        if opts.has_key?(:nfs_export) && !opts[:nfs_export]
+          export_folders.delete(id)
         end
+      end
 
-        # Export the folders. We do this with a class-wide lock because
-        # NFS exporting often requires sudo privilege and we don't want
-        # overlapping input requests. [GH-2680]
-        @@lock.synchronize do
-          begin
-            machine.env.lock("nfs-export") do
-              machine.ui.info I18n.t("vagrant.actions.vm.nfs.exporting")
-              machine.env.host.capability(
-                :nfs_export,
-                machine.ui, machine.id, machine_ip, export_folders)
-            end
-          rescue Vagrant::Errors::EnvironmentLockedError
-            sleep 1
-            retry
+      # Export the folders. We do this with a class-wide lock because
+      # NFS exporting often requires sudo privilege and we don't want
+      # overlapping input requests. [GH-2680]
+      @@lock.synchronize do
+        begin
+          machine.env.lock("nfs-export") do
+            machine.ui.info I18n.t("vagrant.actions.vm.nfs.exporting")
+            machine.env.host.capability(
+              :nfs_export,
+              machine.ui, machine.id, machine_ip, export_folders)
           end
+        rescue Vagrant::Errors::EnvironmentLockedError
+          sleep 1
+          retry
         end
+      end
 
-        # Mount
-        machine.ui.info I18n.t("vagrant.actions.vm.nfs.mounting")
-
-        # Only mount folders that have a guest path specified.
-        mount_folders = {}
-        folders.each do |id, opts|
-          if Vagrant::Util::Platform.windows?
-            unless opts[:mount_options]
-              mount_opts = ["vers=#{opts[:nfs_version]}"]
-              mount_opts << "udp" if opts[:nfs_udp]
-              mount_opts << "nolock"
+      # Mount
+      machine.ui.info I18n.t("vagrant.actions.vm.nfs.mounting")
 
-              opts[:mount_options] = mount_opts
-            end
+      # Only mount folders that have a guest path specified.
+      mount_folders = {}
+      folders.each do |id, opts|
+        if Vagrant::Util::Platform.windows?
+          unless opts[:mount_options]
+            mount_opts = ["vers=#{opts[:nfs_version]}"]
+            mount_opts << "udp" if opts[:nfs_udp]
+            mount_opts << "nolock"
 
-            opts[:hostpath] = '/' + opts[:hostpath].gsub(':', '').gsub('\\', '/')
+            opts[:mount_options] = mount_opts
           end
-          mount_folders[id] = opts.dup if opts[:guestpath]
-        end
 
-        # Mount them!
-        machine.guest.capability(
-          :mount_nfs_folder, nfsopts[:nfs_host_ip], mount_folders)
+          opts[:hostpath] = '/' + opts[:hostpath].gsub(':', '').gsub('\\', '/')
+        end
+        mount_folders[id] = opts.dup if opts[:guestpath]
       end
+
+      # Mount them!
+      machine.guest.capability(
+        :mount_nfs_folder, nfsopts[:nfs_host_ip], mount_folders)
     end
   end
-end
+end

data/lib/vagrant-winnfsd/version.rb

@@ -1,5 +1,4 @@
-module VagrantPlugins
-  module VagrantWinNFSd
-    VERSION = '1.0.6'
-  end
-end
+
+module VagrantWinNFSd
+  VERSION = '1.0.7'
+end

data/vagrant-winnfsd.gemspec

@@ -3,7 +3,7 @@ require "vagrant-winnfsd/version"
 
 Gem::Specification.new do |gem|
   gem.name    = 'vagrant-winnfsd'
-  gem.version = VagrantPlugins::VagrantWinNFSd::VERSION
+  gem.version = VagrantWinNFSd::VERSION
 
   gem.summary     = 'Adds NFS support for Windows'
   gem.description = <<-EOD

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-winnfsd
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Alexander Schneider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-08 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Manage and adds support for NFS on windows.
@@ -23,7 +23,8 @@ files:
 - CHANGELOG
 - Gemfile
 - lib/vagrant-winnfsd/cap/nfs.rb
-- lib/vagrant-winnfsd/config.rb
+- lib/vagrant-winnfsd/config/config.rb
+- lib/vagrant-winnfsd/config/winnfsd.rb
 - lib/vagrant-winnfsd/plugin.rb
 - lib/vagrant-winnfsd/synced_folder.rb
 - lib/vagrant-winnfsd/version.rb