vagrant-notify 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba4fc9493cec21bcfb25014ba736fb42b5fec41f
-  data.tar.gz: a8d46b48d1b215007f65ad3fb5278d4a6810f244
+  metadata.gz: e3f06401113919234836bb523fe7c76febdde45b
+  data.tar.gz: f7cb2652a42a65b648adbfda7eb700e769a8d28b
 SHA512:
-  metadata.gz: af4894a0012437cbd6a81c13a3ada7fa8a2e8dbfe270c0f44732c23b15a92248382fa61300c3bee07bf93edcd827b5d24a417d7cfef9f3ddd14eb56b84602dad
-  data.tar.gz: 2f82cfb35c78298f9de96d417d23fad6060a0c292ec5005940e6b5e5c4173a7dc6545f91fc7729d45c672711df5f50057c36aeb067b69ffeb292ed8c320b110c
+  metadata.gz: 42f8ed1ad51e9de58df011dc50d5949d852fd852d19248f708558e119ee6f9a25ecd2895c0727671a3dbdb9913dd0650635febb1b8a65034cc3c359e73e4c92d
+  data.tar.gz: 809382012aaf777f192da1152bc360254d142f5b178540256b1f7e342781bfdd4dda55cf92cd32b36e8c767ed0a29ebcf5d893dec8d8feae311cacaffb0cbcc6

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 /development/.vagrant
+.DS_Store

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 bundler_args: --without development
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 2.3.0

data/CHANGELOG.md

@@ -1,4 +1,27 @@
-## [0.4.0](https://github.com/fgrehm/vagrant-notify/compare/v0.3.0...master) (Feb 26, 2014)
+
+
+## [0.5.0](https://github.com/fgrehm/vagrant-notify/compare/v0.4.0...v0.5.0) (June 21, 2016)
+
+IMPROVEMENTS
+
+  - Notification server runs as a daemon (fork() has been removed so it's compatible with Windows). [[GH-14]]
+  - Windows support (beta) [[GH-14]]
+  - Notification server is available from localhost.
+  - Notification server information is displayed each time vagrant is started and halted.
+  - New plugin command. Ability to view notification server status, and ability for manual restart. [CLI](https://gist.github.com/alpha01/9b81caca694a2735e658f978c41600b5)
+  - New notify-send example scripts for OS X and Windows
+
+BUG FIXES
+
+  - `vagrant suspend/resume` stops/starts notification server respectively. [[GH-18]]
+  - Plugin causes VM boot to fail. [[GH-22]]
+
+[GH-14]:https://github.com/fgrehm/vagrant-notify/issues/14
+[GH-18]:https://github.com/fgrehm/vagrant-notify/issues/18
+[GH-22]:https://github.com/fgrehm/vagrant-notify/pull/22
+
+
+## [0.4.0](https://github.com/fgrehm/vagrant-notify/compare/v0.3.0...v0.4.0) (Feb 26, 2014)
 
 IMPROVEMENTS
 

data/Gemfile

@@ -7,6 +7,7 @@ group :development do
   gem 'rb-inotify'
   gem 'guard'
   gem 'guard-rspec'
+  gem 'ocra'
 end
 
 group :development, :test do

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: git://github.com/fgrehm/vagrant-lxc.git
-  revision: c19bc91e708f7a69b62e35f465b5246bf5706cc3
+  revision: 4a84d95ff26bf2d887b127765a9ae404899734f9
   specs:
-    vagrant-lxc (0.7.1.dev)
+    vagrant-lxc (0.8.1.dev)
 
 GIT
   remote: git://github.com/mitchellh/vagrant.git
@@ -19,7 +19,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-notify (0.4.0)
+    vagrant-notify (0.5.0)
 
 GEM
   remote: https://rubygems.org/
@@ -51,6 +51,7 @@ GEM
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.7.0)
+    ocra (1.3.6)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -80,6 +81,7 @@ PLATFORMS
 DEPENDENCIES
   guard
   guard-rspec
+  ocra
   rake
   rb-inotify
   rspec (~> 2.13.0)
@@ -87,3 +89,6 @@ DEPENDENCIES
   vagrant!
   vagrant-lxc!
   vagrant-notify!
+
+BUNDLED WITH
+   1.10.6

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014 Fabio Rehm
+Copyright (c) 2012-2016 Fabio Rehm
 
 MIT License
 

data/README.md

@@ -2,7 +2,6 @@
 
 [![Build Status](https://travis-ci.org/fgrehm/vagrant-notify.png)](https://travis-ci.org/fgrehm/vagrant-notify)
 [![Gem Version](https://badge.fury.io/rb/vagrant-notify.png)](http://badge.fury.io/rb/vagrant-notify)
-[![Gittip](http://img.shields.io/gittip/fgrehm.svg)](https://www.gittip.com/fgrehm/)
 
 A Vagrant plugin that forwards `notify-send` from guest to host machine and
 notifies provisioning status. [See it in action](#demo)
@@ -30,8 +29,8 @@ command.
 ### Provisioning notification
 
 Apart from redirecting `notify-send` from the guest VM to the host, whenever
-a Vagrant provisioner completes running you'll also receive a notification
-like:
+a Vagrant 1.4+ provisioner starts or completes running you'll also receive
+notifications like:
 
 ![provisioning](http://i.imgur.com/DgKjDgr.png)
 
@@ -56,14 +55,26 @@ A (too) primitive script integrating with Growl:
 growlnotify -t "Vagrant VM" -m "$*"
 ```
 
+See example [scripts](https://github.com/fgrehm/vagrant-notify/tree/master/examples).
+
+### 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`.
+
+See example [scripts](https://github.com/fgrehm/vagrant-notify/tree/master/examples).
+
+
 ## Demo
 
 ![Demo](http://i.imgur.com/tzOLvGY.gif)
+![Demo OS X](http://i.imgur.com/216NIlf.gif)
+![Demo Windows](http://i.imgur.com/cJYqX4y.gif)
 
 
 ## Known issues
 
-* `vagrant suspend` does not stop the notification server
+* `vagrant destroy` on a running VM will not stop the notification server.
+* On rare occasions the notification server may stop receiving notifications if the host is suspended/hibernates. The notification server may need to be manually restarted if that's the case. `vagrant notify --restart`
 
 
 ## Contributing

data/examples/README.md

@@ -0,0 +1,16 @@
+# Example notify-send wrapper scripts
+
+## 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) 
+
+
+## Windows
+
+* [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)
+
+**IMPORTANT:** `notify-send` wrapper script has to be binary executable. Also as with `notify-send`, `growlnotify.exe` needs to be is in your `path`. 
+
+Compiling using ocra:
+
+    ocra --output notify-send windows/notify-send_growl_for_windows

data/examples/osx/notify-send_terminal-notifier

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Example OS X terminal-notifier notify-send wrapper script.
+
+require 'optparse'
+
+
+options = {}
+OptionParser.new do |opts|
+  opts.on('-u', '--urgency LEVEL')           { |v| options[:u] = v } # Option gets removed
+  opts.on('-t', '--expire-time TIME')        { |v| options[:t] = v } # Option gets removed
+  opts.on('-a', '--app-name APP_NAME')       { |v| options[:a] = v } # TO DO: Set to -title
+  opts.on('-i', '--icon ICON[,ICON...]')     { |v| options[:i] = v } # Option gets removed
+  opts.on('-c', '--category TYPE[,TYPE...]') { |v| options[:c] = v } # Option gets removed
+  opts.on('-h', '--hint TYPE:NAME:VALUE')    { |v| options[:h] = v } # Option gets removed
+  opts.on('-v', '--version')                 { |v| options[:v] = v } # Option gets removed
+end.parse!
+
+
+if ARGV.length == 0
+  puts "No summary specified"
+  exit 1
+elsif ARGV.length == 1
+  message = "-message '\\#{ARGV[0]}'"
+elsif ARGV.length == 2
+  message = "-title '\\#{ARGV[0]}' -message '\\#{ARGV[1]}'"
+else
+  message = ARGV.map{|a| a =~ /-(title|message)/ ? a : "'\\#{a}'"}.join(' ')
+end
+
+system("terminal-notifier -sound default #{message}")

data/examples/windows/notify-send_growl_for_windows

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Example MS-Windows notify-send wrapper script. Assumes growlnotify.exe is in your 'path'.
+
+require 'optparse'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: notify-send [options]"
+
+  opts.on('-u', '--urgency LEVEL')           { |v| options[:u] = v } # TO DO: Set to /p:priority
+  opts.on('-t', '--expire-time TIME')        { |v| options[:t] = v } # Option gets removed 
+  opts.on('-a', '--app-name APP_NAME')       { |v| options[:a] = v } # TO DO: Set to /a:application
+  opts.on('-i', '--icon ICON[,ICON...]')     { |v| options[:i] = v } # TO DO: Set to /i:icon (url only) 
+  opts.on('-c', '--category TYPE[,TYPE...]') { |v| options[:c] = v } # Option gets removed 
+  opts.on('-h', '--hint TYPE:NAME:VALUE')    { |v| options[:h] = v } # Option gets removed
+  opts.on('-v', '--version')                 { |v| options[:v] = v } # Option gets removed
+end.parse!
+
+
+
+if ARGV.length == 0
+  puts "No summary specified"
+elsif ARGV.length == 1
+  message = "'#{ARGV[0]}'"
+  system("growlnotify.exe \"#{message}\"")
+elsif ARGV.length == 2
+  title = "/t:'#{ARGV[0]}'"
+  message = "'#{ARGV[1]}'"
+  system("growlnotify.exe \"#{title}\" \"#{message}\"")
+else
+  message = ARGV.map{|a| "'#{a}'"}.join(' ')
+  system("growlnotify.exe \"#{message}\"")
+end

data/files/notify-send.erb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/ruby
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
@@ -12,7 +12,7 @@ require 'fileutils'
 
 options = {}
 OptionParser.new do |opts|
-  opts.banner = "Usage: example.rb [options]"
+  opts.banner = "Usage: notify-send.rb [options]"
 
   opts.on('-u', '--urgency LEVEL')           { |v| options[:u] = v }
   opts.on('-t', '--expire-time TIME')        { |v| options[:t] = v }
@@ -36,11 +36,10 @@ end.join(' ')
 
 # TODO: Need to escape values
 unless ARGV.empty?
-  cmd << ' -- '
-  cmd << ARGV.map{|a| "'#{a}'"}.join(' ')
+  cmd << ARGV.map{|a| " '#{a}'"}.join(' ')
 end
 
-client_ip = ENV['SSH_CLIENT'].split(' ')[0]
-TCPSocket.open ENV['SSH_CLIENT'], <%= host_port %> do |s|
+client_ip = `ip route|grep default|awk '{print $3}'`
+TCPSocket.open client_ip, <%= host_port %> do |s|
   s.send cmd, 0
 end

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

@@ -7,7 +7,7 @@ module Vagrant
         end
 
         def call(env)
-          path = compile_command(env)
+          path = compile_command(env, 'notify-send.erb')
           install_command_on_guest(env, path)
 
           @app.call env
@@ -15,10 +15,10 @@ module Vagrant
 
         private
 
-        def compile_command(env)
+        def compile_command(env, template_file)
           host_port        = env[:notify_data][:port]
           template_binding = OpenStruct.new(:host_port => host_port, :shared_folder => '/tmp/vagrant-notify')
-          command_template = ERB.new(Vagrant::Notify.files_path.join('notify-send.erb').read)
+          command_template = ERB.new(Vagrant::Notify.files_path.join(template_file).read)
           command          = command_template.result(template_binding.instance_eval { binding })
 
           env[:tmp_path].join('vagrant-notify-send').open('w') { |f| f.write(command) }
@@ -29,6 +29,9 @@ module Vagrant
           env[:machine].communicate.upload(source.to_s, '/tmp/notify-send')
           env[:machine].communicate.sudo('mv /usr/bin/{notify-send,notify-send.bkp}; exit 0')
           env[:machine].communicate.sudo('mv /tmp/notify-send /usr/bin/notify-send && chmod +x /usr/bin/notify-send')
+          if RUBY_PLATFORM =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+            env[:machine].communicate.sudo("sed 's/\r\$//' -i /usr/bin/notify-send") # dos2unix
+          end
         end
       end
     end

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

@@ -1,3 +1,5 @@
+require_relative 'windows/process_info'
+
 module Vagrant
   module Notify
     module Action
@@ -18,9 +20,13 @@ module Vagrant
         private
 
         def valid_process?(pid)
-          Process.getpgid(pid.to_i) if pid
-        rescue Errno::ESRCH
-          false
+          if RUBY_PLATFORM =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+            Vagrant::Notify::Action::Windows::ProcessInfo.queryProcess(pid) if pid
+          else
+            Process.getpgid(pid.to_i) if pid
+          end
+          rescue Errno::ESRCH
+            false
         end
       end
     end

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

@@ -1,6 +1,5 @@
 require "vagrant/util/is_port_open"
 
-require_relative '../server'
 
 module Vagrant
   module Notify
@@ -16,8 +15,18 @@ module Vagrant
           @env = env
 
           port = next_available_port
-          env[:notify_data][:pid]  = Server.run(env, port)
-          env[:notify_data][:port] = port
+          id = env[:machine].id
+          dir = File.expand_path('../../', __FILE__)
+
+          if which('ruby')
+            env[:notify_data][:pid]  = Process.spawn("ruby #{dir}/server.rb #{id} #{port}")
+            env[:notify_data][:port] = port
+
+            env[:machine].ui.success("Started vagrant-notify-server pid: #{env[:notify_data][:pid]}")
+            sleep 5
+          else
+            env[:machine].ui.error("Unable to spawn TCPServer daemon, ruby not found in $PATH")
+          end
 
           @app.call env
         end
@@ -56,6 +65,20 @@ module Vagrant
             yield options
           end
         end
+
+        # http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
+        # Cross-platform way of finding an executable in the $PATH.
+        #   which('ruby') #=> /usr/bin/ruby
+        def which(cmd)
+          exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+          ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+            exts.each { |ext|
+              exe = File.join(path, "#{cmd}#{ext}")
+              return exe if File.executable?(exe) && !File.directory?(exe)
+            }
+          end
+          return nil
+        end
       end
     end
   end

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

@@ -16,7 +16,14 @@ module Vagrant
 
           pid = env[:notify_data][:pid]
 
-          Process.kill('KILL', pid.to_i) rescue nil
+          begin
+            Process.kill('KILL', pid.to_i)
+            env[:machine].ui.success("Stopped vagrant-notify-server pid: #{pid}")
+          rescue Errno::ESRCH
+            nil
+          rescue
+            env[:machine].ui.error("Failed to stop vagrant-notify-server pid: #{pid}")
+          end
 
           env[:notify_data][:pid]  = nil
           env[:notify_data][:port] = nil

data/lib/vagrant-notify/action/windows/process_info.rb

@@ -0,0 +1,23 @@
+
+module Vagrant
+  module Notify
+    module Action
+      module Windows
+        class ProcessInfo
+          def self.queryProcess(pid)
+            return false unless pid =~ /\A\d+\z/
+            result = `c\:/Windows/System32/wbem/WMIC.exe process where \"ProcessID = '#{pid}'\" get ProcessID,Commandline /format:list 2>nul`
+            querypid = false
+            result.split(/\r?\n/).each do |line|
+              next if line =~ /^\s*$/
+              if line =~ /ProcessId=(\d+)/i
+                  querypid = $1.to_i
+              end
+            end
+            return querypid
+          end 
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-notify/action.rb

@@ -52,6 +52,23 @@ module Vagrant
             end
           end
         end
+
+        def action_status_server
+          Vagrant::Action::Builder.new.tap do |b|
+            b.use Call, CheckProvider do |env, b2|
+              next if !env[:result]
+
+              b2.use PrepareData
+              b2.use Call, ServerIsRunning do |env2, b3|
+                if env2[:result]
+                  env[:machine].ui.success("vagrant-notify-server pid: #{env2[:notify_data][:pid]}")
+                else
+                  env[:machine].ui.error("No vagrant-notify server detected.")
+                end
+              end
+            end
+          end
+        end
       end
     end
   end

data/lib/vagrant-notify/command.rb

@@ -0,0 +1,66 @@
+
+require_relative 'action'
+
+module Vagrant
+  module Notify
+    class Command < Vagrant.plugin('2', :command)
+
+      def self.synopsis
+        "plugin: vagrant-notify: forwards notify-send from guest to host machine and notifies provisioning status"
+      end
+
+      def execute
+        options = {}
+        opts = OptionParser.new do |o|
+          o.banner = 'Usage: vagrant notify'
+          o.separator ''
+          o.version = Vagrant::Notify::VERSION
+          o.program_name = 'vagrant notify'
+
+          o.on('-h', '--help', 'Display this screen.' )                           { options[:help] = true }
+          o.on('--status', 'Show vagrant-notify-server daemon status. (default)') { options[:status] = true }
+          o.on('--start', 'Manually start vagrant-notify-server daemon.')         { options[:start] = true }
+          o.on('--stop', 'Manually stop vagrant-notify-server daemon.')           { options[:stop] = true }
+          o.on('--restart', 'Manually restart vagrant-notify-server daemon.')     { options[:restart] = true }
+        end
+
+        argv = parse_options(opts)
+       
+        with_target_vms(argv, options) do |machine|
+          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,
+            })
+            @env.action_runner.run(Vagrant::Notify::Action.action_start_server, {
+              :machine => machine,
+            })
+            return 0
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/vagrant-notify/plugin.rb

@@ -13,7 +13,7 @@ module Vagrant
       #       possible provider action class that Vagrant might have
       start_server_hook = lambda do |hook|
         require_relative './action'
-        hook.after VagrantPlugins::ProviderVirtualBox::Action::Boot, Vagrant::Notify::Action.action_start_server
+        hook.after VagrantPlugins::ProviderVirtualBox::Action::WaitForCommunicator, Vagrant::Notify::Action.action_start_server
 
         if defined?(Vagrant::LXC)
           require 'vagrant-lxc/action'
@@ -23,6 +23,7 @@ module Vagrant
 
       action_hook 'start-server-after-boot-on-machine-up',     :machine_action_up, &start_server_hook
       action_hook 'start-server-after-boot-on-machine-reload', :machine_action_reload, &start_server_hook
+      action_hook 'start-server-after-resume-on-machine',      :machine_action_resume, &start_server_hook
 
       share_folder_hook = lambda do |hook|
         require_relative './action'
@@ -36,6 +37,7 @@ module Vagrant
         hook.before Vagrant::Action::Builtin::GracefulHalt, Vagrant::Notify::Action.action_stop_server
       end
 
+
       # TODO: This should be generic, we don't want to hard code every single
       #       possible provider action class that Vagrant might have
       action_hook 'stop-server-before-destroy', :machine_action_destroy do |hook|
@@ -47,6 +49,16 @@ module Vagrant
           hook.before Vagrant::LXC::Action::Destroy, Vagrant::Notify::Action.action_stop_server
         end
       end
+
+      action_hook 'stop-server-after-suspend', :machine_action_suspend do |hook|
+        require_relative './action'
+        hook.before VagrantPlugins::ProviderVirtualBox::Action::Suspend, Vagrant::Notify::Action.action_stop_server
+      end
+
+      command(:notify) do
+        require_relative 'command'
+        Vagrant::Notify::Command
+      end
     end
   end
 end

data/lib/vagrant-notify/server.rb

@@ -1,21 +1,31 @@
+require 'socket'
+
 module Vagrant
   module Notify
     class Server
       HTTP_RESPONSE = "Hi! You just reached the vagrant notification server"
 
-      def self.run(env, port)
-        id           = env[:machine].id
-        machine_name = env[:machine].name
-        provider     = env[:machine].provider_name
-        fork do
-          $0 = "vagrant-notify-server (#{port})"
-          tcp_server = TCPServer.open(port)
+      def self.run(id, port, machine_name='default', provider='virtualbox')
+        #id           = env[:machine].id
+        #machine_name = env[:machine].name
+        #provider     = env[:machine].provider_name
+
+        if __FILE__ == $0
+          tcp_server = TCPServer.open("127.0.0.1", port)
           server = self.new(id, machine_name, provider)
-          loop {
-            Thread.start(tcp_server.accept) { |client|
-              server.receive_data(client)
-            }
-          }
+
+          # Have to wrap this in a begin/rescue block so we can be certain the server is running at all times.
+          begin
+            loop {
+                Thread.start(tcp_server.accept) { |client|
+                  Thread.handle_interrupt(Interrupt => :never) {  
+                    server.receive_data(client)
+                  }
+                }
+              }
+          rescue Interrupt
+            retry
+          end
         end
       end
 
@@ -68,3 +78,10 @@ module Vagrant
     end
   end
 end
+
+
+# Ghetto
+id = ARGV[0]
+port = ARGV[1]
+
+Vagrant::Notify::Server.run(id,port)

data/lib/vagrant-notify/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Notify
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/lib/vagrant-notify.rb

@@ -8,7 +8,6 @@ if File.exists?(File.join(File.expand_path('../../', __FILE__), '.git'))
 end
 
 require 'vagrant-notify/plugin'
-require 'vagrant-notify/server'
 require "vagrant-notify/version"
 
 module Vagrant

data/spec/action/start_server_spec.rb

@@ -2,11 +2,16 @@ require 'spec_helper'
 
 require 'vagrant-notify/action/start_server'
 
+require 'vagrant-notify/server'
+
 describe Vagrant::Notify::Action::StartServer do
-  let(:app)  { lambda { |env| } }
-  let(:env)  { {notify_data: {}} }
-  let(:pid)  { '42' }
-  let(:port) { '1234' }
+  let(:app)        { lambda { |env| } }
+  let(:ui)         { mock(success: true)}
+  let(:id)         { '425e799c-1293-4939-bo39-263lcc7457e8' }
+  let(:machine)    { mock(state: stub(id: :stopped), ui: ui, id: id) }
+  let(:env)        { {notify_data: {}, machine: machine} }
+  let(:pid)        { '42' }
+  let(:port)       { '1234' }
 
   subject { described_class.new(app, env) }
 
@@ -16,17 +21,18 @@ describe Vagrant::Notify::Action::StartServer do
     subject.call(env)
   end
 
-  it 'starts the server' do
-    Vagrant::Notify::Server.should have_received(:run).with(env, port)
-  end
-
-  it 'persists pid number' do
-    env[:notify_data][:pid].should == pid
+  after do
+    Process.kill('KILL', env[:notify_data][:pid].to_i)
   end
 
-  it 'persists used port' do
+  it 'starts the server and persists used port' do
     env[:notify_data][:port].should == port
   end
 
+  # need proper test of this
+  # it "removes server PID from notify data" do
+  #  env[:notify_data][:pid].should be_nil
+  # end
+
   pending 'identifies the next available port'
-end
+end

data/spec/action/stop_server_spec.rb

@@ -5,7 +5,8 @@ require 'vagrant-notify/action/stop_server'
 describe Vagrant::Notify::Action::StopServer do
   let(:app)          { lambda { |env| } }
   let(:communicator) { mock(sudo: true) }
-  let(:machine)      { mock(communicate: communicator, state: stub(id: :running)) }
+  let(:ui)           { mock(success: true)}
+  let(:machine)      { mock(communicate: communicator, state: stub(id: :running), ui: ui) }
   let(:env)          { {notify_data: {pid: pid, port: 1234}, machine: machine} }
   let(:pid)          { '42' }
   let(:port)         { described_class::PORT }

data/vagrant-notify.gemspec

@@ -6,8 +6,8 @@ require 'vagrant-notify/version'
 Gem::Specification.new do |gem|
   gem.name          = "vagrant-notify"
   gem.version       = Vagrant::Notify::VERSION
-  gem.authors       = ["Fabio Rehm"]
-  gem.email         = ["fgrehm@gmail.com"]
+  gem.authors       = ["Fabio Rehm", "Tony Baltazar"]
+  gem.email         = ["fgrehm@gmail.com", "root@rubyninja.org"]
   gem.description   = 'A Vagrant plugin that forwards `notify-send` from guest to host machine and notifies provisioning status'
   gem.summary       = gem.description
   gem.homepage      = "https://github.com/fgrehm/vagrant-notify"

metadata

@@ -1,19 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-notify
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Fabio Rehm
+- Tony Baltazar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that forwards `notify-send` from guest to host machine
   and notifies provisioning status
 email:
 - fgrehm@gmail.com
+- root@rubyninja.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -29,6 +31,9 @@ files:
 - README.md
 - Rakefile
 - development/Vagrantfile
+- examples/README.md
+- examples/osx/notify-send_terminal-notifier
+- examples/windows/notify-send_growl_for_windows
 - files/notify-send.erb
 - lib/vagrant-notify.rb
 - lib/vagrant-notify/action.rb
@@ -40,6 +45,8 @@ files:
 - lib/vagrant-notify/action/set_shared_folder.rb
 - lib/vagrant-notify/action/start_server.rb
 - lib/vagrant-notify/action/stop_server.rb
+- lib/vagrant-notify/action/windows/process_info.rb
+- lib/vagrant-notify/command.rb
 - lib/vagrant-notify/data.rb
 - lib/vagrant-notify/plugin.rb
 - lib/vagrant-notify/server.rb
@@ -72,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin that forwards `notify-send` from guest to host machine and