zmq 2.1.3 → 2.1.4

data/Makefile

@@ -4,17 +4,19 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /usr/local/Cellar/ruby/1.9.1-p378/include/ruby-1.9.1
-hdrdir = /usr/local/Cellar/ruby/1.9.1-p378/include/ruby-1.9.1
-arch_hdrdir = /usr/local/Cellar/ruby/1.9.1-p378/include/ruby-1.9.1/$(arch)
+topdir = /Users/brian/.rvm/rubies/ruby-1.9.2-p180/include/ruby-1.9.1
+hdrdir = /Users/brian/.rvm/rubies/ruby-1.9.2-p180/include/ruby-1.9.1
+arch_hdrdir = /Users/brian/.rvm/rubies/ruby-1.9.2-p180/include/ruby-1.9.1/$(arch)
 VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = $(DESTDIR)/usr/local/Cellar/ruby/1.9.1-p378
+prefix = $(DESTDIR)/Users/brian/.rvm/rubies/ruby-1.9.2-p180
+rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
 exec_prefix = $(prefix)
 vendorhdrdir = $(rubyhdrdir)/vendor_ruby
 sitehdrdir = $(rubyhdrdir)/site_ruby
-rubyhdrdir = $(includedir)/$(RUBY_INSTALL_NAME)-$(ruby_version)
-vendordir = $(libdir)/$(RUBY_INSTALL_NAME)/vendor_ruby
-sitedir = $(DESTDIR)/Library/Ruby/Site
+rubyhdrdir = $(includedir)/$(RUBY_BASE_NAME)-$(ruby_version)
+vendordir = $(rubylibprefix)/vendor_ruby
+sitedir = $(rubylibprefix)/site_ruby
+ridir = $(datarootdir)/$(RI_BASE_NAME)
 mandir = $(datarootdir)/man
 localedir = $(datarootdir)/locale
 libdir = $(exec_prefix)/lib
@@ -34,15 +36,15 @@ datarootdir = $(prefix)/share
 libexecdir = $(exec_prefix)/libexec
 sbindir = $(exec_prefix)/sbin
 bindir = $(exec_prefix)/bin
-rubylibdir = $(libdir)/$(ruby_install_name)/$(ruby_version)
+rubylibdir = $(rubylibprefix)/$(ruby_version)
 archdir = $(rubylibdir)/$(arch)
 sitelibdir = $(sitedir)/$(ruby_version)
 sitearchdir = $(sitelibdir)/$(sitearch)
 vendorlibdir = $(vendordir)/$(ruby_version)
 vendorarchdir = $(vendorlibdir)/$(sitearch)
 
-CC = /usr/bin/cc
-CXX = /usr/bin/c++
+CC = gcc
+CXX = g++
 LIBRUBY = $(LIBRUBY_SO)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
 LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
@@ -51,30 +53,31 @@ OUTFLAG = -o
 COUTFLAG = -o 
 
 RUBY_EXTCONF_H = 
-cflags   = $(optflags) $(debugflags) $(warnflags)
-optflags = -O2
-debugflags = -g
-warnflags = -Wall -Wno-parentheses
-CFLAGS   =  -fno-common -O3 -march=core2 -msse4.1 -w -pipe $(cflags)  -fno-common -pipe -fno-common 
+cflags   =  $(optflags) $(debugflags) $(warnflags)
+optflags = -O3
+debugflags = -ggdb
+warnflags = -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wshorten-64-to-32 -Wno-long-long
+CFLAGS   = -fno-common $(cflags)  -fno-common -pipe 
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     = 
-CPPFLAGS =  -I/usr/local/Cellar/readline/6.0/include -I/usr/local/Cellar/readline/6.0/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
-CXXFLAGS = $(CFLAGS) -O3 -march=core2 -msse4.1 -w -pipe $(cxxflags)
-ldflags  = -L. -L/usr/local/Cellar/readline/6.0/lib -L/usr/local/Cellar/readline/6.0/lib
-dldflags = 
-archflag = 
-DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
-LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
-LDSHAREDXX = $(LDSHARED)
+CPPFLAGS = -DHAVE_ZMQ_H -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
+CXXFLAGS = $(CFLAGS) $(cxxflags)
+ldflags  = -L. -L/usr/local/lib
+dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress -Wl,-flat_namespace
+ARCH_FLAG = 
+DLDFLAGS = $(ldflags) $(dldflags)
+LDSHARED = $(CC) -dynamic -bundle
+LDSHAREDXX = $(CXX) -dynamic -bundle
 AR = ar
 EXEEXT = 
 
+RUBY_BASE_NAME = ruby
 RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby
-arch = i386-darwin10.3.0
-sitearch = i386-darwin10.3.0
+RUBY_SO_NAME = ruby.1.9.1
+arch = x86_64-darwin10.7.0
+sitearch = $(arch)
 ruby_version = 1.9.1
-ruby = /usr/local/Cellar/ruby/1.9.1-p378/bin/ruby
+ruby = /Users/brian/.rvm/rubies/ruby-1.9.2-p180/bin/ruby
 RUBY = $(ruby)
 RM = rm -f
 RM_RF = $(RUBY) -run -e rm -- -rf
@@ -101,7 +104,7 @@ extout =
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED) -lzmq  -lpthread -ldl -lobjc  
+LIBS = $(LIBRUBYARG_SHARED) -lzmq  -lpthread -ldl -lobjc 
 SRCS = rbzmq.c
 OBJS = rbzmq.o
 TARGET = zmq
@@ -122,6 +125,8 @@ CLEANOBJS     = *.o  *.bak
 
 all:    $(DLLIB)
 static: $(STATIC_LIB)
+.PHONY: all install static install-so install-rb
+.PHONY: clean clean-so clean-rb
 
 clean-rb-default::
 clean-rb::
@@ -143,7 +148,8 @@ install: install-so install-rb
 install-so: $(RUBYARCHDIR)
 install-so: $(RUBYARCHDIR)/$(DLLIB)
 $(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+	@-$(MAKEDIRS) $(@D)
+	$(INSTALL_PROG) $(DLLIB) $(@D)
 install-rb: pre-install-rb install-rb-default
 install-rb-default: pre-install-rb-default
 pre-install-rb: Makefile

data/extconf.rb

@@ -18,7 +18,18 @@
 
 require 'mkmf'
 dir_config('zmq')
-if have_library('zmq', 'zmq_init')
+
+def header?
+  have_header('zmq.h') ||
+    find_header('zmq.h', '/opt/local/include', '/usr/local/include', '/usr/include')
+end
+
+def library?
+  have_library('zmq', 'zmq_init') ||
+    find_library('zmq', 'zmq_init', '/opt/local/lib', '/usr/local/lib', '/usr/lib')
+end
+
+if header? && library?
   puts "Cool, I found your zmq install..."
   create_makefile("zmq")
 else

data/rbzmq.c

@@ -63,6 +63,7 @@ typedef unsigned __int64 uint64_t;
     } while(0)
 
 VALUE socket_type;
+VALUE exception_type;
 
 /*
  * Document-class: ZMQ
@@ -124,7 +125,7 @@ static VALUE context_initialize (int argc_, VALUE* argv_, VALUE self_)
     assert (!DATA_PTR (self_));
     void *ctx = zmq_init (NIL_P (io_threads) ? 1 : NUM2INT (io_threads));
     if (!ctx) {
-        rb_raise (rb_eRuntimeError, "%s", zmq_strerror (zmq_errno ()));
+        rb_raise (exception_type, "%s", zmq_strerror (zmq_errno ()));
         return Qnil;
     }
 
@@ -328,7 +329,7 @@ static VALUE internal_select(VALUE argval)
         rc = zmq_poll (ps.items, ps.nitems, arg->timeout_usec);
     
     if (rc == -1) {
-        rb_raise(rb_eRuntimeError, "%s", zmq_strerror (zmq_errno ()));
+        rb_raise(exception_type, "%s", zmq_strerror (zmq_errno ()));
         return Qnil;
     }
     else if (rc == 0)
@@ -356,7 +357,7 @@ static VALUE internal_select(VALUE argval)
 
 static VALUE module_select_internal(VALUE readset, VALUE writeset, VALUE errset, long timeout_usec)
 {
-    int nitems;
+    size_t nitems;
     struct select_arg arg;
 
     /* Conservative estimate for nitems before we traverse the lists. */
@@ -370,11 +371,7 @@ static VALUE module_select_internal(VALUE readset, VALUE writeset, VALUE errset,
     arg.errset = errset;
     arg.timeout_usec = timeout_usec;
 
-#ifdef HAVE_RUBY_INTERN_H
-    return rb_ensure(internal_select, (VALUE)&arg, (void (*)())ruby_xfree, (VALUE)arg.items);
-#else
     return rb_ensure(internal_select, (VALUE)&arg, (VALUE (*)())ruby_xfree, (VALUE)arg.items);
-#endif
 }
 
 /*
@@ -433,7 +430,7 @@ static VALUE context_socket (VALUE self_, VALUE type_)
     Data_Get_Struct (self_, void, c);
     void * s = zmq_socket (c, NUM2INT (type_));
     if (!s) {
-        rb_raise (rb_eRuntimeError, "%s", zmq_strerror (zmq_errno ()));
+        rb_raise (exception_type, "%s", zmq_strerror (zmq_errno ()));
         return Qnil;
     }
 
@@ -933,7 +930,7 @@ static VALUE socket_getsockopt (VALUE self_, VALUE option_)
                                  &optvalsize);
 
             if (rc != 0) {
-              rb_raise (rb_eRuntimeError, "%s", zmq_strerror (zmq_errno ()));
+              rb_raise (exception_type, "%s", zmq_strerror (zmq_errno ()));
               return Qnil;
             }
 
@@ -952,7 +949,7 @@ static VALUE socket_getsockopt (VALUE self_, VALUE option_)
                                  &optvalsize);
 
             if (rc != 0) {
-              rb_raise (rb_eRuntimeError, "%s", zmq_strerror (zmq_errno ()));
+              rb_raise (exception_type, "%s", zmq_strerror (zmq_errno ()));
               return Qnil;
             }
 
@@ -978,7 +975,7 @@ static VALUE socket_getsockopt (VALUE self_, VALUE option_)
                                  &optvalsize);
 
             if (rc != 0) {
-              rb_raise (rb_eRuntimeError, "%s", zmq_strerror (zmq_errno ()));
+              rb_raise (exception_type, "%s", zmq_strerror (zmq_errno ()));
               return Qnil;
             }
 
@@ -1006,7 +1003,7 @@ static VALUE socket_getsockopt (VALUE self_, VALUE option_)
                                  &optvalsize);
 
             if (rc != 0) {
-              rb_raise (rb_eRuntimeError, "%s", zmq_strerror (zmq_errno ()));
+              rb_raise (exception_type, "%s", zmq_strerror (zmq_errno ()));
               return Qnil;
             }
 
@@ -1025,7 +1022,7 @@ static VALUE socket_getsockopt (VALUE self_, VALUE option_)
                                  &optvalsize);
 
             if (rc != 0) {
-              rb_raise (rb_eRuntimeError, "%s", zmq_strerror (zmq_errno ()));
+              rb_raise (exception_type, "%s", zmq_strerror (zmq_errno ()));
               return Qnil;
             }
 
@@ -1036,7 +1033,7 @@ static VALUE socket_getsockopt (VALUE self_, VALUE option_)
         }
         break;
     default:
-        rb_raise (rb_eRuntimeError, "%s", zmq_strerror (EINVAL));
+        rb_raise (exception_type, "%s", zmq_strerror (EINVAL));
         return Qnil;
     }
   
@@ -1318,7 +1315,7 @@ static VALUE socket_setsockopt (VALUE self_, VALUE option_,
     case ZMQ_RECOVERY_IVL_MSEC:
 #endif
         {
-            int optval = FIX2LONG (optval_);
+            int optval = FIX2INT (optval_);
 
             //  Forward the code to native 0MQ library.
             rc = zmq_setsockopt (s, NUM2INT (option_),
@@ -1337,12 +1334,12 @@ static VALUE socket_setsockopt (VALUE self_, VALUE option_,
         break;
 
     default:
-        rb_raise (rb_eRuntimeError, "%s", zmq_strerror (EINVAL));
+        rb_raise (exception_type, "%s", zmq_strerror (EINVAL));
         return Qnil;
     }
 
     if (rc != 0) {
-        rb_raise (rb_eRuntimeError, "%s", zmq_strerror (zmq_errno ()));
+        rb_raise (exception_type, "%s", zmq_strerror (zmq_errno ()));
         return Qnil;
     }
 
@@ -1381,7 +1378,7 @@ static VALUE socket_bind (VALUE self_, VALUE addr_)
 
     int rc = zmq_bind (s, rb_string_value_cstr (&addr_));
     if (rc != 0) {
-        rb_raise (rb_eRuntimeError, "%s", zmq_strerror (zmq_errno ()));
+        rb_raise (exception_type, "%s", zmq_strerror (zmq_errno ()));
         return Qnil;
     }
 
@@ -1424,7 +1421,7 @@ static VALUE socket_connect (VALUE self_, VALUE addr_)
 
     int rc = zmq_connect (s, rb_string_value_cstr (&addr_));
     if (rc != 0) {
-        rb_raise (rb_eRuntimeError, "%s", zmq_strerror (zmq_errno ()));
+        rb_raise (exception_type, "%s", zmq_strerror (zmq_errno ()));
         return Qnil;
     }
 
@@ -1501,7 +1498,7 @@ static VALUE socket_send (int argc_, VALUE* argv_, VALUE self_)
     zmq_msg_t msg;
     int rc = zmq_msg_init_size (&msg, RSTRING_LEN (msg_));
     if (rc != 0) {
-        rb_raise (rb_eRuntimeError, "%s", zmq_strerror (zmq_errno ()));
+        rb_raise (exception_type, "%s", zmq_strerror (zmq_errno ()));
         return Qnil;
     }
     memcpy (zmq_msg_data (&msg), RSTRING_PTR (msg_), RSTRING_LEN (msg_));
@@ -1525,7 +1522,7 @@ static VALUE socket_send (int argc_, VALUE* argv_, VALUE self_)
     }
 
     if (rc != 0) {
-        rb_raise (rb_eRuntimeError, "%s", zmq_strerror (zmq_errno ()));
+        rb_raise (exception_type, "%s", zmq_strerror (zmq_errno ()));
         rc = zmq_msg_close (&msg);
         assert (rc == 0);
         return Qnil;
@@ -1610,7 +1607,7 @@ static VALUE socket_recv (int argc_, VALUE* argv_, VALUE self_)
     }
 
     if (rc != 0) {
-        rb_raise (rb_eRuntimeError, "%s", zmq_strerror (zmq_errno ()));
+        rb_raise (exception_type, "%s", zmq_strerror (zmq_errno ()));
         rc = zmq_msg_close (&msg);
         assert (rc == 0);
         return Qnil;
@@ -1641,7 +1638,7 @@ static VALUE socket_close (VALUE self_)
     if (s != NULL) {
         int rc = zmq_close (s);
         if (rc != 0) {
-            rb_raise (rb_eRuntimeError, "%s", zmq_strerror (zmq_errno ()));
+            rb_raise (exception_type, "%s", zmq_strerror (zmq_errno ()));
             return Qnil;
         }
 
@@ -1656,6 +1653,8 @@ void Init_zmq ()
     rb_define_singleton_method (zmq_module, "version", module_version, 0);
     rb_define_singleton_method (zmq_module, "select", module_select, -1);
 
+    exception_type = rb_define_class_under (zmq_module, "Error", rb_eRuntimeError );
+
     VALUE context_type = rb_define_class_under (zmq_module, "Context",
         rb_cObject);
     rb_define_alloc_func (context_type, context_alloc);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zmq
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,8 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-05 00:00:00.000000000 -07:00
-default_executable: 
+date: 2011-09-14 00:00:00.000000000Z
 dependencies: []
 description: This gem provides a Ruby API for the ZeroMQ messaging library.
 email:
@@ -26,7 +25,6 @@ files:
 - Makefile
 - rbzmq.c
 - extconf.rb
-has_rdoc: true
 homepage: http://www.zeromq.org/bindings:ruby
 licenses: []
 post_install_message: 
@@ -47,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Ruby API for ZeroMQ