joshbuddy-tokyo_cache_cow 0.0.1 → 0.0.2

data/README.rdoc

@@ -66,11 +66,11 @@ But <i>other_key</i> is still peachy.
 === Server
 
 
-  >> ruby -rubygems runner.rb --help
+  >> tokyo_cache_cow --help
 
 --------------
 
-  Usage: runner.rb [options]
+  Usage: tokyo_cache_cow [options]
     -p, --port[OPTIONAL]             Port (default: 11211)
     -h, --host[OPTIONAL]             Host (default: 0.0.0.0)
         --help                       Show this help message.

data/VERSION.yml

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

data/bin/tokyo_cache_cow

@@ -1,47 +1,6 @@
-require 'eventmachine'
-require 'optparse'
-
-$:.unshift File.join(File.dirname(__FILE__), '..')
-require 'lib/tokyo_cache_cow'
-
-options = {:port => '11211', :host => '0.0.0.0', :provider => 'tokyo_cabinet', :file => '/tmp/cache'}
-OptionParser.new do |opts|
-  opts.banner = "Usage: runner.rb [options]"
-
-  opts.on("-p[OPTIONAL]", "--port", "Port (default: #{options[:port]})") do |v|
-    options[:port] = v
-  end
-
-  opts.on("-h[OPTIONAL]", "--host", "Host (default: #{options[:host]})") do |v|
-    options[:host] = v
-  end
-
-  opts.on("-c[OPTIONAL]", "--cache-provider", "Cache provider (default: #{options[:provider]})") do |v|
-    options[:provider] = v
-  end
-
-  opts.on("-f[OPTIONAL]", "--file", "File (default: #{options[:file]})") do |v|
-    options[:file] = v
-  end
-
-  opts.on_tail("-h", "--help", "Show this help message.") { puts opts; exit }
-
-end.parse!
-
-trap("INT") { EM.stop; puts "moooooooo ya later" }
-
-if File.exists?(File.join(File.dirname(__FILE__), options[:provider]))
-  require File.join(File.dirname(__FILE__), options[:provider])
-  cache = $cache
-else
-  require 'lib/tokyo_cache_cow/cache'
-  cache = TokyoCacheCow::Cache.const_get("#{options[:provider]}_memcache".split('_').map{|e| e.capitalize}.join.to_sym).new(options[:file])
-end
-
-puts "Starting the tokyo cache cow"
-EM.run do 
-  EM.start_server(options[:host], options[:port], TokyoCacheCow::Server) do |c|
-    c.cache = cache
-  end
-end
+#!/usr/bin/env ruby -rubygems
+# Tokyo cache cow command line interface script.
+# Run <tt>tokyo_cache_cow -h</tt> to get more usage.
+require File.dirname(__FILE__) + '/../lib/tokyo_cache_cow'
 
+TokyoCacheCow::Runner.new(ARGV).start!

data/lib/tokyo_cache_cow.rb

@@ -1,4 +1,5 @@
 $:.unshift File.dirname(__FILE__)
 
+require 'tokyo_cache_cow/runner'
 require 'tokyo_cache_cow/server'
-require 'tokyo_cache_cow/providers'
+require 'tokyo_cache_cow/cache'

data/lib/tokyo_cache_cow/cache/file_memcache.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'fileutils'
 require 'cgi'
+
 class TokyoCacheCow
   class Cache
     class FileMemcache < Base
@@ -13,10 +14,9 @@ class TokyoCacheCow
         end
       end
 
-      def initialize(path)
-        @path = path
-        FileUtils.rm_rf(@path)
-        FileUtils.mkdir_p(@path)
+      def initialize(options = {})
+        @path = options[:file] or raise('must supply file')
+        flush_all
       end
       
       def time_expired?(time)
@@ -70,7 +70,9 @@ class TokyoCacheCow
       end
       
       def flush_all
-        FileUtils.rm(Dir.glob(File.join(@path, '*'))) and true
+        FileUtils.rm_rf(@path)
+        FileUtils.mkdir_p(@path)
+        true
       end
 
       def delete(key, expires = nil)

data/lib/tokyo_cache_cow/cache/hash_memcache.rb

@@ -10,7 +10,7 @@ class TokyoCacheCow
         end
       end
 
-      def initialize(file)
+      def initialize(options = {})
         @cache = {}
       end
       

data/lib/tokyo_cache_cow/cache/tokyo_cabinet_memcache.rb

@@ -108,9 +108,10 @@ class TokyoCacheCow
         q.searchout
       end
 
-      def initialize(file)
+      def initialize(options = {})
         @cache = TDB::new # hash database
-        @cache.open(file, TDB::OWRITER | TDB::OCREAT | TDB::OTRUNC)
+        options[:file] ?
+          @cache.open(options[:file], TDB::OWRITER | TDB::OCREAT | TDB::OTRUNC) : raise('must supply file')
         @cache.setxmsiz(500_000_000)
       end
 

data/lib/tokyo_cache_cow/runner.rb

@@ -0,0 +1,110 @@
+require 'eventmachine'
+require 'optparse'
+
+class TokyoCacheCow
+  class Runner
+
+    attr_reader :options
+    
+    def initialize(argv)
+      @argv = argv
+      # Default options values
+      @options = {
+        :chdir                 => Dir.pwd,
+        :address               => '0.0.0.0',
+        :port                  => Server::DefaultPort,
+        :class                 => 'TokyoCacheCow::Cache::TokyoCabinetMemcache',
+        :require               => [],
+        :file                  => '/tmp/tcc-cache',
+        :pid                   => '/tmp/tcc.pid',
+        :special_delete_prefix => nil,
+        :daemonize             => false
+      }
+      
+      parse!
+    end
+
+    def parser
+      OptionParser.new do |opts|
+        opts.banner = "Usage: tokyo_cache_cow [options]"
+
+        opts.separator ""
+        opts.separator "Options:"
+
+        opts.on("-p[OPTIONAL]", "--port", "Port (default: #{options[:port]})") do |v|
+          options[:port] = v
+        end
+
+        opts.on("-a[OPTIONAL]", "--address", "Address (default: #{options[:address]})") do |v|
+          options[:address] = v
+        end
+
+        opts.on("-c[OPTIONAL]", "--class", "Cache provider class (default: #{options[:class]})") do |v|
+          options[:provider] = v
+        end
+
+        opts.on("-r[OPTIONAL]", "--require", "require") do |v|
+          options[:require] << v
+        end
+
+        opts.on("-f[OPTIONAL]", "--file", "File (default: #{options[:file]})") do |v|
+          options[:file] = v
+        end
+
+        opts.on("-d[OPTIONAL]", "--daemonize", "Daemonize (default: #{options[:daemonize]})") do |v|
+          options[:daemonize] = true
+        end
+
+        opts.on("-P[OPTIONAL]", "--pid", "Pid file (default: #{options[:pid]})") do |v|
+          options[:pid] = true
+        end
+
+        opts.on("-m[OPTIONAL]", "--matcher", "Special flag for doing matched deletes (not enabled by default)") do |v|
+          options[:special_delete_char] = v
+        end
+
+        opts.on_tail("-h", "--help", "Show this help message.") { puts opts; exit }
+
+      end
+    end
+
+    def parse!
+      parser.parse!(@argv)
+    end
+    
+    def start!
+      @options[:require].each {|r| require r}
+      
+      clazz = @options[:class].to_s.split('::').inject(Kernel) do |parent, mod|
+        parent.const_get(mod)
+      end
+      
+      
+      address = @options[:address]
+      port = @options[:port]
+      special_delete_char = @options[:special_delete_char]
+      puts "Starting the tokyo cache cow #{address} #{port}"
+      pid = EM.fork_reactor do
+        cache = clazz.new(:file => @options[:file])
+        trap("INT") { EM.stop; puts "\nmoooooooo ya later"; exit(0)}
+        EM.run do
+          EM.start_server(address, port, TokyoCacheCow::Server) do |c|
+            c.cache = cache
+            c.special_delete_char = special_delete_char if special_delete_char
+          end
+        end
+      end
+      
+      if @options[:daemonize]
+        File.open(options[:pid], 'w') {|f| f << pid}
+        Process.detach(pid)
+      else
+        trap("INT") { }
+        Process.wait(pid)
+      end
+      
+      pid
+    end
+    
+  end
+end

data/lib/tokyo_cache_cow/server.rb

@@ -4,6 +4,8 @@ require 'eventmachine'
 class TokyoCacheCow
   class Server < EventMachine::Connection
     
+    DefaultPort = 11211
+    
     Terminator = "\r\n"
     
     #set
@@ -42,7 +44,7 @@ class TokyoCacheCow
     
     TerminatorRegex = /\r\n/
     
-    attr_accessor :cache
+    attr_accessor :cache, :special_delete_char
     
     def send_client_error(message = "invalid arguments")
       send_data(ClientError % message.to_s)
@@ -68,7 +70,6 @@ class TokyoCacheCow
     
     def receive_data(data)
       ss = StringScanner.new(data)
-      
       while part = ss.scan_until(TerminatorRegex)
         begin
           command_argument_separator_index = part.index(/\s/)
@@ -133,8 +134,14 @@ class TokyoCacheCow
             when DeleteCommand
               (key, noreply) = [$1.chomp, !$2.nil?]
               next unless validate_key(key)
-              send_data @cache.delete(key) ?
-                DeletedReply : NotDeletedReply
+              if special_delete_char && key.index(special_delete_char) == 0
+                key.slice!(0,special_delete_char.size)
+                @cache.delete_match(key)
+                send_data(DeletedReply)
+              else
+                send_data @cache.delete(key) ?
+                  DeletedReply : NotDeletedReply
+              end
             end
           when 'delete_match'
             DeleteMatchCommand.match(args)

data/spec/cache_spec.rb

@@ -2,11 +2,10 @@ require 'benchmark'
 require 'lib/tokyo_cache_cow/cache'
 
 {
-  'tokyo cabinet memcache' => TokyoCacheCow::Cache::TokyoCabinetMemcache.new('/tmp/tcc1'),
-  'hash memcache' => TokyoCacheCow::Cache::HashMemcache.new(nil),
-  'file memcache' => TokyoCacheCow::Cache::FileMemcache.new('/tmp/filecache')
+  'tokyo cabinet memcache' => TokyoCacheCow::Cache::TokyoCabinetMemcache.new(:file => '/tmp/tcc1'),
+  'hash memcache' => TokyoCacheCow::Cache::HashMemcache.new,
+  'file memcache' => TokyoCacheCow::Cache::FileMemcache.new(:file => '/tmp/filecache')
 }.each do |name, cache|
-
   describe name do
   
     before(:each) do

data/spec/server_spec.rb

@@ -1,11 +1,18 @@
 require 'rubygems'
 require 'memcached'
 require 'benchmark'
+require 'lib/tokyo_cache_cow'
 
 cache = Memcached.new('127.0.0.1:11211')
 
 describe 'memcache server' do
   
+  before(:all) do
+    runner = TokyoCacheCow::Runner.new(['--daemonize'])
+    @pid = runner.start!
+    sleep(1)
+  end
+  
   before(:each) do 
     cache.flush
   end
@@ -20,5 +27,44 @@ describe 'memcache server' do
     cache.delete('asd')
     proc {cache.get('asd')}.should raise_error Memcached::NotFound
   end
+
+  after(:all) do
+    Process.kill('INT', @pid)
+  end
+  
+  
+end
+
+describe 'memcache server with special delete support' do
+  
+  before(:all) do
+    runner = TokyoCacheCow::Runner.new(['--daemonize', '-m...'])
+    @pid = runner.start!
+    sleep(1)
+  end
+  
+  before(:each) do 
+    cache.flush
+  end
+  
+  it "should delete match through special char " do
+    cache.set('asd123', "qweqweasd")
+    cache.set('asd456', "qweqweasd")
+    cache.set('asd678', "qweqweasd")
+    cache.set('qwe678', "qweqweasd")
+    cache.set('qwe679', "qweqweasd")
+    cache.delete('...asd')
+    proc {cache.get('asd123')}.should raise_error Memcached::NotFound
+    proc {cache.get('asd456')}.should raise_error Memcached::NotFound
+    proc {cache.get('asd678')}.should raise_error Memcached::NotFound
+    cache.delete('...qwe678')
+    proc {cache.get('qwe678')}.should raise_error Memcached::NotFound
+    cache.get('qwe679').should=='qweqweasd'
+  end
+  
+  after(:all) do
+    Process.kill('INT', @pid)
+  end
+  
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joshbuddy-tokyo_cache_cow
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Joshua Hull
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-21 00:00:00 -07:00
+date: 2009-04-30 00:00:00 -07:00
 default_executable: tokyo_cache_cow
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - lib/tokyo_cache_cow/cache/tokyo_cabinet_memcache.rb
 - lib/tokyo_cache_cow/cache.rb
 - lib/tokyo_cache_cow/providers.rb
+- lib/tokyo_cache_cow/runner.rb
 - lib/tokyo_cache_cow/server.rb
 - lib/tokyo_cache_cow.rb
 - spec/cache_spec.rb