vagrant-nfs4j 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59bfc63b02ebc35bf5f00eb59c7497dd8f1a9cf8cc4f2a7250190338ad9bfe12
-  data.tar.gz: c1926e38a3429c48bffc5f3c3c93d1a59f61bb19f5ea9f843e2165173170f0f3
+  metadata.gz: f0a9b39c373275cbb8f6a5ae4a42e9af0cd2e36708a1ae950d953983bfc93cf7
+  data.tar.gz: e12a47e43796bb011fd393de9ff0b1d1ee818737e373ef785799f57644a840ab
 SHA512:
-  metadata.gz: 14d2fa26cc78896e1b94911a6305841baaea143516af50e95225e30e4cc89102318b609fc4bd0ae8b9f2edd27fa8698cf8c89f0790514d2baab7f10073500c92
-  data.tar.gz: ad6a51e7805386c649b74f69a9c871792bdf68656f8df8c05e277420e3c4c93b4019bdc93f9caf02ea252a577b6db006d78ee7d4c8c96e0b297edd85d9490c92
+  metadata.gz: 170fcee451dfbc574d9492ca0a57c2d30e5e66ceed094705c96ab689d22a8f3fc6d589aac3689054b1bf07e4fee634b9b02680a716b28b6f141c6f0e50ebfa1e
+  data.tar.gz: 67bcb391cfb2cc49f1ea97a553755aac13b5972015769ce50a5013032f3eaf5c1ff9c6b4d9b584b835d7dc4f73eec9858de227a1977c77649369adcb91c3f6f7

data/Gemfile.lock

@@ -27,7 +27,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-nfs4j (0.1.0)
+    vagrant-nfs4j (0.1.1)
 
 GEM
   remote: https://rubygems.org/

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

@@ -21,7 +21,7 @@ module VagrantNfs4j
           end
         end
 
-        wrapper.setup_firewall(machine.ui, config.java_home)
+        wrapper.setup_firewall(machine.ui, config.setup_firewall, config.java_home)
 
         wrapper.start(machine.ui,
                       config.daemon_start,

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

@@ -7,6 +7,7 @@ module VagrantNfs4j
       attr_accessor :shares_config
       attr_accessor :host_ip
       attr_accessor :api_port
+      attr_accessor :setup_firewall
       attr_accessor :daemon_start
       attr_accessor :daemon_exe
       attr_accessor :daemon_jar
@@ -19,6 +20,7 @@ module VagrantNfs4j
         @shares_config = UNSET_VALUE
         @host_ip = UNSET_VALUE
         @api_port = UNSET_VALUE
+        @setup_firewall = UNSET_VALUE
         @daemon_start = UNSET_VALUE
         @daemon_exe = UNSET_VALUE
         @daemon_jar = UNSET_VALUE
@@ -33,9 +35,6 @@ module VagrantNfs4j
         errors << 'nfs4j.shares_config cannot be nil.' if machine.config.nfs4j.shares_config.nil?
         errors << 'nfs4j.host_ip cannot be nil.' if machine.config.nfs4j.host_ip.nil?
         errors << 'nfs4j.api_port cannot be nil.' if machine.config.nfs4j.api_port.nil?
-        errors << 'nfs4j.daemon_start cannot be nil.' if machine.config.nfs4j.daemon_start.nil?
-        errors << 'nfs4j.daemon_exe cannot be nil.' if machine.config.nfs4j.daemon_exe.nil?
-        errors << 'nfs4j.daemon_jar cannot be nil.' if machine.config.nfs4j.daemon_jar.nil?
 
         {"nsf4j" => errors}
       end
@@ -45,6 +44,7 @@ module VagrantNfs4j
         @shares_config = {} if @shares_config == UNSET_VALUE
         @host_ip = "" if @host_ip == UNSET_VALUE
         @api_port = 9732 if @api_port == UNSET_VALUE
+        @setup_firewall = true if @setup_firewall == UNSET_VALUE
         @daemon_start = true if @daemon_start == UNSET_VALUE
         @daemon_exe = true if @daemon_exe == UNSET_VALUE
         @daemon_jar = true if @daemon_jar == UNSET_VALUE

data/lib/vagrant-nfs4j/nfs4j_daemon/errors.rb

@@ -57,6 +57,10 @@ module VagrantNfs4j
       error_key(:unavailable)
     end
 
+    class TimeoutError < Nfs4jDaemonErrors
+      error_key(:timeout_error)
+    end
+
     class StartFailed < Nfs4jDaemonErrors
       error_key(:start_failed)
     end

data/lib/vagrant-nfs4j/nfs4j_daemon/wrapper.rb

@@ -32,7 +32,7 @@ module VagrantNfs4j
         end
       end
 
-      def setup_firewall(ui, java_home)
+      def setup_firewall(ui, setup_firewall, java_home)
         java_exe = if java_home
                      additional_path = File.join(java_home, 'bin')
                      VagrantNfs4j::Utils.which("java", additional_path)
@@ -42,13 +42,15 @@ module VagrantNfs4j
 
         java_exe = java_exe.gsub('/', '\\')
 
-        rule_name = "vagrant-nfs4j-#{VagrantNfs4j::VERSION}-#{java_exe}-tcp-2049".gsub('\\', '-').gsub(':', '')
+        ports = [2049, @api_port]
+
+        rule_name = "vagrant-nfs4j-#{VagrantNfs4j::VERSION}-#{java_exe}-tcp-#{ports.join(',')}".gsub('\\', '-').gsub(':', '')
         rule_exist = "netsh advfirewall firewall show rule name=\"#{rule_name}\">nul"
 
         unless system(sprintf(rule_exist, rule_name))
-          ui.detail(I18n.t('vagrant_nfs4j.nfs4j_daemon.installing_firewall_rule', rule_name: rule_name))
 
-          rule_template = "advfirewall firewall add rule name=\"%s\" dir=\"%s\" action=allow protocol=TCP localport=2049 program=\"%s\" profile=any"
+
+          rule_template = "advfirewall firewall add rule name=\"%s\" dir=\"%s\" action=allow protocol=TCP localport=#{ports.join(',')} program=\"%s\" profile=any"
 
           all_rules = []
           all_rules.push("advfirewall firewall delete rule name=\"#{rule_name}\"")
@@ -62,29 +64,44 @@ module VagrantNfs4j
             firewall_rule += " \" #{rule}\""
           end
 
-          if system(firewall_rule) and system(sprintf(rule_exist, rule_name))
-            ui.detail(I18n.t('vagrant_nfs4j.nfs4j_daemon.firewall_rule_installed', rule_name: rule_name))
+          if setup_firewall
+            ui.detail(I18n.t('vagrant_nfs4j.nfs4j_daemon.installing_firewall_rule', rule_name: rule_name))
+
+            if system(firewall_rule) and system(sprintf(rule_exist, rule_name))
+              ui.detail(I18n.t('vagrant_nfs4j.nfs4j_daemon.firewall_rule_installed', rule_name: rule_name))
+            else
+              ui.detail(I18n.t('vagrant_nfs4j.nfs4j_daemon.firewall_error'))
+              all_rules.each do |rule|
+                puts "netsh #{rule}"
+              end
+            end
           else
-            ui.detail(I18n.t('vagrant_nfs4j.firewall.error'))
+            ui.detail(I18n.t('vagrant_nfs4j.nfs4j_daemon.firewall_manual'))
             all_rules.each do |rule|
-              ui.detail("netsh #{rule}")
+              puts "netsh #{rule}"
             end
           end
         end
       end
 
-      def is_running(should_raise_start_failed = false)
+      def is_running(should_raise_start_failed = false, ui = nil)
         unless @api_port
           return false
         end
         begin
-          r = RestClient.get "http://localhost:#{@api_port}/ping", {accept: :json}.merge(self.headers())
+          r = RestClient::Request.execute method: :get, url: "http://localhost:#{@api_port}/ping", headers: {accept: :json}.merge(self.headers()), timeout: 5
           data = JSON.parse(r.body)
           return data === 'pong'
         rescue
           if should_raise_start_failed
             raise StartFailed
           end
+          if ui
+            if $!.is_a?(RestClient::Exceptions::Timeout)
+              raise TimeoutError
+            end
+          end
+          ui.detail(I18n.t('vagrant_nfs4j.nfs4j_daemon.check_has_failed_retrying', {:cause => Nfs4jDaemonErrors.get_message($!)})) if ui
         end
         false
       end
@@ -141,11 +158,12 @@ module VagrantNfs4j
         cmd = "start \"vagrant-nfs4j-daemon\" #{bin}#{opts}"
         ui.detail(I18n.t('vagrant_nfs4j.nfs4j_daemon.is_starting', cmd: cmd))
 
-        pid = spawn(cmd)
-        Process.detach(pid)
+        #pid = spawn(cmd)
+        #Process.detach(pid)
 
         i = 0
-        until self.is_running(i > 30)
+        check_start_time = Time.now
+        until self.is_running(Time.now - check_start_time > 30, ui)
           sleep 1
           i += 1
         end

data/lib/vagrant-nfs4j/version.rb

@@ -1,3 +1,3 @@
 module VagrantNfs4j
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/locales/en.yml

@@ -15,16 +15,28 @@ en:
           NFS share detach has failed. (%{cause})
         status_failed: |-
           NFS share status can't be retrieved. (%{cause})
+        timeout_error: |-
+          nfs4j-daemon might be started, but the vagrant process (ruby.exe) is not able to access to its HTTP Endpoint 
+          throw the network (timeout). You should check your network and firewall configuration to allow this 
+          connection to be done. (%{cause})
       is_already_running: |-
         nfs4j-daemon is running and ready to serve.
       is_starting: |-
         nfs4j-daemon is going to start with the following command (%{cmd})
+      check_has_failed_retrying: |-
+        Waiting for nfs4j-daemon to be started. Retrying check ... (%{cause})
       has_been_started: |-
         nfs4j-daemon has been started and is ready to serve.
       installing_firewall_rule: |-
-        Installing windows firewall rule %{rule_name}.
+        Installing Windows firewall rule %{rule_name}.
       firewall_rule_installed: |-
         Windows firewall rule %{rule_name} has been installed.
+      firewall_error: |-
+        It seems that you don't have the privileges to change the Windows firewall rules. NFS may not work without 
+        custom firewall rules. Execute the following commands as administrator:
+      firewall_manual: |-
+        Setup of the Windows firewall is dsabled. NFS may not work without custom firewall rules. 
+        Execute the following commands as administrator:
     cap:
       nfs_export:
         attaching_share: |-
@@ -34,7 +46,3 @@ en:
       nfs_prune:
         pruning_share: |-
           Pruning orphan NFS share from nfs4j-daemon: %{path} => %{alias}
-    firewall:
-      error: |-
-        It seems that you don't have the privileges to change the firewall rules. NFS will not work without that firewall
-        changes. Execute the following commands via cmd as administrator:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-nfs4j
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Rémi Alvergnat