nosey 0.0.7 → 0.0.9

data/lib/nosey/eventmachine.rb

@@ -1,10 +1,12 @@
 require 'eventmachine'
+require 'strscan'
 
 module EventMachine
   module Nosey
     class SocketServer < EventMachine::Connection
       Host = '/tmp/nosey.socket'
       Port = nil
+      CommandPattern = /[A-Z]+\n/
 
       attr_accessor :report
 
@@ -15,21 +17,25 @@ module EventMachine
 
       def receive_data(data)
         buffer << data
-        # Stop buffering if a newline is detected and process command
-        process_command buffer.strip if data =~ /\n/
+        # Look for commands in the buffer and process them
+        # TODO - For higher performance, queue this in a Em::Queue
+        while command = buffer.scan(CommandPattern)
+          process_command command
+        end
       end
 
       def process_command(command)
-        case command
+        case command.strip
         when 'READ' # This is for more normal uses cases where you want to watch stats
           send_data report.to_s
         when 'RESET' # This is used primarly by munin, or other tools that can't track state.
           send_data report.to_s
           report.reset
+        when 'QUIT'
+          close_connection_after_writing
         else
-          send_data "No Comprende. send 'read' to see stats or 'reset' to read and reset."
+          send_data "No Comprende. READ, RESET, o QUIT."
         end
-        close_connection_after_writing
       end
 
       # A nice short-cut for peeps who aren't familar with EM to fire up
@@ -40,7 +46,7 @@ module EventMachine
 
     private
       def buffer
-        @buffer ||= ""
+        @buffer ||= StringScanner.new("")
       end
     end
   end

data/lib/nosey/munin.rb

@@ -122,7 +122,7 @@ module Nosey
       # We use this command to read Nosey data from the socket, but more
       # importantly, reset it so that when we come back around the next time
       # we can grab all the data that's occured since that time.
-      ResetCommand = "RESET\n"
+      ResetCommand = "RESET\nQUIT\n"
 
       # Default munin category. Zie app!
       Category = 'App'
@@ -188,7 +188,6 @@ module Nosey
 
       # Read the report YAML data from the socket
       def read_socket
-        p ResetCommand
         socket = UNIXSocket.new(@host)
         socket.puts(ResetCommand)
         socket.gets("\n\n")

data/lib/nosey/version.rb

@@ -1,3 +1,3 @@
 module Nosey
-  VERSION = "0.0.7"
+  VERSION = "0.0.9"
 end

data/spec/lib/eventmachine_spec.rb

@@ -23,7 +23,7 @@ describe EventMachine::Nosey::SocketServer do
     socket.callback{|data|
       @resp = data
     }
-    socket.send_data("READ\n")
+    socket.send_data("READ\nQUIT\n")
 
     ly{2}.test{|count| YAML.load(@resp)['Group 0']['hit'] == count }
   end
@@ -36,10 +36,10 @@ describe EventMachine::Nosey::SocketServer do
     s1 = Nosey::Test::ReadSocket.start('/tmp/nosey.socket')
     s2 = Nosey::Test::ReadSocket.start('/tmp/nosey.socket')
 
-    s1.send_data("RESET\n")
+    s1.send_data("RESET\nQUIT\n")
     s1.callback{|data|
       @r1 = data
-      s2.send_data("READ\n")
+      s2.send_data("READ\nQUIT\n")
       s2.callback{|data|
         @r2 = data
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nosey
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-19 00:00:00.000000000Z
+date: 2011-09-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70234556114360 !ruby/object:Gem::Requirement
+  requirement: &70198108041380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70234556114360
+  version_requirements: *70198108041380
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70234556113540 !ruby/object:Gem::Requirement
+  requirement: &70198108040880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70234556113540
+  version_requirements: *70198108040880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70234556112860 !ruby/object:Gem::Requirement
+  requirement: &70198108040120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70234556112860
+  version_requirements: *70198108040120
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70234556110900 !ruby/object:Gem::Requirement
+  requirement: &70198108039680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70234556110900
+  version_requirements: *70198108039680
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70234556110300 !ruby/object:Gem::Requirement
+  requirement: &70198108039160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70234556110300
+  version_requirements: *70198108039160
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70234556109540 !ruby/object:Gem::Requirement
+  requirement: &70198108038680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70234556109540
+  version_requirements: *70198108038680
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70234556108520 !ruby/object:Gem::Requirement
+  requirement: &70198108038200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70234556108520
+  version_requirements: *70198108038200
 - !ruby/object:Gem::Dependency
   name: em-ventually
-  requirement: &70234556107600 !ruby/object:Gem::Requirement
+  requirement: &70198108037700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70234556107600
+  version_requirements: *70198108037700
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70234556106180 !ruby/object:Gem::Requirement
+  requirement: &70198108037280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70234556106180
+  version_requirements: *70198108037280
 description: Nosey is a way to instrument your Evented Ruby applications to track
   counts, aggregates, etc. It was built a Poll Everywhere because we need a way to
   peer into our Evented apps and grab some basic statistics so that we could graph