vnctools 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7070f1ce08f5ff05c7d8fcb9961ba0bb4e88731a
-  data.tar.gz: 07734fb235eb62bc649438807b54d9e2aa340a06
+  metadata.gz: 8220175c00e0319f5ec2f710d196b3c7e7742b74
+  data.tar.gz: b36cbf5873c53f8c7326b35789ba5325bd18116a
 SHA512:
-  metadata.gz: 68877e18ac8e37dd5c8600f5a4301bf66791fde310174d39c2717673fb38a59921990de4964e9dc059614e85e88d3908712e686a3f84963becbdc8af239c210b
-  data.tar.gz: cf46f49bebf9da63d71efce96d0780149229a3cb91e60c437349196c56a57ab50e9250f3108c16894acec1fdce92c9fa4f7787eacae0be61f4b93b813e35179f
+  metadata.gz: fddce38135a2713fbbb02f19f6f033bb2379a0a3cbab7985a18f413f6a2211da8c369a8b46ba91fbd4401ee5a748d30f193d95c0c0d9252c1184120e639dd2f5
+  data.tar.gz: 2df7438a254aa66d6c197b91ce08ec01b7235f3b79d1482e526cba413ee82cbdb995d23fcea2c5a12a030c79460c841847a3e330de22b9b5c34c7115734ddb9f

data/.travis.yml

@@ -1,4 +1,4 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0

data/LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2011-2013 Jari Bakken
+   Copyright 2011-2014 Jari Bakken
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/README.mdown

@@ -16,10 +16,10 @@ server.start
 # `ffmpeg`
 recorder = VncTools::Recorder.new(server.display, "movie.mp4")
 recorder.start
-    
+
 ENV['DISPLAY'] = server.display
 ...
-    
+
 recorder.stop
 server.stop
 ```
@@ -44,5 +44,5 @@ Note on Patches/Pull Requests
 Copyright
 =========
 
-Copyright (c) 2011-2013 Jari Bakken. See LICENSE for details.
+Copyright (c) 2011-2014 Jari Bakken. See LICENSE for details.
 

data/lib/vnctools/server.rb

@@ -56,6 +56,17 @@ module VncTools
       pid_path.delete if pid_path.exist?
     end
 
+    def alive?
+      pid_path.exist? && Process.kill(0, Integer(pid_path.read))
+    rescue Errno::ESRCH
+      pid_path.delete if pid_path.exist?
+      false
+    end
+
+    def dead?
+      !alive?
+    end
+
     def pid_path
       @pid_path ||= Pathname.new(File.expand_path("~/.vnc/#{host}#{display}.pid"))
     end

data/lib/vnctools/server_pool.rb

@@ -54,9 +54,11 @@ module VncTools
     def next_server
       server = @servers.shift
 
-      if server.display.nil?
+      if server.display.nil? || server.dead?
+        server = @server_class.new if server.dead?
+
         fire :on_display_starting, server
-        start_server server
+        start_server(server)
         @running << server
       end
 
@@ -72,6 +74,7 @@ module VncTools
       server.start
     end
 
+    # can be overridden by subclasses
     def stop_server(server)
       server.stop
     end

data/lib/vnctools/version.rb

@@ -1,3 +1,3 @@
 module VncTools
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/spec/vnctools/server_pool_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path("../../spec_helper", __FILE__)
 
 module VncTools
   describe ServerPool do
-    let(:server) { double(Server, :start => nil, :stop => nil) }
+    let(:server) { double(Server, :start => nil, :stop => nil, :dead? => false) }
     let(:fake_server_class) { double(:new => server)}
     let(:pool)  { ServerPool.new(3, fake_server_class) }
 
@@ -25,6 +25,18 @@ module VncTools
       pool.release obj
     end
 
+    it 'replaces a dead server from the pool' do
+      server.stub(:dead? => true)
+      fake_server_class.should_receive(:new).exactly(3).times
+      pool # create pool to trigger the above
+
+      replacement_server = double(Server, :dead? => false)
+      fake_server_class.should_receive(:new).once.and_return(replacement_server)
+      replacement_server.should_receive(:start)
+
+      pool.get.should == replacement_server
+    end
+
     it "can stop the pool" do
       pool.stub(:running => [server])
       server.should_receive(:stop)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vnctools
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: vnctools
-rubygems_version: 2.0.6
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Simple CLI wrappers to control and record VNC displays from Ruby.