couchbase-memcached 1.2.8 → 1.2.9

data/CHANGELOG

@@ -1,3 +1,5 @@
+v1.2.9. Fix test_all task to properly run tests on both platforms. Fix build for ruby 1.8 (enterprise edition)
+
 v1.2.8. Upgrade to libmemcached 0.50. Implement TOUCH command.
 
 v1.2.7. Fix prefix keys on binary (multi)gets. Remove extraneous space from CAS requests.

data/Rakefile

@@ -1,5 +1,4 @@
-require 'psych'
-gem 'echoe', '>= 4.5.6'
+gem 'echoe', '~> 4.5.6'
 require 'echoe'
 
 Echoe.new("couchbase-memcached") do |p|
@@ -54,11 +53,11 @@ task :exceptions do
 end
 
 task :test_all do
-  if !system("rvm use ree-1.8.7-2010.02 && rake clean && rake")
+  if !system("rvm ree rake clean test")
     puts "REE test failed"
     exit(1)
   end
-  if !system("rvm use ruby-1.9.2 && rake clean && rake")
+  if !system("rvm 1.9.2 rake clean test")
     puts "1.9 test failed"
     exit(1)
   end

data/couchbase-memcached.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{couchbase-memcached}
-  s.version = "1.2.8"
+  s.version = "1.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Evan Weaver}]
   s.cert_chain = [%q{/home/avsej/.gem/keys/gem-public_cert.pem}]
-  s.date = %q{2011-07-06}
+  s.date = %q{2011-07-07}
   s.description = %q{An interface to the libmemcached C client.}
   s.email = %q{}
   s.extensions = [%q{ext/extconf.rb}]

data/ext/extconf.rb

@@ -13,7 +13,7 @@ $CFLAGS << " -I/usr/local/include" if BSD
 $EXTRA_CONF = " --disable-64bit" if SOLARIS_32
 
 $LDFLAGS = "#{RbConfig::CONFIG['LDFLAGS']} #{$LDFLAGS} -L#{RbConfig::CONFIG['libdir']}".gsub("$(ldflags)", "").gsub("-fno-common", "")
-$CXXFLAGS = " -std=gnu++98"
+$CXXFLAGS = "-fPIC -std=gnu++98"
 $CPPFLAGS = $ARCH_FLAG = $DLDFLAGS = ""
 
 # JRuby's default configure options can't build libmemcached properly
@@ -51,7 +51,7 @@ def check_libmemcached
     run("touch -r #{BUNDLE_PATH}/configure.ac #{BUNDLE_PATH}/m4/pandora_have_sasl.m4", "Touching aclocal.m4 in libmemcached.")
 
     Dir.chdir(BUNDLE_PATH) do
-      run("env CFLAGS='-fPIC #{LIBM_CFLAGS}' LDFLAGS='-fPIC #{LIBM_LDFLAGS}' ./configure --prefix=#{HERE} --without-memcached --disable-shared --disable-dependency-tracking #{$EXTRA_CONF} 2>&1", "Configuring libmemcached.")
+      run("env CFLAGS='-fPIC #{LIBM_CFLAGS}' CXXFLAGS='#{$CXXFLAGS} #{LIBM_CFLAGS}' LDFLAGS='-fPIC #{LIBM_LDFLAGS}' ./configure --prefix=#{HERE} --without-memcached --disable-shared --disable-dependency-tracking #{$EXTRA_CONF} 2>&1", "Configuring libmemcached.")
     end
 
     Dir.chdir(BUNDLE_PATH) do

data/ext/rlibmemcached_wrap.c

@@ -15206,13 +15206,13 @@ _wrap_memcached_touch(int argc, VALUE *argv, VALUE self) {
   int ecode4 = 0 ;
   memcached_return_t result;
   VALUE vresult = Qnil;
-
+  
   if ((argc < 3) || (argc > 3)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_touch", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_touch", 1, argv[0] )); 
   }
   arg1 = (memcached_st *)(argp1);
   {
@@ -15222,7 +15222,7 @@ _wrap_memcached_touch(int argc, VALUE *argv, VALUE self) {
   ecode4 = SWIG_AsVal_unsigned_SS_long(argv[2], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "time_t","memcached_touch", 4, argv[2] ));
-  }
+  } 
   arg4 = (time_t)(val4);
   result = (memcached_return_t)memcached_touch(arg1,(char const *)arg2,arg3,arg4);
   vresult = SWIG_From_int((int)(result));
@@ -15251,13 +15251,13 @@ _wrap_memcached_touch_by_key(int argc, VALUE *argv, VALUE self) {
   int ecode6 = 0 ;
   memcached_return_t result;
   VALUE vresult = Qnil;
-
+  
   if ((argc < 5) || (argc > 5)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_touch_by_key", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_touch_by_key", 1, argv[0] )); 
   }
   arg1 = (memcached_st *)(argp1);
   res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
@@ -15268,7 +15268,7 @@ _wrap_memcached_touch_by_key(int argc, VALUE *argv, VALUE self) {
   ecode3 = SWIG_AsVal_size_t(argv[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "size_t","memcached_touch_by_key", 3, argv[2] ));
-  }
+  } 
   arg3 = (size_t)(val3);
   {
     arg4 = StringValuePtr(argv[3]);
@@ -15277,7 +15277,7 @@ _wrap_memcached_touch_by_key(int argc, VALUE *argv, VALUE self) {
   ecode6 = SWIG_AsVal_unsigned_SS_long(argv[4], &val6);
   if (!SWIG_IsOK(ecode6)) {
     SWIG_exception_fail(SWIG_ArgError(ecode6), Ruby_Format_TypeError( "", "time_t","memcached_touch_by_key", 6, argv[4] ));
-  }
+  } 
   arg6 = (time_t)(val6);
   result = (memcached_return_t)memcached_touch_by_key(arg1,(char const *)arg2,arg3,(char const *)arg4,arg5,arg6);
   vresult = SWIG_From_int((int)(result));

metadata

@@ -1,63 +1,51 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: couchbase-memcached
-version: !ruby/object:Gem::Version
-  version: 1.2.8
+version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: 
+  segments: 
+  - 1
+  - 2
+  - 9
+  version: 1.2.9
 platform: ruby
-authors:
+authors: 
 - Evan Weaver
 autorequire: 
 bindir: bin
-cert_chain:
-- ! '-----BEGIN CERTIFICATE-----
-
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
   MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRcwFQYDVQQDDA5zZXJn
-
   ZXkuYXZzZXlldjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQB
-
   GRYDY29tMB4XDTExMDcwNjExNTcyOFoXDTEyMDcwNTExNTcyOFowRTEXMBUGA1UE
-
   AwwOc2VyZ2V5LmF2c2V5ZXYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmS
-
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALoc
-
   QacD5O88aMGijLTFVYkNiuoC5+UvbGCl/rTE+Un9/bE/0aVn/LOSUVO2ejJSDHam
-
   GmOxnBwf6fFqJxLt3cD1tvYJaN3DNZIu3zKPTNn/zomEXmuTBTL9qjOEenmcnb/f
-
   z2XlgG1MlkodFdiNxGfStW8c2oM2LipQRtMK3ya78geIMH3bB+JNUmVfqOmTmway
-
   ddL7oJt4U5MWvwHFoHDGiYURmj2VAETZy05xUU7uQ71qUBjw4/ujUwFdswX3iT2z
-
   hdPLyAllVVXPA/AxfK8q1Y8R7fBYEn4Z8o1vP1LnzRfz+wOhTEttt7zSzJhrwMVC
-
   mHp7qaBjPVo4dl+RMacCAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4EFgQUPfv+
-
   2olOX2/ZPqZg6c6g9Ms/KS0wCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEBBQUAA4IB
-
   AQCkQ2hx5hj+Id0UOXzy+dHX9TJXXRg5gnSf+X92vFfYptdUS9wfjwbGoQeVT5/p
-
   c2apo3Gaw0w9k30+Fbt1bbpfg5XQyKlnLmciPrzeaJLkQ1rinreVlC7eXKj3HMTE
-
   QYKsWT8CJcCByLPjWfx1mmBUNIQPnMO9lQrv2HQckqEeZXClPCrLQcp5zUj6deN/
-
   Lolty1nz50mseJ5AJz0nyjdpedxGCwHm51GBhGiEZaJ0zboguiCPC+uYEZOxQRIH
-
   ANLruem4eqvjbHARur8XzSisE6495q5eNRI497/k+l0dkME3QHdvfKo2e87+Hgei
-
   LYAFXGZjixXjcjuuFQP26Wb8
-
   -----END CERTIFICATE-----
 
-'
-date: 2011-07-06 00:00:00.000000000Z
+date: 2011-07-07 00:00:00 Z
 dependencies: []
+
 description: An interface to the libmemcached C client.
-email: ''
+email: ""
 executables: []
-extensions:
+
+extensions: 
 - ext/extconf.rb
-extra_rdoc_files:
+extra_rdoc_files: 
 - BENCHMARKS
 - CHANGELOG
 - LICENSE
@@ -74,7 +62,7 @@ extra_rdoc_files:
 - lib/memcached/experimental.rb
 - lib/memcached/memcached.rb
 - lib/memcached/rails.rb
-files:
+files: 
 - BENCHMARKS
 - CHANGELOG
 - LICENSE
@@ -613,36 +601,45 @@ files:
 - couchbase-memcached.gemspec
 homepage: http://fauna.github.com/fauna/couchbase-memcached/
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --line-numbers
 - --inline-source
 - --title
 - Couchbase-memcached
 - --main
 - README
-require_paths:
+require_paths: 
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '1.2'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 11
+      segments: 
+      - 1
+      - 2
+      version: "1.2"
 requirements: []
+
 rubyforge_project: fauna
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: An interface to the libmemcached C client.
-test_files:
+test_files: 
 - test/unit/binding_test.rb
 - test/unit/rails_test.rb
 - test/unit/memcached_test.rb