cukeforker 0.0.9 → 0.1.0

data/cukeforker.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "cukeforker"
 
   s.add_dependency "cucumber"
+  s.add_dependency "vnctools"
   s.add_development_dependency "rspec"
   s.add_development_dependency "simplecov"
 

data/lib/cukeforker.rb

@@ -4,6 +4,7 @@ end
 
 
 require "cucumber/cli/main"
+require "vnctools"
 require "fileutils"
 require "observer"
 require "ostruct"
@@ -11,10 +12,9 @@ require "ostruct"
 module CukeForker
 end
 
-require 'cukeforker/vnc_server_pool'
-require 'cukeforker/vnc_server'
 require 'cukeforker/abstract_listener'
 require 'cukeforker/vnc_listener'
+require 'cukeforker/recording_vnc_listener'
 require 'cukeforker/logging_listener'
 require 'cukeforker/worker'
 require 'cukeforker/worker_queue'

data/lib/cukeforker/recording_vnc_listener.rb

@@ -0,0 +1,32 @@
+module CukeForker
+  class RecordingVncListener < VncListener
+    def initialize(pool, opts = {})
+      super(pool)
+      
+      @ext     = opts[:codec] || "mpeg4"
+      @options = opts
+    end
+    
+    def on_worker_starting(worker)
+      super
+      worker.data.recorder = recorder_for(worker)
+    end
+
+    def on_worker_finished(worker)
+      worker.data.recorder.stop
+      worker.data.recorder = nil
+      
+      super
+    end
+
+    private
+    
+    def recorder_for(worker)
+      display = worker.data.vnc.display
+      output  = File.join(worker.out, "#{worker.basename}.#{@ext}")
+      
+      VncTools::Recorder.new display, output, @options
+    end
+
+  end # RecordingVncListener
+end # CukeForker

data/lib/cukeforker/runner.rb

@@ -46,7 +46,7 @@ module CukeForker
       end
 
       if opts[:vnc]
-        vnc_pool = VncServerPool.new(max)
+        vnc_pool = VncTools::ServerPool.new(max)
         listeners << VncListener.new(vnc_pool)
       end
 

data/lib/cukeforker/version.rb

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

data/spec/cukeforker/logging_listener_spec.rb

@@ -11,7 +11,7 @@ module CukeForker
       mock_worker  = mock(Worker,     :id => "1", :feature => "foo/bar", :failed? => false)
       mock_worker2 = mock(Worker,     :id => "15", :feature => "foo/baz", :failed? => true)
 
-      mock_display = mock(VncServer)
+      mock_display = mock(VncTools::Server)
       mock_display.stub(:display).and_return(nil, ":5", ":15")
 
       listener.on_run_starting

data/spec/cukeforker/recording_vnc_listener_spec.rb

@@ -0,0 +1,10 @@
+require File.expand_path("../../spec_helper", __FILE__)
+
+module CukeForker
+  describe RecordingVncListener do
+    let(:recorder)  { mock(VncTools::Recorder) }
+    let(:listener)  { RecordingVncListener.new nil, :codec => "foo" }
+
+    # TODO: yuck inheritance
+  end # RecordingVncListener
+end # CukeForker

data/spec/cukeforker/runner_spec.rb

@@ -37,8 +37,8 @@ module CukeForker
       end
 
       it "sets up the VNC pool if :vnc => true" do
-        mock_pool = mock(VncServerPool, :add_observer => nil)
-        VncServerPool.should_receive(:new).with(2).and_return mock_pool
+        mock_pool = mock(VncTools::ServerPool, :add_observer => nil)
+        VncTools::ServerPool.should_receive(:new).with(2).and_return mock_pool
         VncListener.should_receive(:new).with(mock_pool).and_return mock(:update => nil)
 
         Runner.create([], :max => 2, :vnc => true)

data/spec/cukeforker/vnc_listener_spec.rb

@@ -2,8 +2,8 @@ require File.expand_path("../../spec_helper", __FILE__)
 
 module CukeForker
   describe VncListener do
-    let(:server)    { mock(VncServer, :display => ":15")    }
-    let(:pool)      { mock(VncServerPool)                   }
+    let(:server)    { mock(VncTools::Server, :display => ":15")    }
+    let(:pool)      { mock(VncTools::ServerPool)                   }
     let(:worker)    { mock(Worker, :data => OpenStruct.new) }
     let(:listener)  { VncListener.new pool                  }
 

data/spec/spec_helper.rb

@@ -8,21 +8,3 @@ end
 
 $LOAD_PATH.unshift File.expand_path("../lib")
 require 'cukeforker'
-
-module CukeForker
-  module SpecHelper
-    class FakeVnc
-      def start
-        # noop
-      end
-
-      def display
-        ":1"
-      end
-    end
-  end
-end
-
-RSpec.configure { |c|
-  c.include CukeForker::SpecHelper
-}

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: cukeforker
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 9
-  version: 0.0.9
+  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jari Bakken
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 +01:00
+date: 2011-02-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,37 +21,42 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: vnctools
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: simplecov
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Library to maintain a forking queue of Cucumber processes, with optional VNC displays.
 email: 
 - jari.bakken@gmail.com
@@ -77,18 +78,16 @@ files:
 - lib/cukeforker.rb
 - lib/cukeforker/abstract_listener.rb
 - lib/cukeforker/logging_listener.rb
+- lib/cukeforker/recording_vnc_listener.rb
 - lib/cukeforker/runner.rb
 - lib/cukeforker/version.rb
 - lib/cukeforker/vnc_listener.rb
-- lib/cukeforker/vnc_server.rb
-- lib/cukeforker/vnc_server_pool.rb
 - lib/cukeforker/worker.rb
 - lib/cukeforker/worker_queue.rb
 - spec/cukeforker/logging_listener_spec.rb
+- spec/cukeforker/recording_vnc_listener_spec.rb
 - spec/cukeforker/runner_spec.rb
 - spec/cukeforker/vnc_listener_spec.rb
-- spec/cukeforker/vnc_server_pool_spec.rb
-- spec/cukeforker/vnc_server_spec.rb
 - spec/cukeforker/worker_queue_spec.rb
 - spec/cukeforker/worker_spec.rb
 - spec/spec_helper.rb
@@ -106,30 +105,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: cukeforker
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Library to maintain a forking queue of Cucumber processes
 test_files: 
 - spec/cukeforker/logging_listener_spec.rb
+- spec/cukeforker/recording_vnc_listener_spec.rb
 - spec/cukeforker/runner_spec.rb
 - spec/cukeforker/vnc_listener_spec.rb
-- spec/cukeforker/vnc_server_pool_spec.rb
-- spec/cukeforker/vnc_server_spec.rb
 - spec/cukeforker/worker_queue_spec.rb
 - spec/cukeforker/worker_spec.rb
 - spec/spec_helper.rb

data/lib/cukeforker/vnc_server.rb

@@ -1,62 +0,0 @@
-require "socket"
-
-module CukeForker
-  class VncServer
-
-    class Error < StandardError
-    end
-
-    class << self
-      def displays
-        Dir[File.expand_path("~/.vnc/*.pid")].map { |e| e[/(\d+)\.pid/, 1] }.compact
-      end
-
-      def all
-        displays.map { |display| new ":#{display}" }
-      end
-    end
-
-    attr_reader :display
-
-    def initialize(display = nil)
-      @display = display
-    end
-
-    def start
-      if display
-        server display
-      else
-        output = server
-        @display = output[/desktop is #{host}(\S+)/, 1]
-      end
-    end
-
-    def stop
-      server "-kill", display.to_s
-    end
-
-    private
-
-    def server(*args)
-      cmd = ['tightvncserver', args, '2>&1'].flatten.compact
-      out = `#{cmd.join ' '}`
-
-      unless last_status.success?
-        raise Error, "could not run tightvncserver: #{out.inspect}"
-      end
-
-      out
-    end
-
-    def last_status
-      $?
-    end
-
-    def host
-      @host ||= Socket.gethostname
-    end
-  end # VncServer
-end # CukeForker
-
-
-

data/lib/cukeforker/vnc_server_pool.rb

@@ -1,68 +0,0 @@
-module CukeForker
-  class VncServerPool
-    include Observable
-
-    def initialize(capacity, klass = VncServer)
-      @capacity = capacity
-      @servers  = Array.new(capacity) { klass.new }
-      @running  = []
-    end
-
-    def stop
-      running.each do |s|
-        fire :on_display_stopping, s
-        s.stop
-      end
-    end
-
-    def size
-      @servers.size
-    end
-
-    def get
-      raise OutOfDisplaysError if @servers.empty?
-
-      server = next_server
-      fire :on_display_fetched, server
-
-      server
-    end
-
-    def release(server)
-      raise TooManyDisplaysError if size == @capacity
-      fire :on_display_released, server
-
-      @servers.unshift server
-    end
-
-    private
-
-    def fire(*args)
-      changed
-      notify_observers(*args)
-    end
-
-    def running
-      @running
-    end
-
-    def next_server
-      server = @servers.shift
-
-      if server.display.nil?
-        fire :on_display_starting, server
-        server.start
-        @running << server
-      end
-
-      server
-    end
-
-    class TooManyDisplaysError < StandardError
-    end
-
-    class OutOfDisplaysError < StandardError
-    end
-
-  end # DisplayPool
-end # CukeForker

data/spec/cukeforker/vnc_server_pool_spec.rb

@@ -1,62 +0,0 @@
-require File.expand_path("../../spec_helper", __FILE__)
-
-module CukeForker
-  describe VncServerPool do
-    let(:pool)  { VncServerPool.new(3, SpecHelper::FakeVnc) }
-
-    it "creates 3 instances of the given display class" do
-      SpecHelper::FakeVnc.should_receive(:new).exactly(3).times
-
-      pool = VncServerPool.new(3, SpecHelper::FakeVnc)
-      pool.size.should == 3
-    end
-
-    it "can fetch a server from the pool" do
-      pool.get.should be_kind_of(SpecHelper::FakeVnc)
-      pool.size.should == 2
-    end
-
-    it "can release a server" do
-      obj = pool.get
-      pool.size.should == 2
-
-      pool.release obj
-    end
-
-    it "can stop the pool" do
-      mock_server = mock(VncServer)
-
-      pool.stub(:running => [mock_server])
-      mock_server.should_receive(:stop)
-
-      pool.stop
-    end
-
-    it "raises a TooManyDisplaysError if the pool is over capacity" do
-      lambda { pool.release "foo" }.should raise_error(VncServerPool::TooManyDisplaysError)
-    end
-
-    it "raises a OutOfDisplaysError if the pool is empty" do
-      3.times { pool.get }
-      lambda { pool.get }.should raise_error(VncServerPool::OutOfDisplaysError)
-    end
-
-    it "notifies observers" do
-      server   = mock(VncServer, :start => nil, :stop => nil)
-      observer = mock(AbstractListener)
-
-      SpecHelper::FakeVnc.stub :new => server
-
-      observer.should_receive(:update).with :on_display_fetched , server
-      observer.should_receive(:update).with :on_display_released, server
-      observer.should_receive(:update).with :on_display_starting, server
-      observer.should_receive(:update).with :on_display_stopping , server
-
-      pool.add_observer observer
-
-      pool.release pool.get
-      pool.stop
-    end
-
-  end # VncServerPool
-end # CukeForker

data/spec/cukeforker/vnc_server_spec.rb

@@ -1,48 +0,0 @@
-require File.expand_path("../../spec_helper", __FILE__)
-
-module CukeForker
-  describe VncServer do
-
-    context "managing new displays" do
-      let(:server) { VncServer.new }
-
-      it "starts a new server" do
-        server.should_receive(:`).with("tightvncserver 2>&1").and_return("desktop is #{Socket.gethostname}:1")
-        server.start
-        server.display.should == ":1"
-      end
-
-      it "stops the server" do
-        server.should_receive(:`).with("tightvncserver -kill :5 2>&1")
-        server.stub :display => ":5"
-        server.stop
-      end
-
-      it "raises VncServer::Error if the server could not be started" do
-        server.should_receive(:`).and_return("oops")
-        server.stub :last_status => mock(:success? => false)
-
-        lambda { server.start }.should raise_error(VncServer::Error, /oops/)
-      end
-    end
-
-    context "controlling an existing display" do
-      let(:server) { VncServer.new ":5" }
-
-      it "starts the server on the given display" do
-        server.should_receive(:`).with("tightvncserver :5 2>&1").and_return("desktop is #{Socket.gethostname}:5")
-        server.start
-        server.display.should == ":5"
-      end
-    end
-
-    it "returns an instance for all existing displays" do
-      Dir.stub(:[]).and_return [".vnc/qa1:1.pid", ".vnc/qa1:2.pid", ".vnc/qa1:3.pid"]
-
-      all = VncServer.all
-      all.size.should == 3
-      all.map { |e| e.display }.should == [":1", ":2", ":3"]
-    end
-
-  end # VncServer
-end # CukeForker