tikh-klarlack 0.0.8 → 0.0.9

data/lib/klarlack.rb

@@ -1,4 +1,5 @@
 require 'socket'
+require 'digest'
 require 'varnish/socket_factory'
 require 'varnish/client'
 

data/lib/varnish/client.rb

@@ -127,7 +127,6 @@ module Varnish
     #
     # 1.
     #  .purge :url, <regexp>
-    #  .purge :hash, <regexp>
     #
     # <regexp> is a string containing a varnish compatible regexp
     #
@@ -149,7 +148,7 @@ module Varnish
     #
     def purge(*args)
       c = 'purge'
-      c << ".#{args.shift}" if [:url, :hash, :list].include?(args.first)
+      c << ".#{args.shift}" if [:url, :list].include?(args.first)
       response = cmd(c, *args)
       case c
       when 'purge.list'
@@ -249,6 +248,10 @@ module Varnish
       content = conn_read(length.to_i + 1) # +1 = \n
       if status.to_i == 107
         @conn.write "auth #{auth_response(content[0,32])}\n"
+        status, length = conn_gets.split # <status> <content_length>\n
+        content = conn_read(length.to_i + 1) # +1 = \n
+        content.chomp!
+        raise CommandFailed, "Command #{name} returned with status #{status}: #{content}" if status.to_i != 200
       end
     end
 
@@ -289,7 +292,6 @@ module Varnish
       ctx << File.read(secret_file)
       ctx << challenge
       ctx << "\n"
-      puts "#{ctx.to_s}"
       ctx.to_s
     end
 

data/spec/klarlack_spec.rb

@@ -1,7 +1,7 @@
 require 'spec/spec_helper'
 
 describe Varnish::Client do
-  
+
   before(:each) do
     @varnish = Varnish::Client.new "127.0.0.1:6082"
   end
@@ -22,7 +22,7 @@ describe Varnish::Client do
     end
 
     it 'should use timeouts when sending commands' do
-      Varnish::SocketFactory::Timer.should_receive(:timeout).and_return("200 0")
+      Varnish::SocketFactory::Timer.should_receive(:timeout).exactly(2).times.and_return("200 0")
       @varnish.timeout = 10
       @varnish.ping
     end
@@ -80,7 +80,6 @@ describe Varnish::Client do
 
     it '#purge should allow purging by url, hash and custom fields' do
       @varnish.purge(:url, '^/articles/.*').should be_true
-      @varnish.purge(:hash, 12345).should be_true
       @varnish.purge("req.http.host", "~", "www.example.com").should be_true
       @varnish.purge("req.http.host ~ www.example.com").should be_true
     end
@@ -119,23 +118,13 @@ describe Varnish::Client do
 
   end
 
-  describe '(regression)' do
-
-    it '#purge.hash with regex containing backslashes should be escaped properly' do
-      test_regex = '/home\?x=1'
-      @varnish.purge :hash, test_regex
-      list = @varnish.purge :list
-      list.flatten.join.should include(test_regex)
-    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)
@@ -147,9 +136,9 @@ describe Varnish::Client do
     end
 
   end
-  
+
   describe '(daemon lifecycle)' do
-    
+
     it '#start, #stop, #running?, #stopped? should bahave as advertised' do
       ensure_stopped # issues #stop
       @varnish.stopped?.should be_true
@@ -158,41 +147,59 @@ describe Varnish::Client do
       @varnish.stopped?.should be_false
       @varnish.running?.should be_true
     end
-    
+
     it 'starting an already started daemon should raise an error' do
       ensure_started
       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::CommandFailed)
     end
-    
+
+  end
+
+  describe '(authentication)' do
+    before(:each) do
+      fake_connection!(:connected => false, :return => ["107 59\n", "xbhewxtfvjtxivucjwlajklgguylsehr\nAuthentication required.\n"])
+      @varnish.secret_file = "path/to/secret"
+    end
+
+    it 'send response on challenge request' do
+      File.should_receive(:read).with("path/to/secret").and_return("secret\n")
+      Varnish::SocketFactory.should_receive(:tcp_socket).and_return(@conn)
+      @conn.should_receive(:write).with("auth df7fd4ad1b16ffd6cc6af0730530a462ee2a365cc19a1d83cf3dc1bd1d5cd547\n")
+      @varnish.send(:connect)
+    end
   end
-  
+
   def ensure_started
     @varnish.start if @varnish.stopped?
     while(!@varnish.running?) do sleep 0.1 end
   end
-  
+
   def ensure_stopped
     @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 read(*args) @retval.shift end
+    def gets(*args) @retval.shift end
     def write(str) str.to_s.size end
   end
 
   def fake_connection!(opts = {})
     @conn = FakeConn.new
-    @conn.retval = opts[:return] || ''
+    @conn.retval = wrap(opts[:return] || '')
     @varnish.stub!(:connected?).and_return(opts[:connected] || false)
     @varnish.instance_variable_set('@conn', @conn)
   end
 
+  def wrap(value)
+    value.is_a?(Array) ? value : [value]
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'spec'
+require 'rspec'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tikh-klarlack
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - "Max Sch\xC3\xB6fmann"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 +03:00
+date: 2010-11-24 00:00:00 +03:00
 default_executable: 
 dependencies: []