vagrant-notify-forwarder 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0de481fac4a7e43796671364c899c5dacaf63c68
-  data.tar.gz: 62ee6182f5f9c1eb47f02e283688d8f8d3720426
+  metadata.gz: c3f0078e68ff06061fdaa7747628a44f7f258537
+  data.tar.gz: dd2d4b0d4a5ba9964dbe05dbfd12c9f9cb02e881
 SHA512:
-  metadata.gz: 5939a4088a66cb58af7add7b435443f9ed86eb7b83ba2ecb225c2f1bc6783c46bb388cb6c43fcf685ec2864e7b12116404710dad153adcdcb01526f89437666d
-  data.tar.gz: e8d9340c781a795d9f482c27687beb43b5068bafc9407ce08b2f6668bf8d4a47835a81a818e9b161d72cef6e7eee310323a166add8c62342bc51645adb87e25f
+  metadata.gz: fe9af0569a977ee0a226e550328f9d5a7421fc84bf28601741781d7a3ffcbeee2de724120db2f699d751de947b7ee2dc901e34d68bf00fd27455ccb9b5b6e78e
+  data.tar.gz: b5ece858b8e0b9ca63070d029cea65e12902af4468c12748790d7e68db8cbae4a1ce114a7ebeb752bdf3c315c7bedf7cf1e4234fbdbc8f08f75e67441582246f

data/README.md

@@ -24,6 +24,15 @@ config.notify_forwarder.port = 22020 # Or your port number
 The server and guest binaries will be automatically downloaded from the notify-forwarder repo's
 releases and verified with SHA256.
 
+### Permissions
+
+The client in the guest OS will run as root by default, assuming passwordless `sudo` works. If this
+does *not* work, you can disable privilege escalation in your `Vagrantfile`:
+
+```ruby
+config.notify_forwarder.run_as_root = false
+```
+
 ## Supported operating systems
 
 To conserve size and dependencies, the plugin downloads binaries for supported platforms. This
@@ -44,3 +53,4 @@ config.notify_forwarder.enable = false
 
 * [CharlieC3](https://github.com/CharlieC3)
 * [hedinfaok](https://github.com/hedinfaok)
+* [seff](https://github.com/seff)

data/lib/vagrant-notify-forwarder/action/check_boot_state.rb

@@ -0,0 +1,18 @@
+module VagrantPlugins
+  module VagrantNotifyForwarder
+    module Action
+      class CheckBootState
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          return unless env[:machine].config.notify_forwarder.enable
+          $BOOT_SAVED = env[:machine].state.id == :saved
+
+          @app.call env
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-notify-forwarder/action/start_client_forwarder.rb

@@ -31,6 +31,8 @@ module VagrantPlugins
         def call(env)
           @app.call env
 
+          return if $BOOT_SAVED
+
           return unless env[:machine].config.notify_forwarder.enable
 
           path = ensure_binary_downloaded env
@@ -38,12 +40,18 @@ module VagrantPlugins
 
           port = env[:machine].config.notify_forwarder.port
 
+          start_command = "nohup /tmp/notify-forwarder receive -p #{port} &"
+
+          if env[:machine].config.notify_forwarder.run_as_root
+            start_command = "sudo #{start_command}"
+          end
+
           env[:machine].communicate.upload(path, "/tmp/notify-forwarder")
           env[:ui].output("Starting notify-forwarder ...")
-          env[:machine].communicate.execute("nohup /tmp/notify-forwarder receive -p #{port} &")
+          env[:machine].communicate.execute(start_command)
           env[:ui].detail("Notify-forwarder: guest listening for file change notifications on 0.0.0.0:#{port}.")
         end
       end
     end
   end
-end
+end

data/lib/vagrant-notify-forwarder/config.rb

@@ -3,16 +3,19 @@ module VagrantPlugins
     class Config < Vagrant.plugin(2, :config)
       attr_accessor :port
       attr_accessor :enable
+      attr_accessor :run_as_root
 
       def initialize
         @port = UNSET_VALUE
         @enable = UNSET_VALUE
+        @run_as_root = UNSET_VALUE
       end
 
       def finalize!
         @port = 29324 if @port == UNSET_VALUE
         @enable = true if @enable == UNSET_VALUE
+        @run_as_root = true if @run_as_root == UNSET_VALUE
       end
     end
   end
-end
+end

data/lib/vagrant-notify-forwarder/plugin.rb

@@ -1,5 +1,7 @@
 require 'vagrant'
 
+$BOOT_SAVED = false
+
 module VagrantPlugins
   module VagrantNotifyForwarder
     class Plugin < Vagrant.plugin('2')
@@ -8,15 +10,32 @@ module VagrantPlugins
 
       register_boot_hooks = lambda do |hook|
         require_relative 'action/start_host_forwarder'
-        require_relative 'action/stop_host_forwarder'
+        # require_relative 'action/stop_host_forwarder'
         require_relative 'action/start_client_forwarder'
+        require_relative 'action/check_boot_state'
 
+        hook.before VagrantPlugins::ProviderVirtualBox::Action::Resume,
+                    VagrantPlugins::VagrantNotifyForwarder::Action::CheckBootState
         hook.after Vagrant::Action::Builtin::Provision,
                    VagrantPlugins::VagrantNotifyForwarder::Action::StartHostForwarder
         hook.after VagrantPlugins::VagrantNotifyForwarder::Action::StartHostForwarder,
                    VagrantPlugins::VagrantNotifyForwarder::Action::StartClientForwarder
       end
 
+      register_suspend_hooks = lambda do |hook|
+        require_relative 'action/stop_host_forwarder'
+
+        hook.before VagrantPlugins::ProviderVirtualBox::Action::Suspend,
+                    VagrantPlugins::VagrantNotifyForwarder::Action::StopHostForwarder
+      end
+
+      register_resume_hooks = lambda do |hook|
+        require_relative 'action/start_host_forwarder'
+
+        hook.after VagrantPlugins::ProviderVirtualBox::Action::Provision,
+                    VagrantPlugins::VagrantNotifyForwarder::Action::StartHostForwarder
+      end
+
       register_halt_hooks = lambda do |hook|
         require_relative 'action/stop_host_forwarder'
 
@@ -39,6 +58,9 @@ module VagrantPlugins
       action_hook :start_notify_forwarder, :machine_action_up, &register_boot_hooks
       action_hook :start_notify_forwarder, :machine_action_reload, &register_boot_hooks
 
+      action_hook :stop_notify_forwarder, :machine_action_suspend, &register_suspend_hooks
+      action_hook :stop_notify_forwarder, :machine_action_resume, &register_resume_hooks
+
       action_hook :stop_notify_forwarder, :machine_action_halt, &register_halt_hooks
       action_hook :stop_notify_forwarder, :machine_action_reload, &register_halt_hooks
 
@@ -46,4 +68,4 @@ module VagrantPlugins
 
     end
   end
-end
+end

data/lib/vagrant-notify-forwarder/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VagrantNotifyForwarder
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-notify-forwarder
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Magnus Hallin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-09-18 00:00:00.000000000 Z
 dependencies: []
 description: A vagrant plugin that forwards file system events from the host to the
   guest
@@ -18,12 +18,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/vagrant-notify-forwarder.rb
+- lib/vagrant-notify-forwarder/action/check_boot_state.rb
 - lib/vagrant-notify-forwarder/action/start_client_forwarder.rb
 - lib/vagrant-notify-forwarder/action/start_host_forwarder.rb
 - lib/vagrant-notify-forwarder/action/stop_host_forwarder.rb
@@ -42,17 +43,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A vagrant plugin that forwards file system events from the host to the guest