norikra-client-jruby 0.0.5-java → 0.0.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 383de04bc8eb474267a7bd76ba92a584fc5315a2
-  data.tar.gz: 01a37951189c7c91b27869d7f7162ee623af8e59
+  metadata.gz: a0b8c2a12693429e07784a344c1609541c7ba392
+  data.tar.gz: e63c466165e6e1bf1fcf6b4e504ce6efe8aea972
 SHA512:
-  metadata.gz: 4c9dfd5e5fbde542a1ae4baf975727ed340aad2e3a1fd1a47968495aa5068515a9276050e07fa2a79f3e8b6b61a41b70a5cecbb9c9b216e5da706b3e0515a90f
-  data.tar.gz: 979531d399715d03a34616c4c409b95e90c809266dc9926bcc35fee67fcd7dbfd3708e6f93e2f0179412164338afd969f7112d329b4408bde33d6208eb05504e
+  metadata.gz: 353d7e11fa879d8a5f512947a858f049ea6142c8261cfbe0e16f39e729fb355f1805d84bf9fe06dcd0ade519b367259ca4a252ae90324f03e7d78bf516a40e63
+  data.tar.gz: d7497c7d2691f3e37ccdfb1c0058a7d80c756e86b9473ec27bf01d9cc4320153a3e0993c5dac645aade6b45947a265aa6b213b51e8d8102e1237c65d2d4f734b

data/lib/norikra/client.rb

@@ -36,8 +36,8 @@ module Norikra
       @client.call(:queries)
     end
 
-    def register(query_name, query_expression)
-      @client.call(:register, query_name, query_expression)
+    def register(query_name, query_group, query_expression)
+      @client.call(:register, query_name, query_group, query_expression)
     end
 
     def deregister(query_name)
@@ -62,8 +62,8 @@ module Norikra
     end
 
     # {'query_name' => [ [time, event], ... ]}
-    def sweep
-      @client.call(:sweep)
+    def sweep(query_group=nil)
+      @client.call(:sweep, query_group)
     end
   end
 end

data/lib/norikra/client/cli.rb

@@ -67,19 +67,25 @@ class Norikra::Client
     option :simple, :type => :boolean, :default => false, :desc => "suppress header/footer", :aliases => "-s"
     def list
       wrap do
-        puts "QUERY_NAME\tTARGETS\tQUERY" unless options[:simple]
+        puts ["QUERY_NAME", "GROUP", "TARGETS", "QUERY"].join("\t") unless options[:simple]
         queries = client(parent_options).queries
         queries.sort{|a,b| (a['targets'].first <=> b['targets'].first).nonzero? || a['name'] <=> b['name']}.each do |q|
-          puts "#{q['name']}\t#{q['targets'].join(',')}\t#{q['expression']}"
+          puts [
+            q['name'],
+            (q['group'] || 'default'),
+            q['targets'].join(','),
+            q['expression']
+          ].join("\t")
         end
         puts "#{queries.size} queries found." unless options[:simple]
       end
     end
 
     desc "add QUERY_NAME QUERY_EXPRESSION", "register a query"
+    option :group, :type => :string, :default => nil, :desc => "query group for sweep/listen (default: null)", :aliases => "-g"
     def add(query_name, expression)
       wrap do
-        client(parent_options).register(query_name, expression)
+        client(parent_options).register(query_name, options[:group], expression)
       end
     end
 
@@ -153,17 +159,17 @@ class Norikra::Client
       end
     end
 
-    desc "sweep", "fetch all output events of all queries"
+    desc "sweep [query_group_name]", "fetch all output events of all queries of default (or specified) query group"
     option :format, :type => :string, :default => 'json', :desc => "format of output data per line of stdout [json(default), ltsv]"
     option :query_name_key, :type => :string, :default => 'query', :desc => "output key name for query name (default: query)"
     option :time_key, :type => :string, :default => 'time', :desc => "output key name for event time (default: time)"
     option :time_format, :type => :string, :default => '%Y/%m/%d %H:%M:%S', :desc => "output time format (default: '2013/05/14 17:57:59')"
-    def sweep
+    def sweep(query_group=nil)
       wrap do
         formatter = formatter(options[:format])
         time_formatter = lambda{|t| Time.at(t).strftime(options[:time_format])}
 
-        data = client(parent_options).sweep
+        data = client(parent_options).sweep(query_group)
 
         data.keys.sort.each do |queryname|
           events = data[queryname]

data/lib/norikra/client/version.rb

@@ -1,5 +1,5 @@
 module Norikra
   class Client
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: norikra-client-jruby
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: java
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack-rpc-over-http-jruby
@@ -98,7 +98,6 @@ files:
 - lib/norikra/client/cli.rb
 - lib/norikra/client/cli/formatter.rb
 - lib/norikra/client/cli/parser.rb
-- lib/norikra/client/query.rb
 - lib/norikra/client/version.rb
 - norikra-client.gemspec
 homepage: https://github.com/tagomoris/norikra-client
@@ -121,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Client commands and libraries for Norikra