nats 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7ddc674e2fae7f2b90a23808e70653f03e83705
-  data.tar.gz: 507e7fef7ae1d83b7d6d71582733c2dd117b2958
+  metadata.gz: c785185ca50a110f1e5097074eb94932875ec56f
+  data.tar.gz: fdf520606b0140c0ea01ecce19ef4a7a2e60c5fb
 SHA512:
-  metadata.gz: 70075424ffa0204ff72290c67b934b68966d42fd6e7df080e2c2874525efbe56070391f31bb69fa643fc4726c52eabc1c736ef14471e49f7cb39a8f84b40cf54
-  data.tar.gz: e7521de1ab5fb77210cafab68f8f3156afa06b8031d9a2eaf42f10656fa152242dd6b2cd0110dc21a11cd366481b5df6e10dc562e068eb0c2503b0e8442cd8b5
+  metadata.gz: 8caccc1be68f33b8a06385e002646ca4e9ac3bb8aea387f192a95d46978a84df8d28898f03f9b932bf9c0e7a0d9a6de9f4476041770f28b96be853f5b4fae3e1
+  data.tar.gz: 7f9280338f75b80a1088d2d5ac280efb239449de5a87987d3725883bd0257768cebb36b19ca9e2fe9b2d6e47a3be48494a73c16711e48e99a5bac672e107efb6

data/HISTORY.md

@@ -1,5 +1,14 @@
 # HISTORY
 
+## v0.7.1 (July 8, 2016)
+  - Remove dependencies which are no longer needed for ruby-client
+  - See full list @ https://github.com/nats-io/ruby-nats/compare/v0.7.0...v0.7.1
+
+## v0.7.0 (July 8, 2016)
+  - Enhanced TLS support: certificates and verify peer functionality added
+  - Bumped version of Eventmachine to 1.2 series
+  - See full list @ https://github.com/nats-io/ruby-nats/compare/v0.6.0...v0.7.0
+
 ## 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)

data/Rakefile

@@ -2,17 +2,24 @@
 require 'rspec/core'
 require 'rspec/core/rake_task'
 
+task :default => 'spec:client'
+
 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"]
+  spec.rspec_opts = ["--format", "documentation", "--colour", "--profile"]
 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"]
+  spec.rspec_opts = ["--format", "documentation", "--colour", "--profile"]
+end
+
+desc 'Run spec from client on jruby using gnatsd as the server'
+RSpec::Core::RakeTask.new('spec:client:jruby') do |spec|
+  spec.pattern = FileList['spec/client/*_spec.rb']
+  spec.rspec_opts = ["--format", "documentation", "--colour", "--tag", "~jruby_excluded", "--profile"]
 end
 
 desc 'Run spec from server'

data/lib/nats/client.rb

@@ -10,6 +10,7 @@ require "#{ep}/version"
 
 module NATS
 
+  PROTOCOL_VERSION = 1
   DEFAULT_PORT = 4222
   DEFAULT_URI = "nats://localhost:#{DEFAULT_PORT}".freeze
 
@@ -173,8 +174,10 @@ module NATS
         EM.epoll
       elsif EM.kqueue?
         EM.kqueue
+      elsif EM.library_type == :java
+        # No warning needed, we're using Java NIO
       else
-        Kernel.warn('Neither epoll nor kqueue are supported')
+        Kernel.warn('Neither epoll nor kqueue are supported, performance may be impacted')
       end
       EM.run { @client = connect(*args, &blk) }
     end
@@ -241,7 +244,7 @@ module NATS
     end
 
     # Set the default on_closed callback.
-    # @param [Block] &callback called when will reach a state when will no longer be connected. 
+    # @param [Block] &callback called when will reach a state when will no longer be connected.
     def on_close(&callback)
       @close_cb = callback
       @client.on_close(&callback) unless @client.nil?
@@ -517,7 +520,8 @@ module NATS
       :verbose => @options[:verbose],
       :pedantic => @options[:pedantic],
       :lang => :ruby,
-      :version => VERSION
+      :version => VERSION,
+      :protocol => PROTOCOL_VERSION
     }
     if auth_connection?
       cs[:user] = @uri.user
@@ -654,6 +658,37 @@ module NATS
       # Otherwise, use a regular connection.
     end
 
+    # Detect any announced server that we might not be aware of...
+    connect_urls = @server_info[:connect_urls]
+    if connect_urls
+      srvs = []
+
+      connect_urls.each do |url|
+        u = URI.parse("nats://#{url}")
+        present = server_pool.detect do |srv|
+          srv[:uri].host == u.host && srv[:uri].port == u.port
+        end
+
+        if not present
+          # Let explicit user and pass options set the credentials.
+          u.user = options[:user] if options[:user]
+          u.password = options[:pass] if options[:pass]
+
+          # Use creds from the current server if not set explicitly.
+          if @uri
+            u.user ||= @uri.user if @uri.user
+            u.password ||= @uri.password if @uri.password
+          end
+
+          srvs << { :uri => u, :reconnect_attempts => 0 }
+        end
+      end
+      srvs.shuffle! unless @options[:dont_randomize_servers]
+
+      # Include in server pool but keep current one as the first one.
+      server_pool.push(*srvs)
+    end
+
     if @server_info[:auth_required]
       current = server_pool.first
       current[:auth_required] = true
@@ -705,7 +740,7 @@ module NATS
     # Mark that we established already TCP connection to the server. In case of TLS,
     # prepare commands which will be dispatched to server and delay flushing until
     # we have processed the INFO line sent by the server and done the handshake.
-    @connected = true 
+    @connected = true
     process_connect
   end
 
@@ -714,7 +749,7 @@ module NATS
     process_connect
   end
 
-  def process_connect #:nodoc:   
+  def process_connect #:nodoc:
     # Reset reconnect attempts since TCP connection has been successful at this point.
     current = server_pool.first
     current[:was_connected] = true
@@ -759,12 +794,12 @@ module NATS
 
   def send_ping #:nodoc:
     return if @closing
+    @pings_outstanding += 1
     if @pings_outstanding > @options[:max_outstanding_pings]
       close_connection
       #close
       return
     end
-    @pings_outstanding += 1
     queue_server_rt { process_pong }
     flush_pending
   end

data/lib/nats/server/util.rb

@@ -1,3 +1,4 @@
+require 'pp'
 
 def fast_uuid #:nodoc:
   v = [rand(0x0010000),rand(0x0010000),rand(0x0010000),

data/lib/nats/version.rb

@@ -1,3 +1,3 @@
 module NATS
-  VERSION = "0.7.1".freeze
+  VERSION = "0.8.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nats
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Derek Collison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine