command_wrap 0.2 → 0.3

data/bin/xvfb_server.rb

@@ -0,0 +1,4 @@
+require 'rubygems'
+require File.dirname(__FILE__) + "/../lib/command_wrap"
+
+CommandWrap::Xvfb::Server.restart

data/lib/command_wrap.rb

@@ -115,9 +115,10 @@ module CommandWrap
         ''
     end
 
-    autoload :Image,        File.dirname(__FILE__) + "/command_wrap/image"
-    autoload :OpenOffice,   File.dirname(__FILE__) + "/command_wrap/open_office"
-    autoload :Config,       File.dirname(__FILE__) + "/command_wrap/config"
-    autoload :Pdf,          File.dirname(__FILE__) + "/command_wrap/pdf"
+    autoload :Image,      File.dirname(__FILE__) + '/command_wrap/image'
+    autoload :OpenOffice, File.dirname(__FILE__) + '/command_wrap/open_office'
+    autoload :Config,     File.dirname(__FILE__) + '/command_wrap/config'
+    autoload :Pdf,        File.dirname(__FILE__) + '/command_wrap/pdf'
+    autoload :Xvfb,       File.dirname(__FILE__) + '/command_wrap/xvfb'
 
 end

data/lib/command_wrap/config/xvfb.rb

@@ -19,7 +19,46 @@ module CommandWrap::Config
         end
 
         def self.command (subcommand)
-            "#{executable} #{params} #{subcommand}"
+            if server_mode
+                "DISPLAY=:#{server_port};#{subcommand}"
+            else
+                "#{executable} #{params} #{subcommand}"
+            end
+        end
+
+        def self.server_mode
+            if @server_mode.nil?
+                @server_mode = false
+            end
+            @server_mode
+        end
+
+        def self.server_mode= (server_mode)
+            @server_mode = server_mode
+        end
+
+        def self.server_port
+            @server_port ||= '35'
+        end
+
+        def self.server_port= (server_port)
+            @server_port = server_port
+        end
+
+        def self.server_command
+            @server_command ||= 'Xvfb :35 -screen 0 1024x768x24'
+        end
+
+        def self.server_command= (server_command)
+            @server_command = server_command
+        end
+
+        def self.stop_server_command
+            @server_stop ||= "killall -9 Xvfb"
+        end
+
+        def self.stop_server_command= (server_stop)
+            @server_stop = server_stop
         end
 
     end

data/lib/command_wrap/xvfb.rb

@@ -0,0 +1,9 @@
+module CommandWrap
+
+    module Xvfb
+
+        autoload :Server, File.dirname(__FILE__) + '/xvfb/server'
+
+    end
+
+end

data/lib/command_wrap/xvfb/server.rb

@@ -0,0 +1,23 @@
+module CommandWrap::Xvfb
+
+    module Server
+
+        def self.start
+            fork do
+                exec CommandWrap::Config::Xvfb.server_command
+            end
+        end
+
+        def self.stop
+            `#{CommandWrap::Config::Xvfb.stop_server_command}`
+        end
+
+        def self.restart
+            stop
+            sleep 5
+            start
+        end
+
+    end
+
+end

data/tests/unit/config_xvfb_test.rb

@@ -30,5 +30,50 @@ class ConfigXvfbTest < Test::Unit::TestCase
     def test_command
         assert_equal 'xvfb-run --wait=0 --server-args="-screen 0, 1024x768x24" echo "test"', CommandWrap::Config::Xvfb.command('echo "test"')
     end
+
+    def test_server_mode
+        assert_nothing_raised do
+            assert_equal false, CommandWrap::Config::Xvfb.server_mode
+            CommandWrap::Config::Xvfb.server_mode = true
+            assert_equal true, CommandWrap::Config::Xvfb.server_mode
+            CommandWrap::Config::Xvfb.server_mode = false
+        end
+    end
+
+    def test_server_port
+        assert_nothing_raised do
+            assert_equal '35', CommandWrap::Config::Xvfb.server_port
+            CommandWrap::Config::Xvfb.server_port = '15'
+            assert_equal '15', CommandWrap::Config::Xvfb.server_port
+            CommandWrap::Config::Xvfb.server_port = '35'
+        end
+    end
+
+    def test_server_command
+        assert_nothing_raised do
+            assert_equal 'Xvfb :35 -screen 0 1024x768x24', CommandWrap::Config::Xvfb.server_command
+            CommandWrap::Config::Xvfb.server_command = 'Xvfb :15 -screen 0 1024x768x24'
+            assert_equal 'Xvfb :15 -screen 0 1024x768x24', CommandWrap::Config::Xvfb.server_command
+            CommandWrap::Config::Xvfb.server_command = 'Xvfb :35 -screen 0 1024x768x24'
+        end
+    end
+
+    def test_stop_server_command
+        assert_nothing_raised do
+            assert_equal 'killall -9 Xvfb', CommandWrap::Config::Xvfb.stop_server_command
+            CommandWrap::Config::Xvfb.stop_server_command = 'dummy'
+            assert_equal 'dummy', CommandWrap::Config::Xvfb.stop_server_command
+            CommandWrap::Config::Xvfb.stop_server_command = 'killall -9 Xvfb'
+        end
+    end
+
+    def test_command_server_mode
+        begin
+            CommandWrap::Config::Xvfb.server_mode = true
+            assert_equal 'DISPLAY=:35;ksnapshot', CommandWrap::Config::Xvfb.command('ksnapshot')
+        ensure
+            CommandWrap::Config::Xvfb.server_mode = false
+        end
+    end
         
 end

data/tests/unit/xvfb_server_test.rb

@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + "/../test_helper"
+
+class XvfbServerTest < Test::Unit::TestCase
+
+    def test_exists
+        assert_nothing_raised do
+            CommandWrap::Xvfb::Server
+        end
+    end
+
+end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: command_wrap
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Stefaan Colman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 +01:00
+date: 2011-03-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,9 +47,12 @@ files:
 - lib/command_wrap/config/open_office.rb
 - lib/command_wrap/config/xvfb.rb
 - lib/command_wrap/open_office/server.rb
+- lib/command_wrap/xvfb/server.rb
+- lib/command_wrap/xvfb.rb
 - lib/command_wrap/image.rb
 - lib/command_wrap/pdf.rb
 - lib/command_wrap.rb
+- tests/unit/xvfb_server_test.rb
 - tests/unit/command_wrap_test.rb
 - tests/unit/pdf_test.rb
 - tests/unit/config_test.rb
@@ -70,6 +73,7 @@ files:
 - tests/helpers/pdf2.pdf
 - tests/test_helper.rb
 - README
+- bin/xvfb_server.rb
 - bin/wkhtmltopdf
 - bin/CutyCapt
 - bin/openoffice_server.rb
@@ -109,6 +113,7 @@ signing_key:
 specification_version: 3
 summary: Extracting meta data from file
 test_files: 
+- tests/unit/xvfb_server_test.rb
 - tests/unit/command_wrap_test.rb
 - tests/unit/pdf_test.rb
 - tests/unit/config_test.rb