quark 0.0.2 → 0.0.3

data/lib/quark.rb

@@ -8,6 +8,10 @@ require 'quark/config'
 
 
 module Quark
+  class Error < Exception; end
+  class ArgumentError < Error; end
+  class InvalidCommand < Error; end
+
   module SocketServer
     Dir[File.join(File.dirname(__FILE__), "quark", "commands", "*.rb")].each do |rb|
       require "#{rb.gsub(/\.rb$/,'')}"
@@ -26,22 +30,50 @@ module Quark
     def receive_data(data)
       command, arguments = data.chomp.split(' ',2)
 
-      if methods.include?(:"process_command_#{command.downcase}")
-        rv = send(:"process_command_#{command.downcase}", arguments)
-        if rv.nil?
-          send_data(MultiJson.dump({
-            :success => true
-          })+"\n")
+      begin
+        if methods.include?(:"process_command_#{command.downcase}")
+          rv = send(:"process_command_#{command.downcase}", arguments)
+          if rv.nil?
+            send_json({
+              :success => true
+            })
+          else
+            send_json({
+              :success => true,
+              :command => data.chomp,
+              :results => rv
+            })
+          end
         else
-          send_data(MultiJson.dump({
-            :success => true,
-            :command => data.chomp,
-            :results => rv
-          })+"\n")
+          raise Quark::InvalidCommand.new("Unknown command '#{command.upcase}'")
         end
+      rescue Quark::Error => e
+        send_json({
+          :success => false,
+          :command => data.chomp,
+          :error => {
+            :class   => e.class.name,
+            :message => e.message
+          }
+        })
+
+      rescue Exception => e
+        send_json({
+          :success => false,
+          :command => data.chomp,
+          :error => {
+            :class     => e.class.name,
+            :message   => e.message,
+            :backtrace => e.backtrace
+          }
+        })
       end
     end
 
+    def send_json(data)
+      send_data(MultiJson.dump(data)+"\n")
+    end
+
     def unbind()
     end
   end

data/lib/quark/commands/fetch.rb

@@ -1,6 +1,8 @@
 module Quark
   module SocketServer
     def process_command_fetch(data)
+      raise Quark::ArgumentError.new("FETCH command requires at least 1 argument") if data.nil? or data.empty?
+
       rv = {}
       keys, from, to = data.split(' ')
       now = (Time.now.to_f * 1000).to_i
@@ -17,6 +19,10 @@ module Quark
     # if not set, to defaults to now
       to ||= now
 
+
+      raise Quark::ArgumentError.new("FETCH 'from' argument must be numeric") if not from.nil? and (Integer(from) rescue false) === false
+      raise Quark::ArgumentError.new("FETCH 'to' argument must be numeric") if not to.nil? and (Integer(to) rescue false) === false
+
     # find all matching keys from all blocks
       @redis.keys("#{@_prefix}:#{keys}:*").each do |key|
         x, name, block = key.split(':',3)

data/lib/quark/commands/ping.rb

@@ -0,0 +1,13 @@
+module Quark
+  module SocketServer
+    require 'socket'
+
+    def process_command_ping(data)
+      return {
+        :alive    => true,
+        :hostname => Socket.gethostname(),
+        :time     => (Time.now.to_f * 1000).to_i
+      }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quark
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &13898660 !ruby/object:Gem::Requirement
+  requirement: &9517780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.7.9
   type: :runtime
   prerelease: false
-  version_requirements: *13898660
+  version_requirements: *9517780
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &13897140 !ruby/object:Gem::Requirement
+  requirement: &9507840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *13897140
+  version_requirements: *9507840
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &13896080 !ruby/object:Gem::Requirement
+  requirement: &9506400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *13896080
+  version_requirements: *9506400
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &13894740 !ruby/object:Gem::Requirement
+  requirement: &9504900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *13894740
+  version_requirements: *9504900
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &13893380 !ruby/object:Gem::Requirement
+  requirement: &9502740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *13893380
+  version_requirements: *9502740
 description: A small service for logging and retrieving timeseries metrics into a
   Redis server
 email: garyhetzel@gmail.com
@@ -79,6 +79,7 @@ files:
 - lib/quark/commands/peek.rb
 - lib/quark/commands/fetch.rb
 - lib/quark/commands/observe.rb
+- lib/quark/commands/ping.rb
 - bin/quark
 homepage: https://github.com/ghetzel/quark
 licenses: []