starling-starling 0.9.9 → 0.10.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.10.0
+* Solved compatibility issues with the new (and awesome, thanks mperham) Memcache client
+* Fixed the old rspec tests.
+
 == 0.9.9
 * remove dependency on SyslogLogger so that starling works on windows.
 * fix config file loading so relative paths are expanded properly <jacob@jacobatzen.dk>

data/README.rdoc

@@ -11,7 +11,7 @@ that speaks MemCache can take advantage of Starling's queue facilities.
 
 = Installation
 
-  This fork of the Starling source is hosted at GitHub and can be found at:
+  The Starling source is hosted at GitHub and can be found at:
 
   http://github.com/starling/starling/tree/master
 
@@ -44,7 +44,7 @@ that speaks MemCache can take advantage of Starling's queue facilities.
   >> require 'starling'
   => true
   >> starling = Starling.new('127.0.0.1:22122')
-  => MemCache: 1 servers, 1 buckets, ns: nil, ro: false
+  => MemCache: 1 servers, ns: nil, ro: false
   >> starling.set('my_queue', 12345)
   => nil
   >> starling.get('my_queue')
@@ -67,13 +67,13 @@ that speaks MemCache can take advantage of Starling's queue facilities.
 	
   'rdoc'
 
-= Using fiveruns memcache-client
+= Using memcache-client
 
-	memcache-client from fiveruns has a couple of fixed added like supporting failover and retry on failure.
+	memcache-client is now maintained by Mike Perham (http://www.mikeperham.com/)
 	
-	This fork of the memcache-client source is hosted at GitHub and can be found at:
+	He is the current maintainer of the gem which is hosted at GitHub and can be found at:
 
-	http://github.com/fiveruns/memcache-client/tree/master
+  http://github.com/mperham/memcache-client/tree/master
 
 	It can be installed using:
 
@@ -81,10 +81,11 @@ that speaks MemCache can take advantage of Starling's queue facilities.
 	gem sources -a http://gems.github.com/
 
 	# As often as you like
-	sudo gem install fiveruns-memcache-client
+	sudo gem install memcache-client
 
 = Known Issues
 
+* Only tested with Memcache client 1.7.x and with SystemTimer (http://systemtimer.rubyforge.org/)
 * Starling is "slow" as far as messaging systems are concerned. In practice,
   it's fast enough.
 
@@ -99,6 +100,7 @@ that speaks MemCache can take advantage of Starling's queue facilities.
 * AnotherBritt <?>
 * Glenn Rempe <?>
 * Abdul-Rahman Advany <abdulrahman@advany.com>
+* Harm Aarts <harmaarts@gmail.com>
 
 = Copyright
 

data/etc/starling.ubuntu

@@ -9,7 +9,7 @@
 # Description: The Starling distributed, transactional queue server
 ### END INIT INFO
 # Author: Twitter
-# Version: 0.9.7.7
+# Version: 0.10.0
 
 set -e
 

data/lib/starling.rb

@@ -43,17 +43,10 @@ class Starling < MemCache
   # yields to the block provided.  This helps work around the
   # normally random nature of the #get_server_for_key method.
   #
-  # Acquires the mutex for the entire duration of the call
-  # since unrelated calls to #get_server_for_key might be
-  # adversely affected by the non_random result.
-  def with_servers(my_servers = @servers.dup)
+  def with_servers(my_servers = self.servers.dup)
     return unless block_given?
-    with_lock do
-      my_servers.each do |server|
-        @force_server = server
-        yield
-      end
-      @force_server = nil
+    my_servers.each do |server|
+      yield
     end
   end
   
@@ -131,38 +124,17 @@ class Starling < MemCache
   def get_server_for_key(key)
     raise ArgumentError, "illegal character in key #{key.inspect}" if key =~ /\s/
     raise ArgumentError, "key too long #{key.inspect}" if key.length > 250
-    raise MemCacheError, "No servers available" if @servers.empty?
-    return @force_server if @force_server
-
-    bukkits = @buckets.dup
-    bukkits.nitems.times do |try|
-      n = rand(bukkits.nitems)
-      server = bukkits[n]
+    raise MemCacheError, "No servers available" if servers.empty?
+ 
+    # Ignores server weights, oh well
+    srvs = servers.dup
+    srvs.size.times do |try|
+      n = rand(srvs.size)
+      server = srvs[n]
       return server if server.alive?
-      bukkits.delete_at(n)
+      srvs.delete_at(n)
     end
-
+  
     raise MemCacheError, "No servers available (all dead)"
   end
-end
-
-
-class MemCache
-
- protected
-
-  ##
-  # Ensure that everything within the given block is executed
-  # within the locked mutex if this client is multithreaded.
-  # If the client isn't multithreaded, the block is simply executed.
-  def with_lock
-    return unless block_given?
-    begin
-      @mutex.lock if @multithread
-      yield
-    ensure
-      @mutex.unlock if @multithread
-    end
-  end
-
 end

data/lib/starling/server.rb

@@ -10,7 +10,7 @@ require File.join(here, 'handler')
 
 module StarlingServer
 
-  VERSION = "0.9.9"
+  VERSION = "0.10.0"
   
   class Base
     attr_reader :logger

data/spec/starling_server_spec.rb

@@ -124,8 +124,8 @@ describe "StarlingServer" do
 
   it "should output statistics per server" do
     stats = @client.stats
-    assert_kind_of Hash, stats
-    assert stats.has_key?('127.0.0.1:22133')
+    stats.kind_of? Hash
+    stats.has_key?('127.0.0.1:22133').should be_true
     
     server_stats = stats['127.0.0.1:22133']
     
@@ -140,8 +140,10 @@ describe "StarlingServer" do
   end
 
   it "should return valid response with unkown command" do
-    response = @client.add('blah', 1)
-    response.should eql("CLIENT_ERROR bad command line format\r\n")
+    #why is this an unknown command?
+    lambda {
+      response = @client.add('blah', 1)
+    }.should raise_error(MemCache::MemCacheError)
   end
 
   it "should disconnect and reconnect again" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: starling-starling
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 0.10.0
 platform: ruby
 authors: 
 - Blaine Cook
@@ -10,24 +10,28 @@ authors:
 - Glenn Rempe
 - Abdul-Rahman Advany
 - Seth Fitzsimmons
+- Harm Aarts
+- Chris Gaffney
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-10-27 00:00:00 -07:00
+date: 2009-04-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: fiveruns-memcache-client
+  name: memcache-client
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.7.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,6 +45,8 @@ email:
 - chris@ozmm.org
 - abdulrahman@advany.com
 - starlingmq@groups.google.com
+- harmaarts@gmail.com
+- gaffneyc@gmail.com
 executables: 
 - starling
 - starling_top