vnctools 0.0.4 → 0.0.5

data/LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2011] [Jari Bakken]
+   Copyright 2011-2012 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

@@ -8,20 +8,27 @@ Simple CLI wrappers to control and record VNC displays from Ruby.
 Usage
 =============
 
-    # `tightvncserver`
-    server = VncTools::Server.new
-    server.start
-
-    # `ffmpeg`
-    recorder = VncTools::Recorder.new(server.display, "movie.mp4")
-    recorder.start
+```ruby
+# `tightvncserver`
+server = VncTools::Server.new
+server.start
+
+# `ffmpeg`
+recorder = VncTools::Recorder.new(server.display, "movie.mp4")
+recorder.start
     
-    ENV['DISPLAY'] = server.display
-    ...
+ENV['DISPLAY'] = server.display
+...
     
-    recorder.stop
-    server.stop
+recorder.stop
+server.stop
+```
+
+Requirements
+============
 
+* Linux
+* tightvncserver (apt-get install tightvncserver)
 
 Note on Patches/Pull Requests
 =============================
@@ -37,5 +44,5 @@ Note on Patches/Pull Requests
 Copyright
 =========
 
-Copyright (c) 2011 Jari Bakken. See LICENSE for details.
+Copyright (c) 2011-2012 Jari Bakken. See LICENSE for details.
 

data/lib/vnctools/server_pool.rb

@@ -3,16 +3,21 @@ module VncTools
     include Observable
 
     def initialize(capacity, klass = Server)
-      @capacity = capacity
-      @servers  = Array.new(capacity) { klass.new }
-      @running  = []
+      @capacity     = capacity
+      @running      = []
+      @server_class = klass
+
+      create_servers
     end
 
     def stop
-      running.each do |s|
+      running.dup.each do |s|
         fire :on_display_stopping, s
-        s.stop
+        stop_server s
+        running.delete s
       end
+
+      create_servers
     end
 
     def size
@@ -51,13 +56,26 @@ module VncTools
 
       if server.display.nil?
         fire :on_display_starting, server
-        server.start
+        start_server server
         @running << server
       end
 
       server
     end
 
+    def create_servers
+      @servers = Array.new(@capacity) { @server_class.new }
+    end
+
+    # can be overridden by subclasses
+    def start_server(server)
+      server.start
+    end
+
+    def stop_server(server)
+      server.stop
+    end
+
     class TooManyDisplaysError < StandardError
     end
 

data/lib/vnctools/version.rb

@@ -1,3 +1,3 @@
 module VncTools
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,91 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vnctools
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.0.5
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
 platform: ruby
-authors: 
+authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: childprocess
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 5
-        version: "2.5"
+      - !ruby/object:Gem::Version
+        version: '2.5'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
+        version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 description: Simple CLI wrappers to control and record VNC displays from Ruby.
-email: 
+email:
 - jari.bakken@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -103,41 +99,33 @@ files:
 - spec/vnctools/server_pool_spec.rb
 - spec/vnctools/server_spec.rb
 - vnctools.gemspec
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: vnctools
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple CLI wrappers to control and record VNC displays from Ruby.
-test_files: 
+test_files:
 - spec/spec_helper.rb
 - spec/vnctools/recorder_spec.rb
 - spec/vnctools/server_pool_spec.rb
 - spec/vnctools/server_spec.rb
+has_rdoc: