curb 0.5.9.0 → 0.5.9.1

data/ext/curb.h

@@ -20,12 +20,12 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.5.9.0"
-#define CURB_VER_NUM   590
+#define CURB_VERSION   "0.5.9.1"
+#define CURB_VER_NUM   591
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   5
 #define CURB_VER_MIC   9
-#define CURB_VER_PATCH 0
+#define CURB_VER_PATCH 1
 
 
 // Maybe not yet defined in Ruby

data/ext/curb_multi.c

@@ -92,7 +92,7 @@ VALUE ruby_curl_multi_new(VALUE klass) {
   return new_curlm;
 }
 
-// Hash#foreach callback for ruby_curl_multi_requests
+/* Hash#foreach callback for ruby_curl_multi_requests */
 static int ruby_curl_multi_requests_callback(VALUE key, VALUE value, VALUE result_array) {
   rb_ary_push(result_array, value);
   
@@ -113,8 +113,8 @@ static VALUE ruby_curl_multi_requests(VALUE self) {
   
   result_array = rb_ary_new();
   
-  // iterate over the requests hash, and stuff references into the array.
-  rb_hash_foreach( rbcm->requests, ruby_curl_multi_requests_callback, result_array );
+  /* iterate over the requests hash, and stuff references into the array. */
+  rb_hash_foreach(rbcm->requests, ruby_curl_multi_requests_callback, result_array);
   
   return result_array;
 }

data/ext/extconf.rb

@@ -1,4 +1,5 @@
 require 'mkmf'
+puts $CFLAGS.inspect
 
 dir_config('curl')
 
@@ -24,15 +25,16 @@ elsif !have_library('curl') or !have_header('curl/curl.h')
 end
 
 # Check arch flags
-archs = $CFLAGS.scan(/-arch\s(.*?)\s/).first # get the first arch flag
-if archs and archs.size >= 1
-  # need to reduce the number of archs...
-  # guess the first one is correct... at least the first one is probably the ruby installed arch...
-  # this could lead to compiled binaries that crash at runtime...
-  $CFLAGS.gsub!(/-arch\s(.*?)\s/,' ')
-  $CFLAGS << " -arch #{archs.first}"
-  puts "Selected arch: #{archs.first}"
-end
+# TODO: detect mismatched arch types when libcurl mac ports is mixed with native mac ruby or vice versa
+#archs = $CFLAGS.scan(/-arch\s(.*?)\s/).first # get the first arch flag
+#if archs and archs.size >= 1
+#  # need to reduce the number of archs...
+#  # guess the first one is correct... at least the first one is probably the ruby installed arch...
+#  # this could lead to compiled binaries that crash at runtime...
+#  $CFLAGS.gsub!(/-arch\s(.*?)\s/,' ')
+#  $CFLAGS << " -arch #{archs.first}"
+#  puts "Selected arch: #{archs.first}"
+#end
 
 def define(s)
   $defs.push( format("-D HAVE_%s", s.to_s.upcase) )

data/lib/curb.rb

@@ -1,6 +1,7 @@
 require 'curb_core'
 
 module Curl
+
   class Easy
     class << self
     
@@ -54,6 +55,7 @@ module Curl
       self.cert
     end
   end
+
   class Multi
     class << self
       # call-seq:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: curb
 version: !ruby/object:Gem::Version 
-  version: 0.5.9.0
+  version: 0.5.9.1
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -05:00
+date: 2009-11-24 00:00:00 -05:00
 default_executable: 
 dependencies: []