ffi-rzmq 1.0.3 → 2.0.4

data/spec/spec_helper.rb

@@ -1,11 +1,7 @@
-# To run these specs using rake, make sure the 'bones' and 'bones-extras'
-# gems are installed. Then execute 'rake spec' from the main directory
-# to run all specs.
 
 require File.expand_path(
 File.join(File.dirname(__FILE__), %w[.. lib ffi-rzmq]))
 
-require 'thread' # necessary when testing in MRI 1.8 mode
 Thread.abort_on_exception = true
 
 require 'openssl'
@@ -14,12 +10,8 @@ require 'securerandom'
 
 # define some version guards so we can turn on/off specs based upon
 # the version of the 0mq library that is loaded
-def version2?
-  ZMQ::LibZMQ.version2?
-end
-
-def version3?
-  ZMQ::LibZMQ.version3?
+def version4?
+  ZMQ::LibZMQ.version4?
 end
 
 def jruby?
@@ -35,7 +27,7 @@ end
 
 module APIHelper
   def poller_setup
-    @helper_poller ||= ZMQ::Poller.new
+    @helper_poller = ZMQ::Poller.new
   end
 
   def poller_register_socket(socket)

data/spec/util_spec.rb

@@ -0,0 +1,29 @@
+require File.join(File.dirname(__FILE__), %w[spec_helper])
+
+module ZMQ
+  describe Util do
+
+    if LibZMQ.version4?
+      describe "curve_keypair" do
+
+        it "returns a set of public and private keys (libsodium linked)" do
+          expect(ZMQ::Util).to receive(:curve_keypair).and_return([0, 1])
+          public_key, private_key = ZMQ::Util.curve_keypair
+
+          expect(public_key).not_to eq private_key
+          expect(public_key).not_to be_nil
+          expect(private_key).not_to be_nil
+        end
+
+        it "raises if zmq does not support CURVE (libsodium not linked)" do
+          expect do
+            allow(LibZMQ).to receive(:zmq_curve_keypair).and_return(-1)
+            ZMQ::Util.curve_keypair
+          end.to raise_exception(ZMQ::NotSupportedError)
+        end
+
+      end
+    end
+
+  end
+end

metadata

@@ -1,117 +1,96 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ffi-rzmq
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 3
-  version: 1.0.3
+version: !ruby/object:Gem::Version
+  version: 2.0.4
 platform: ruby
-authors: 
+authors:
 - Chuck Remes
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-10-03 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ffi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+date: 2015-01-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ffi-rzmq-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   This gem wraps the ZeroMQ networking library using the ruby FFI (foreign
   function interface). It's a pure ruby wrapper so this gem can be loaded
-  and run by any ruby runtime that supports FFI. That's all of the major ones -
-  MRI, Rubinius and JRuby.
-email: 
+  and run by any ruby runtime that supports FFI. That's all of the major ones - MRI, Rubinius and JRuby.
+email:
 - git@chuckremes.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .bnsignore
-- .gitignore
-- .travis.yml
+files:
+- ".bnsignore"
+- ".gitignore"
+- ".travis.yml"
 - AUTHORS.txt
 - Gemfile
 - History.txt
 - README.rdoc
 - Rakefile
 - examples/README.rdoc
-- examples/v2api/latency_measurement.rb
-- examples/v2api/local_lat.rb
-- examples/v2api/local_lat_poll.rb
-- examples/v2api/local_throughput.rb
-- examples/v2api/pub.rb
-- examples/v2api/publish_subscribe.rb
-- examples/v2api/remote_lat.rb
-- examples/v2api/remote_throughput.rb
-- examples/v2api/reqrep_poll.rb
-- examples/v2api/request_response.rb
-- examples/v2api/sub.rb
-- examples/v2api/throughput_measurement.rb
-- examples/v2api/xreqxrep_poll.rb
-- examples/v3api/latency_measurement.rb
-- examples/v3api/local_lat.rb
-- examples/v3api/local_lat_poll.rb
-- examples/v3api/local_throughput.rb
-- examples/v3api/pub.rb
-- examples/v3api/publish_subscribe.rb
-- examples/v3api/remote_lat.rb
-- examples/v3api/remote_throughput.rb
-- examples/v3api/reqrep_poll.rb
-- examples/v3api/request_response.rb
-- examples/v3api/sub.rb
-- examples/v3api/throughput_measurement.rb
-- examples/v3api/xreqxrep_poll.rb
+- examples/latency_measurement.rb
+- examples/local_lat.rb
+- examples/local_lat_poll.rb
+- examples/local_throughput.rb
+- examples/pub.rb
+- examples/publish_subscribe.rb
+- examples/remote_lat.rb
+- examples/remote_throughput.rb
+- examples/repreq_over_curve.rb
+- examples/reqrep_poll.rb
+- examples/request_response.rb
+- examples/sub.rb
+- examples/throughput_measurement.rb
+- examples/xreqxrep_poll.rb
 - ext/README
 - ffi-rzmq.gemspec
 - lib/ffi-rzmq.rb
-- lib/ffi-rzmq/constants.rb
 - lib/ffi-rzmq/context.rb
 - lib/ffi-rzmq/device.rb
 - lib/ffi-rzmq/exceptions.rb
-- lib/ffi-rzmq/libc.rb
-- lib/ffi-rzmq/libzmq.rb
 - lib/ffi-rzmq/message.rb
 - lib/ffi-rzmq/poll.rb
 - lib/ffi-rzmq/poll_item.rb
@@ -132,37 +111,33 @@ files:
 - spec/spec_helper.rb
 - spec/support/test.crt
 - spec/support/test.key
-has_rdoc: true
+- spec/util_spec.rb
 homepage: http://github.com/chuckremes/ffi-rzmq
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ffi-rzmq
-rubygems_version: 1.3.6
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: This gem wraps the ZeroMQ (0mq) networking library using Ruby FFI (foreign function interface).
-test_files: 
+specification_version: 4
+summary: This gem wraps the ZeroMQ (0mq) networking library using Ruby FFI (foreign
+  function interface).
+test_files:
 - spec/context_spec.rb
 - spec/device_spec.rb
 - spec/message_spec.rb
@@ -175,3 +150,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/test.crt
 - spec/support/test.key
+- spec/util_spec.rb

data/examples/v2api/latency_measurement.rb

@@ -1,139 +0,0 @@
-
-require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'ffi-rzmq')
-
-
-# Within a single process, we start up two threads. One thread has a REQ (request)
-# socket and the second thread has a REP (reply) socket. We measure the
-# *round-trip* latency between these sockets. Only *one* message is in flight at
-# any given moment.
-#
-# This example also illustrates how a single context can be shared amongst several
-# threads. Sharing a single context also allows a user to specify the "inproc"
-# transport in addition to "tcp" and "ipc".
-#
-#  % ruby latency_measurement.rb tcp://127.0.0.1:5555 1024 1_000_000
-#
-#  % ruby latency_measurement.rb inproc://lm_sock 1024 1_000_000
-#
-
-if ARGV.length < 3
-  puts "usage: ruby latency_measurement.rb <connect-to> <message-size> <roundtrip-count>"
-  exit
-end
-
-link = ARGV[0]
-message_size = ARGV[1].to_i
-roundtrip_count = ARGV[2].to_i
-
-def assert(rc)
-  raise "Last API call failed at #{caller(1)}" unless rc >= 0
-end
-
-begin
-  master_context = ZMQ::Context.new
-rescue ContextError => e
-  STDERR.puts "Failed to allocate context or socket!"
-  raise
-end
-
-
-class Receiver
-  def initialize context, link, size, count
-    @context = context
-    @link = link
-    @size = size
-    @count = count
-
-    begin
-      @socket = @context.socket(ZMQ::REP)
-    rescue ContextError => e
-      STDERR.puts "Failed to allocate REP socket!"
-      raise
-    end
-
-    assert(@socket.setsockopt(ZMQ::LINGER, 100))
-
-    assert(@socket.setsockopt(ZMQ::HWM, 100))
-
-    assert(@socket.bind(@link))
-  end
-
-  def run
-    @count.times do
-      string = ''
-      assert(@socket.recv_string(string, 0))
-
-      raise "Message size doesn't match, expected [#{@size}] but received [#{string.size}]" if @size != string.size
-
-      assert(@socket.send_string(string, 0))
-    end
-
-    assert(@socket.close)
-  end
-end
-
-class Transmitter
-  def initialize context, link, size, count
-    @context = context
-    @link = link
-    @size = size
-    @count = count
-
-    begin
-      @socket = @context.socket(ZMQ::REQ)
-    rescue ContextError => e
-      STDERR.puts "Failed to allocate REP socket!"
-      raise
-    end
-
-    assert(@socket.setsockopt(ZMQ::LINGER, 100))
-
-    assert(@socket.setsockopt(ZMQ::HWM, 100))
-
-    assert(@socket.connect(@link))
-  end
-
-  def run
-    msg = "#{ '3' * @size }"
-
-    elapsed = elapsed_microseconds do
-      @count.times do
-        assert(@socket.send_string(msg, 0))
-        assert(@socket.recv_string(msg, 0))
-
-        raise "Message size doesn't match, expected [#{@size}] but received [#{msg.size}]" if @size != msg.size
-      end
-    end
-
-    latency = elapsed / @count / 2
-
-    puts "message size: %i [B]" % @size
-    puts "roundtrip count: %i" % @count
-    puts "throughput (msgs/s): %i" % (@count / (elapsed / 1_000_000))
-    puts "mean latency: %.3f [us]" % latency
-    assert(@socket.close)
-  end
-
-  def elapsed_microseconds(&blk)
-    start = Time.now
-    yield
-    value = ((Time.now - start) * 1_000_000)
-  end
-end
-
-threads = []
-threads << Thread.new do
-  receiver = Receiver.new(master_context, link, message_size, roundtrip_count)
-  receiver.run
-end
-
-sleep 1
-
-threads << Thread.new do
-  transmitter = Transmitter.new(master_context, link, message_size, roundtrip_count)
-  transmitter.run
-end
-
-threads.each {|t| t.join}
-
-master_context.terminate

data/examples/v2api/local_lat.rb

@@ -1,58 +0,0 @@
-#
-#    Copyright (c) 2007-2010 iMatix Corporation
-#
-#    This file is part of 0MQ.
-#
-#    0MQ is free software; you can redistribute it and/or modify it under
-#    the terms of the Lesser GNU General Public License as published by
-#    the Free Software Foundation; either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    0MQ is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    Lesser GNU General Public License for more details.
-#
-#    You should have received a copy of the Lesser GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'ffi-rzmq')
-
-if ARGV.length < 3
-  puts "usage: ruby local_lat.rb <connect-to> <message-size> <roundtrip-count>"
-  exit
-end
-
-bind_to = ARGV[0]
-message_size = ARGV[1].to_i
-roundtrip_count = ARGV[2].to_i
-
-def assert(rc)
-  raise "Last API call failed at #{caller(1)}" unless rc >= 0
-end
-
-begin
-  ctx = ZMQ::Context.new
-  s = ctx.socket(ZMQ::REP)
-rescue ContextError => e
-  STDERR.puts "Failed to allocate context or socket!"
-  raise
-end
-
-assert(s.setsockopt(ZMQ::LINGER, 100))
-assert(s.setsockopt(ZMQ::HWM, 100))
-
-assert(s.bind(bind_to))
-
-roundtrip_count.times do
-  string = ''
-  assert(s.recv_string(string, 0))
-
-  raise "Message size doesn't match, expected [#{message_size}] but received [#{string.size}]" if message_size != string.size
-
-  assert(s.send_string(string, 0))
-end
-
-assert(s.close)
-
-ctx.terminate