kinetic-ruby 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f189587940e17c98646e020e9a1273d369efab0d
-  data.tar.gz: 92c531dbd2441ecf40577a0cb5712556fe740d34
+  metadata.gz: bf1c12357e8d889c3e7076c8215fe84bd29a8973
+  data.tar.gz: 8eb7356990856bfe9a2fd5126c4048a0625d020b
 SHA512:
-  metadata.gz: 5846939b710c3b7e66392ca684052c44b099f4931bb92b21cfecb48c0f739cfcfe2d5636b9ccf2b45b68b2753c544fbc0dfc12036d674a723d25ac34bcef0cb4
-  data.tar.gz: c50521a898906902c37f1dc5452505d4752ea0efe049aabb1872244e0729a15da9d06b420eaf9bbee7a2c474fc5559260762c17d7b37139c62995e83f43acf46
+  metadata.gz: 48a55ccafce38cf772b7950e8ec2e77576063c946e280b8bbd79240f5db4b7c7503c3194ecfb1474625b045e2b94f7e1bed0cc0cb7c325f19a76cff9ff8393f7
+  data.tar.gz: 35b9d71bf84a1ac45f20f04bd865efadcf3e5bb669f7ed46cea940e9e7699281e90cc8d7fc635da04aede050a5536242c68ab0e9941218174b42ed6e7fb16e6e

data/Rakefile

@@ -10,7 +10,11 @@ CLEAN.include ['*.gem', '*.log']
 namespace :test do
   desc "Test Kinetic Ruby server"
   task :server => 'kinetic:server:start' do
-    report "Started Kinetic Ruby server!"
+
+    report("Validating server can accept a client connection", true)
+
+    report "Kinetic Ruby server launched!"
+
     client = Thread.new do
       addr = $kinetic_server.host + ':' + $kinetic_server.port.to_s
       report "Connecting test client to #{addr}\n"
@@ -19,9 +23,16 @@ namespace :test do
       report "Connected to server!"
       client.close
     end
+
+    report "Terminating client connection..."
     client.join 5.0
+
+    report "Initiating server shutdown..."
     $kinetic_server.shutdown unless $kinetic_server.nil?
     $kinetic_server = nil
+
+    report "Shutdown complete!"
+
     report "Kinetic Ruby server test successful!"
   end
 end

data/lib/kinetic_logger.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 module KineticRuby
 
   class Logger
@@ -9,10 +11,11 @@ module KineticRuby
       LOG_LEVEL_VERBOSE = 3,
     ]
 
-    def initialize(log_level=LOG_LEVEL_INFO, stream=$stdout)
+    def initialize(log_level=LOG_LEVEL_INFO, stream=$stdout, enable_timestamp=true)
       set_level log_level
       @stream = stream
       @prefix = ''
+      @timestamp_enabled = enable_timestamp
     end
 
     def level=(log_level)
@@ -23,6 +26,14 @@ module KineticRuby
       @level.dup
     end
 
+    def enable_timestamp(enable=true)
+      @timestamp_enabled = enable
+    end
+
+    def timestamp_enabled
+      @timestamp_enabled
+    end
+
     def prefix=(msg)
       @prefix = msg if msg
     end
@@ -66,9 +77,10 @@ module KineticRuby
     end
 
     def log_message(msg, banner)
-      msg = @prefix + msg if (@prefix && !@prefix.empty?)
-      msg += "\n" + @prefix + ('-'*40) if (banner && msg && !msg.empty?)
-      @stream.puts msg
+      now = '[' + DateTime.now.to_s + '] '
+      timestamp = @timestamp_enabled ? now : '[N/A]'
+      @stream.puts(timestamp + @prefix + msg) if (msg)
+      @stream.puts(timestamp + @prefix + ('-'*40)) if (banner && msg)
       @stream.flush
     end
 

data/lib/kinetic_proto.rb

@@ -23,7 +23,7 @@ module KineticRuby
         logger.prefix = logger.prefix + add_prefix
         logger.log 'message:'
         logger.prefix = logger.prefix + '  '
-        self.to_yaml(msg).each_line{|line| logger.log(line) }
+        self.to_yaml(msg).each_line{|line| logger.log(line.rstrip) }
         logger.prefix = orig_prefix
         logger.log
       end
@@ -75,14 +75,14 @@ module KineticRuby
       @logger.log_verbose "    #{pb.hmac}"
 
       @logger.log '  command:'
-      pb.command.to_yaml.each_line{|l| @logger.log("    #{l}")}
+      pb.command.to_yaml.each_line{|l| @logger.log("    #{l.rstrip}")}
       @logger.log '  encoded:'
       @logger.log '    Length: ' + encoded.length.to_s + ' bytes'
 
       @logger.log_verbose "    Raw:"
       @logger.log_verbose "      #{encoded.inspect}"
       @logger.log_verbose "    Content:"
-      encoded.to_yaml.each_line{|line| @logger.log_verbose "      #{line}"}
+      encoded.to_yaml.each_line{|line| @logger.log_verbose "      #{line.rstrip}"}
       
       @logger.log
 

data/lib/kinetic_server.rb

@@ -190,7 +190,7 @@ module KineticRuby
           request = ''
           pdu = nil
           connected = true
-          raw_proto = nil
+          raw_proto = []
 
           # Process requests while client available
           while connected && (data = client.receive)
@@ -213,39 +213,42 @@ module KineticRuby
               else
                 @logger.log "Waiting on remainder of PDU..."
               end
-            end
 
-            # Handle raw protobuf.. for tests
-            if raw_proto || request.match(/^\n/)
+            # Otherwise, handle custom test requests
+            elsif pdu.nil?
+              @logger.logv "Checking for custom request: '#{request}'"
+              
+              # Handle raw protobuf.. for tests
+              if !raw_proto.empty? || request.match(/^\n/)
                 @logger.log "Appears to be a standalone protobuf incoming..."
-                pdu = nil
                 raw_proto ||= []
                 raw_proto += request.bytes
                 @logger.log "  protobuf: (#{raw_proto.length} bytes)"
-
-            # Otherwise, handle custom test requests
-            elsif pdu.nil?
-              @logger.logv "Checking for custom request: '#{request}'"
-              request_match = request.match(/^read\((\d+)\)/)
-              if request_match
+                request = ''
+              
+              # Handle request for read(num_bytes), and respond with num_bytes of dummy data
+              elsif request_match = request.match(/^read\((\d+)\)/)
                 len = request_match[1].to_i
                 response = 'G'*len
                 @logger.log "Responding to 'read(#{len})' w/ '#{response}'"
                 client.send response
                 request = ''
-                pdu = nil
+              
+              # Handle request for readProto(), and respond with canned Kinetic protobuf
               elsif request =~ /^readProto()/
                 response = Proto.new(@logger).test_encode
                 @logger.log "Responding to 'read(#{len})' w/ dummy protobuf (#{response.length} bytes)"
                 client.send response
                 request = ''
-                pdu = nil
+              
+              # Report not enough data yet to make a call...
               elsif request.match(/^read/) && data.length < 7
                 @logger.log "no command match for request: '#{request}' (...yet)";
+
+              # Otherwise, report unknown request received!
               else
                 @logger.log "Unknown request! Aborting..."
                 request = ''
-                pdu = nil
                 connected = false
               end
             end

data/lib/version.rb

@@ -1,4 +1,4 @@
 module KineticRuby
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
   PROTOCOL_VERSION = 'v2.0.4'
 end

data/lib/version.rb.erb

@@ -1,4 +1,4 @@
 module KineticRuby
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
   PROTOCOL_VERSION = '<%= proto_ver %>'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kinetic-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Greg Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake