quark 0.3.0 → 0.3.1

data/bin/quark

@@ -146,7 +146,8 @@ module Quark
         end).parse!
 
         if Quark::Config.get("execute") === true
-          rv = Quark::SocketServer.process_command(ARGV.join(' '))
+          Quark::Server.connect()
+          rv = Quark::CommandProcessor.process_command(ARGV.join(' '))
           puts MultiJson.dump(rv, :pretty => true)
         else
           Quark::Server.run()

data/lib/quark/commands/list.rb

@@ -0,0 +1,9 @@
+module Quark
+  module CommandProcessor
+    def self.process_command_list(data)
+      return @redis.keys("#{@_prefix}:#{data.strip.chomp}:*").collect{|i|
+        i.split(':')[1]
+      }.compact.sort.uniq()
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quark
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   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: &10639560 !ruby/object:Gem::Requirement
+  requirement: &15803720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.7.9
   type: :runtime
   prerelease: false
-  version_requirements: *10639560
+  version_requirements: *15803720
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &10638880 !ruby/object:Gem::Requirement
+  requirement: &15803080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *10638880
+  version_requirements: *15803080
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &10638300 !ruby/object:Gem::Requirement
+  requirement: &15802620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *10638300
+  version_requirements: *15802620
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &10637740 !ruby/object:Gem::Requirement
+  requirement: &15802060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *10637740
+  version_requirements: *15802060
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &10637140 !ruby/object:Gem::Requirement
+  requirement: &15801500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *10637140
+  version_requirements: *15801500
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &10652680 !ruby/object:Gem::Requirement
+  requirement: &15800820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *10652680
+  version_requirements: *15800820
 - !ruby/object:Gem::Dependency
   name: hashlib
-  requirement: &10652080 !ruby/object:Gem::Requirement
+  requirement: &15800080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.0.35
   type: :runtime
   prerelease: false
-  version_requirements: *10652080
+  version_requirements: *15800080
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &10651640 !ruby/object:Gem::Requirement
+  requirement: &15799640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10651640
+  version_requirements: *15799640
 - !ruby/object:Gem::Dependency
   name: sinatra-cross_origin
-  requirement: &10651060 !ruby/object:Gem::Requirement
+  requirement: &15799100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10651060
+  version_requirements: *15799100
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &10650340 !ruby/object:Gem::Requirement
+  requirement: &15798380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10650340
+  version_requirements: *15798380
 description: A small service for logging and retrieving timeseries metrics into a
   Redis server
 email: garyhetzel@gmail.com
@@ -137,14 +137,13 @@ files:
 - lib/quark/servers/tcp.rb
 - lib/quark/config.rb
 - lib/quark/command_processor.rb
-- lib/quark/commands/subscribe.rb
 - lib/quark/commands/peek.rb
 - lib/quark/commands/fetch.rb
 - lib/quark/commands/observe.rb
 - lib/quark/commands/ping.rb
+- lib/quark/commands/list.rb
 - lib/quark/commands/put.rb
 - lib/quark/errors.rb
-- lib/quark/subscription.rb
 - lib/quark/server.rb
 - lib/quark/base_server.rb
 - dist/collectd-quark.py

data/lib/quark/commands/subscribe.rb

@@ -1,15 +0,0 @@
-module Quark
-  module CommandProcessor
-    def self.process_command_subscribe(data)
-      channel, patterns = data.chomp.split(' ', 2)
-      channel = channel.to_sym
-
-      Quark::Server.register_subscription(channel, Quark::Subscription.new({
-        :channel  => channel,
-        :patterns => patterns.split(/\s+/)
-      }))
-
-      return Quark::Server.subscriptions[channel]
-    end
-  end
-end

data/lib/quark/subscription.rb

@@ -1,18 +0,0 @@
-module Quark
-  class Subscription
-    attr_reader :channel, :patterns
-
-    def initialize(options={})
-      @channel = (options[:channel] || :default).to_sym
-      @patterns = [*(options[:patterns] || [])].uniq
-    end
-
-    def add_pattern(pattern)
-      @patterns << pattern unless @patterns.include?(pattern)
-    end
-
-    def <<(pattern)
-      add_pattern(pattern)
-    end
-  end
-end