nats 0.4.2 → 0.4.8

data/COPYING

@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE. 
+IN THE SOFTWARE.

data/bin/nats-pub

@@ -1,19 +1,26 @@
 #!/usr/bin/env ruby
 
+require 'optparse'
 require 'rubygems'
 require 'nats/client'
 
 def usage
-  puts "Usage: nats-pub <subject> <msg>"; exit
+  puts "Usage: nats-pub <subject> <msg> [-s server]"; exit
 end
 
-subject, msg = ARGV
+args = ARGV.dup
+opts_parser = OptionParser.new do |opts|
+  opts.on('-s SERVER') { |server| $nats_server = server }
+end
+args = opts_parser.parse!(args)
+
+subject, msg = args
 usage unless subject
 msg ||= 'Hello World'
 
 NATS.on_error { |err| puts "Server Error: #{err}"; exit! }
 
-NATS.start do
+NATS.start(:uri => $nats_server, :autostart => true) do
   NATS.publish(subject, msg) { NATS.stop }
 end
 

data/bin/nats-queue

@@ -1,21 +1,40 @@
 #!/usr/bin/env ruby
 
+require 'optparse'
 require 'rubygems'
 require 'nats/client'
 
-trap("TERM") { NATS.stop }
-trap("INT")  { NATS.stop }
+['TERM', 'INT'].each { |s| trap(s) {  puts; exit! } }
 
 def usage
-  puts "Usage: nats-queue <subject> <queue name>"; exit
+  puts "Usage: nats-queue <subject> <queue name> [-s server] [-t]"; exit
 end
 
-subject, queue_group = ARGV
+args = ARGV.dup
+opts_parser = OptionParser.new do |opts|
+  opts.on('-s SERVER') { |server| $nats_server = server }
+  opts.on('-t') { $show_time = true }
+
+end
+args = opts_parser.parse!(args)
+
+subject, queue_group = args
 usage unless subject and queue_group
 
+def time_prefix
+  "[#{Time.now}] " if $show_time
+end
+
+def header
+  $i=0 unless $i
+  "#{time_prefix}[\##{$i+=1}]"
+end
+
 NATS.on_error { |err| puts "Server Error: #{err}"; exit! }
 
-NATS.start do
+NATS.start(:uri => $nats_server,  :autostart => true) do
   puts "Listening on [#{subject}], queue group [#{queue_group}]"
-  NATS.subscribe(subject, queue_group) { |msg| puts "Received '#{msg}'" }
+  NATS.subscribe(subject, :queue => queue_group) { |msg, _, sub|
+    puts "#{header} Received on [#{sub}] : '#{msg}'"
+  }
 end

data/bin/nats-sub

@@ -1,22 +1,38 @@
 #!/usr/bin/env ruby
 
+require 'optparse'
 require 'rubygems'
 require 'nats/client'
 
-trap("TERM") { NATS.stop }
-trap("INT")  { NATS.stop }
+['TERM', 'INT'].each { |s| trap(s) {  puts; exit! } }
 
 def usage
-  puts "Usage: nats-sub <subject>"; exit
+  puts "Usage: nats-sub <subject> [-s server] [-t]"; exit
 end
 
-subject = ARGV.shift
+args = ARGV.dup
+opts_parser = OptionParser.new do |opts|
+  opts.on('-s SERVER') { |server| $nats_server = server }
+  opts.on('-t') { $show_time = true }
+
+end
+args = opts_parser.parse!(args)
+
+subject = args.shift
 usage unless subject
-i = 0
+
+def time_prefix
+  "[#{Time.now}] " if $show_time
+end
+
+def header
+  $i=0 unless $i
+  "#{time_prefix}[\##{$i+=1}]"
+end
 
 NATS.on_error { |err| puts "Server Error: #{err}"; exit! }
 
-NATS.start do
+NATS.start(:uri => $nats_server, :autostart => true) do
   puts "Listening on [#{subject}]"
-  NATS.subscribe(subject) { |msg, _, sub| puts "\##{i+=1}: Received on [#{sub}] : '#{msg}'" }
+  NATS.subscribe(subject) { |msg, _, sub| puts "#{header} Received on [#{sub}] : '#{msg}'" }
 end

data/lib/nats/client.rb

@@ -8,7 +8,7 @@ require "#{ep}/ext/json"
 
 module NATS
 
-  VERSION = "0.4.2".freeze
+  VERSION = "0.4.8".freeze
 
   DEFAULT_PORT = 4222
   DEFAULT_URI = "nats://localhost:#{DEFAULT_PORT}".freeze
@@ -16,16 +16,13 @@ module NATS
   MAX_RECONNECT_ATTEMPTS = 10
   RECONNECT_TIME_WAIT = 2
 
-  AUTOSTART_PID_FILE = '/tmp/nats-server.pid'
-  AUTOSTART_LOG_FILE = '/tmp/nats-server.log'
-
   # Protocol
   # @private
-  MSG      = /\AMSG\s+([^\s\r\n]+)\s+([^\s\r\n]+)\s+(([^\s\r\n]+)[^\S\r\n]+)?(\d+)\r\n/i #:nodoc:
+  MSG      = /\AMSG\s+([^\s]+)\s+([^\s]+)\s+(([^\s]+)[^\S\r\n]+)?(\d+)\r\n/i #:nodoc:
   OK       = /\A\+OK\s*\r\n/i #:nodoc:
   ERR      = /\A-ERR\s+('.+')?\r\n/i #:nodoc:
-  PING     = /\APING\r\n/i #:nodoc:
-  PONG     = /\APONG\r\n/i #:nodoc:
+  PING     = /\APING\s*\r\n/i #:nodoc:
+  PONG     = /\APONG\s*\r\n/i #:nodoc:
   INFO     = /\AINFO\s+([^\r\n]+)\r\n/i  #:nodoc:
   UNKNOWN  = /\A(.*)\r\n/  #:nodoc:
 
@@ -46,6 +43,10 @@ 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 = {}
 
@@ -59,12 +60,12 @@ 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 needed if the <b>uri</b> is determined to be local.
+    # 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 The URI to connect to, example nats://localhost:4222
-    # @option opts [Boolean] :autostart Boolean that can be used to suppress autostart functionality.
+    # @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.
@@ -82,11 +83,10 @@ module NATS
       opts[:verbose] = ENV['NATS_VERBOSE'] unless ENV['NATS_VERBOSE'].nil?
       opts[:pedantic] = ENV['NATS_PEDANTIC'] unless ENV['NATS_PEDANTIC'].nil?
       opts[:debug] = ENV['NATS_DEBUG'] if !ENV['NATS_DEBUG'].nil?
-      opts[:autostart] = (ENV['NATS_AUTO'] || true) if opts[:autostart].nil?
-
       @uri = opts[:uri] = URI.parse(opts[:uri])
       @err_cb = proc { raise Error, "Could not connect to server on #{@uri}."} unless err_cb
-      check_autostart(@uri) if opts[:autostart]
+      check_autostart(@uri) if opts[:autostart] == true
+
       client = EM.connect(@uri.host, @uri.port, self, opts)
       client.on_connect(&blk) if blk
       return client
@@ -207,7 +207,7 @@ module NATS
       log_arg  = "-l #{AUTOSTART_LOG_FILE}"
       pid_arg  = "-P #{AUTOSTART_PID_FILE}"
       # daemon mode to release client
-      system("nats-server #{port_arg} #{user_arg} #{pass_arg} #{log_arg} #{pid_arg} -d 2> /dev/null")
+      `nats-server #{port_arg} #{user_arg} #{pass_arg} #{log_arg} #{pid_arg} -d 2> /dev/null`
       $? == 0
     end
 

data/lib/nats/server.rb

@@ -26,6 +26,6 @@ EM.run {
   rescue => e
     log "Could not start server on port #{NATSD::Server.port}"
     log_error
-    exit
+    exit(1)
   end
 }

data/lib/nats/server/const.rb

@@ -1,7 +1,7 @@
 
 module NATSD #:nodoc:
 
-  VERSION  = '0.4.2'
+  VERSION  = '0.4.8'
   APP_NAME = 'nats-server'
 
   DEFAULT_PORT = 4222
@@ -12,11 +12,12 @@ module NATSD #:nodoc:
   AWAITING_MSG_PAYLOAD  = 2
 
   # Ops - See protocol.txt for more info
-  INFO     = /\AINFO\r\n/i
-  PUB_OP   = /\APUB\s+([^\s\r\n]+)\s+(([^\s\r\n]+)[^\S\r\n]+)?(\d+)\r\n/i
-  SUB_OP   = /\ASUB\s+([^\s\r\n]+)\s+(([^\s\r\n]+)[^\S\r\n]+)?([^\s\r\n]+)\r\n/i
-  UNSUB_OP = /\AUNSUB\s+([^\s\r\n]+)\s*(\s+(\d+))?\r\n/i
-  PING     = /\APING\r\n/i
+  INFO     = /\AINFO\s*\r\n/i
+  PUB_OP   = /\APUB\s+([^\s]+)\s+(([^\s]+)[^\S\r\n]+)?(\d+)\r\n/i
+  SUB_OP   = /\ASUB\s+([^\s]+)\s+(([^\s]+)[^\S\r\n]+)?([^\s]+)\r\n/i
+  UNSUB_OP = /\AUNSUB\s+([^\s]+)\s*(\s+(\d+))?\r\n/i
+  PING     = /\APING\s*\r\n/i
+  PONG     = /\APONG\s*\r\n/i
   CONNECT  = /\ACONNECT\s+([^\r\n]+)\r\n/i
   UNKNOWN  = /\A(.*)\r\n/
 

data/lib/nats/server/options.rb

@@ -19,8 +19,7 @@ module NATSD
           opts.on("-d", "--daemonize", "Run daemonized in the background")     { @options[:daemonize] = true }
           opts.on("-P", "--pid FILE", "File to store PID")                     { |file| @options[:pid_file] = file }
 
-          opts.on("-C", "--config FILE", "Configuration File " +
-                                      "(default: #{@options[:config_file]})")  { |file| @options[:config_file] = file }
+          opts.on("-c", "--config FILE", "Configuration File")                 { |file| @options[:config_file] = file }
 
           opts.separator ""
           opts.separator "Logging options:"
@@ -53,18 +52,22 @@ module NATSD
       def read_config_file
         return unless config_file = @options[:config_file]
         config = File.open(config_file) { |f| YAML.load(f) }
+
         # Command lines args, parsed first, will override these.
         @options[:port] = config['port'] if @options[:port].nil?
         @options[:addr] = config['net'] if @options[:addr].nil?
+
         if auth = config['authorization']
           @options[:user] = auth['user'] if @options[:user].nil?
           @options[:pass] = auth['password'] if @options[:pass].nil?
+          @options[:pass] = auth['pass'] if @options[:pass].nil?
           @options[:token] = auth['token'] if @options[:token].nil?
           @options[:auth_timeout] = auth['timeout'] if @options[:auth_timeout].nil?
         end
+
         @options[:pid_file] = config['pid_file'] if @options[:pid_file].nil?
         @options[:log_file] = config['log_file'] if @options[:log_file].nil?
-        @options[:logtime] = config['logtime'] if @options[:logtime].nil?
+        @options[:log_time] = config['logtime'] if @options[:log_time].nil?
         @options[:debug] = config['debug'] if @options[:debug].nil?
         @options[:trace] = config['trace'] if @options[:trace].nil?
 
@@ -123,6 +126,5 @@ module NATSD
       end
 
     end
-
   end
 end

data/lib/nats/server/server.rb

@@ -13,7 +13,7 @@ module NATSD #:nodoc: all
       alias debug_flag?    :debug_flag
       alias trace_flag?    :trace_flag
 
-      def version; "nats server version #{NATSD::VERSION}" end
+      def version; "nats-server version #{NATSD::VERSION}" end
 
       def host; @options[:addr]  end
       def port; @options[:port]  end
@@ -24,8 +24,11 @@ module NATSD #:nodoc: all
 
         # Allow command line to override config file, so do them first.
         parser.parse!(argv)
-        read_config_file
+        read_config_file if @options[:config_file]
         finalize_options
+      rescue OptionParser::InvalidOption => e
+        log_error "Error parsing options: #{e}"
+        exit(1)
       end
 
       def setup(argv)
@@ -58,7 +61,7 @@ module NATSD #:nodoc: all
         EM.epoll unless @options[:noepoll]
         EM.kqueue unless @options[:nokqueue]
 
-        # Write pid file if need be.
+        # Write pid file if requested.
         File.open(@options[:pid_file], 'w') { |f| f.puts "#{Process.pid}" } if @options[:pid_file]
       end
 
@@ -170,90 +173,91 @@ module NATSD #:nodoc: all
       # while (@buf && !@buf.empty? && !@closing)
       while (@buf && !@closing)
         case @parse_state
-
-          when AWAITING_CONTROL_LINE
-            case @buf
-              when PUB_OP
-                ctrace('PUB OP', strip_op($&)) if NATSD::Server.trace_flag?
-                return connect_auth_timeout if @auth_pending
-                @buf = $'
-                @parse_state = AWAITING_MSG_PAYLOAD
-                @msg_sub, @msg_reply, @msg_size = $1, $3, $4.to_i
-                if (@msg_size > NATSD::Server.max_payload)
-                  debug "Message payload size exceeded (#{@msg_size}/#{NATSD::Server.max_payload}), closing connection"
-                  error_close PAYLOAD_TOO_BIG
-                end
-                send_data(INVALID_SUBJECT) if (@pedantic && !(@msg_sub =~ SUB_NO_WC))
-              when SUB_OP
-                ctrace('SUB OP', strip_op($&)) if NATSD::Server.trace_flag?
-                return connect_auth_timeout if @auth_pending
-                @buf = $'
-                sub, qgroup, sid = $1, $3, $4
-                return send_data(INVALID_SUBJECT) if !($1 =~ SUB)
-                return send_data(INVALID_SID_TAKEN) if @subscriptions[sid]
-                sub = Subscriber.new(self, sub, sid, qgroup, 0)
-                @subscriptions[sid] = sub
-                Server.subscribe(sub)
-                send_data(OK) if @verbose
-              when UNSUB_OP
-                ctrace('UNSUB OP', strip_op($&)) if NATSD::Server.trace_flag?
-                return connect_auth_timeout if @auth_pending
-                @buf = $'
-                sid, sub = $1, @subscriptions[$1]
-                return send_data(INVALID_SID_NOEXIST) unless sub
-                # If we have set max_responses, we will unsubscribe once we have received the appropriate
-                # amount of responses
-                sub.max_responses = ($2 && $3) ? $3.to_i : nil
-                delete_subscriber(sub) unless (sub.max_responses && (sub.num_responses < sub.max_responses))
-                send_data(OK) if @verbose
-              when PING
-                ctrace('PING OP', strip_op($&)) if NATSD::Server.trace_flag?
-                @buf = $'
-                send_data(PONG_RESPONSE)
-              when CONNECT
-                ctrace('CONNECT OP', strip_op($&)) if NATSD::Server.trace_flag?
-                @buf = $'
-                begin
-                  config = JSON.parse($1, :symbolize_keys => true, :symbolize_names => true)
-                  process_connect_config(config)
-                rescue => e
-                  send_data(INVALID_CONFIG)
-                  log_error
-                end
-              when INFO
-                ctrace('INFO OP', strip_op($&)) if NATSD::Server.trace_flag?
-                return connect_auth_timeout if @auth_pending
-                @buf = $'
-                send_info
-              when UNKNOWN
-                ctrace('Unknown Op', strip_op($&)) if NATSD::Server.trace_flag?
-                return connect_auth_timeout if @auth_pending
-                @buf = $'
-                send_data(UNKNOWN_OP)
-              else
-                # If we are here we do not have a complete line yet that we understand.
-                # If too big, cut the connection off.
-                if @buf.bytesize > NATSD::Server.max_control_line
-                  debug "Control line size exceeded (#{@buf.bytesize}/#{NATSD::Server.max_control_line}), closing connection.."
-                  error_close PROTOCOL_OP_TOO_BIG
-                end
-                return
+        when AWAITING_CONTROL_LINE
+          case @buf
+          when PUB_OP
+            ctrace('PUB OP', strip_op($&)) if NATSD::Server.trace_flag?
+            return connect_auth_timeout if @auth_pending
+            @buf = $'
+            @parse_state = AWAITING_MSG_PAYLOAD
+            @msg_sub, @msg_reply, @msg_size = $1, $3, $4.to_i
+            if (@msg_size > NATSD::Server.max_payload)
+              debug "Message payload size exceeded (#{@msg_size}/#{NATSD::Server.max_payload}), closing connection"
+              error_close PAYLOAD_TOO_BIG
             end
-            @buf = nil if (@buf && @buf.empty?)
-
-          when AWAITING_MSG_PAYLOAD
-            return unless (@buf.bytesize >= (@msg_size + CR_LF_SIZE))
-            msg = @buf.slice(0, @msg_size)
-            ctrace('Processing msg', @msg_sub, @msg_reply, msg) if NATSD::Server.trace_flag?
+            send_data(INVALID_SUBJECT) if (@pedantic && !(@msg_sub =~ SUB_NO_WC))
+          when SUB_OP
+            ctrace('SUB OP', strip_op($&)) if NATSD::Server.trace_flag?
+            return connect_auth_timeout if @auth_pending
+            @buf = $'
+            sub, qgroup, sid = $1, $3, $4
+            return send_data(INVALID_SUBJECT) if !($1 =~ SUB)
+            return send_data(INVALID_SID_TAKEN) if @subscriptions[sid]
+            sub = Subscriber.new(self, sub, sid, qgroup, 0)
+            @subscriptions[sid] = sub
+            Server.subscribe(sub)
             send_data(OK) if @verbose
-            Server.route_to_subscribers(@msg_sub, @msg_reply, msg)
-            @buf = @buf.slice((@msg_size + CR_LF_SIZE), @buf.bytesize)
-            @msg_sub = @msg_size = @reply = nil
-            @parse_state = AWAITING_CONTROL_LINE
-            @buf = nil if (@buf && @buf.empty?)
+          when UNSUB_OP
+            ctrace('UNSUB OP', strip_op($&)) if NATSD::Server.trace_flag?
+            return connect_auth_timeout if @auth_pending
+            @buf = $'
+            sid, sub = $1, @subscriptions[$1]
+            if sub
+              # If we have set max_responses, we will unsubscribe once we have received
+              # the appropriate amount of responses.
+              sub.max_responses = ($2 && $3) ? $3.to_i : nil
+              delete_subscriber(sub) unless (sub.max_responses && (sub.num_responses < sub.max_responses))
+              send_data(OK) if @verbose
+            else
+              send_data(INVALID_SID_NOEXIST) if @pedantic
+            end
+          when PING
+            ctrace('PING OP', strip_op($&)) if NATSD::Server.trace_flag?
+            @buf = $'
+            send_data(PONG_RESPONSE)
+          when CONNECT
+            ctrace('CONNECT OP', strip_op($&)) if NATSD::Server.trace_flag?
+            @buf = $'
+            begin
+              config = JSON.parse($1)
+              process_connect_config(config)
+            rescue => e
+              send_data(INVALID_CONFIG)
+              log_error
+            end
+          when INFO
+            ctrace('INFO OP', strip_op($&)) if NATSD::Server.trace_flag?
+            return connect_auth_timeout if @auth_pending
+            @buf = $'
+            send_info
+          when UNKNOWN
+            ctrace('Unknown Op', strip_op($&)) if NATSD::Server.trace_flag?
+            return connect_auth_timeout if @auth_pending
+            @buf = $'
+            send_data(UNKNOWN_OP)
+          else
+            # If we are here we do not have a complete line yet that we understand.
+            # If too big, cut the connection off.
+            if @buf.bytesize > NATSD::Server.max_control_line
+              debug "Control line size exceeded (#{@buf.bytesize}/#{NATSD::Server.max_control_line}), closing connection.."
+              error_close PROTOCOL_OP_TOO_BIG
+            end
+            return
           end
+          @buf = nil if (@buf && @buf.empty?)
+
+        when AWAITING_MSG_PAYLOAD
+          return unless (@buf.bytesize >= (@msg_size + CR_LF_SIZE))
+          msg = @buf.slice(0, @msg_size)
+          ctrace('Processing msg', @msg_sub, @msg_reply, msg) if NATSD::Server.trace_flag?
+          send_data(OK) if @verbose
+          Server.route_to_subscribers(@msg_sub, @msg_reply, msg)
+          @buf = @buf.slice((@msg_size + CR_LF_SIZE), @buf.bytesize)
+          @msg_sub = @msg_size = @reply = nil
+          @parse_state = AWAITING_CONTROL_LINE
+          @buf = nil if (@buf && @buf.empty?)
+        end
       end
-
     end
 
     def send_info
@@ -261,12 +265,12 @@ module NATSD #:nodoc: all
     end
 
     def process_connect_config(config)
-      @verbose  = config[:verbose] unless config[:verbose].nil?
-      @pedantic = config[:pedantic] unless config[:pedantic].nil?
+      @verbose  = config['verbose'] unless config['verbose'].nil?
+      @pedantic = config['pedantic'] unless config['pedantic'].nil?
       return send_data(OK) unless Server.auth_required?
 
       EM.cancel_timer(@auth_pending)
-      if Server.auth_ok?(config[:user], config[:pass])
+      if Server.auth_ok?(config['user'], config['pass'])
         send_data(OK) if @verbose
         @auth_pending = nil
       else

data/lib/nats/server/util.rb

@@ -11,11 +11,11 @@ def log(*args) #:nodoc:
 end
 
 def debug(*args) #:nodoc:
-  log *args if NATSD::Server.debug_flag?
+  log(*args) if NATSD::Server.debug_flag?
 end
 
 def trace(*args) #:nodoc:
-  log *args if NATSD::Server.trace_flag?
+  log(*args) if NATSD::Server.trace_flag?
 end
 
 def log_error(e=$!) #:nodoc:

data/nats.gemspec

@@ -3,12 +3,11 @@
 lib = File.expand_path('../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
 
-require 'nats/server/const.rb'
+require 'nats/server/const'
 
 spec = Gem::Specification.new do |s|
   s.name = 'nats'
   s.version = NATSD::VERSION
-  s.date = '2011-02-09'
   s.summary = 'A lightweight publish-subscribe messaging system.'
   s.homepage = 'http://github.com/derekcollison/nats'
   s.description = 'A lightweight publish-subscribe messaging system.'

metadata

@@ -2,7 +2,7 @@
 name: nats
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.2
+  version: 0.4.8
 platform: ruby
 authors: 
 - Derek Collison
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 -06:00
+date: 2011-04-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A lightweight publish-subscribe messaging system.