klarlack 0.0.3 → 0.0.4

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 0
+:patch: 4
 :major: 0

data/lib/klarlack.rb

@@ -3,5 +3,5 @@ require 'varnish/socket_factory'
 require 'varnish/client'
 
 module Varnish
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/varnish/client.rb

@@ -1,5 +1,7 @@
 module Varnish
   class Error < StandardError; end
+  class BrokenConnection < Error; end
+  class CommandFailed < Error; end
   class Client
     # Default management port of varnishd
     DEFAULT_PORT = 6082
@@ -215,16 +217,16 @@ module Varnish
     private
 
     # Sends a command to varnishd.
-    # Raises an Varnish::Error when a non-200 status is returned
+    # Raises a Varnish::CommandFailed error when a non-200 status is returned
     # Returns the response text
     def cmd(name, *params)
       @mutex.synchronize do
         connect unless connected?
         @conn.write "#{name} #{params.join(' ').gsub('\\', '\\\\\\')}\n"
-        status, length = @conn.gets.split # <status> <content_length>\n
-        content = @conn.read(length.to_i + 1) # +1 = \n
+        status, length = conn_gets.split # <status> <content_length>\n
+        content = conn_read(length.to_i + 1) # +1 = \n
         content.chomp!
-        raise Error, "Command #{name} returned with status #{status}: #{content}" if status.to_i != 200
+        raise CommandFailed, "Command #{name} returned with status #{status}: #{content}" if status.to_i != 200
         content
       end
     end
@@ -250,6 +252,14 @@ module Varnish
       @conn
     end
 
+    def conn_gets
+      @conn.gets || raise(BrokenConnection, "Expected to read one line from Varnish, got nil")
+    end
+
+    def conn_read(bytes)
+      @conn.read(bytes) || raise(BrokenConnection, "Expected to read #{bytes} bytes from Varnish, got nil")
+    end
+
     # converts +value+ into a boolean
     def bool(value)
       !!value

data/spec/klarlack_spec.rb

@@ -128,6 +128,24 @@ describe Varnish::Client do
     end
 
   end
+
+  describe '(broken connection)' do
+
+    before(:each) do
+      fake_connection!(:connected => true, :return => "200 1\n")
+    end
+    
+    it 'should fail with a Varnish::Error when the connection does return nil for gets' do
+      @conn.stub!(:gets).and_return(nil)
+      lambda { @varnish.ping }.should raise_error(Varnish::BrokenConnection)
+    end
+
+    it 'should fail with a Varnish::Error when the connection does return nil for read' do
+      @conn.stub!(:read).and_return(nil)
+      lambda { @varnish.ping }.should raise_error(Varnish::BrokenConnection)
+    end
+
+  end
   
   describe '(daemon lifecycle)' do
     
@@ -142,12 +160,12 @@ describe Varnish::Client do
     
     it 'starting an already started daemon should raise an error' do
       ensure_started
-      lambda { @varnish.start }.should raise_error(Varnish::Error)
+      lambda { @varnish.start }.should raise_error(Varnish::CommandFailed)
     end
     
     it 'stopping an already stopped daemon should raise an error' do
       ensure_stopped
-      lambda { @varnish.stop }.should raise_error(Varnish::Error)
+      lambda { @varnish.stop }.should raise_error(Varnish::CommandFailed)
     end
     
   end
@@ -161,5 +179,19 @@ describe Varnish::Client do
     @varnish.stop if @varnish.running?
     while(!@varnish.stopped?) do sleep 0.1 end
   end
+  
+  class FakeConn
+    attr_accessor :retval
+    def read(*args) @retval end
+    def gets(*args) @retval end
+    def write(str) str.to_s.size end
+  end
+
+  def fake_connection!(opts = {})
+    @conn = FakeConn.new
+    @conn.retval = opts[:return] || ''
+    @varnish.stub!(:connected?).and_return(opts[:connected] || false)
+    @varnish.instance_variable_set('@conn', @conn)
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: klarlack
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - "Max Sch\xC3\xB6fmann"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 +01:00
+date: 2010-01-03 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -58,7 +58,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: ruby client for varnishd's admin interface
 test_files: 
 - spec/klarlack_spec.rb