memcached 1.0.5 → 1.0.6

data.tar.gz.sig

@@ -1,2 +1,2 @@
-O�3���Ց�U��$�ܘ�� �8`𺱭��軡$��s {�r1>�R*�7+����o%�n6A���M���=s&yc�O���7h�i�@ꂪ_�h_p���I���f))*PʉS�H?�V7�*�D<���@v>>����
-|�&�X��T.\��YqW9.4�(1����ǾAx!�63z����݋Jv^�i�\���Us�eDR)���K��4��k�a�>'Α�Vǐ�b�5�V�/�@���� �P���p
+`F�n���T��SS��@��A��,�~�רv1f��6�Ԋ�T�:4뇒��8_\/o����f�8��_��}��d�f�K�9cLu�踖�c��>? mX荿�@�3R���R����<T�DK����{!m���z�<�U�uw,�L�3�ntꉿ.���4�\���iD��H{��P�yYKӱp��0׍�4�l���Ґ(Փ������Fz=eee��
+b����$j���.����

data/CHANGELOG

@@ -1,3 +1,5 @@
+v1.0.6. Make build step repeatable in the event of failure.
+
 v1.0.5. Fix Manifest.
 
 v1.0.4. Fix server_failure_count mangling in memcached_quit.

data/ext/extconf.rb

@@ -14,12 +14,22 @@ $LDFLAGS = "#{RbConfig::CONFIG['LDFLAGS']} #{$LDFLAGS} -L#{RbConfig::CONFIG['lib
 $CXXFLAGS = " -std=gnu++98 #{$CFLAGS}"
 $CPPFLAGS = $ARCH_FLAG = $DLDFLAGS = ""
 
+GMAKE_CMD = Config::CONFIG['host_os'].downcase =~ /bsd|solaris/ ? "gmake" : "make"
+TAR_CMD = SOLARIS_32 ? 'gtar' : 'tar'
+PATCH_CMD = SOLARIS_32 ? 'gpatch' : 'patch'
+
 if ENV['DEBUG']
   puts "Setting debug flags."
   $CFLAGS << " -O0 -ggdb -DHAVE_DEBUG"
   $EXTRA_CONF = ""
 end
 
+def patch(prefix, reason)
+  puts "Patching libmemcached source for #{reason}."
+  puts(cmd = "#{PATCH_CMD} -p1 -f < #{prefix}.patch")
+  raise "'#{cmd}' failed" unless system(cmd) or ENV['DEV']
+end
+
 def check_libmemcached
   return if ENV["EXTERNAL_LIB"]
 
@@ -35,45 +45,24 @@ def check_libmemcached
     if File.exist?("lib")
       puts "Libmemcached already built; run 'rake clean' first if you need to rebuild."
     else
-      tar = SOLARIS_32 ? 'gtar' : 'tar'
-      patch = SOLARIS_32 ? 'gpatch' : 'patch'
-
       # have_sasl check may fail on OSX, skip it
       # unless RUBY_PLATFORM =~ /darwin/ or have_library('sasl2')
       #   raise "SASL2 not found. You need the libsasl2-dev library, which should be provided through your system's package manager."
       # end
 
+      system("rm -rf #{BUNDLE_PATH}") unless ENV['DEBUG'] or ENV['DEV']
+
       puts "Building libmemcached."
-      puts(cmd = "#{tar} xzf #{BUNDLE} 2>&1")
+      puts(cmd = "#{TAR_CMD} xzf #{BUNDLE} 2>&1")
       raise "'#{cmd}' failed" unless system(cmd)
 
-      puts "Patching libmemcached source."
-      puts(cmd = "#{patch} -p1 -Z < libmemcached.patch") 
-      raise "'#{cmd}' failed" unless system(cmd) or ENV['DEV']
-
-      puts "Patching libmemcached with SASL support."
-      puts(cmd = "#{patch} -p1 -Z < sasl.patch")
-      raise "'#{cmd}' failed" unless system(cmd) or ENV['DEV']
-
-      puts "Patching libmemcached for get_from_last support."
-      puts(cmd = "#{patch} -p1 -Z < libmemcached-2.patch")
-      raise "'#{cmd}' failed" unless system(cmd) or ENV['DEV']
-
-      puts "Patching libmemcached for no block prepend and append support."
-      puts(cmd = "#{patch} -p1 -Z < libmemcached-3.patch")
-      raise "'#{cmd}' failed" unless system(cmd) or ENV['DEV']
-
-      puts "Patching libmemcached for noop hash support."
-      puts(cmd = "#{patch} -p1 -Z < libmemcached-4.patch")
-      raise "'#{cmd}' failed" unless system(cmd) or ENV['DEV']
-
-      puts "Patching libmemcached for get_len command."
-      puts(cmd = "#{patch} -p1 -Z < libmemcached-5.patch")
-      raise "'#{cmd}' failed" unless system(cmd) or ENV['DEV']
-
-      puts "Patching libmemcached for failure count breakage."
-      puts(cmd = "#{patch} -p1 -Z < libmemcached-6.patch")
-      raise "'#{cmd}' failed" unless system(cmd) or ENV['DEV']
+      patch("libmemcached", "mark-dead behavior")
+      patch("sasl", "SASL")
+      patch("libmemcached-2", "get_from_last method")
+      patch("libmemcached-3", "no block prepend and append")
+      patch("libmemcached-4", "noop hash")
+      patch("libmemcached-5", "get_len method")
+      patch("libmemcached-6", "failure count bug")
 
       puts "Touching aclocal.m4  in libmemcached."
       puts(cmd = "touch -r #{BUNDLE_PATH}/m4/visibility.m4 #{BUNDLE_PATH}/configure.ac #{BUNDLE_PATH}/m4/pandora_have_sasl.m4")
@@ -83,10 +72,10 @@ def check_libmemcached
         puts(cmd = "env CFLAGS='-fPIC #{$CFLAGS}' LDFLAGS='-fPIC #{$LDFLAGS}' ./configure --prefix=#{HERE} --without-memcached --disable-shared --disable-utils --disable-dependency-tracking #{$EXTRA_CONF} 2>&1")
         raise "'#{cmd}' failed" unless system(cmd)
 
-        puts(cmd = "make CXXFLAGS='#{$CXXFLAGS}' || true 2>&1")
+        puts(cmd = "#{GMAKE_CMD} CXXFLAGS='#{$CXXFLAGS}' || true 2>&1")
         raise "'#{cmd}' failed" unless system(cmd)
 
-        puts(cmd = "make install || true 2>&1")
+        puts(cmd = "#{GMAKE_CMD} install || true 2>&1")
         raise "'#{cmd}' failed" unless system(cmd)
       end
 

data/memcached.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   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{2011-01-27}
+  s.date = %q{2011-02-09}
   s.description = %q{An interface to the libmemcached C client.}
   s.email = %q{}
   s.extensions = ["ext/extconf.rb"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: memcached
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Evan Weaver
@@ -36,7 +36,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2011-01-27 00:00:00 -08:00
+date: 2011-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: []