headless 1.0.0 → 1.0.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+## 1.0.1 (2013-02-20)
+
+* when starting, wait for Xvfb to launch (fixed issue #33)
+
 ## 1.0.0 (2013-01-28)
 
 * bugfix release

data/headless.gemspec

@@ -3,7 +3,7 @@ spec = Gem::Specification.new do |s|
   s.email = 'leonid@shevtsov.me'
 
   s.name = 'headless'
-  s.version = '1.0.0'
+  s.version = '1.0.1'
   s.summary = 'Ruby headless display interface'
 
   s.description = <<-EOF

data/lib/headless.rb

@@ -44,6 +44,8 @@ class Headless
   DEFAULT_DISPLAY_NUMBER = 99
   MAX_DISPLAY_NUMBER = 10_000
   DEFAULT_DISPLAY_DIMENSIONS = '1280x1024x24'
+  # How long should we wait for Xvfb to open a display, before assuming that it is frozen (in seconds)
+  XVFB_LAUNCH_TIMEOUT = 10
 
   class Exception < RuntimeError
   end
@@ -72,6 +74,7 @@ class Headless
     @video_capture_options = options.fetch(:video, {})
     @destroy_at_exit = options.fetch(:destroy_at_exit, true)
 
+    # FIXME Xvfb launch should not happen inside the constructor
     attach_xvfb
   end
 
@@ -142,9 +145,18 @@ private
     #TODO error reporting
     result = system "#{CliUtil.path_to("Xvfb")} :#{display} -screen 0 #{dimensions} -ac >/dev/null 2>&1 &"
     raise Headless::Exception.new("Xvfb did not launch - something's wrong") unless result
+    ensure_xvfb_is_running
     return true
   end
 
+  def ensure_xvfb_is_running
+    start_time = Time.now
+    begin
+      sleep 0.01 # to avoid cpu hogging
+      raise Headless::Exception.new("Xvfb is frozen") if (Time.now-start_time)>=XVFB_LAUNCH_TIMEOUT
+    end while !xvfb_running?
+  end
+
   def xvfb_running?
     !!read_xvfb_pid
   end
@@ -168,3 +180,4 @@ private
     end
   end
 end
+

data/spec/headless_spec.rb

@@ -17,7 +17,7 @@ describe Headless do
       end
     end
 
-    context "when Xvfb not started yet" do
+    context "when Xvfb is not started yet" do
       it "starts Xvfb" do
         Headless.any_instance.should_receive(:system).with("/usr/bin/Xvfb :99 -screen 0 1280x1024x24 -ac >/dev/null 2>&1 &").and_return(true)
 
@@ -168,5 +168,8 @@ private
     Headless::CliUtil.stub!(:application_exists?).and_return(true)
     Headless::CliUtil.stub!(:read_pid).and_return(nil)
     Headless::CliUtil.stub!(:path_to).and_return("/usr/bin/Xvfb")
+
+    # TODO this is wrong. But, as long as Xvfb is started inside the constructor (which is also wrong), I don't see another option to make tests pass
+    Headless.any_instance.stub(:ensure_xvfb_is_running).and_return(true)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: headless
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -79,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2986386947499728446
+      hash: -3030427348639260588
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2986386947499728446
+      hash: -3030427348639260588
 requirements:
 - Xvfb
 rubyforge_project: