vagrant-nfs4j 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b0558819c167f813246adebc01045532d038d7cbff96d9d98003628032cc10e
-  data.tar.gz: 8fb79f415a8af80fb941825687c649bf324ede35c56ba8faa9aa7f59d7062b69
+  metadata.gz: b4296f3bbb1d4aa3a2e8c76913e7bdf3fa2af6a33ba0c669f313ce9a5960bebe
+  data.tar.gz: 62aab3a846663ed13f5e41fb56f3bbf33148025ddd4e72b55447403188587ad5
 SHA512:
-  metadata.gz: f44e09f8fabc2630fa9c03878388bf9082671d37841d534fabec67b6eb0849fbefe8251365cf86e36b7de0b5061e573003695622c16f190d5762f5c4db051549
-  data.tar.gz: 9068d4a71bd8d115e21cab38872375358b7cbdbb3c9c59d4e9593a333a750a8b920f95c916190cf5cc1e993303bcea3826648e62c65565a50773a125f7a5f18b
+  metadata.gz: 2a4713b8db011857a9270d86008a514c5f37138734d08ce7032298d1443e3e17e9b3d1ffd85d85f93db28af22b3e3e6f26d15b1ffb0bc223c85ba589c26d674a
+  data.tar.gz: 8dccc782e3537d7e606fbc269e5d43aae5fa70ceeba7d15265201007a1dc623af6cb097f419c5cc9ea81f9e2b95a04af7e3121d4e637a72e35d19bdd5acf1ed3

data/Gemfile.lock

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

data/README.md

@@ -1,7 +1,35 @@
 # vagrant-nfs4j
 
+[![](https://img.shields.io/gem/v/vagrant-nfs4j.svg)](https://rubygems.org/gems/vagrant-nfs4j)
+
 A Vagrant plugin that brings support of 
 [Vagrant NFS Synced Folders](https://www.vagrantup.com/docs/synced-folders/nfs.html) to Windows hosts with 
 [nfs4j-daemon](https://github.com/gfi-centre-ouest/nfs4j-daemon) under the hood.
 
 This project is heavily inspired by [vagrant-winnfsd](https://github.com/winnfsd/vagrant-winnfsd).
+
+## Quickstart
+
+- Install the plugin
+```
+vagrant plugin install vagrant-nfs4j
+```
+
+- Configure nfs synced folders in `Vagrantfile`
+
+```ruby
+Vagrant.configure('2') do |config|
+  config.vm.box = 'ubuntu/xenial64'
+
+  config.vm.synced_folder 'C:\Users\Toilal', # Host Path 
+                          '/user', # VM Path
+                          id: 'user',
+                          type: 'nfs',
+                          mount_options: %w(uid=1000 gid=1000)
+end
+```
+
+## Configuration
+
+See [lib/vagrant-nfs4j/config/nfs4j.rb](https://github.com/gfi-centre-ouest/vagrant-nfs4j/blob/master/lib/vagrant-nfs4j/config/nfs4j.rb)
+for options available in `config.nfs4j` object of `Vagrantfile`.

data/config.yaml

@@ -1,8 +1,8 @@
 ip_address: 192.168.1.100
 synced_folders:
   user:
-    source: 'C:\Users\Toilal' # absolute or relative path from Vagrantfile
-    target: '/user' # absolute or relative path from home of VM
+    source: 'D:\Users\FRUP67305' # absolute or relative path from Vagrantfile
+    target: '/D/Users/FRUP67305' # absolute or relative path from home of VM
   project:
-    source: 'D:\' # absolute or relative path from Vagrantfile
-    target: '/hdd' # absolute or relative path from home of VM
+    source: 'C:\' # absolute or relative path from Vagrantfile
+    target: '/C' # absolute or relative path from home of VM

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

@@ -27,6 +27,7 @@ module VagrantNfs4j
                       config.daemon_start,
                       config.daemon_exe,
                       config.daemon_jar,
+                      config.daemon_cmd,
                       config.daemon_opts,
                       config.java_home,
                       config.java_opts)

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

@@ -1,4 +1,6 @@
 require 'vagrant'
+require_relative '../nfs4j_daemon/wrapper'
+require 'open3'
 
 module VagrantNfs4j
   module Config
@@ -6,10 +8,12 @@ module VagrantNfs4j
       attr_accessor :shares_config
       attr_accessor :host_ip
       attr_accessor :api_port
+      attr_accessor :api_bearer
       attr_accessor :setup_firewall
       attr_accessor :daemon_start
       attr_accessor :daemon_exe
       attr_accessor :daemon_jar
+      attr_accessor :daemon_cmd
       attr_accessor :daemon_opts
       attr_accessor :java_home
       attr_accessor :java_opts
@@ -18,10 +22,12 @@ module VagrantNfs4j
         @shares_config = UNSET_VALUE
         @host_ip = UNSET_VALUE
         @api_port = UNSET_VALUE
+        @api_bearer = UNSET_VALUE
         @setup_firewall = UNSET_VALUE
         @daemon_start = UNSET_VALUE
         @daemon_exe = UNSET_VALUE
         @daemon_jar = UNSET_VALUE
+        @daemon_cmd = UNSET_VALUE
         @daemon_opts = UNSET_VALUE
         @java_home = UNSET_VALUE
         @java_opts = UNSET_VALUE
@@ -29,9 +35,31 @@ module VagrantNfs4j
 
       def validate(machine)
         errors = []
-        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?
+
+        config = machine.config.nfs4j
+
+        errors << 'nfs4j.shares_config cannot be nil.' if config.shares_config.nil?
+        errors << 'nfs4j.host_ip cannot be nil.' if config.host_ip.nil?
+        errors << 'nfs4j.api_port cannot be nil.' if config.api_port.nil?
+
+        java_required = false
+        if config.daemon_start
+          begin
+            stdout, stderr, status = Open3.capture3("#{config.daemon_cmd} -h")
+            if status.to_i != 0
+              java_required = true
+              errors << "nfs4j-daemon cannot be executed (#{config.daemon_cmd}) [#{status}]. check nfs4j.daemon_* and nfs4j.java_* options."
+            elsif not stdout.include?('[<shares>...]')
+              java_required = true
+              errors << "nfs4j-daemon cannot be executed (#{config.daemon_cmd}) [doesn't looks like nfs4j-daemon]. check nfs4j.daemon_* and nfs4j.java_* options."
+            end
+          rescue StandardError => err
+            java_required = true
+            errors << "nfs4j-daemon cannot be executed (#{config.daemon_cmd}): #{err.message}. check nfs4j.daemon_* and nfs4j.java_* options."
+          end
+        end
+
+        errors << "nfs4j-daemon requires Java >= 8. Make sure you actually have a JRE/JDK installed and JAVA_HOME environment variable or nfs4j.java_home option is set to JRE/JDK installation directory." if java_required
 
         {"nsf4j" => errors}
       end
@@ -40,14 +68,19 @@ module VagrantNfs4j
         @shares_config = {} if @shares_config == UNSET_VALUE
         @host_ip = "" if @host_ip == UNSET_VALUE
         @api_port = 9732 if @api_port == UNSET_VALUE
+        @api_bearer = nil if @api_bearer == 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 = false if @daemon_jar == UNSET_VALUE
+        @daemon_cmd = nil if @daemon_cmd == UNSET_VALUE
         @daemon_opts = nil if @daemon_opts == UNSET_VALUE
         @java_home = ENV['JAVA_HOME'] if @java_home == UNSET_VALUE
         @java_opts = ENV['JAVA_OPTS'] if @java_opts == UNSET_VALUE
 
+        ENV['JAVA_HOME'] = @java_home if @java_home
+        ENV['JAVA_OPTS'] = @java_opts if @java_opts
+
         if @daemon_jar
           @daemon_exe = false
         end
@@ -56,8 +89,15 @@ module VagrantNfs4j
           @daemon_jar = false
         end
 
-        ENV['JAVA_HOME'] = @java_home if @java_home
-        ENV['JAVA_OPTS'] = @java_opts if @java_opts
+        if @daemon_cmd
+          @daemon_exe = false
+          @daemon_jar = false
+        else
+          @daemon_cmd = VagrantNfs4j::Nfs4jDaemon::Wrapper.new(
+              config.api_port,
+              config.api_bearer
+          ).get_cmd_base(@daemon_exe, @daemon_jar, @java_home, @java_opts)
+        end
       end
     end
   end

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

@@ -3,6 +3,7 @@ require 'json'
 require 'fileutils'
 
 require_relative 'errors'
+require_relative '../utils'
 
 module VagrantNfs4j
   module Nfs4jDaemon
@@ -114,7 +115,33 @@ module VagrantNfs4j
         false
       end
 
-      def start(ui, start, exe, jar, opts, java_home, java_opts)
+      def get_cmd_base(exe, jar, java_home, java_opts)
+        cmd_base = if exe
+                     "\"#{exe.is_a?(String) ? VagrantNfs4j::Utils.which(exe) : @exe}\""
+                   else
+                     java_exe = if java_home
+                                  additional_path = File.join(java_home, 'bin')
+                                  "\"#{VagrantNfs4j::Utils.which("java", additional_path)}\""
+                                else
+                                  "\"#{VagrantNfs4j::Utils.which("java")}\""
+                                end
+                     jar.is_a?(String) ? "#{java_exe} -jar #{jar}" : "#{java_exe} -jar #{@jar}"
+                   end
+
+        unless exe
+          if not java_opts
+            java_opts = ""
+          else
+            java_opts = " #{java_opts}"
+          end
+
+          cmd_base = "#{cmd_base}#{java_opts}"
+        end
+
+        cmd_base
+      end
+
+      def start(ui, start, exe, jar, cmd, opts, java_home, java_opts)
         unless start
           unless self.is_running()
             raise Nfs4jUnavailable.new({api_port: @api_port})
@@ -126,27 +153,10 @@ module VagrantNfs4j
           return false
         end
 
-        bin = if exe
-                exe.is_a?(String) ? exe : @exe
-              else
-                java_exe = if java_home
-                             additional_path = File.join(java_home, 'bin')
-                             VagrantNfs4j::Utils.which("java", additional_path)
-                           else
-                             VagrantNfs4j::Utils.which("java")
-                           end
-
-                jar.is_a?(String) ? "#{java_exe} -jar #{jar}" : "#{java_exe} -jar #{@jar}"
-              end
-
-        unless exe
-          if not java_opts
-            java_opts = " "
-          else
-            java_opts = " #{java_opts}"
-          end
-
-          bin = "#{bin}#{java_opts}"
+        if cmd
+          cmd_base = cmd
+        else
+          cmd_base = self.get_cmd_base(exe, jar, java_home, java_opts)
         end
 
         if opts
@@ -161,7 +171,7 @@ module VagrantNfs4j
         opts = " --api-port=#{@api_port}#{opts}"
         opts = " --no-share#{opts}"
 
-        cmd = "start \"vagrant-nfs4j-daemon\" #{bin}#{opts}"
+        cmd = "start \"vagrant-nfs4j-daemon\" #{cmd_base}#{opts}"
         ui.detail(I18n.t('vagrant_nfs4j.nfs4j_daemon.is_starting', cmd: cmd))
 
         pid = spawn(cmd)

data/lib/vagrant-nfs4j/utils.rb

@@ -70,7 +70,7 @@ module VagrantNfs4j
 
     def self.which(cmd, more_paths = [])
       exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-      exts = exts.map {|e| e.downcase }
+      exts = exts.map {|e| e.downcase}
 
       path = [more_paths, *ENV['PATH'].split(File::PATH_SEPARATOR)].flatten.map {|path| path.gsub(/\\/, '/')}
       path.each do |path|
@@ -79,7 +79,8 @@ module VagrantNfs4j
           return exe if File.executable?(exe) && !File.directory?(exe)
         end
       end
-      return nil
+
+      return cmd
     end
   end
 end

data/lib/vagrant-nfs4j/version.rb

@@ -1,3 +1,3 @@
 module VagrantNfs4j
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-nfs4j
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Rémi Alvergnat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler