nats 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdd90752229d1b9e8958d4a29b02951ce3107d93
-  data.tar.gz: 0f7ddb25822e6be88d025d8a1ab200470b7c5a2f
+  metadata.gz: 9001307af28148c669590f0964512c8ddc60cff4
+  data.tar.gz: 97ffb35dca621454dddcda8aad90d081b7d51520
 SHA512:
-  metadata.gz: c0543c590534e277b2b95077d564acdc0055478e04655fa24030022f34bd14bd0a7fd5450288c89984106f0832d68088053fdec3555a3f6bf6c4f0630efdfb2c
-  data.tar.gz: 9207aac064c91db634a100a01f482696ffa0362ce257ab44661c921b9fab408206009fc082fd20ade7c67521c625b36ae1a7d1d278c8d70b6645177b9687f5cd
+  metadata.gz: a2aaddd687461480f22bd596d60d1b28cf10af716d011d2531e9e7f31f6b5391c9e67f33f494378c8d39c7973ae426bce6e93227e8ce65ec30d3988d045f02f1
+  data.tar.gz: 446229594e7a0f4aa88aba27e5e3f12abe8adffdde363674a7e464ed541567ed81370ef939a25c77d455051407078fd6dce73f89d310bb5e0bd5637c7e2b5032

data/HISTORY.md

@@ -1,5 +1,20 @@
 # HISTORY
 
+## v0.6.0 (March 22, 2016)
+  - Removed distributing `nats-server` along with the gem
+  - Fixed issue with subscriptions not being sent on first reconnect (#94)
+  - Added loading Oj gem for JSON when supported (#91)
+  - Fixed removing warning message introduced by EM 1.0.8 (#90)
+  - Changed to testing spec with `gnatsd` (#95)
+  - See full list @ https://github.com/nats-io/ruby-nats/compare/v0.5.1...v0.6.0
+
+## v0.5.1 (August 7, 2015)
+  - Changed to never remove servers when configured as such (#88)
+  - See full list @ https://github.com/nats-io/ruby-nats/compare/v0.5.0...v0.5.1
+
+## v0.5.0 (June 19, 2015)
+  - See full list @ https://github.com/nats-io/ruby-nats/compare/v0.5.0.beta.16...v0.5.0
+
 ## v0.5.0.beta.16 (December 7, 2014)
   - Resolved major issue on cluster connects to non-first server, issue #78
   - Official Support for Ruby 2.1

data/Rakefile

@@ -1,12 +1,26 @@
-desc "Run rspec"
-task :spec do
-  require "rspec/core/rake_task"
-  RSpec::Core::RakeTask.new do |t|
-    t.rspec_opts = %w(-fd -c)
-  end
+#!/usr/bin/env rake
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
+desc 'Run specs from client and server'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+  spec.rspec_opts = ["--format", "documentation", "--colour"]
 end
 task :default => :spec
 
+desc 'Run spec from client using gnatsd as the server'
+RSpec::Core::RakeTask.new('spec:client') do |spec|
+  spec.pattern = FileList['spec/client/*_spec.rb']
+  spec.rspec_opts = ["--format", "documentation", "--colour"]
+end
+
+desc 'Run spec from server'
+RSpec::Core::RakeTask.new('spec:server') do |spec|
+  spec.pattern = FileList['spec/server/*_spec.rb']
+  spec.rspec_opts = ["--format", "documentation", "--colour"]
+end
+
 desc "Build the gem"
 task :gem do
   sh 'gem build *.gemspec'

data/lib/nats/client.rb

@@ -6,11 +6,10 @@ ep = File.expand_path(File.dirname(__FILE__))
 require "#{ep}/ext/em"
 require "#{ep}/ext/bytesize"
 require "#{ep}/ext/json"
+require "#{ep}/version"
 
 module NATS
 
-  VERSION = "0.5.1".freeze
-
   DEFAULT_PORT = 4222
   DEFAULT_URI = "nats://localhost:#{DEFAULT_PORT}".freeze
 
@@ -43,6 +42,7 @@ module NATS
   PING_REQUEST  = ("PING#{CR_LF}".freeze) #:nodoc:
   PONG_RESPONSE = ("PONG#{CR_LF}".freeze) #:nodoc:
 
+  SUB_OP = ('SUB'.freeze) #:nodoc:
   EMPTY_MSG = (''.freeze) #:nodoc:
 
   # Used for future pedantic Mode
@@ -53,13 +53,6 @@ module NATS
   AWAITING_CONTROL_LINE = 1 #:nodoc:
   AWAITING_MSG_PAYLOAD  = 2 #:nodoc:
 
-  # Autostart properties
-  AUTOSTART_PID_FILE = '/tmp/nats-server.pid'
-  AUTOSTART_LOG_FILE = '/tmp/nats-server.log'
-
-  # Duplicate autostart protection
-  @@tried_autostart = {}
-
   class Error < StandardError; end #:nodoc:
 
   # When the NATS server sends us an ERROR message, this is raised/passed by default
@@ -82,12 +75,10 @@ module NATS
     alias :reactor_was_running? :reactor_was_running
 
     # Create and return a connection to the server with the given options.
-    # The server will be autostarted if requested and the <b>uri</b> is determined to be local.
     # The optional block will be called when the connection has been completed.
     #
     # @param [Hash] opts
     # @option opts [String|URI] :uri The URI to connect to, example nats://localhost:4222
-    # @option opts [Boolean] :autostart Boolean that can be used to engage server autostart functionality.
     # @option opts [Boolean] :reconnect Boolean that can be used to suppress reconnect functionality.
     # @option opts [Boolean] :debug Boolean that can be used to output additional debug information.
     # @option opts [Boolean] :verbose Boolean that is sent to server for setting verbose protocol mode.
@@ -136,7 +127,6 @@ module NATS
       end
 
       @err_cb = proc { |e| raise e } unless err_cb
-      check_autostart(@uri) if opts[:autostart] == true
 
       client = EM.connect(@uri.host, @uri.port, self, opts)
       client.on_connect(&blk) if blk
@@ -151,7 +141,13 @@ module NATS
         raise(Error, "EM needs to be running when NATS.start is called without a run block")
       end
       # Setup optimized select versions
-      EM.epoll; EM.kqueue
+      if EM.epoll?
+        EM.epoll
+      elsif EM.kqueue?
+        EM.kqueue
+      else
+        Kernel.warn('Neither epoll nor kqueue are supported')
+      end
       EM.run { @client = connect(*args, &blk) }
     end
 
@@ -160,7 +156,6 @@ module NATS
     def stop(&blk)
       client.close if (client and (client.connected? || client.reconnecting?))
       blk.call if blk
-      @@tried_autostart = {}
       @err_cb = nil
     end
 
@@ -278,29 +273,10 @@ module NATS
 
     private
 
-    def check_autostart(uri)
-      return if uri_is_remote?(uri) || @@tried_autostart[uri]
-      @@tried_autostart[uri] = true
-      return if server_running?(uri)
-      return unless try_autostart_succeeded?(uri)
-      wait_for_server(uri)
-    end
-
     def uri_is_remote?(uri)
       uri.host != 'localhost' && uri.host != '127.0.0.1'
     end
 
-    def try_autostart_succeeded?(uri)
-      port_arg = "-p #{uri.port}"
-      user_arg = "--user #{uri.user}" if uri.user
-      pass_arg = "--pass #{uri.password}" if uri.password
-      log_arg  = "-l #{AUTOSTART_LOG_FILE}"
-      pid_arg  = "-P #{AUTOSTART_PID_FILE}"
-      # daemon mode to release client
-      `nats-server #{port_arg} #{user_arg} #{pass_arg} #{log_arg} #{pid_arg} -d 2> /dev/null`
-      $? == 0
-    end
-
   end
 
   attr_reader :connected, :connect_cb, :err_cb, :err_cb_overridden, :pongs_received #:nodoc:
@@ -314,7 +290,9 @@ module NATS
   def initialize(options)
     @options = options
     process_uri_options
+    @ssl = false
     @ssl = options[:ssl] if options[:ssl]
+    @buf = nil
     @ssid, @subs = 1, {}
     @err_cb = NATS.err_cb
     @reconnect_timer, @needed = nil, nil
@@ -584,7 +562,11 @@ module NATS
   end
 
   def process_info(info) #:nodoc:
-    @server_info = JSON.parse(info, :symbolize_keys => true, :symbolize_names => true)
+    # Each JSON parser uses a different key/value pair to use symbol keys
+    # instead of strings when parsing. Passing all three pairs assures each
+    # parser gets what it needs. For the json gem :symbolize_name, for yajl
+    # :symbolize_keys, and for oj :symbol_keys.
+    @server_info = JSON.parse(info, :symbolize_keys => true, :symbolize_names => true, :symbol_keys => true)
     if @server_info[:ssl_required] && @ssl
       start_tls
     else
@@ -621,11 +603,12 @@ module NATS
     current = server_pool.first
     current[:was_connected] = true
     current[:reconnect_attempts] = 0
+    cancel_reconnect_timer if reconnecting?
 
-    if reconnecting?
-      cancel_reconnect_timer
-      @subs.each_pair { |k, v| send_command("SUB #{v[:subject]} #{v[:queue]} #{k}#{CR_LF}") }
-    end
+    # whip through any pending SUB commands since we replay
+    # all subscriptions already done anyway.
+    @pending.delete_if { |sub| sub[0..2] == SUB_OP }
+    @subs.each_pair { |k, v| send_command("SUB #{v[:subject]} #{v[:queue]} #{k}#{CR_LF}") }
 
     unless user_err_cb? or reconnecting?
       @err_cb = proc { |e| raise e }

data/lib/nats/ext/json.rb

@@ -2,6 +2,11 @@ begin
   require 'yajl'
   require 'yajl/json_gem'
 rescue LoadError
-  require 'rubygems'
-  require 'json'
+  begin
+    require 'oj'
+    Oj.mimic_JSON()
+  rescue LoadError
+    require 'rubygems'
+    require 'json'
+  end
 end

data/lib/nats/server.rb

@@ -26,7 +26,7 @@ NATSD::Server.setup(ARGV.dup)
 # Event Loop
 EM.run do
 
-  log "WARNING: nats-server is deprecated and no longer supported. It will be removed in a future release. See https://github.com/apcera/gnatsd."
+  log "WARNING: nats-server is deprecated and no longer supported. It will be removed in a future release. See https://github.com/nats-io/gnatsd"
   log "Starting #{NATSD::APP_NAME} version #{NATSD::VERSION} on port #{NATSD::Server.port}"
   log "TLS/SSL Support Enabled" if NATSD::Server.options[:ssl]
   begin

data/lib/nats/server/connection.rb

@@ -20,7 +20,8 @@ module NATSD #:nodoc: all
     end
 
     def client_info
-      @client_info ||= (get_peername.nil? ? 'N/A' : Socket.unpack_sockaddr_in(get_peername))
+      cur_peername = get_peername
+      @client_info ||= (cur_peername.nil? ? 'N/A' : Socket.unpack_sockaddr_in(cur_peername))
     end
 
     def info

data/lib/nats/version.rb

@@ -0,0 +1,3 @@
+module NATS
+  VERSION = "0.6.0".freeze
+end

data/nats.gemspec

@@ -3,11 +3,11 @@
 lib = File.expand_path('../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
 
-require 'nats/server/const'
+require 'nats/version'
 
 spec = Gem::Specification.new do |s|
   s.name = 'nats'
-  s.version = NATSD::VERSION
+  s.version = NATS::VERSION
   s.summary = 'NATS is an open-source, high-performance, lightweight cloud messaging system.'
   s.homepage = 'https://nats.io'
   s.description = 'NATS is an open-source, high-performance, lightweight cloud messaging system.'
@@ -24,7 +24,7 @@ spec = Gem::Specification.new do |s|
 
   s.require_paths = ['lib']
   s.bindir = 'bin'
-  s.executables = [NATSD::APP_NAME, 'nats-pub', 'nats-sub', 'nats-queue', 'nats-top', 'nats-request']
+  s.executables = ['nats-pub', 'nats-sub', 'nats-queue', 'nats-top', 'nats-request']
 
   s.files = %w[
     COPYING
@@ -39,6 +39,7 @@ spec = Gem::Specification.new do |s|
     bin/nats-top
     bin/nats-request
     lib/nats/client.rb
+    lib/nats/version.rb
     lib/nats/ext/bytesize.rb
     lib/nats/ext/em.rb
     lib/nats/ext/json.rb
@@ -55,4 +56,4 @@ spec = Gem::Specification.new do |s|
     lib/nats/server/connz.rb
   ]
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nats
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Derek Collison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -95,7 +95,6 @@ description: NATS is an open-source, high-performance, lightweight cloud messagi
 email:
 - derek.collison@gmail.com
 executables:
-- nats-server
 - nats-pub
 - nats-sub
 - nats-queue
@@ -129,6 +128,7 @@ files:
 - lib/nats/server/sublist.rb
 - lib/nats/server/util.rb
 - lib/nats/server/varz.rb
+- lib/nats/version.rb
 - nats.gemspec
 homepage: https://nats.io
 licenses:
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: NATS is an open-source, high-performance, lightweight cloud messaging system.