vnctools 0.0.6 → 0.0.7

data/lib/vnctools/server.rb

@@ -1,4 +1,5 @@
 require "socket"
+require 'pathname'
 
 module VncTools
   class Server
@@ -37,8 +38,24 @@ module VncTools
       end
     end
 
-    def stop
+    def stop(force = false)
       server "-kill", display.to_s
+    rescue Error
+      force_kill if force
+    end
+
+    def force_kill
+      if pid_path.exist?
+        Process.kill(9, Integer(pid_path.read))
+        pid_path.delete if pid_path.exist?
+      end
+    rescue Errno::ESRCH
+      # already gone
+      pid_path.delete if pid_path.exist?
+    end
+
+    def pid_path
+      @pid_path ||= Pathname.new(File.expand_path("~/.vnc/#{host}#{display}.pid"))
     end
 
     private

data/lib/vnctools/version.rb

@@ -1,3 +1,3 @@
 module VncTools
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/vnctools/server_spec.rb

@@ -18,6 +18,20 @@ module VncTools
         server.stop
       end
 
+      it "forcefully stops the server" do
+        server.should_receive(:`).with("tightvncserver -kill :5 2>&1")
+        server.stub :last_status => mock(:success? => false)
+        server.stub :display => ":5"
+
+        mock_pathname = mock('Pathname:5.pid', :exist? => true)
+        Pathname.should_receive(:new).with("#{ENV['HOME']}/.vnc/#{Socket.gethostname}:5.pid").and_return(mock_pathname)
+        mock_pathname.should_receive(:read).and_return 123123
+        mock_pathname.should_receive(:delete)
+        Process.should_receive(:kill).with(9, 123123)
+
+        server.stop(true)
+      end
+
       it "raises Server::Error if the server could not be started" do
         server.should_receive(:`).and_return("oops")
         server.stub :last_status => mock(:success? => false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vnctools
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors: