memcached 0.15 → 0.15.1

data/CHANGELOG

@@ -1,5 +1,7 @@
 
-v0.15. Update to libmemcached 0.32. UDP support. Domain socket support (hellvinz). Bugfixes. Bundle libmemcached itself with the gem (antifuchs).
+v0.15.1. Fix build problem.
+
+v0.15. Update to libmemcached 0.31.1. UDP support. Domain socket support (hellvinz). Bugfixes. Bundle libmemcached itself with the gem (antifuchs).
 
 v0.14.4. Re-SWIG.
 

data/README

@@ -27,9 +27,6 @@ You need Ruby 1.8.6. Other versions are not guaranteed to work. You also need {m
 Install the gem:
   sudo gem install memcached --no-rdoc --no-ri
   
-Note that on OS X 10.5 you may need to set the architecture explicitly: 
-  sudo env ARCHFLAGS="-arch i386" gem install memcached --no-rdoc --no-ri
-  
 == Usage
 
 Start a local networked memcached server:

data/ext/extconf.rb

@@ -5,51 +5,60 @@ HERE = File.expand_path(File.dirname(__FILE__))
 BUNDLE = Dir.glob("libmemcached-*.tar.gz").first
 BUNDLE_PATH = BUNDLE.sub(".tar.gz", "")
 
-$includes = ENV['INCLUDE_PATH'].to_s.split(':').map{|s| " -I#{s}"}.uniq.join
+DARWIN = `uname -sp` == "Darwin i386\n"
 
 if !ENV["EXTERNAL_LIB"]
-  $includes = " -I#{HERE}/include" + $includes
+  $includes = " -I#{HERE}/include"
   $libraries = " -L#{HERE}/lib"
 
   $CFLAGS = "#{$includes} #{$libraries} #{$CFLAGS}"
   $LDFLAGS = "#{$libraries} #{$LDFLAGS}"
-  $CPPFLAGS = ""
+  $CPPFLAGS = $ARCH_FLAG = $DLDFLAGS = ""
+
   $LIBPATH = ["#{HERE}/lib"]
   $DEFLIBPATH = []
 
   Dir.chdir(HERE) do
     if File.exist?("lib")
       puts "Libmemcached already built; run 'rake clean' first if you need to rebuild."
-    else    
+    else
       puts "Building libmemcached."
       puts(cmd = "tar xzf #{BUNDLE} 2>&1")
-      raise "'#{cmd}' failed" unless system(cmd)    
+      raise "'#{cmd}' failed" unless system(cmd)
+
       Dir.chdir(BUNDLE_PATH) do
-        puts(cmd = "./configure --prefix=#{HERE} 2>&1") 
-        raise "'#{cmd}' failed" unless system(cmd)      
-        puts(cmd = "make 2>&1")
+        puts(cmd = "env CFLAGS=-fPIC LDFLAGS=-fPIC ./configure --prefix=#{HERE} --disable-shared --disable-utils 2>&1")
+        raise "'#{cmd}' failed" unless system(cmd)
+        puts(cmd = "make || true 2>&1")
         raise "'#{cmd}' failed" unless system(cmd)
-        puts(cmd = "make install 2>&1")
+        puts(cmd = "make install || true 2>&1")
         raise "'#{cmd}' failed" unless system(cmd)
-      end      
+      end
       system("rm -rf #{BUNDLE_PATH}")
-    end      
+    end
   end
+  
+  # Absolutely prevent the linker from picking up any other libmemcached
+  Dir.chdir("#{HERE}/lib") do
+    system("cp libmemcached.a libmemcached_gem.a") 
+    system("cp libmemcached.la libmemcached_gem.la") 
+  end
+  $LIBS << " -lmemcached_gem"
 end
 
-if ENV['SWIG']
-  puts "Running SWIG."
-  puts(cmd = "swig #{$includes} -ruby -autorename rlibmemcached.i")  
-  raise "'#{cmd}' failed" unless system(cmd)    
-end
-
-if `uname -sp` == "Darwin i386\n"
+if DARWIN
   $CFLAGS.gsub! /-arch \S+/, ''
   $CFLAGS << " -arch i386"
   $LDFLAGS.gsub! /-arch \S+/, ''
   $LDFLAGS << " -arch i386"
 end
 
+if ENV['SWIG']
+  puts "Running SWIG."
+  puts(cmd = "swig #{$includes} -ruby -autorename rlibmemcached.i")
+  raise "'#{cmd}' failed" unless system(cmd)
+end
+
 $CFLAGS.gsub! /-O\d/, ''
 
 if ENV['DEBUG']

data/lib/memcached.rb

@@ -22,7 +22,7 @@ class Memcached
   Lib = Rlibmemcached
   REQUIRED_VERSION = File.read("#{File.dirname(__FILE__)}/../COMPATIBILITY")[/:: ([\d\.]+)/, 1]
   RECEIVED_VERSION = Lib.memcached_lib_version
-  STDERR.puts "Warning: libmemcached #{REQUIRED_VERSION} suggested; you have #{RECEIVED_VERSION}." unless REQUIRED_VERSION == RECEIVED_VERSION
+  raise "libmemcached #{REQUIRED_VERSION} required; you somehow linked to #{RECEIVED_VERSION}." unless REQUIRED_VERSION == RECEIVED_VERSION
 end
 
 require 'memcached/integer'

data/memcached.gemspec

@@ -2,29 +2,30 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "0.15"
+  s.version = "0.15.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
   s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = %q{2009-08-03}
+  s.date = %q{2009-08-04}
   s.description = %q{An interface to the libmemcached C client.}
   s.email = %q{}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = ["BENCHMARKS", "CHANGELOG", "COMPATIBILITY", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "lib/memcached.rb", "LICENSE", "README", "TODO"]
   s.files = ["BENCHMARKS", "CHANGELOG", "COMPATIBILITY", "ext/extconf.rb", "ext/libmemcached-0.31.tar.gz", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/integer.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "lib/memcached.rb", "LICENSE", "Manifest", "memcached.gemspec", "Rakefile", "README", "test/profile/benchmark.rb", "test/profile/profile.rb", "test/profile/valgrind.rb", "test/setup.rb", "test/teardown.rb", "test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb", "TODO"]
+  s.has_rdoc = true
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/memcached/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Memcached", "--main", "README"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.1}
   s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem}
   s.summary = %q{An interface to the libmemcached C client.}
   s.test_files = ["test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+    s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else

data/test/unit/memcached_test.rb

@@ -867,9 +867,13 @@ class MemcachedTest < Test::Unit::TestCase
       cache.set(key2, @value)
     end        
   end
+  
+  def test_missing_server_with_random_distribution
+    cache = Memcached.new(@servers, :distribution => :random)
+    # FIXME Needs to exercise the ejection code
+  end  
 
   def test_consistent_hashing
-
     keys = %w(EN6qtgMW n6Oz2W4I ss4A8Brr QShqFLZt Y3hgP9bs CokDD4OD Nd3iTSE1 24vBV4AU H9XBUQs5 E5j8vUq1 AzSh8fva PYBlK2Pi Ke3TgZ4I AyAIYanO oxj8Xhyd eBFnE6Bt yZyTikWQ pwGoU7Pw 2UNDkKRN qMJzkgo2 keFXbQXq pBl2QnIg ApRl3mWY wmalTJW1 TLueug8M wPQL4Qfg uACwus23 nmOk9R6w lwgZJrzJ v1UJtKdG RK629Cra U2UXFRqr d9OQLNl8 KAm1K3m5 Z13gKZ1v tNVai1nT LhpVXuVx pRib1Itj I1oLUob7 Z1nUsd5Q ZOwHehUa aXpFX29U ZsnqxlGz ivQRjOdb mB3iBEAj)
 
     # Five servers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memcached
 version: !ruby/object:Gem::Version 
-  version: "0.15"
+  version: 0.15.1
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2009-08-03 00:00:00 -07:00
+date: 2009-08-04 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -83,8 +83,6 @@ files:
 - TODO
 has_rdoc: true
 homepage: http://blog.evanweaver.com/files/doc/fauna/memcached/
-licenses: []
-
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -111,9 +109,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.3.4
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: An interface to the libmemcached C client.
 test_files: 
 - test/test_helper.rb