posterous-lacquer 0.2.3 → 0.2.4

data/README.rdoc

@@ -1,11 +1,11 @@
 = lacquer
 
-Rails drop in for Varnish support.
+Rails drop in for Varnish support. This version is adapted from Russ Smith's gem and is in production use on posterous.com.
 
 == Install
 Basic installation
 
-  rails generate lacquer install
+  sudo gem install posterous-lacquer
 
 config/initializers/lacquer.rb
 

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/lacquer/varnish.rb

@@ -7,7 +7,7 @@ module Lacquer
       
         stats = stats.collect do |stat|
           stat = stat.strip.match(/(\d+)\s+(.+)$/)
-          { :key => stat[2], :value => stat[1] }
+          { :key => stat[2], :value => stat[1] } if stat
         end
       end
     end
@@ -18,23 +18,22 @@ module Lacquer
       end
     end
 
-  private
+  # private
 
-    # Sends commands over telnet to varnish servers listed in the config.
+   # Sends commands over telnet to varnish servers listed in the config.
     def send_command(command)
       Lacquer.configuration.varnish_servers.collect do |server|
+        # RAILS_DEFAULT_LOGGER.debug("POSTEROUS_LACQUER_DEBUG: running(#{command.inspect}) on #{server.inspect}")
         retries = 0
+        response = nil
         begin
           retries += 1
-          response = []
           connection = Net::Telnet.new(
             'Host' => server[:host],
             'Port' => server[:port],
             'Timeout' => server[:timeout] || 5)
-          connection.cmd(command) do |c|
-            response.push c.strip
-            c.strip
-          end
+          connection.cmd(command + "\nquit\n") {|r| response = r.strip}
+          connection.close
         rescue Exception => e
           if retries < Lacquer.configuration.retries
             retry
@@ -44,15 +43,15 @@ module Lacquer
                :error_class   => "Varnish Error, retried #{Lacquer.configuration.retries} times",
                :error_message => "Error while trying to connect to #{server[:host]}:#{server[:port]}: #{e}",
                :parameters    => server,
-               :response      => response.join("\n")})
+               :response      => response})
             else
               raise VarnishError.new("Error while trying to connect to #{server[:host]}:#{server[:port]} #{e}")
             end
-          end
-        ensure
-         connection.close rescue nil
+          end        
         end
+        response
       end
     end
+    
   end
 end

data/{lacquer.gemspec → posterous-lacquer.gemspec}

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{lacquer}
-  s.version = "0.2.1"
+  s.name = %q{posterous-lacquer}
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Russ Smith"]
-  s.date = %q{2010-06-14}
+  s.authors = ["Garry Tan", "Russ Smith"]
+  s.date = %q{2010-09-03}
   s.description = %q{Rails drop in for Varnish support.}
-  s.email = %q{russ@bashme.org}
+  s.email = %q{garry@posterous.com}
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "init.rb",
-     "lacquer.gemspec",
      "lib/generators/USAGE",
      "lib/generators/lacquer_generator.rb",
      "lib/generators/templates/initializer.rb",
@@ -35,31 +34,35 @@ Gem::Specification.new do |s|
      "lib/lacquer/delayed_job_job.rb",
      "lib/lacquer/resque_job.rb",
      "lib/lacquer/varnish.rb",
+     "posterous-lacquer.gemspec",
      "rails/init.rb",
-     "test.rb",
-     "test/helper.rb",
-     "test/test_cache_utils.rb",
-     "test/test_varnish_interface.rb"
+     "spec/lacquer/cache_utils_spec.rb",
+     "spec/lacquer/varnish_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/russ/lacquer}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Rails drop in for Varnish support.}
   s.test_files = [
-    "test/helper.rb",
-     "test/test_cache_utils.rb",
-     "test/test_varnish_interface.rb"
+    "spec/lacquer/cache_utils_spec.rb",
+     "spec/lacquer/varnish_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
     else
+      s.add_dependency(%q<rspec>, [">= 1.3.0"])
     end
   else
+    s.add_dependency(%q<rspec>, [">= 1.3.0"])
   end
 end
 

data/spec/lacquer/varnish_spec.rb

@@ -6,6 +6,8 @@ describe "Varnish" do
     Net::Telnet.stub!(:new).and_return(@telnet_mock)
     @telnet_mock.stub!(:close)
     @telnet_mock.stub!(:cmd)    
+    @telnet_mock.stub!(:puts)
+    @telnet_mock.stub!(:waitfor)
     Lacquer.configuration.retries.should == 5
   end
 
@@ -48,7 +50,74 @@ describe "Varnish" do
   
   describe "when sending a stats command" do
     it "should return an array of stats" do
-      @telnet_mock.stub!(:cmd).and_yield("200 200\n1000 Connections")
+      @telnet_mock.stub!(:cmd).and_yield(%Q[
+200 2023    
+     6263596  Client connections accepted
+     6260911  Client requests received
+      919605  Cache hits for pass
+     2123848  Cache misses
+     6723161  Backend conn. success
+     6641493  Fetch with Length
+       81512  Fetch wanted close
+          11  Fetch failed
+        1648  N struct sess_mem
+          81  N struct sess
+       22781  N struct object
+       23040  N struct objectcore
+       36047  N struct objecthead
+       56108  N struct smf
+        1646  N small free smf
+         263  N large free smf
+          55  N struct vbe_conn
+         804  N worker threads
+        1583  N worker threads created
+        2114  N worker threads limited
+        1609  N overflowed work requests
+           1  N backends
+     1693663  N expired objects
+      400637  N LRU nuked objects
+          10  N LRU moved objects
+         254  HTTP header overflows
+     2506470  Objects sent with write
+     6263541  Total Sessions
+     6260911  Total Requests
+          40  Total pipe
+     4599215  Total pass
+     6722994  Total fetch
+  2607029095  Total header bytes
+ 55280196533  Total body bytes
+     6263536  Session Closed
+           5  Session herd
+   511352337  SHM records
+    33376035  SHM writes
+       33177  SHM flushes due to overflow
+      208858  SHM MTX contention
+         246  SHM cycles through buffer
+     6361382  allocator requests
+       54199  outstanding allocations
+   953389056  bytes allocated
+   120352768  bytes free
+         323  SMS allocator requests
+      151528  SMS bytes allocated
+      151528  SMS bytes freed
+     6723053  Backend requests made
+           1  N vcl total
+           1  N vcl available
+          49  N total active purges
+         197  N new purges added
+         148  N old purges deleted
+        6117  N objects tested
+       60375  N regexps tested against
+         140  N duplicate purges removed
+      944407  HCB Lookups without lock
+           3  HCB Lookups with lock
+     2099076  HCB Inserts
+      515351  Objects ESI parsed (unlock)
+       35371  Client uptime
+
+500 22      
+Closing CLI connection    
+].strip)
       stats = Lacquer::Varnish.new.stats
       stats.size.should be(1)
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: posterous-lacquer
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Garry Tan
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 -07:00
+date: 2010-09-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,7 +52,6 @@ files:
 - Rakefile
 - VERSION
 - init.rb
-- lacquer.gemspec
 - lib/generators/USAGE
 - lib/generators/lacquer_generator.rb
 - lib/generators/templates/initializer.rb
@@ -63,6 +62,7 @@ files:
 - lib/lacquer/delayed_job_job.rb
 - lib/lacquer/resque_job.rb
 - lib/lacquer/varnish.rb
+- posterous-lacquer.gemspec
 - rails/init.rb
 - spec/lacquer/cache_utils_spec.rb
 - spec/lacquer/varnish_spec.rb