vagrant-notify 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ada78d8b90c45702484b19524bd6dcaa04c34de2
-  data.tar.gz: 506699d1e51e71f78b7e1ee673434d2220099bd4
+  metadata.gz: f220061039ad0bc6f804c6561f05ae7c8bed22c1
+  data.tar.gz: 5d602de0a1ad6a73f2de0276971c3851cd98661e
 SHA512:
-  metadata.gz: f04ded61ee31fafbae3051584f777e040caffecc3b5d3743f27b7f67c54f57af5b6e776d891b8661fd5245a009dedaeea855fdd93be5a1bbf5572a566d262a9a
-  data.tar.gz: 63e64ff01e18fa9b26e904759d19aa2f8551872d9f18d8b1c1350b349a2ffb0e73d533976f99760c3e39da04f80eead0d5f062b16dfa97b9de7f045f0dc652ad
+  metadata.gz: eefc2a70255f14d573238f69e78d097e143e4b401653255cf2e0ae1f848f4b0ae8df6e265deb82fbe1c083819d54f55b4be271aa91aa8dcaeeae91a9fd2d488e
+  data.tar.gz: 211c6257ee813b170a21ab18a05c5bcf0505e331dc8cac93041923036dac5f338b8124bd7e220af0e9d4b114e783f826e039b6bad4b73b691b4e3566dfcf5f3f

data/CHANGELOG.md

@@ -1,7 +1,22 @@
+## [0.5.3](https://github.com/fgrehm/vagrant-notify/compare/v0.5.2...v0.5.3) (November 18, 2016)
+IMPROVEMENTS
+
+  - Command line operations work on multi-VM configurations.
+  - Notification when provisioning fails. [[GH-23]](https://github.com/fgrehm/vagrant-notify/issues/23)
+  - Do not start notification server if the guest is not running or has not been created.
+  - New Windows 10 notify-send notification center PowerShell script.
+
+BUG FIXES
+
+  - Correctly identify guest shared folder capability. [[GH-31]](https://github.com/fgrehm/vagrant-notify/issues/31)
+  - Properly manually restart notification server.
+  - Don't send notify-send notices to host when doing a provision if plugin is disabled.
+
+
 ## [0.5.2](https://github.com/fgrehm/vagrant-notify/compare/v0.5.1...v0.5.2) (October 7, 2016)
 IMPROVEMENTS
 
-  - Support for docker, lxc, parrallels, and vmware fusion providers. [[GH-13]](https://github.com/fgrehm/vagrant-notify/issues/13)
+  - Support for docker, lxc, parallels, and vmware fusion providers. [[GH-13]](https://github.com/fgrehm/vagrant-notify/issues/13)
   - More reliable notification server status notices.
   - New `bind_ip` configuration option.
 

data/README.md

@@ -42,41 +42,33 @@ Since Linux distributions have `notify-send` pre-installed, everything should wo
 
 ### OS X
 
-You will need to create a `notify-send` script, available on `$PATH`. The script can forward the message to either
-[Growl](http://growl.info/) with [GrowlNotify](http://growl.info/downloads) (version 1.2.2 is free but unreliable)
-or to the [Notification Center](http://support.apple.com/kb/HT5362) available on OS X 10.8+
-using f.ex. [terminal-notifier](https://github.com/alloy/terminal-notifier).
-
-A (too) primitive script integrating with Growl:
-
-```bash
-#!/bin/bash
-growlnotify -t "Vagrant VM" -m "$*"
-```
-
 Check out our OS X notify-send compatible [scripts](https://github.com/fgrehm/vagrant-notify/tree/master/examples#os-x).
 
 ### Windows (beta)
 
-You can use the freeware application [notify-send for Windows](http://vaskovsky.net/notify-send/), make sure the notify-send binary is available on `Path`.
-
 Check out our Windows notify-send compatible [scripts](https://github.com/fgrehm/vagrant-notify/tree/master/examples#windows).
 
 ## Configuration
 
-Notification server is enabled by default on all guests. You can individually disable the plugin by adding the following to your `Vagrantfile`
+Notification server is enabled by default on all guests. You can individually disable the plugin by adding a false boolean to the ***notify.enable*** option in your `Vagrantfile` configuration block
 
 ```ruby
-config.notify.enable = false
+Vagrant.configure(2) do |config|
+  config.vm.box = "ubuntu/trusty64"
+  config.notify.enable = false
+end
 ```
 
 _Please note that as of v0.5.1, the notification server will automatically be disabled for any of the following
 [cloud providers](lib/vagrant-notify/plugin.rb#L77-L79)._
 
-By default, the notification server is binded to [local interfaces](lib/vagrant-notify/plugin.rb#L82-L86). For networking different than your provider's default network configuration, you can use the *bind_ip* configuration option to bind the notification server onto a different local ip address. 
+By default, the notification server is binded to [local interfaces](lib/vagrant-notify/plugin.rb#L82-L86). For networking different than your provider's default network configuration, you can use the ***notify.bind\_ip*** configuration option to bind the notification server onto a different local ip address. 
 
 ```ruby
-config.notify.bind_ip = "192.68.56.20"
+Vagrant.configure(2) do |config|
+  config.vm.box = "ubuntu/trusty64"
+  config.notify.bind_ip = "192.68.56.20"
+end
 ```
 
 **WARNING**

data/examples/README.md

@@ -1,22 +1,46 @@
 # Example notify-send wrapper scripts
 
+You will need to create a `notify-send` script, available on `$PATH`. 
+A (too) primitive script integrating with Growl for OS X:
+
+```bash
+#!/bin/bash
+growlnotify -t "Vagrant VM" -m "$*"
+```
+
+
 ## OS X
 
-* [terminal-notifier](https://github.com/alloy/terminal-notifier) [wrapper script](https://github.com/fgrehm/vagrant-notify/blob/master/examples/osx/notify-send_terminal-notifier) 
-* [growlnotify](http://growl.info/downloads) [wrapper script](https://github.com/fgrehm/vagrant-notify/blob/master/examples/osx/notify-send_growl_for_mac)
+The `notify-send` script can forward the message to either
+[Growl](http://growl.info/) with [GrowlNotify](http://growl.info/downloads) (version 1.2.2 is free but unreliable)
+or to the [Notification Center](http://support.apple.com/kb/HT5362) available on OS X 10.8+
+using f.ex. [terminal-notifier](https://github.com/alloy/terminal-notifier).
+
+
+* [terminal-notifier wrapper script](https://github.com/fgrehm/vagrant-notify/blob/master/examples/osx/terminal-notifier/notify-send.rb)
+* [growlnotify wrapper script](https://github.com/fgrehm/vagrant-notify/blob/master/examples/osx/growl_for_mac/notify-send.rb)
 
 
 ## Windows
 
-**IMPORTANT:** In addition of `notify-send` being in your `path`, the `notify-send` wrapper script has to be binary executable.
-Compiling using ocra:
+You can use the freeware application [notify-send for Windows](http://vaskovsky.net/notify-send/), make sure the notify-send binary is available on `Path`. Or you can create your own notify-send program and compile it to an .exe binary executable.
+
+
+Compile using ocra:
+
+    ocra --output notify-send examples/windows/snarl/notify-send.rb
+
+
+* [Growl for Windows wrapper script](https://github.com/fgrehm/vagrant-notify/blob/master/examples/windows/growl_for_windows/notify-send.rb) (`growlnotify.exe` needs to be is in your `Path`.)
+* [Snarl wrapper script](https://github.com/fgrehm/vagrant-notify/blob/master/examples/windows/snarl/notify-send.rb)
 
-    ocra --output notify-send windows/notify-send_growl_for_snarl
+### Windows 10
 
+You can use our [wrapper script](https://github.com/fgrehm/vagrant-notify/blob/master/examples/windows/notification-center/notify-send.ps1) to send messages to the native Windows 10 notification center.
 
-* [Growl for Windows](http://www.growlforwindows.com/gfw/default.aspx) [wrapper script](https://github.com/fgrehm/vagrant-notify/blob/master/examples/windows/notify-send_growl_for_windows)
+Compile using [PS1toEXE](https://github.com/aravindvcyber/PS1toEXE):
 
-`growlnotify.exe` needs to be is in your `path`. 
+    ps c:> .\PS1toEXE.ps1 -inputfile examples/windows/notification-center/notify-send.ps1 notify-send.exe
 
 
-* [Snarl](http://snarl.fullphat.net/) [wrapper script](https://github.com/fgrehm/vagrant-notify/blob/master/examples/windows/notify-send_snarl)
+* [Notification Center](https://github.com/fgrehm/vagrant-notify/blob/master/examples/windows/notification-center/notify-send.ps1)

data/examples/windows/notification-center/notify-send.ps1

@@ -0,0 +1,93 @@
+
+# Example Windows 10 Notification Center notify-send wrapper PowerShell script. (I apologize if you find this script a bit messy, PowerShell is not my forte)
+
+[Windows.UI.Notifications.ToastNotificationManager, Windows.UI.Notifications, ContentType = WindowsRuntime] > $null
+[Windows.Data.Xml.Dom.XmlDocument, Windows.Data.Xml.Dom.XmlDocument, ContentType = WindowsRuntime] > $null
+[Windows.UI.Notifications.ToastNotification, Windows.UI.Notifications, ContentType = WindowsRuntime] > $null
+
+$arguments = @{};
+$non_opt   = @();
+$title     = "";
+$message   = "";
+$icon      = "";
+$help = "Usage:
+  notify-send [Options][body]
+    -i, --icon ICON
+    --help
+  ";
+
+
+for ( $i = 0; $i -lt $args.count; $i++ ) {
+  switch -regex ($args[ $i ]) {
+  "^\-u="               { $arguments.Add("-u", $args[ $i ]); }          # Option gets ignored
+  "^\-u$"               { $arguments.Add("-u", $args[ $i+1 ]); $i+=1; } # Option gets ignored
+  "^\-\-urgency="       { $arguments.Add("-u", $args[ $i ]); }          # Option gets ignored
+  "^\-\-urgency$"       { $arguments.Add("-u", $args[ $i+1 ]); $i+=1; } # Option gets ignored
+  "^\-t="               { $arguments.Add("-t", $args[ $i ]); }          # Option gets ignored
+  "^\-t$"               { $arguments.Add("-t", $args[ $i+1 ]); $i+=1; } # Option gets ignored
+  "^\-\-expire\-time="  { $arguments.Add("-t", $args[ $i ]); }          # Option gets ignored
+  "^\-\-expire\-time$"  { $arguments.Add("-t", $args[ $i+1 ]); $i+=1; } # Option gets ignored
+  "^\-a="               { $arguments.Add("-a", $args[ $i ]); }          # Option gets ignored
+  "^\-a$"               { $arguments.Add("-a", $args[ $i+1 ]); $i+=1; } # Option gets ignored
+  "^\-\-app\-name="     { $arguments.Add("-a", $args[ $i ]); }          # Option gets ignored
+  "^\-\-app\-name$"     { $arguments.Add("-a", $args[ $i+1 ]); $i+=1; } # Option gets ignored
+  "^\-i=(.*)"           { $args[ $i ] -match '=(.*)'; $arguments.Add("-i", $matches[1]); }
+  "^\-i$"               { $arguments.Add("-i", $args[ $i+1 ]); $i+=1; }
+  "^\-\-icon="          { $args[ $i ] -match '=(.*)'; $arguments.Add("-i", $matches[1]); }
+  "^\-\-icon$"          { $arguments.Add("-i", $args[ $i +1]); $i+=1; }
+  "^\-h="               { $arguments.Add("-h", $args[ $i ]); }          # Option gets ignored
+  "^\-h$"               { $arguments.Add("-h", $args[ $i+1 ]); $i+=1; } # Option gets ignored
+  "^\-\-hint="          { $arguments.Add("-h", $args[ $i ]); }          # Option gets ignored
+  "^\-\-hint$"          { $arguments.Add("-h", $args[ $i+1 ]); $i+=1; } # Option gets ignored
+  "^\-v$"               { $arguments.Add("-v", "vagrant-notify"); }     # Option gets ignored
+  "^\-\-version$"       { $arguments.Add("-v", "vagrant-notify"); }     # Option gets ignored
+  "^\-\-help$"          { $arguments.Add("--help", $help); }
+  default               { $non_opt += $args[ $i ]; }
+  }
+}
+
+#Write-Host "Num Args:" $args.Length;
+#Write-Host "CLI is: " $arguments.Count;
+#Write-Host "MSG is: " $non_opt.Count;
+
+If ($arguments.Get_Item("--help")) {
+  Write-Host $help
+  exit 1;
+}
+If ($arguments.Get_Item("-i")) {
+  $icon = $arguments."-i";
+}
+
+
+If ($args.Length -eq 0 ) {
+  Write-Host "No Summary Specified";
+  exit 1;
+  
+} ElseIf ($non_opt.Count -eq 1) {
+  $message = $non_opt[0];
+
+  If($arguments.Get_Item("-i")) { $icon = $arguments."-i"; }
+  
+} ElseIf ($non_opt.Count -eq 2) {
+  $title = $non_opt[0];
+  $message = $non_opt[1];
+
+  If($arguments.Get_Item("-i")) { $icon = $arguments."-i"; }
+  
+} ElseIf ($non_opt.Length -gt 2) {
+  Write-Host "Invalid number of options";
+  exit 1;
+
+} Else {
+  Write-Host $help
+  exit 1;
+}
+
+
+$xml = New-Object Windows.Data.Xml.Dom.XmlDocument
+$template = "<toast><visual><binding template=`"ToastImageAndText02`"><image id=`"1`" src=`"$icon`" alt=`"image`"/><text id=`"1`">$title</text><text id=`"2`">$message</text></binding></visual></toast>"
+
+$xml.LoadXml($template)
+$toast = New-Object Windows.UI.Notifications.ToastNotification $xml
+
+[Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier("(notify-send)").Show($toast)

data/lib/vagrant-notify/action.rb

@@ -31,7 +31,8 @@ module Vagrant
                     if env3[:result]
                       env3[:machine].ui.success("vagrant-notify-server pid: #{env3[:notify_data][:pid]}")
                     else
-                      env3[:machine].ui.error("Unable to start notification server using #{env3[:machine].config.notify.bind_ip}")
+                      env3[:machine].ui.error("Unable to start notification server using #{env3[:notify_data][:bind_ip]}")
+                      env3[:notify_data][:pid] = env3[:notify_data][:port] = env3[:notify_data][:bind_ip] = nil
                     end
                   end
                 end

data/lib/vagrant-notify/action/install_command.rb

@@ -19,8 +19,9 @@ module Vagrant
 
         def compile_command(env, template_file)
           host_port        = env[:notify_data][:port]
+          client_ip        = env[:notify_data][:bind_ip]
           provider_name    = env[:machine].provider_name
-          template_binding = OpenStruct.new(:host_port => host_port, :shared_folder => '/tmp/vagrant-notify', :provider_name => provider_name, :client_ip => env[:machine].config.notify.bind_ip)
+          template_binding = OpenStruct.new(:host_port => host_port, :shared_folder => '/tmp/vagrant-notify', :provider_name => provider_name, :client_ip => client_ip)
           command_template = ERB.new(Vagrant::Notify.files_path.join(template_file).read)
           command          = command_template.result(template_binding.instance_eval { binding })
 

data/lib/vagrant-notify/action/notify_provisioning_status.rb

@@ -7,9 +7,18 @@ module Vagrant
         end
 
         def call(env)
-          system("notify-send '[#{env[:machine].name}] Provisioning with \"#{env[:provisioner_name]}\"...'")
-          @app.call(env)
-          system("notify-send '[#{env[:machine].name}] Finished provisioning with \"#{env[:provisioner_name]}\"'")
+
+          system("notify-send '[#{env[:machine].name}] Provisioning with \"#{env[:provisioner_name]}\"...'") unless env[:machine].config.notify.enable == false
+
+          begin
+            @app.call(env)
+          rescue => msg
+            system("notify-send '[#{env[:machine].name}] \"#{env[:provisioner_name]}\" provision failed!'") unless env[:machine].config.notify.enable == false
+            env[:machine].ui.error("#{msg}")
+          else
+            system("notify-send '[#{env[:machine].name}] Finished provisioning with \"#{env[:provisioner_name]}\"'") unless env[:machine].config.notify.enable == false
+          end
+
         end
       end
     end

data/lib/vagrant-notify/action/server_is_running.rb

@@ -12,6 +12,10 @@ module Vagrant
         def call(env)
           env[:result] = valid_process?(env[:notify_data][:pid])
 
+          unless env[:notify_data][:bind_ip]
+            env[:notify_data][:bind_ip] = env[:machine].config.notify.bind_ip if env[:machine].config.notify.bind_ip.is_a?(String)
+          end
+
           # Call the next if we have one (but we shouldn't, since this
           # middleware is built to run with the Call-type middlewares)
           @app.call env

data/lib/vagrant-notify/action/set_shared_folder.rb

@@ -14,7 +14,7 @@ module Vagrant
               env[:machine].config.vm.synced_folder host_dir, "/tmp/vagrant-notify", id: "vagrant-notify"
             end
             @app.call(env)
-            rescue
+            rescue Vagrant::Errors::GuestCapabilityNotFound
               env[:machine].ui.warn("vagrant-notify: guest does not support the shared folder capability.")
           end
         end

data/lib/vagrant-notify/action/start_server.rb

@@ -20,10 +20,10 @@ module Vagrant
           
           return if env[:machine].config.notify.enable == false
 
-          port = next_available_port(env[:machine].config.notify.bind_ip)
+          port = next_available_port(env[:notify_data][:bind_ip])
 
           if which('ruby')
-            env[:notify_data][:pid]  = Process.spawn("ruby #{dir}/server.rb #{id} #{port} #{env[:machine].config.notify.bind_ip} #{provider_name}")
+            env[:notify_data][:pid]  = Process.spawn("ruby #{dir}/server.rb #{id} #{port} #{env[:notify_data][:bind_ip]} #{provider_name}")
             env[:notify_data][:port] = port
 
             sleep 5

data/lib/vagrant-notify/action/stop_server.rb

@@ -30,6 +30,7 @@ module Vagrant
 
           env[:notify_data][:pid]  = nil
           env[:notify_data][:port] = nil
+          env[:notify_data][:bind_ip] = nil unless env[:notify_restart]
         end
       end
     end

data/lib/vagrant-notify/command.rb

@@ -27,40 +27,45 @@ module Vagrant
         argv = parse_options(opts)
        
         with_target_vms(argv, options) do |machine|
+
+          if machine.state.id != :running
+            @env.ui.info("Guest '#{machine.name}' is not running.")
+            next
+          end
+
           if options[:help]
             @env.ui.info(opts)
-            return 0
           end
+
           if options[:status] || options.length == 0
             @env.action_runner.run(Vagrant::Notify::Action.action_status_server, {
               :machine => machine,
             })
-            return 0
           end
+
           if options[:stop]
             @env.action_runner.run(Vagrant::Notify::Action.action_stop_server, {
               :machine => machine,
             })
-            return 0
           end
+
           if options[:start]
             @env.action_runner.run(Vagrant::Notify::Action.action_start_server, {
               :machine => machine,
             })
-            return 0
           end
+          
           if options[:restart]
             @env.action_runner.run(Vagrant::Notify::Action.action_stop_server, {
               :machine => machine,
+              :notify_restart => true
             })
             @env.action_runner.run(Vagrant::Notify::Action.action_start_server, {
               :machine => machine,
             })
-            return 0
           end
         end
       end
-
     end
   end
 end

data/lib/vagrant-notify/config.rb

@@ -5,7 +5,6 @@ module Vagrant
 
       def initialize()
         @enable  = UNSET_VALUE
-        @bind_ip = UNSET_VALUE
       end
 
       def validate(machine)
@@ -45,7 +44,6 @@ module Vagrant
 
       def finalize!
         @enable = 0 if @enable == UNSET_VALUE
-        @bind_ip = @bind_ip if @bind_ip == UNSET_VALUE
       end
 
       private

data/lib/vagrant-notify/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Notify
-    VERSION = "0.5.2"
+    VERSION = "0.5.3"
   end
 end

data/spec/action/install_command_spec.rb

@@ -17,7 +17,6 @@ describe Vagrant::Notify::Action::InstallCommand do
   let(:guest_tmp_path)   { '/tmp/notify-send' }
   let(:guest_path)       { '/usr/bin/notify-send' }
   let(:stubbed_template) { ERB.new('<%= host_port %>') }
-  let(:stubbed_template2) { ERB.new('<%= provider_name %>') }
 
   subject { described_class.new(app, env) }
 

data/spec/action/server_is_running_spec.rb

@@ -4,7 +4,7 @@ require 'vagrant-notify/action/server_is_running'
 
 describe Vagrant::Notify::Action::ServerIsRunning do
   let(:app) { lambda { |env| } }
-  let(:env) { {notify_data: {pid: pid}} }
+  let(:env) { {notify_data: {pid: pid, bind_ip: "127.0.0.1"}} }
 
   subject { described_class.new(app, env) }
 

data/spec/action/start_server_spec.rb

@@ -6,12 +6,12 @@ require 'vagrant-notify/server'
 
 describe Vagrant::Notify::Action::StartServer do
   let(:app)           { lambda { |env| } }
-  let(:config)        { mock(notify: stub(enable: true, bind_ip: "127.0.0.1")) }
+  let(:config)        { mock(notify: stub(enable: true)) }
   let(:ui)            { mock(success: true)}
   let(:id)            { '425e799c-1293-4939-bo39-263lcc7457e8' }
   let(:provider_name) { 'virtualbox' }
   let(:machine)       { mock(state: stub(id: :stopped), ui: ui, id: id, config: config,  provider_name: provider_name) }
-  let(:env)           { {notify_data: {}, machine: machine} }
+  let(:env)           { {notify_data: {bind_ip: "127.0.0.1"}, machine: machine} }
   let(:pid)           { '42' }
   let(:port)          { '1234' }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-notify
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Fabio Rehm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-08 00:00:00.000000000 Z
+date: 2016-11-19 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that forwards `notify-send` from guest to host machine
   and notifies provisioning status
@@ -32,10 +32,11 @@ files:
 - Rakefile
 - development/Vagrantfile
 - examples/README.md
-- examples/osx/notify-send_growl_for_mac
-- examples/osx/notify-send_terminal-notifier
-- examples/windows/notify-send_growl_for_windows
-- examples/windows/notify-send_snarl
+- examples/osx/growl_for_mac/notify-send.rb
+- examples/osx/terminal-notifier/notify-send.rb
+- examples/windows/growl_for_windows/notify-send.rb
+- examples/windows/notification-center/notify-send.ps1
+- examples/windows/snarl/notify-send.rb
 - files/notify-send.erb
 - lib/vagrant-notify.rb
 - lib/vagrant-notify/action.rb