norikra-client-jruby 0.0.6-java → 0.0.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0b8c2a12693429e07784a344c1609541c7ba392
-  data.tar.gz: e63c466165e6e1bf1fcf6b4e504ce6efe8aea972
+  metadata.gz: 7be0d49cbcc1f5d04f3210e3fc6dd789d892b917
+  data.tar.gz: e54e6a9ab06bc661d6acb24dd0f35a406574eabf
 SHA512:
-  metadata.gz: 353d7e11fa879d8a5f512947a858f049ea6142c8261cfbe0e16f39e729fb355f1805d84bf9fe06dcd0ade519b367259ca4a252ae90324f03e7d78bf516a40e63
-  data.tar.gz: d7497c7d2691f3e37ccdfb1c0058a7d80c756e86b9473ec27bf01d9cc4320153a3e0993c5dac645aade6b45947a265aa6b213b51e8d8102e1237c65d2d4f734b
+  metadata.gz: 3ff64659bee138f37bba82eea0f29b9c7212e05d48325f45c83eb34360bca117e7f6a8ee6456d2003029263a08757d7dd5f4f623394a3ddc21c5f6c0bcbf21e9
+  data.tar.gz: fd75255d00fd316086bf9ba0deb59381a62dca79c81a6d4a5f183c9338b38c9275a040cdd1ccc7e199cd4884317b7a1f20829e4bbdbcf9d78ca0baee2250b627

data/lib/norikra/client/cli.rb

@@ -28,27 +28,30 @@ class Norikra::Client
     option :simple, :type => :boolean, :default => false, :desc => "suppress header/footer", :aliases => "-s"
     def list
       wrap do
-        puts "TARGET" unless options[:simple]
+        puts ["TARGET","AUTO_FIELD"].join("\t") unless options[:simple]
         targets = client(parent_options).targets
         targets.each do |t|
-          puts t
+          puts [t[:name], t[:auto_field]].join("\t")
         end
         puts "#{targets.size} targets found." unless options[:simple]
       end
     end
 
     desc "open TARGET [fieldname1:type1 [fieldname2:type2 [fieldname3:type3] ...]]", "create new target (and define its fields)"
+    option :suppress_auto_field, :type => :boolean, :default => false, :desc => "suppress to define fields automatically", :aliases => "-x"
     def open(target, *field_defs)
-      wrap do
-        fields = nil
-        if field_defs.size > 0
-          fields = {}
-          field_defs.each do |str|
-            fname,ftype = str.split(':')
-            fields[fname] = ftype
-          end
+      fields = nil
+      if field_defs.size > 0
+        fields = {}
+        field_defs.each do |str|
+          fname,ftype = str.split(':')
+          fields[fname] = ftype
         end
-        client(parent_options).open(target, fields)
+      end
+      auto_field = (not options[:suppress_auto_field])
+
+      wrap do
+        client(parent_options).open(target, fields, auto_field)
       end
     end
 
@@ -58,6 +61,14 @@ class Norikra::Client
         client(parent_options).close(target)
       end
     end
+
+    desc "modify TARGET BOOL_VALUE", "modify target to do define fields automatically or not"
+    def modify(target, val)
+      auto_field = ['yes','true','auto'].include?(val.downcase)
+      wrap do
+        client(parent_options).modify(target, auto_field)
+      end
+    end
   end
 
   class Query < Thor
@@ -128,17 +139,18 @@ class Norikra::Client
     option :format, :type => :string, :default => 'json', :desc => "format of input data per line of stdin [json(default), ltsv]"
     option :batch_size, :type => :numeric, :default => 10000, :desc => "records sent in once transferring (default: 10000)"
     def send(target)
-      wrap do
-        client = client(parent_options)
-        parser = parser(options[:format])
-        buffer = []
-        $stdin.each_line do |line|
-          buffer.push(parser.parse(line))
-          if buffer.size >= options[:batch_size]
-            client.send(target, buffer)
-            buffer = []
-          end
+      client = client(parent_options)
+      parser = parser(options[:format])
+      buffer = []
+      $stdin.each_line do |line|
+        buffer.push(parser.parse(line))
+        if buffer.size >= options[:batch_size]
+          client.send(target, buffer)
+          buffer = []
         end
+      end
+
+      wrap do
         client.send(target, buffer) if buffer.size > 0
       end
     end
@@ -148,10 +160,10 @@ class Norikra::Client
     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 fetch(query_name)
-      wrap do
-        formatter = formatter(options[:format])
-        time_formatter = lambda{|t| Time.at(t).strftime(options[:time_format])}
+      formatter = formatter(options[:format])
+      time_formatter = lambda{|t| Time.at(t).strftime(options[:time_format])}
 
+      wrap do
         client(parent_options).event(query_name).each do |time,event|
           event = {options[:time_key] => Time.at(time).strftime(options[:time_format])}.merge(event)
           puts formatter.format(event)

data/lib/norikra/client/version.rb

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

data/lib/norikra/client.rb

@@ -21,17 +21,21 @@ module Norikra
     end
 
     def targets
-      @client.call(:targets)
+      @client.call(:targets) #=> {:name => "name", :auto_field => true}
     end
 
-    def open(target, fields=nil)
-      @client.call(:open, target, fields)
+    def open(target, fields=nil, auto_field=true)
+      @client.call(:open, target, fields, auto_field)
     end
 
     def close(target)
       @client.call(:close, target)
     end
 
+    def modify(target, auto_field)
+      @client.call(:modify, target, auto_field)
+    end
+
     def queries
       @client.call(:queries)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: norikra-client-jruby
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: java
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack-rpc-over-http-jruby