vagrant-winnfsd 1.0.5 → 1.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e53d68888b912d54bee041bb9d5529d5b24877eb
+  data.tar.gz: 514bc4778d3c8c36e10a2b6ef6f117c76bb7ee3d
+SHA512:
+  metadata.gz: 08344c308000f6e04603f881d80465597215bb20933ad3f1c4647e4036150bbd4f5159f55b7608146e1c18ca58d02117c4492cace1fc03309fc27db30811726c
+  data.tar.gz: 390d49b9030e2646816f6e7dd32cff5d54aae5fb0636a362b4c5c2ea77654f2ca1d47f7d5d2f1765e0292a76c427f035a2c03ea942a094631bcab16e4ee55b41

data/.gitignore

@@ -1,13 +1,13 @@
-# RubyMine
-.idea
-
-# Bundler/Rubygems
-*.gem
-.bundle
-pkg/*
-tags
-Gemfile.lock
-
-# Vagrant
-.vagrant
+# RubyMine
+.idea
+
+# Bundler/Rubygems
+*.gem
+.bundle
+pkg/*
+tags
+Gemfile.lock
+
+# Vagrant
+.vagrant
 Vagrantfile

data/CHANGELOG

@@ -1,6 +1,14 @@
 CHANGELOG
 =========
 
+1.0.6
+-----
+
+Add support for vagrant 1.5.0 and higher
+Remove support for vagrant lower than 1.5.0
+Improve error message
+
+
 1.0.5
 -----
 

data/Gemfile

@@ -1,11 +1,15 @@
-source "https://rubygems.org"
-
-gemspec
-
-group :development do
-  # We depend on Vagrant for development, but we don't add it as a
-  # gem dependency because we expect to be installed within the
-  # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :branch => "master"
-  gem "rspec"
+source "https://rubygems.org"
+
+gemspec
+
+group :development do
+  # We depend on Vagrant for development, but we don't add it as a
+  # gem dependency because we expect to be installed within the
+  # Vagrant environment itself using `vagrant plugin`.
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :branch => "master"
+  gem "rspec"
+end
+
+group :plugins do
+  gem "vagrant-winnfsd", path: "."
 end

data/Rakefile

@@ -1,21 +1,21 @@
-require 'rubygems'
-require 'bundler/setup'
-#require 'rspec/core/rake_task'
-
-# Immediately sync all stdout so that tools like buildbot can
-# immediately load in the output.
-$stdout.sync = true
-$stderr.sync = true
-
-# Change to the directory of this file.
-Dir.chdir(File.expand_path("../", __FILE__))
-
-# This installs the tasks that help with gem creation and
-# publishing.
-Bundler::GemHelper.install_tasks
-
-# Install the `spec` task so that we can run tests.
-#RSpec::Core::RakeTask.new
-
-# Default task is to run the unit tests
+require 'rubygems'
+require 'bundler/setup'
+#require 'rspec/core/rake_task'
+
+# Immediately sync all stdout so that tools like buildbot can
+# immediately load in the output.
+$stdout.sync = true
+$stderr.sync = true
+
+# Change to the directory of this file.
+Dir.chdir(File.expand_path("../", __FILE__))
+
+# This installs the tasks that help with gem creation and
+# publishing.
+Bundler::GemHelper.install_tasks
+
+# Install the `spec` task so that we can run tests.
+#RSpec::Core::RakeTask.new
+
+# Default task is to run the unit tests
 #task :default => "spec"

data/bin/setupfirewall.vbs

@@ -1,4 +1,4 @@
-Set UAC = CreateObject("Shell.Application")
-For count = 0 to (WScript.Arguments.Count - 1)
-    UAC.ShellExecute "netsh", Replace(WScript.Arguments(count), "'", Chr(34)), "", "runas", 1
+Set UAC = CreateObject("Shell.Application")
+For count = 0 to (WScript.Arguments.Count - 1)
+    UAC.ShellExecute "netsh", Replace(WScript.Arguments(count), "'", Chr(34)), "", "runas", 1
 Next

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

@@ -0,0 +1,58 @@
+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
+
+          system("#@nfs_start_command .\\#@nfs_path_file")
+          sleep 2
+        end
+
+        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
+        end
+
+        def self.nfs_installed(env)
+          true
+        end
+
+        protected
+
+        def self.nfs_running?
+          system("#@nfs_check_command")
+        end
+
+        def self.nfs_cleanup
+          if nfs_running?
+            system("#@nfs_stop_command")
+          end
+
+          if !nfs_running? && File.exist?(@nfs_path_file)
+            File.delete(@nfs_path_file)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-winnfsd/plugin.rb

@@ -4,8 +4,8 @@ rescue LoadError
   raise "The Vagrant WinNFSd plugin must be run within Vagrant."
 end
 
-if Vagrant::VERSION < "1.4.0"
-  raise "The Vagrant AWS plugin is only compatible with Vagrant 1.4.0+"
+if Vagrant::VERSION < "1.5.0"
+  raise "The Vagrant AWS plugin is only compatible with Vagrant 1.5.0+"
 end
 
 module VagrantPlugins
@@ -29,9 +29,19 @@ module VagrantPlugins
         SyncedFolder
       end
 
-      host("windows") do
-        require_relative "host"
-        Host
+      host_capability("windows", "nfs_export") do
+        require_relative "cap/nfs"
+        Cap::NFS
+      end
+
+      host_capability("windows", "nfs_installed") do
+        require_relative "cap/nfs"
+        Cap::NFS
+      end
+
+      host_capability("windows", "nfs_prune") do
+        require_relative "cap/nfs"
+        Cap::NFS
       end
 
       def self.init_plugin
@@ -43,8 +53,8 @@ module VagrantPlugins
         rule_exist = "netsh advfirewall firewall show rule name=\"%s\">nul"
 
         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"
+          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)
 
@@ -53,8 +63,8 @@ module VagrantPlugins
 
           unless system(firewall_rule)
             puts I18n.t("vagrant_winnfsd.firewall.error")
-            puts "#{in_rule}\n"
-            puts "#{out_rule}\n"
+            puts "netsh #{in_rule}\n"
+            puts "netsh #{out_rule}\n"
           end
         end
       end

data/lib/vagrant-winnfsd/synced_folder.rb

@@ -1,48 +1,80 @@
-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]
-
-        machine_ip = nfsopts[:nfs_machine_ip]
-        machine_ip = [machine_ip] if !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) }
-
-        # Export the folders
-        machine.ui.info I18n.t("vagrant.actions.vm.nfs.exporting")
-        machine.env.host.nfs_export(machine.id, machine_ip, folders)
-
-        # 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"
-
-              opts[:mount_options] = mount_opts
-            end
-
-            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
+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]
+
+        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
+        end
+
+        machine_ip = nfsopts[:nfs_machine_ip]
+        machine_ip = [machine_ip] if !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) }
+
+        # 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
+          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"
+
+              opts[:mount_options] = mount_opts
+            end
+
+            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,5 @@
 module VagrantPlugins
   module VagrantWinNFSd
-    VERSION = '1.0.5'
+    VERSION = '1.0.6'
   end
 end

metadata

@@ -1,19 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-winnfsd
 version: !ruby/object:Gem::Version
-  version: 1.0.5
-  prerelease: 
+  version: 1.0.6
 platform: ruby
 authors:
 - Alexander Schneider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies: []
-description: ! '    Manage and adds support for NFS on windows.
-
-'
+description: |2
+      Manage and adds support for NFS on windows.
 email: alexander.schneider@jankowfsky.com
 executables: []
 extensions: []
@@ -24,8 +22,8 @@ files:
 - bin/winnfsd.exe
 - CHANGELOG
 - Gemfile
+- lib/vagrant-winnfsd/cap/nfs.rb
 - lib/vagrant-winnfsd/config.rb
-- lib/vagrant-winnfsd/host.rb
 - lib/vagrant-winnfsd/plugin.rb
 - lib/vagrant-winnfsd/synced_folder.rb
 - lib/vagrant-winnfsd/version.rb
@@ -40,32 +38,25 @@ files:
 homepage: https://github.com/gm-alex/vagrant-winnfsd
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -598002623
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -598002623
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.28
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Adds NFS support for Windows
 test_files: []

data/lib/vagrant-winnfsd/host.rb

@@ -1,65 +0,0 @@
-require Vagrant.source_root.join("plugins/hosts/windows/host")
-
-module VagrantPlugins
-  module VagrantWinNFSd
-    class Host < Vagrant.plugin("2", :host)
-      def self.match?
-        Vagrant::Util::Platform.windows?
-      end
-
-      def initialize(*args)
-        super
-
-        @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"
-      end
-
-      # Windows does not support NFS
-      def nfs?
-        true
-      end
-
-      def nfs_export(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
-
-        system("#@nfs_start_command .\\#@nfs_path_file")
-        sleep 2
-      end
-
-      def nfs_prune(valid_ids)
-        @ui.info I18n.t("vagrant_winnfsd.hosts.windows.nfs_prune")
-        @logger.info("Pruning invalid NFS entries...")
-        nfs_cleanup()
-      end
-
-      protected
-
-      def nfs_running?
-        system("#@nfs_check_command")
-      end
-
-      def nfs_cleanup()
-        if nfs_running?
-          system("#@nfs_stop_command")
-        end
-
-        if !nfs_running? && File.exist?(@nfs_path_file)
-          File.delete(@nfs_path_file)
-        end
-      end
-    end
-  end
-end