memcached 1.0.6 → 1.0.7

data/CHANGELOG

@@ -1,3 +1,5 @@
+v1.0.7. Fix build on BSD (Stew Mckinney). Fix build on Rubinius (brixen).
+
 v1.0.6. Make build step repeatable in the event of failure.
 
 v1.0.5. Fix Manifest.

data/ext/extconf.rb

@@ -25,8 +25,13 @@ if ENV['DEBUG']
 end
 
 def patch(prefix, reason)
-  puts "Patching libmemcached source for #{reason}."
-  puts(cmd = "#{PATCH_CMD} -p1 -f < #{prefix}.patch")
+  cmd = "#{PATCH_CMD} -p1 -f < #{prefix}.patch"
+  run(cmd, "Patching libmemcached source for #{reason}.")
+end
+
+def run(cmd, reason)
+  puts reason
+  puts cmd
   raise "'#{cmd}' failed" unless system(cmd) or ENV['DEV']
 end
 
@@ -51,10 +56,7 @@ def check_libmemcached
       # end
 
       system("rm -rf #{BUNDLE_PATH}") unless ENV['DEBUG'] or ENV['DEV']
-
-      puts "Building libmemcached."
-      puts(cmd = "#{TAR_CMD} xzf #{BUNDLE} 2>&1")
-      raise "'#{cmd}' failed" unless system(cmd)
+      run("#{TAR_CMD} xzf #{BUNDLE} 2>&1", "Building libmemcached.")
 
       patch("libmemcached", "mark-dead behavior")
       patch("sasl", "SASL")
@@ -64,19 +66,13 @@ def check_libmemcached
       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")
-      raise "'#{cmd}' failed" unless system(cmd)
+      run("touch -r #{BUNDLE_PATH}/m4/visibility.m4 #{BUNDLE_PATH}/configure.ac #{BUNDLE_PATH}/m4/pandora_have_sasl.m4", "Touching aclocal.m4 in libmemcached.")
 
       Dir.chdir(BUNDLE_PATH) do
-        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)
+        run("env CFLAGS='-fPIC #{$CFLAGS}' LDFLAGS='-fPIC #{$LDFLAGS}' ./configure --prefix=#{HERE} --without-memcached --disable-shared --disable-utils --disable-dependency-tracking #{$EXTRA_CONF} 2>&1", "Configuring libmemcached.")
 
-        puts(cmd = "#{GMAKE_CMD} CXXFLAGS='#{$CXXFLAGS}' || true 2>&1")
-        raise "'#{cmd}' failed" unless system(cmd)
-
-        puts(cmd = "#{GMAKE_CMD} install || true 2>&1")
-        raise "'#{cmd}' failed" unless system(cmd)
+        #Running the make command in another script invoked by another shell command solves the "cd ." issue on FreeBSD 6+
+        run("GMAKE_CMD='#{GMAKE_CMD}' CXXFLAGS='#{$CXXFLAGS}' SOURCE_DIR='#{BUNDLE_PATH}' HERE='#{HERE}' ruby ../extconf-make.rb", "Making libmemcached.")
       end
 
       system("rm -rf #{BUNDLE_PATH}") unless ENV['DEBUG'] or ENV['DEV']
@@ -94,11 +90,13 @@ end
 check_libmemcached
 
 if ENV['SWIG']
-  puts "Running SWIG."
-  puts(cmd = "swig #{$defines} #{$includes} -ruby -autorename rlibmemcached.i")
-  raise "'#{cmd}' failed" unless system(cmd)
-  puts(cmd = "sed -i '' 's/STR2CSTR/StringValuePtr/' rlibmemcached_wrap.c")
-  raise "'#{cmd}' failed" unless system(cmd)
+  if (`swig -version`=~ /2.0.1/)
+    run("swig #{$defines} #{$includes} -ruby -autorename rlibmemcached.i", "Running SWIG.")
+    run("sed -i '' 's/STR2CSTR/StringValuePtr/' rlibmemcached_wrap.c", "Patching SWIG output for Ruby 1.9.")
+    run("sed -i '' 's/\"swig_runtime_data\"/\"SwigRuntimeData\"/' rlibmemcached_wrap.c", "Patching SWIG output for Ruby 1.9.")
+  else
+    raise "Swig 2.0.1 not found. Newer versions may not work."
+  end
 end
 
 $CFLAGS << " -Os"

data/ext/rlibmemcached.i

@@ -34,7 +34,7 @@
   Check_Type($input, T_ARRAY);
   $3 = (unsigned int) RARRAY_LEN($input);
   $2 = (size_t *) malloc(($3+1)*sizeof(size_t));
-  $1 = (char **) malloc(($3+1)*sizeof(char *)); 
+  $1 = (char **) malloc(($3+1)*sizeof(char *));
   for(i = 0; i < $3; i ++) {
     Check_Type(RARRAY_PTR($input)[i], T_STRING);
     $2[i] = RSTRING_LEN(RARRAY_PTR($input)[i]);
@@ -46,7 +46,7 @@
   Check_Type($input, T_ARRAY);
   $3 = (unsigned int) RARRAY_LEN($input);
   $2 = (size_t *) malloc(($3+1)*sizeof(size_t));
-  $1 = (char **) malloc(($3+1)*sizeof(char *)); 
+  $1 = (char **) malloc(($3+1)*sizeof(char *));
   for(i = 0; i < $3; i ++) {
     Check_Type(RARRAY_PTR($input)[i], T_STRING);
     $2[i] = RSTRING_LEN(RARRAY_PTR($input)[i]);
@@ -74,8 +74,8 @@
 };
 
 %apply (const char *str, size_t len) {
-  (const char *namespace, size_t namespace_length), 
-  (const char *key, size_t key_length), 
+  (const char *namespace, size_t namespace_length),
+  (const char *key, size_t key_length),
   (const char *value, size_t value_length)
 };
 
@@ -116,16 +116,16 @@
   size_t length = 0;
   $1 = string;
   $2 = &length;
-}; 
+};
 %typemap(argout) (char *key, size_t *key_length) {
   // Pushes an empty string when *key_length == 0
-  rb_ary_push($result, rb_str_new($1, *$2)); 
+  rb_ary_push($result, rb_str_new($1, *$2));
 }
 
 // Array of strings
 
 %typemap(out) (char **) {
-  int i;  
+  int i;
   VALUE ary = rb_ary_new();
   $result = rb_ary_new();
 
@@ -195,7 +195,7 @@ VALUE memcached_fetch_rvalue(memcached_st *ptr, char *key, size_t *key_length, u
 VALUE memcached_fetch_rvalue(memcached_st *ptr, char *key, size_t *key_length, uint32_t *flags, memcached_return *error) {
   size_t value_length;
   VALUE result = rb_ary_new();
-  
+
   char *value = memcached_fetch(ptr, key, key_length, &value_length, flags, error);
   VALUE ret = rb_str_new(value, value_length);
   rb_ary_push(result, ret);
@@ -238,7 +238,7 @@ memcached_stat_st *memcached_select_stat_at(memcached_st *in_ptr, memcached_stat
 // Uint32
 VALUE memcached_generate_hash_rvalue(const char *key, size_t key_length, memcached_hash hash_algorithm);
 %{
-VALUE memcached_generate_hash_rvalue(const char *key, size_t key_length,memcached_hash hash_algorithm) {  
+VALUE memcached_generate_hash_rvalue(const char *key, size_t key_length,memcached_hash hash_algorithm) {
   return UINT2NUM(memcached_generate_hash_value(key, key_length, hash_algorithm));
 };
 %}

data/ext/rlibmemcached_wrap.c

@@ -1734,7 +1734,7 @@ SWIGRUNTIME void
 SWIG_Ruby_SetModule(swig_module_info *pointer)
 {
   /* register a new class */
-  VALUE cl = rb_define_class("swig_runtime_data", rb_cObject);
+  VALUE cl = rb_define_class("SwigRuntimeData", rb_cObject);
   /* create and store the structure pointer to a global variable */
   swig_runtime_data_type_pointer = Data_Wrap_Struct(cl, 0, 0, pointer);
   rb_define_readonly_variable("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, &swig_runtime_data_type_pointer);
@@ -2286,7 +2286,7 @@ VALUE memcached_get_from_last_rvalue(memcached_st *ptr, const char *key, size_t
 VALUE memcached_fetch_rvalue(memcached_st *ptr, char *key, size_t *key_length, uint32_t *flags, memcached_return *error) {
   size_t value_length;
   VALUE result = rb_ary_new();
-  
+
   char *value = memcached_fetch(ptr, key, key_length, &value_length, flags, error);
   VALUE ret = rb_str_new(value, value_length);
   rb_ary_push(result, ret);
@@ -2315,7 +2315,7 @@ memcached_stat_st *memcached_select_stat_at(memcached_st *in_ptr, memcached_stat
 };
 
 
-VALUE memcached_generate_hash_rvalue(const char *key, size_t key_length,memcached_hash hash_algorithm) {  
+VALUE memcached_generate_hash_rvalue(const char *key, size_t key_length,memcached_hash hash_algorithm) {
   return UINT2NUM(memcached_generate_hash_value(key, key_length, hash_algorithm));
 };
 
@@ -8224,7 +8224,7 @@ _wrap_memcached_stat_get_keys(int argc, VALUE *argv, VALUE self) {
   arg2 = (memcached_stat_st *)(argp2);
   result = (char **)memcached_stat_get_keys(arg1,arg2,arg3);
   {
-    int i;  
+    int i;
     VALUE ary = rb_ary_new();
     vresult = rb_ary_new();
     
@@ -8836,7 +8836,7 @@ _wrap_memcached_mget(int argc, VALUE *argv, VALUE self) {
     Check_Type(argv[1], T_ARRAY);
     arg4 = (unsigned int) RARRAY_LEN(argv[1]);
     arg3 = (size_t *) malloc((arg4+1)*sizeof(size_t));
-    arg2 = (char **) malloc((arg4+1)*sizeof(char *)); 
+    arg2 = (char **) malloc((arg4+1)*sizeof(char *));
     for(i = 0; i < arg4; i ++) {
       Check_Type(RARRAY_PTR(argv[1])[i], T_STRING);
       arg3[i] = RSTRING_LEN(RARRAY_PTR(argv[1])[i]);
@@ -8878,7 +8878,7 @@ _wrap_memcached_mget_len(int argc, VALUE *argv, VALUE self) {
     Check_Type(argv[1], T_ARRAY);
     arg4 = (unsigned int) RARRAY_LEN(argv[1]);
     arg3 = (size_t *) malloc((arg4+1)*sizeof(size_t));
-    arg2 = (char **) malloc((arg4+1)*sizeof(char *)); 
+    arg2 = (char **) malloc((arg4+1)*sizeof(char *));
     for(i = 0; i < arg4; i ++) {
       Check_Type(RARRAY_PTR(argv[1])[i], T_STRING);
       arg3[i] = RSTRING_LEN(RARRAY_PTR(argv[1])[i]);
@@ -9012,7 +9012,7 @@ _wrap_memcached_mget_by_key(int argc, VALUE *argv, VALUE self) {
     Check_Type(argv[3], T_ARRAY);
     arg6 = (unsigned int) RARRAY_LEN(argv[3]);
     arg5 = (size_t *) malloc((arg6+1)*sizeof(size_t));
-    arg4 = (char **) malloc((arg6+1)*sizeof(char *)); 
+    arg4 = (char **) malloc((arg6+1)*sizeof(char *));
     for(i = 0; i < arg6; i ++) {
       Check_Type(RARRAY_PTR(argv[3])[i], T_STRING);
       arg5[i] = RSTRING_LEN(RARRAY_PTR(argv[3])[i]);
@@ -9074,7 +9074,7 @@ _wrap_memcached_fetch(int argc, VALUE *argv, VALUE self) {
   vresult = SWIG_FromCharPtr((const char *)result);
   {
     // Pushes an empty string when *key_length == 0
-    rb_ary_push(vresult, rb_str_new(arg2, *arg3)); 
+    rb_ary_push(vresult, rb_str_new(arg2, *arg3));
   }
   if (SWIG_IsTmpObj(res4)) {
     vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_size_t((*arg4)));
@@ -12642,7 +12642,7 @@ _wrap_memcached_fetch_rvalue(int argc, VALUE *argv, VALUE self) {
   vresult = result;
   {
     // Pushes an empty string when *key_length == 0
-    rb_ary_push(vresult, rb_str_new(arg2, *arg3)); 
+    rb_ary_push(vresult, rb_str_new(arg2, *arg3));
   }
   if (SWIG_IsTmpObj(res4)) {
     vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_int((*arg4)));

data/memcached.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "1.0.6"
+  s.version = "1.0.7"
 
   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-02-09}
+  s.date = %q{2011-02-22}
   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: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Evan Weaver
@@ -36,7 +36,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2011-02-09 00:00:00 -08:00
+date: 2011-02-22 00:00:00 -08:00
 default_executable: 
 dependencies: []