vagrant-notify 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f220061039ad0bc6f804c6561f05ae7c8bed22c1
-  data.tar.gz: 5d602de0a1ad6a73f2de0276971c3851cd98661e
+  metadata.gz: 1cc808b0736ce22d4855eafd7f920afa8d97834b
+  data.tar.gz: 51a1e2b03a29dac79356b8169a13ae7ee0f28bae
 SHA512:
-  metadata.gz: eefc2a70255f14d573238f69e78d097e143e4b401653255cf2e0ae1f848f4b0ae8df6e265deb82fbe1c083819d54f55b4be271aa91aa8dcaeeae91a9fd2d488e
-  data.tar.gz: 211c6257ee813b170a21ab18a05c5bcf0505e331dc8cac93041923036dac5f338b8124bd7e220af0e9d4b114e783f826e039b6bad4b73b691b4e3566dfcf5f3f
+  metadata.gz: 727b9a5fbe52de21b671fa23acec9a767f17b935daeb8f6bee6753ce0713bfee81a94f7d59840e6abdf05d8d7562b5cc4d606104bc87cb927ffe8262cf8ff031
+  data.tar.gz: 3cdcf5e597f15b9e4502b5cba71eccde7accff59322963af74129e19e5a87cc0ec03af66f8b507544287a294bd66cb366ad0135c2eef83692b3debf94c160265

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.5.4](https://github.com/fgrehm/vagrant-notify/compare/v0.5.3...v0.5.4) (May 4, 2017)
+IMPROVEMENTS
+
+  - Display warning if Ruby is not installed on guest. [[GH-35]](https://github.com/fgrehm/vagrant-notify/issues/35)
+  - Shell name included in provision notify message. [[GH-21]](https://github.com/fgrehm/vagrant-notify/issues/21)
+
 ## [0.5.3](https://github.com/fgrehm/vagrant-notify/compare/v0.5.2...v0.5.3) (November 18, 2016)
 IMPROVEMENTS
 

data/LICENSE.txt

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

data/README.md

@@ -21,7 +21,7 @@ $ vagrant plugin install vagrant-notify
 ### `notify-send` from guest VMs
 
 Whenever you run `vagrant up`, a Ruby [TCPServer](http://www.ruby-doc.org/stdlib-1.9.3/libdoc/socket/rdoc/TCPServer.html)
-will fire up on a port within the [usable port range](https://github.com/mitchellh/vagrant/blob/master/config/default.rb#L14)
+will fire up on a port within the [usable port range](https://www.vagrantup.com/docs/vagrantfile/machine_settings.html)
 and a Ruby [script](https://github.com/fgrehm/vagrant-notify/blob/master/files/notify-send.erb)
 will be copied over to the guest machine to replace the original `notify-send`
 command.

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

@@ -11,6 +11,7 @@ module Vagrant
           
           path = compile_command(env, 'notify-send.erb')
           install_command_on_guest(env, path)
+          check_if_ruby_on_guest(env)
 
           @app.call env
         end
@@ -37,6 +38,14 @@ module Vagrant
             env[:machine].communicate.sudo("sed 's/\r\$//' -i /usr/bin/notify-send") # dos2unix
           end
         end
+
+        def check_if_ruby_on_guest(env)
+          ruby_check = ''
+          env[:machine].communicate.sudo("which ruby || true") {|type, data| ruby_check = data }
+          if ruby_check.empty?
+            env[:machine].ui.warn("Ruby is not installed on '#{env[:machine].name}' guest VM! vagrant-notify will not work until a version of Ruby is installed.")
+          end
+        end
       end
     end
   end

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

@@ -7,8 +7,8 @@ module Vagrant
         end
 
         def call(env)
-
-          system("notify-send '[#{env[:machine].name}] Provisioning with \"#{env[:provisioner_name]}\"...'") unless env[:machine].config.notify.enable == false
+          message = notify_provision_messages(env) unless env[:machine].config.notify.enable == false
+          system(message[:start]) unless env[:machine].config.notify.enable == false
 
           begin
             @app.call(env)
@@ -16,9 +16,20 @@ module Vagrant
             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
+            system(message[:end]) unless env[:machine].config.notify.enable == false
           end
+        end
 
+        def notify_provision_messages(env)
+          message = Hash.new
+          if env[:provisioner_name].to_s == 'shell' and env[:provisioner].config.name
+            message[:start] = "notify-send '[#{env[:machine].name}] Provisioning with \"#{env[:provisioner_name]} (#{env[:provisioner].config.name})\"...'"
+            message[:end] = "notify-send '[#{env[:machine].name}] Finished provisioning with \"#{env[:provisioner_name]} (#{env[:provisioner].config.name})\"'" 
+          else
+            message[:start] = "notify-send '[#{env[:machine].name}] Provisioning with \"#{env[:provisioner_name]}\"...'"
+            message[:end] = "notify-send '[#{env[:machine].name}] Finished provisioning with \"#{env[:provisioner_name]}\"'"
+          end
+          return message
         end
       end
     end

data/lib/vagrant-notify/version.rb

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

data/spec/action/install_command_spec.rb

@@ -8,7 +8,9 @@ describe Vagrant::Notify::Action::InstallCommand do
   let(:config)           { mock(notify: stub(enable: true, bind_ip: "127.0.0.1")) }
   let(:env)              { {notify_data: {port: host_port}, machine: machine, tmp_path: tmp_path} }
   let(:host_port)        { 12345 }
-  let(:machine)          { mock(communicate: communicator, config: config, provider_name: provider_name) }
+  let(:ui)               { mock(warn: true)}
+  let(:name)             { 'test-vm' }
+  let(:machine)          { mock(communicate: communicator, config: config, provider_name: provider_name, ui: ui, name: name) }
   let(:communicator)     { mock(upload: true, sudo: true) }
   let(:host_ip)          { '192.168.1.2' }
   let(:provider_name)    { 'virtualbox' }
@@ -42,4 +44,8 @@ describe Vagrant::Notify::Action::InstallCommand do
   it 'installs command for all users' do
     communicator.should have_received(:sudo).with("mv #{guest_tmp_path} #{guest_path} && chmod +x #{guest_path}")
   end
+
+  it 'verify if ruby is installed on guest' do
+    communicator.should have_received(:sudo).with("which ruby || true")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-notify
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Fabio Rehm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-19 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that forwards `notify-send` from guest to host machine
   and notifies provisioning status