vagrant-notify 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a1074a71950090d90ae0b29f1a84c15ceb70ba2e
+  data.tar.gz: 9da0d636fd6ebe6f8023ed14d2338574a90c5868
+SHA512:
+  metadata.gz: 4aa952173645b5a6e165b180fbd4111c8e06dac056673813d3a658b09a4c19fb284e675233a414d605a92fe63b32aae2d7daec2c57e2ab5596e86b7ee8643723
+  data.tar.gz: 7858e8b543ff5236af42f2c32c894bf3980814979fb94d5eb8c6d41329e9fe4410809a19961173fb5f6f37167a66f546bd8f82aea33af5b967ef56372d2d390c

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+/.vagrant

data/.travis.yml

@@ -1,7 +1,5 @@
 language: ruby
-before_script:
-  - sudo apt-get -y install linux-headers-$(uname -r)
-  - sudo apt-get install virtualbox
+bundler_args: --without development
 rvm:
   - 1.9.3
-  - 1.8.7
+  - 2.0.0

data/Gemfile

@@ -3,6 +3,18 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in vagrant-notify.gemspec
 gemspec
 
-gem 'rb-inotify'
-gem 'guard'
-gem 'guard-rspec'
+group :development do
+  gem 'rb-inotify'
+  gem 'guard'
+  gem 'guard-rspec'
+end
+
+group :development, :test do
+  # We depend on Vagrant for development, but we don't add it as a
+  # gem dependency because we expect to be installed within the
+  # Vagrant environment itself using `vagrant plugin`.
+  gem 'vagrant', github: 'mitchellh/vagrant'
+  gem 'rake'
+  gem 'rspec'
+  gem 'rspec-spies'
+end

data/Gemfile.lock

@@ -1,53 +1,68 @@
+GIT
+  remote: git://github.com/mitchellh/vagrant.git
+  revision: 11ad0392758b6b3f4b8a44332c66a79e94cef1eb
+  specs:
+    vagrant (1.1.3.dev)
+      childprocess (~> 0.3.7)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6.0)
+      json (>= 1.5.1, < 1.8.0)
+      log4r (~> 1.1.9)
+      net-scp (~> 1.1.0)
+      net-ssh (~> 2.6.6)
+
 PATH
   remote: .
   specs:
-    vagrant-notify (0.1.0)
+    vagrant-notify (0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    archive-tar-minitar (0.5.2)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    diff-lcs (1.1.3)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.0.9)
+    diff-lcs (1.2.1)
     erubis (2.7.0)
-    ffi (1.1.5)
-    guard (1.4.0)
-      listen (>= 0.4.2)
+    ffi (1.5.0)
+    guard (1.6.2)
+      listen (>= 0.6.0)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      terminal-table (>= 1.4.3)
       thor (>= 0.14.6)
-    guard-rspec (2.1.0)
+    guard-rspec (2.5.1)
       guard (>= 1.1)
       rspec (~> 2.11)
-    i18n (0.6.1)
-    json (1.5.4)
-    listen (0.5.3)
+    i18n (0.6.4)
+    json (1.7.7)
+    listen (0.7.3)
     log4r (1.1.10)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-ssh (2.2.2)
-    rake (0.9.2.2)
-    rb-inotify (0.8.8)
+    lumberjack (1.0.3)
+    method_source (0.8.1)
+    net-scp (1.1.0)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.6)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rake (10.0.3)
+    rb-inotify (0.9.0)
       ffi (>= 0.5.0)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
     rspec-spies (2.1.3)
       rspec (~> 2.0)
-    thor (0.16.0)
-    vagrant (1.0.5)
-      archive-tar-minitar (= 0.5.2)
-      childprocess (~> 0.3.1)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6.0)
-      json (~> 1.5.1)
-      log4r (~> 1.1.9)
-      net-scp (~> 1.0.4)
-      net-ssh (~> 2.2.2)
+    slop (3.4.4)
+    terminal-table (1.4.5)
+    thor (0.17.0)
 
 PLATFORMS
   ruby
@@ -59,5 +74,5 @@ DEPENDENCIES
   rb-inotify
   rspec
   rspec-spies
-  vagrant
+  vagrant!
   vagrant-notify!

data/README.md

@@ -8,17 +8,13 @@ using Ubuntu as guest and host machine.
 
 ## Installation
 
-If you use the gem version of Vagrant, use:
+Make sure you have Vagrant >= 1.1 around and run:
 
 ```terminal
-$ gem install vagrant-notify
+$ vagrant plugin install vagrant-notify
 ```
 
-otherwise, use:
 
-```terminal
-$ vagrant gem install vagrant-notify
-```
 
 ## Usage
 
@@ -31,8 +27,8 @@ command.
 If by any chance your IP changes, you can run `vagrant provision` in order to
 update the guest script with the new IP.
 
-
-
+As of now, the plugin is not supported on multi vm environments, it used to be
+for the Vagrant < 1.1 version and I'm planning to fix that as soon as I have a chance.
 
 
 ## Contributing

data/burn/old_stack.rb

@@ -0,0 +1,11 @@
+Vagrant.actions[:start].tap do |start|
+  start.insert_after Vagrant::Action::VM::Boot,                Vagrant::Notify::Middleware::StartServer
+  start.insert_after Vagrant::Notify::Middleware::StartServer, Vagrant::Notify::Middleware::InstallCommand
+end
+Vagrant.actions[:resume].tap do |start|
+  start.use Vagrant::Notify::Middleware::StartServer
+  start.use Vagrant::Notify::Middleware::InstallCommand
+end
+Vagrant.actions[:halt].use      Vagrant::Notify::Middleware::StopServer
+Vagrant.actions[:suspend].use   Vagrant::Notify::Middleware::StopServer
+Vagrant.actions[:provision].use Vagrant::Notify::Middleware::InstallCommand

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

@@ -0,0 +1,19 @@
+module Vagrant
+  module Notify
+    module Action
+      class CheckProvider
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:result] = true
+
+          # 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
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,58 @@
+module Vagrant
+  module Notify
+    module Action
+      class InstallCommand
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          path = compile_command(env)
+          install_command_on_guest(env, path)
+
+          @app.call env
+        end
+
+        private
+
+        def compile_command(env)
+          host_port        = env[:notify_data][:port]
+          template_binding = OpenStruct.new(:host_ip => local_ip, :host_port => host_port)
+          command_template = ERB.new(Vagrant::Notify.files_path.join('notify-send.erb').read)
+          command          = command_template.result(template_binding.instance_eval { binding })
+
+          env[:tmp_path].join('vagrant-notify-send').open('w') { |f| f.write(command) }
+        end
+
+        def install_command_on_guest(env, command_path)
+          source = env[:tmp_path].join 'vagrant-notify-send'
+          env[:machine].communicate.upload(source.to_s, '/tmp/notify-send')
+          env[:machine].communicate.sudo('mv /tmp/notify-send /usr/bin/notify-send && chmod +x /usr/bin/notify-send')
+        end
+
+        ##
+        # Returns the local IP address of the host running the vagrant VMs.
+        #
+        # Thanks to:
+        #   https://github.com/fnichol/vagrant-butter/blob/master/lib/vagrant/butter/helpers.rb
+        #   https://github.com/jedi4ever/veewee/blob/c75a5b175c5b8ac7e5aa3341e93493923d0c7af0/lib/veewee/session.rb#L622
+        #
+        # @return [String] the local IP address
+        def local_ip
+          @local_ip ||= begin
+            # turn off reverse DNS resolution temporarily
+            orig, Socket.do_not_reverse_lookup =
+              Socket.do_not_reverse_lookup, true
+
+            UDPSocket.open do |s|
+              s.connect '64.233.187.99', 1
+              s.addr.last
+            end
+          ensure
+            Socket.do_not_reverse_lookup = orig
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+require_relative '../data'
+
+module Vagrant
+  module Notify
+    module Action
+      class PrepareData
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant::notify::action::prepare_data")
+        end
+
+        def call(env)
+          @env      = env
+          @data_dir = @env[:machine].data_dir.join('vagrant-notify')
+
+          ensure_dir_exists
+          assign_data_object
+
+          @app.call env
+        end
+
+        private
+
+        def ensure_dir_exists
+          return if @data_dir.directory?
+
+          @logger.debug 'Creating data directory'
+          @data_dir.mkdir
+        end
+
+        def assign_data_object
+          return if @env[:notify_data]
+
+          @logger.debug 'Assigning data object'
+          @env[:notify_data] = Data.new(@data_dir)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Vagrant
+  module Notify
+    module Action
+      class ServerIsRunning
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant::notify::action::prepare_data_dir")
+        end
+
+        def call(env)
+          env[:result] = valid_process?(env[:notify_data][:pid])
+
+          # 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
+        end
+
+        private
+
+        def valid_process?(pid)
+          Process.getpgid(pid.to_i) if pid
+        rescue Errno::ESRCH
+          false
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+require_relative '../server'
+
+module Vagrant
+  module Notify
+    module Action
+      class StartServer
+        # TODO: This should come from vm configuration or be automatically
+        #       assigned
+        PORT = '9999'
+
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:notify_data][:pid]  = Server.run(env, PORT)
+          env[:notify_data][:port] = PORT
+
+          @app.call env
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Vagrant
+  module Notify
+    module Action
+      class StopServer
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          @app.call env
+
+          pid = env[:notify_data][:pid]
+
+          Process.kill('KILL', pid.to_i) rescue nil
+
+          env[:notify_data][:pid]  = nil
+          env[:notify_data][:port] = nil
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-notify/action.rb

@@ -0,0 +1,56 @@
+require_relative 'action/check_provider'
+require_relative 'action/install_command'
+require_relative 'action/prepare_data'
+require_relative 'action/server_is_running'
+require_relative 'action/start_server'
+require_relative 'action/stop_server'
+
+module Vagrant
+  module Notify
+    module Action
+      class << self
+        Call = Vagrant::Action::Builtin::Call
+
+        def action_start_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]
+                  # TODO: b3.use MessageServerRunning
+                else
+                  # TODO: b3.use CheckServerPortCollision
+                  b3.use StartServer
+                  # TODO: b3.use BackupCommand
+                end
+                # Always install the command to make sure we can fix stale ips
+                # on the guest machine
+                b3.use InstallCommand
+              end
+            end
+          end
+        end
+
+        def action_stop_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]
+                  b3.use StopServer
+                  # TODO: b3.use RestoreCommandBackup
+                else
+                  # TODO: b3.use MessageServerStopped
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-notify/data.rb

@@ -0,0 +1,23 @@
+module Vagrant
+  module Notify
+    class Data
+      def initialize(data_dir)
+        @data_dir = data_dir
+      end
+
+      def []=(key, value)
+        file = @data_dir.join(key.to_s)
+        if value.nil?
+          file.delete
+        else
+          file.open("w+") { |f| f.write(value) }
+        end
+      end
+
+      def [](key)
+        file = @data_dir.join(key.to_s)
+        file.read if file.file?
+      end
+    end
+  end
+end

data/lib/vagrant-notify/plugin.rb

@@ -0,0 +1,29 @@
+module Vagrant
+  module Notify
+    class Plugin < Vagrant.plugin('2')
+      name 'vagrant notify'
+      description 'Forwards notify-send from guest to host machine'
+
+      action_hook 'start-server-after-boot' do |hook|
+        require_relative './action'
+        # TODO: This should be generic
+        hook.after VagrantPlugins::ProviderVirtualBox::Action::Boot, Vagrant::Notify::Action.action_start_server
+
+        if defined?(Vagrant::LXC)
+          # TODO: Require just the boot file once its "require dependencies" are sorted out
+          require 'vagrant-lxc/action'
+          hook.after Vagrant::LXC::Action::Boot, Vagrant::Notify::Action.action_start_server
+        end
+      end
+
+      action_hook 'install-command-after-provisioning', :machine_action_provision do |hook|
+        hook.after Vagrant::Action::Builtin::Provision, Vagrant::Notify::Action.action_start_server
+      end
+
+      action_hook 'stop-server-after-halting' do |hook|
+        require_relative './action'
+        hook.after Vagrant::Action::Builtin::GracefulHalt, Vagrant::Notify::Action.action_stop_server
+      end
+    end
+  end
+end

data/lib/vagrant-notify/server.rb

@@ -4,22 +4,25 @@ module Vagrant
       HTTP_RESPONSE = "Hi! You just reached the vagrant notification server"
 
       def self.run(env, port)
-        uuid = env[:vm].uuid
+        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)
-          server = self.new(uuid)
+          server = self.new(id, machine_name, provider)
           loop {
-            Thread.start(tcp_server.accept) do |client|
+            Thread.start(tcp_server.accept) { |client|
               server.receive_data(client)
-            end
+            }
           }
         end
       end
 
-      def initialize(uuid, env = Vagrant::Environment.new)
-        @uuid = uuid
-        @env  = env
+      def initialize(id, machine_name = :default, provider = :virtualbox)
+        @id           = id
+        @machine_name = machine_name
+        @provider     = provider
       end
 
       def receive_data(client)
@@ -31,6 +34,10 @@ module Vagrant
           system("notify-send #{args}")
         end
         client.close
+      rescue => ex
+        File.open("/tmp/vagrant-notify-error-#{@id}.log", 'a+') do |log|
+          log.puts "#{ex.message}"
+        end
       end
 
       private
@@ -51,13 +58,22 @@ module Vagrant
         return unless args =~ /-i '([^']+)'/
         icon = $1
         # TODO: Handle system icons
-        host_file = "/tmp/vagrant-notify-#{@uuid}-#{icon.gsub('/', '-')}"
+        host_file = "/tmp/vagrant-notify-#{@id}-#{icon.gsub('/', '-')}"
         download(icon, host_file) unless File.exists?(host_file)
         args.gsub!(icon, host_file)
       end
 
       def download(icon, host_file)
-        @env.vms[:default].channel.download(icon, host_file)
+        communicator.download(icon, host_file)
+      end
+
+      def communicator
+        @communicator ||=
+          begin
+            env     = Vagrant::Environment.new
+            machine = env.machine(@machine_name, @provider)
+            machine.communicate
+          end
       end
     end
   end

data/lib/vagrant-notify/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Notify
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/vagrant-notify.rb

@@ -7,29 +7,16 @@ if File.exists?(File.join(File.expand_path('../../', __FILE__), '.git'))
   $:.unshift(File.expand_path('../../lib', __FILE__))
 end
 
-require 'vagrant-notify/middleware'
+require 'vagrant-notify/plugin'
 require 'vagrant-notify/server'
-require 'vagrant-notify/vagrant_ssh_ext'
 require "vagrant-notify/version"
 
 module Vagrant
   module Notify
     class << self
       def files_path
-        @file_path ||= File.expand_path(File.dirname(__FILE__) + '/../files')
+        @file_path ||= Pathname.new(File.dirname(__FILE__)).join('..', 'files').expand_path
       end
     end
   end
 end
-
-Vagrant.actions[:start].tap do |start|
-  start.insert_after Vagrant::Action::VM::Boot,                Vagrant::Notify::Middleware::StartServer
-  start.insert_after Vagrant::Notify::Middleware::StartServer, Vagrant::Notify::Middleware::InstallCommand
-end
-Vagrant.actions[:resume].tap do |start|
-  start.use Vagrant::Notify::Middleware::StartServer
-  start.use Vagrant::Notify::Middleware::InstallCommand
-end
-Vagrant.actions[:halt].use      Vagrant::Notify::Middleware::StopServer
-Vagrant.actions[:suspend].use   Vagrant::Notify::Middleware::StopServer
-Vagrant.actions[:provision].use Vagrant::Notify::Middleware::InstallCommand

data/spec/action/install_command_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+require 'vagrant-notify'
+require 'vagrant-notify/action/install_command'
+
+describe Vagrant::Notify::Action::InstallCommand do
+  let(:app)              { lambda { |env| } }
+  let(:env)              { {notify_data: {port: host_port}, machine: machine, tmp_path: tmp_path} }
+  let(:host_port)        { 12345 }
+  let(:machine)          { mock(communicate: communicator) }
+  let(:communicator)     { mock(upload: true, sudo: true) }
+  let(:host_ip)          { '192.168.1.2' }
+  let(:tmp_path)         { Pathname.new(Dir.mktmpdir) }
+  let(:tmp_cmd_path)     { tmp_path.join('vagrant-notify-send') }
+  let(:guest_tmp_path)   { '/tmp/notify-send' }
+  let(:guest_path)       { '/usr/bin/notify-send' }
+  let(:stubbed_template) { ERB.new('<%= host_ip %> <%= host_port %>') }
+
+  subject { described_class.new(app, env) }
+
+  before do
+    ERB.stub(:new => stubbed_template)
+    subject.stub(local_ip: host_ip)
+    subject.call(env)
+  end
+
+  after { FileUtils.rm_rf tmp_path.to_s }
+
+  it 'compiles command script passing host ip and server port' do
+    tmp_cmd_path.read.should == "#{host_ip} #{host_port}"
+  end
+
+  it 'uploads compiled command script over to guest machine' do
+    communicator.should have_received(:upload).with(tmp_cmd_path.to_s, guest_tmp_path)
+  end
+
+  it 'installs command for all users' do
+    communicator.should have_received(:sudo).with("mv #{guest_tmp_path} #{guest_path} && chmod +x #{guest_path}")
+  end
+end

data/spec/action/prepare_data_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+require 'vagrant-notify/action/prepare_data'
+
+describe Vagrant::Notify::Action::PrepareData do
+  let(:data_dir) { Pathname.new(Dir.mktmpdir) }
+  let(:app)      { lambda { |env| } }
+  let(:env)      { {machine: mock(data_dir: data_dir)} }
+
+  subject { described_class.new(app, env) }
+
+  before { subject.call(env) }
+  after  { FileUtils.rm_rf data_dir.to_s }
+
+  it 'creates the directory to keep vagrant notify data' do
+    data_dir.join('vagrant-notify').should be_directory
+  end
+
+  it 'assigns a data object to the environment' do
+    env[:notify_data].should be_a(Vagrant::Notify::Data)
+  end
+end

data/spec/action/server_is_running_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+require 'vagrant-notify/action/server_is_running'
+
+describe Vagrant::Notify::Action::ServerIsRunning do
+  let(:app) { lambda { |env| } }
+  let(:env) { {notify_data: {pid: pid}} }
+
+  subject { described_class.new(app, env) }
+
+  context 'when pid is not set' do
+    let(:pid) { nil }
+
+    it 'sets the result to false' do
+      env[:result].should be_false
+    end
+  end
+
+  context 'when pid is set' do
+    let(:pid) { '12345' }
+
+    context 'and is valid' do
+      before do
+        Process.stub(:getpgid => true)
+        subject.call(env)
+      end
+
+      it 'sets the result to true' do
+        env[:result].should be_true
+      end
+    end
+
+    context 'and is invalid' do
+      before do
+        Process.stub(:getpgid).and_raise(Errno::ESRCH)
+        subject.call(env)
+      end
+
+      it 'sets the result to false' do
+        env[:result].should be_false
+      end
+    end
+  end
+end

data/spec/action/start_server_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+require 'vagrant-notify/action/start_server'
+
+describe Vagrant::Notify::Action::StartServer do
+  let(:app)  { lambda { |env| } }
+  let(:env)  { {notify_data: {}} }
+  let(:pid)  { '42' }
+  let(:port) { described_class::PORT }
+
+  subject { described_class.new(app, env) }
+
+  before do
+    Vagrant::Notify::Server.stub(:run => pid)
+    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
+  end
+
+  it 'persists used port' do
+    env[:notify_data][:port].should == port
+  end
+end

data/spec/action/stop_server_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+require 'vagrant-notify/action/stop_server'
+
+describe Vagrant::Notify::Action::StopServer do
+  let(:app)  { lambda { |env| } }
+  let(:env)  { {notify_data: {pid: pid, port: 1234}} }
+  let(:pid)  { '42' }
+  let(:port) { described_class::PORT }
+
+  subject { described_class.new(app, env) }
+
+  before do
+    Process.stub(kill: true)
+    subject.call(env)
+  end
+
+  it 'kills the notification server' do
+    Process.should have_received(:kill).with('KILL', pid.to_i)
+  end
+
+  it "removes server PID from notify data" do
+    env[:notify_data][:pid].should be_nil
+  end
+
+  it "removes server port from notify data" do
+    env[:notify_data][:port].should be_nil
+  end
+end

data/spec/data_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+require 'vagrant-notify/data'
+
+describe Vagrant::Notify::Data do
+  let!(:data_dir) { Pathname.new(Dir.mktmpdir) }
+  let(:key)       { :pid }
+  let(:value)     { '123456' }
+
+  subject { described_class.new(data_dir) }
+
+  after { FileUtils.rm_rf data_dir.to_s }
+
+  it 'writes data out to a file' do
+    subject[key] = value
+
+    data_dir.join(key.to_s).read.should eq value
+  end
+
+  it 'reads data from files' do
+    data_dir.join(key.to_s).open('w+') { |f| f.write(value) }
+
+    subject[key].should eq value
+  end
+
+  it 'handles unset keys' do
+    subject[key].should be_nil
+  end
+
+  it 'removes the file when a value is set to nil' do
+    subject.tap { |s| s[key] = value; s[key] = nil }
+
+    data_dir.join(key.to_s).should_not be_file
+  end
+end

data/spec/server_spec.rb

@@ -1,8 +1,11 @@
+require 'vagrant-notify/server'
+
 describe Vagrant::Notify::Server do
-  let(:arguments) { "-- '20 examples, 1 failure\n10 seconds'" }
-  let(:client)    { StringIO.new(arguments) }
+  let(:arguments)  { "-- '20 examples, 1 failure\n10 seconds'" }
+  let(:client)     { StringIO.new(arguments) }
+  let(:machine_id) { 'machine-id' }
 
-  subject { described_class.new('uuid') }
+  subject { described_class.new(machine_id) }
 
   before { subject.stub(:system => true, :download => true) }
 
@@ -27,7 +30,7 @@ describe Vagrant::Notify::Server do
       end
 
       it 'rewrites icon path before sending the notification' do
-        subject.should have_received(:system).with("notify-send -i '/tmp/vagrant-notify-uuid-foo-bar.jpg'")
+        subject.should have_received(:system).with("notify-send -i '/tmp/vagrant-notify-#{machine_id}-foo-bar.jpg'")
       end
     end
 

data/spec/spec_helper.rb

@@ -1,4 +1,8 @@
-require 'vagrant-notify'
+require 'vagrant'
+
+require 'fileutils'
+require 'tmpdir'
+
 require 'rspec-spies'
 
 RSpec.configure do |config|
@@ -11,6 +15,4 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
-
-  config.include Vagrant::TestHelpers
 end

data/vagrant-notify.gemspec

@@ -16,9 +16,4 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-
-  gem.add_development_dependency 'vagrant'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'rspec-spies'
 end

metadata

@@ -1,80 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-notify
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  name: vagrant
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  name: rake
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  name: rspec-spies
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  type: :development
+date: 2013-03-21 00:00:00.000000000 Z
+dependencies: []
 description: A Vagrant plugin that redirects system notifications from guest to host
   machine.
 email:
@@ -92,55 +27,64 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- burn/middleware/install_command.rb
+- burn/middleware/start_server.rb
+- burn/middleware/stop_server.rb
+- burn/old_stack.rb
+- burn/spec/middleware/install_command_spec.rb
+- burn/spec/middleware/start_server_spec.rb
+- burn/spec/middleware/stop_server_spec.rb
 - files/notify-send.erb
 - lib/vagrant-notify.rb
-- lib/vagrant-notify/middleware.rb
-- lib/vagrant-notify/middleware/install_command.rb
-- lib/vagrant-notify/middleware/start_server.rb
-- lib/vagrant-notify/middleware/stop_server.rb
+- lib/vagrant-notify/action.rb
+- lib/vagrant-notify/action/check_provider.rb
+- lib/vagrant-notify/action/install_command.rb
+- lib/vagrant-notify/action/prepare_data.rb
+- lib/vagrant-notify/action/server_is_running.rb
+- lib/vagrant-notify/action/start_server.rb
+- lib/vagrant-notify/action/stop_server.rb
+- lib/vagrant-notify/data.rb
+- lib/vagrant-notify/plugin.rb
 - lib/vagrant-notify/server.rb
-- lib/vagrant-notify/vagrant_ssh_ext.rb
 - lib/vagrant-notify/version.rb
-- lib/vagrant_init.rb
-- spec/middleware/install_command_spec.rb
-- spec/middleware/start_server_spec.rb
-- spec/middleware/stop_server_spec.rb
+- spec/action/install_command_spec.rb
+- spec/action/prepare_data_spec.rb
+- spec/action/server_is_running_spec.rb
+- spec/action/start_server_spec.rb
+- spec/action/stop_server_spec.rb
+- spec/data_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
 - vagrant-notify.gemspec
 homepage: https://github.com/fgrehm/vagrant-notify
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2874098481974869093
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2874098481974869093
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Vagrant plugin that redirects system notifications from guest to host machine.
 test_files:
-- spec/middleware/install_command_spec.rb
-- spec/middleware/start_server_spec.rb
-- spec/middleware/stop_server_spec.rb
+- spec/action/install_command_spec.rb
+- spec/action/prepare_data_spec.rb
+- spec/action/server_is_running_spec.rb
+- spec/action/start_server_spec.rb
+- spec/action/stop_server_spec.rb
+- spec/data_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb

data/lib/vagrant-notify/middleware.rb

@@ -1,3 +0,0 @@
-Dir[File.dirname(__FILE__) + '/middleware/**/*.rb'].each do |file|
-  require file
-end

data/lib/vagrant-notify/vagrant_ssh_ext.rb

@@ -1,22 +0,0 @@
-require 'vagrant/communication/ssh'
-
-module VagrantSshExt
-  # Based on https://github.com/mitchellh/vagrant/blob/1-0-stable/lib/vagrant/communication/ssh.rb#L75-L90
-  def download(from, to)
-    @logger.debug("Downloading: #{from} to #{to}")
-
-    connect do |connection|
-      scp = Net::SCP.new(connection)
-      scp.download!(from, to)
-    end
-  rescue Net::SCP::Error => e
-    # If we get the exit code of 127, then this means SCP is unavailable.
-    raise Errors::SCPUnavailable if e.message =~ /\(127\)/
-      # Otherwise, just raise the error up
-      raise
-  end
-end
-
-unless Vagrant::Communication::SSH.public_methods.include?('download')
-  Vagrant::Communication::SSH.send :include, VagrantSshExt
-end

data/lib/vagrant_init.rb

@@ -1,4 +0,0 @@
-# This file is automatically loaded by Vagrant to load any
-# plugins. This file kicks off this plugin.
-
-require 'vagrant-notify'