rbczmq 1.3 → 1.4

data/CHANGELOG.rdoc

@@ -1,6 +1,9 @@
 = Changelog
 
-== 1.3 (April 8, 2012)
+== 1.4 (April 27, 2013)
+* Ships with release libzmq and czmq tarballs - removes autotools dependency (James Tucker)
+
+== 1.3 (April 8, 2013)
 * Bump czmq
 
 == 1.2 (April 5, 2012)
@@ -53,4 +56,4 @@
 * Include Travis CI build status in README
 
 == 0.1 ( February 21, 2012)
-* Initial public release
+* Initial public release

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    rbczmq (1.2)
+    rbczmq (1.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    rake (0.9.2.2)
-    rake-compiler (0.8.0)
+    rake (10.0.4)
+    rake-compiler (0.8.3)
       rake
 
 PLATFORMS

data/ext/patches/czmq/0_zframe_free.patch

@@ -0,0 +1,78 @@
+diff --git a/include/zframe.h b/include/zframe.h
+index e0e36c2..1b880d3 100644
+--- a/include/zframe.h
++++ b/include/zframe.h
+@@ -116,6 +116,10 @@ CZMQ_EXPORT void
+ CZMQ_EXPORT void
+     zframe_reset (zframe_t *self, const void *data, size_t size);
+ 
++//  Set the free callback for frame
++CZMQ_EXPORT void
++    zframe_freefn(zframe_t *self, zframe_free_fn *free_fn, void *arg);
++
+ //  Self test of this class
+ CZMQ_EXPORT int
+     zframe_test (bool verbose);
+diff --git a/src/zframe.c b/src/zframe.c
+index edeec07..cf124ac 100644
+--- a/src/zframe.c
++++ b/src/zframe.c
+@@ -49,6 +49,8 @@ struct _zframe_t {
+     zmq_msg_t zmsg;             //  zmq_msg_t blob for frame
+     int more;                   //  More flag, from last read
+     int zero_copy;              //  zero-copy flag
++    zframe_free_fn *free_fn;    //  destructor callback
++    void *free_arg;             //  destructor callback arg
+ };
+ 
+ 
+@@ -116,6 +118,8 @@ zframe_destroy (zframe_t **self_p)
+     assert (self_p);
+     if (*self_p) {
+         zframe_t *self = *self_p;
++        if (self->free_fn)
++          (self->free_fn) (self, self->free_arg);
+         zmq_msg_close (&self->zmsg);
+         free (self);
+         *self_p = NULL;
+@@ -373,6 +377,16 @@ zframe_reset (zframe_t *self, const void *data, size_t size)
+     memcpy (zmq_msg_data (&self->zmsg), data, size);
+ }
+ 
++void
++zframe_freefn (zframe_t *self, zframe_free_fn *free_fn, void *arg)
++{
++    assert (self);
++    assert (free_fn);
++
++    self->free_fn = free_fn;
++    self->free_arg = arg;
++}
++
+ //  --------------------------------------------------------------------------
+ //  Selftest
+ 
+@@ -389,6 +403,12 @@ s_test_free_cb (void *data, void *arg)
+     free (data);
+ }
+ 
++static void
++s_test_free_frame_cb(void *frame, void *arg)
++{
++    assert (frame);
++}
++
+ int
+ zframe_test (bool verbose)
+ {
+@@ -472,6 +492,10 @@ zframe_test (bool verbose)
+     zframe_destroy (&frame);
+     zframe_destroy (&frame_copy);
+ 
++    frame = zframe_new ("callback", 8);
++    zframe_freefn (frame, s_test_free_frame_cb, NULL);
++    zframe_destroy (&frame);
++
+     zctx_destroy (&ctx);
+     //  @end
+     printf ("OK\n");

data/ext/rbczmq/extconf.rb

@@ -96,14 +96,26 @@ end
 unless File.directory?(zmq_path) && File.directory?(czmq_path)
   fail "The 'tar' (creates and manipulates streaming archive files) utility is required to extract dependencies" if `which tar`.strip.empty?
   Dir.chdir(vendor_path) do
-    sys "tar xvzf zeromq.tar.gz", "Could not extract the ZeroMQ archive!"
-    sys "tar xvzf czmq.tar.gz", "Could not extract the CZMQ archive!"
+    names = Dir['*mq*.tar.gz'].map { |f| File.basename(f, '.tar.gz') }
+    fail "required files not found: #{names}" unless names.size == 2
+
+    names.each do |name|
+      puts "Extracting #{name}"
+      sys "tar xvzf #{name}.tar.gz", "Could not extract #{name}"
+      puts "Moving #{name} to #{name.split('-').first}"
+      sys "mv #{name} #{name.split('-').first}", "Could not move #{name}"
+    end
   end
 end
 
 # build libzmq
 lib = libs_path + "libzmq.#{LIBEXT}"
 Dir.chdir zmq_path do
+  Dir['../patches/zeromq/*.patch'].sort.each do |patch|
+    puts "applying: #{patch}"
+    sys "patch -p1 < #{patch}", "failed to apply patch: #{patch}"
+  end
+
   sys "./autogen.sh", "ZeroMQ autogen failed!" unless File.exist?(zmq_path + 'configure')
   sys "./configure --prefix=#{dst_path} --without-documentation --enable-shared && make && make install", "ZeroMQ compile error!"
 end unless File.exist?(lib)
@@ -111,6 +123,11 @@ end unless File.exist?(lib)
 # build libczmq
 lib = libs_path + "libczmq.#{LIBEXT}"
 Dir.chdir czmq_path do
+  Dir['../patches/czmq/*.patch'].sort.each do |patch|
+    puts "Applying: #{patch}"
+    sys "patch -p1 < #{patch}", "Failed to apply patch: #{patch}"
+  end
+
   sys "./autogen.sh", "CZMQ autogen failed!" unless File.exist?(czmq_path + 'configure')
   sys "./configure LDFLAGS=-L#{libs_path} CFLAGS='#{CZMQ_CFLAGS.join(" ")}' --prefix=#{dst_path} --with-libzmq=#{dst_path} --disable-shared && make all && make install", "CZMQ compile error!"
 end unless File.exist?(lib)

data/ext/rbczmq/frame.h

@@ -10,7 +10,7 @@
     if (!(st_lookup(frames_map, (st_data_t)frame, 0))) rb_raise(rb_eZmqError, "ZMQ::Frame instance %p has been destroyed by the ZMQ framework", (void *)obj);
 
 #define ZmqRegisterFrame(fr) \
-    zframe_freefn((fr), rb_czmq_frame_freed); \
+    zframe_freefn((fr), rb_czmq_frame_freed, NULL); \
     st_insert(frames_map, (st_data_t)(fr), (st_data_t)0);
 
 void rb_czmq_free_frame(zframe_t *frame);

data/lib/zmq/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module ZMQ
-  VERSION = "1.3"
+  VERSION = "1.4"
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rbczmq
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
-  version: "1.3"
+  - 4
+  version: "1.4"
 platform: ruby
 authors: 
 - "Lourens Naud\xC3\xA9"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-08 00:00:00 Z
+date: 2013-04-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
@@ -57,8 +57,8 @@ files:
 - examples/pub_sub.rb
 - examples/push_pull.rb
 - examples/req_rep.rb
-- ext/czmq.tar.gz
-- ext/libzmq.tar.gz
+- ext/czmq-1.3.2.tar.gz
+- ext/patches/czmq/0_zframe_free.patch
 - ext/rbczmq/context.c
 - ext/rbczmq/context.h
 - ext/rbczmq/extconf.rb
@@ -83,7 +83,7 @@ files:
 - ext/rbczmq/socket.h
 - ext/rbczmq/timer.c
 - ext/rbczmq/timer.h
-- ext/zeromq.tar.gz
+- ext/zeromq-3.2.2.tar.gz
 - lib/rbczmq.rb
 - lib/zmq.rb
 - lib/zmq/context.rb