droonga-client 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c506f2bd7e3f43ef73c8ed5463a678fb6a281cda
-  data.tar.gz: b6f6a5fec2421d4b625060d9b4d2f61b1d229cdc
+  metadata.gz: 0bddfcb4cdb8dd14e9290a5e63ef0bbbff7a2302
+  data.tar.gz: 973fd9fcc5799bada35619aca7551a1c668f33b4
 SHA512:
-  metadata.gz: 8c644cdee887e5733d8349eda8ea6aa5f316d73357ea311e0af419a439d13d998260d7443ae7f8062b1aba1e021c6a64f2d7360f4acc0225c5b630cd9c67ea53
-  data.tar.gz: 3cc489e4cb5de93c5705df1a3c961fd6d320f4e97b20fd0529fd4ce63509374e02af892c48dad4bf7c9d52f0cc98310744f31ee2b538a066ecb7194dae6cc91d
+  metadata.gz: 3998d23334009b7c7b6e35bc67d271493edbc691cf3467f714c8e139b78827b592456eb574c4e16286d3c2d7c1b910eac78b42d7c9f8989b1abf4b341f1e2f45
+  data.tar.gz: 5bc8cf2f9df903588bf3816036e2f200a38e02c102ce26abd894b1408976639bfa2c99fc0e5e6c7fd02a8363ab612c15e0f2d8297f8b81a463a732e31aefc12f

data/Gemfile

@@ -1,6 +1,6 @@
 # -*- mode: ruby; coding: utf-8 -*-
 #
-# Copyright (C) 2013 Droonga Project
+# Copyright (C) 2013-2015 Droonga Project
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -19,3 +19,11 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in droonga-client.gemspec
 gemspec
+
+parent_dir = File.join(File.dirname(__FILE__), "..")
+grn2drn_dir = File.join(parent_dir, "grn2drn")
+if File.exist?(grn2drn_dir)
+  gem "grn2drn", :path => grn2drn_dir
+else
+  gem "grn2drn", :github => "droonga/grn2drn"
+end

data/bin/droonga-add

@@ -27,7 +27,8 @@ module Droonga
           option.banner("Usage: droonga-add [options]\n" +
                         "   ex: droonga-add --table User --name Adam --age 10\n" +
                         "       droonga-add --table Server --value:host example.com\n" +
-                        "       (You can specify column value expressly with the prefix \"value:\".)")
+                        "       (You can specify column value expressly with the prefix \"value:\".)\n" +
+                        "")
 
           option.on("table=",
                     "Name of the target table.",
@@ -51,10 +52,12 @@ module Droonga
         puts "Adding new record..."
         puts(JSON.pretty_generate(add_params))
 
-        response = request(add_message)
-        raise NoResponse.new unless response
+        result = request(add_message) do |response|
+          raise NoResponse.new unless response
+          response["body"]
+        end
 
-        if response["body"]
+        if result
           puts "Done."
           true
         else

data/bin/droonga-groonga

@@ -18,6 +18,7 @@
 require "json"
 
 require "droonga/command/base"
+require "grn2drn/command-converter"
 
 module Droonga
   module Command
@@ -32,34 +33,31 @@ module Droonga
         parse_options do |option|
           option.banner("Usage: droonga-groonga [groonga-command-name] [options]\n" +
                         "   ex: droonga-groonga select --table=Users")
-
           option.separator("Formatting:")
           option.on(:pretty,
                     "Output result as a pretty print JSON.",
                     :default => false)
         end
 
-        @command = ARGV.shift
-        assert_valid_command
-
-        groonga_message = {
-          "dataset" => @options[:dataset],
-          "type" => @command,
-          "body" => build_params(ARGV),
-        }
-
-        response = request(groonga_message)
-        raise NoResponse.new unless response
-        body = response["body"]
-
-        if @options[:pretty]
-          puts(JSON.pretty_generate(body))
+        unless ARGV.empty?
+          groonga_command_args = ARGV.collect do |arg|
+            if /\s/ =~ arg
+              JSON.generate(arg)
+            else
+              arg
+            end
+          end
+          command_converter.convert(groonga_command_args.join(" ")) do |command|
+            process_groonga_message(command)
+          end
         else
-          puts(JSON.generate(body))
+          command_converter.convert(ARGF) do |command|
+            process_groonga_message(command)
+          end
         end
 
         true
-      rescue MissingRequiredParameter, InvalidCommandName, MissingCommandName
+      rescue MissingRequiredParameter
         puts(@options)
         false
       rescue NoResponse
@@ -68,28 +66,29 @@ module Droonga
       end
 
       private
-      def assert_valid_command
-        raise InvalidCommandName.new(@command) if /\A--.+\z/ =~ @command
-        raise MissingCommandName.new if @command.nil?
-      end
+      def process_groonga_message(groonga_message)
+        request(groonga_message) do |response|
+          raise NoResponse.new unless response
+          body = response["body"]
 
-      def build_params(argv)
-        params = {}
-        option_name = nil
-        argv.each do |arg|
-          case arg
-          when /\A--([^\s=]+)=(.+)\z/
-            params[$1] = $2
-          when /\A--([^\s=]+)\z/
-            option_name = $1
+          if @options[:pretty]
+            puts(JSON.pretty_generate(body))
           else
-            if option_name
-              params[option_name] = arg
-              option_name = nil
-            end
+            puts(JSON.generate(body))
           end
         end
-        params
+      end
+
+      def command_converter
+        @command_converter ||= create_command_converter
+      end
+
+      def create_command_converter
+        convert_options = {
+          :id_prefix => "droonga-groonga:#{Time.now.to_i.to_s}",
+          :dataset   => @options[:dataset],
+        }
+        ::Grn2Drn::CommandConverter.new(convert_options)
       end
     end
   end

data/bin/droonga-request

@@ -26,10 +26,9 @@ options = {
   :port                => Droonga::Client::DEFAULT_PORT,
   :tag                 => Droonga::Client::DEFAULT_TAG,
   :default_dataset     => Droonga::Client::DEFAULT_DATASET,
-  :protocol            => :droonga,
+  :protocol            => Droonga::Client::DEFAULT_PROTOCOL,
   :default_target_role => Droonga::Client::DEFAULT_TARGET_ROLE,
   :timeout             => 1,
-  :exit_on_response    => true,
   :receiver_host       => Droonga::Client::DEFAULT_HOST,
   :receiver_port       => 0,
   :report_request      => false,
@@ -44,60 +43,50 @@ parser.banner += " REQUEST_JSON_FILE"
 parser.separator("")
 parser.separator("Connect:")
 parser.on("--host=HOST",
-          "Host name to be connected.",
+          "Host name of the endpoint to communicate with the Droonga cluster.",
           "(#{options[:host]})") do |host|
   options[:host] = host
 end
 parser.on("--port=PORT", Integer,
-          "Port number to be connected.",
+          "Port number to communicate with the endpoint of the Droonga cluster.",
           "(#{options[:port]})") do |port|
   options[:port] = port
 end
 parser.on("--tag=TAG",
-          "Tag name to be used to communicate with Droonga system.",
+          "Tag name to communicate with the endpoint of the Droonga cluster.",
           "(#{options[:tag]})") do |tag|
   options[:tag] = tag
 end
 available_protocols = [:droonga, :http]
 parser.on("--protocol=PROTOCOL", available_protocols,
-          "Protocol to be used to communicate with Droonga system.",
+          "Protocol to communicate with the endpoint of the Droonga cluster.",
           "[#{available_protocols.join('|')}]",
           "(#{options[:protocol]})") do |protocol|
-  options[:protocol] = protocol
+  options[:protocol] = protocol.downcase.to_sym
 end
 parser.separator("")
 parser.separator("Timeout:")
 parser.on("--timeout=TIMEOUT", Integer,
-          "Timeout for operations.",
+          "Time to terminate unresponsive connections, in seconds.",
           "(#{options[:timeout]})") do |timeout|
   options[:timeout] = timeout
 end
-parser.on("--[no-]exit-on-response",
-          "Exit when a response is received.",
-          "(#{options[:exit_on_response]})") do |exit_on_response|
-  options[:exit_on_response] = exit_on_response
-end
 parser.separator("")
 parser.separator("Droonga protocol:")
 parser.on("--receiver-host=HOST",
-          "Host name to be received a response from Droonga engine.",
+          "Host name of the computer you are running this command.",
           "(#{options[:receiver_host]})") do |host|
   options[:receiver_host] = host
 end
-parser.on("--receiver-port=PORT", Integer,
-          "Port number to be received a response from Droonga engine.",
-          "(#{options[:receiver_port]})") do |port|
-  options[:receiver_port] = port
-end
 parser.separator("")
 parser.separator("Report:")
 parser.on("--[no-]report-request",
-          "Reports request message.",
+          "Reports request messages actually sent.",
           "(#{options[:report_request]})") do |report_request|
   options[:report_request] = report_request
 end
 parser.on("--[no-]report-elapsed-time",
-          "Reports elapsed time.",
+          "Reports elapsed time between a request and a response.",
           "(#{options[:report_elapsed_time]})") do |report_elapsed_time|
   options[:report_elapsed_time] = report_elapsed_time
 end
@@ -109,17 +98,17 @@ parser.on("--detault-dataset=NAME",
   options[:default_dataset] = name
 end
 parser.on("--detault-target-role=ROLE",
-          "Default target role of engine nodes for sending messages.",
+          "Default role of engine nodes which should process messages.",
           "(#{options[:default_target_role]})") do |role|
   options[:default_target_role] = role
 end
 parser.on("--[no-]completion",
-          "Do completion of required fields for input message or not.",
+          "Do completion of required fields for input messages or not.",
           "(#{options[:completion]})") do |completion|
   options[:completion] = completion
 end
 parser.on("--[no-]validation",
-          "Do validation for input message or not.",
+          "Do validation for input messages or not.",
           "(#{options[:validation]})") do |validation|
   options[:validation] = validation
 end
@@ -128,9 +117,9 @@ request_json_files = parser.parse!(ARGV)
 client = Droonga::Client.new(options)
 json_parser = Yajl::Parser.new
 json_parser.on_parse_complete = lambda do |request_message|
-  request_message["dataset"] ||= options[:default_dataset]
   if options[:report_request]
     message = "Request: "
+    request_message = client.complete(request_message)
     begin
       message << JSON.pretty_generate(request_message)
     rescue
@@ -140,21 +129,21 @@ json_parser.on_parse_complete = lambda do |request_message|
     print(message)
   end
   start = Time.now
-  request = client.request(request_message) do |response|
-    message = ""
-    if options[:report_elapsed_time]
-      message << "Elapsed time: #{Time.now - start}\n"
-    end
-    begin
-      message << JSON.pretty_generate(response)
-    rescue
-      message << response.inspect
+  response = client.request(request_message)
+  message = ""
+  if options[:report_elapsed_time]
+    message << "Elapsed time: #{Time.now - start}\n"
+  end
+  begin
+    if options[:protocol] == :http
+      response = JSON.parse(response)
     end
-    message << "\n"
-    print(message)
-    break if options[:exit_on_response]
+    message << JSON.pretty_generate(response)
+  rescue
+    message << response.inspect
   end
-  request.wait
+  message << "\n"
+  print(message)
 end
 
 if request_json_files.empty?

data/bin/droonga-send

@@ -25,7 +25,7 @@ require "droonga/client"
 options = OpenStruct.new
 options.report_request = false
 options.report_throughput = false
-options.default_protocol = "droonga"
+options.default_protocol = Droonga::Client::DEFAULT_PROTOCOL
 options.default_host     = Droonga::Client::DEFAULT_HOST
 options.default_port     = Droonga::Client::DEFAULT_PORT
 options.default_tag      = Droonga::Client::DEFAULT_TAG
@@ -53,15 +53,16 @@ def parse_server(server, options)
     protocol = nil
   end
 
-  protocol ||= options.default_protocol
+  protocol ||= options.default_protocol.to_s
   port     ||= options.default_port
   tag      ||= options.default_tag
 
   {
     :host     => host,
     :port     => Integer(port),
-    :protocol => protocol.to_sym,
+    :protocol => protocol.downcase.to_sym,
     :tag      => tag,
+    :default_dataset => options.default_dataset,
     :default_target_role => options.default_target_role,
     :completion => options.completion,
     :validation => options.validation,
@@ -114,36 +115,36 @@ parser.on("--server=PROTOCOL:HOST:PORT/TAG",
   servers << server
 end
 parser.on("--messages-per-second=N", Integer,
-          "Apply rate limitation by N messages/second.",
-          "'#{Droonga::Client::RateLimiter::NO_LIMIT}' means no limit.",
+          "Maximum number of messages to be sent in a second.",
+          "'#{Droonga::Client::RateLimiter::NO_LIMIT}' means \"no limit\".",
           "(#{messages_per_second})") do |n|
   messages_per_second = n
 end
 parser.on("--default-protocol=PROTOCOL",
-          "Default protocol for servers.",
+          "Default protocol to communicate with endpoints of the Droonga cluster.",
           "(#{options.default_protocol})") do |protocol|
-  options.default_protocol = protocol
+  options.default_protocol = protocol.downcase.to_sym
 end
 parser.on("--default-port=PORT", Integer,
-          "Default port for servers.",
+          "Default port number to communicate with endpoints of the Droonga cluster.",
           "(#{options.default_port})") do |port|
   options.default_port = port
 end
 parser.on("--default-tag=TAG",
-          "Default tag for servers.",
+          "Default tag name to communicate with the endpoints of the Droonga cluster.",
           "(#{options.default_tag})") do |tag|
   options.default_tag = tag
 end
 parser.separator("")
 parser.separator("Report:")
 parser.on("--[no-]report-request",
-          "Reports request message.",
+          "Reports request messages.",
           "(#{options.report_request})") do |report_request|
   options.report_request = report_request
 end
-parser.on("--report-throughput",
+parser.on("--[no-]report-throughput",
           "Reports throughput by messages per second.",
-          "(no)") do
+          "(#{options.report_throughput})") do
   options.report_throughput = true
 end
 parser.separator("")
@@ -154,23 +155,26 @@ parser.on("--default-dataset=NAME",
   options.default_dataset = name
 end
 parser.on("--default-target-role=ROLE",
-          "Default target role of engine nodes for sending messages.",
+          "Default role of engine nodes which should process messages.",
           "(#{options.default_target_role})") do |role|
   options.default_target_role = role
 end
 parser.on("--[no-]completion",
-          "Do completion of required fields for input message or not.",
+          "Do completion of required fields for input messages or not.",
           "(#{options.completion})") do |completion|
   options.completion = completion
 end
 parser.on("--[no-]validation",
-          "Do validation for input message or not.",
+          "Do validation for input messages or not.",
           "(#{options.validation})") do |validation|
   options.validation = validation
 end
 request_json_files = parser.parse!(ARGV)
 
-servers << default_server if servers.empty?
+if servers.empty?
+  default_server = "#{options.default_protocol}:#{options.default_host}:#{options.default_port}/#{options.default_tag}"
+  servers << default_server
+end
 if messages_per_second > 0 and servers.size > 1
   messages_per_second = messages_per_second / servers.size
 end
@@ -187,9 +191,10 @@ end
 client_index = 0
 json_parser = Yajl::Parser.new
 json_parser.on_parse_complete = lambda do |request_message|
-  request_message["dataset"] ||= options.default_dataset
+  client = clients[client_index]
   if options.report_request
     message = "Request: "
+    request_message = client.complete(request_message)
     begin
       message << JSON.pretty_generate(request_message)
     rescue
@@ -198,7 +203,6 @@ json_parser.on_parse_complete = lambda do |request_message|
     message << "\n"
     print(message)
   end
-  client = clients[client_index]
   client.send(request_message)
   client_index = (client_index + 1) % clients.size
   throughput_reporter.on_message_sent if throughput_reporter

data/bin/droonga-system-status

@@ -25,19 +25,23 @@ module Droonga
       def run
         parse_options do |option|
           option.on(:pretty,
-                    "Output result as a pretty print JSON.",
+                    "Output result as a pretty printed JSON.",
                     :default => false)
         end
 
-        response = request("dataset" => @options[:dataset],
-                           "type"    => "system.status")
-        raise NoResponse.new unless response
-        body = response["body"]
+        system_status_message = {
+          "dataset" => @options[:dataset],
+          "type"    => "system.status",
+        }
+        request(system_status_message) do |response|
+          raise NoResponse.new unless response
+          body = response["body"]
 
-        if @options[:pretty]
-          puts(JSON.pretty_generate(body))
-        else
-          puts(JSON.generate(body))
+          if @options[:pretty]
+            puts(JSON.pretty_generate(body))
+          else
+            puts(JSON.generate(body))
+          end
         end
 
         true

data/doc/text/news.md

@@ -1,6 +1,15 @@
 # News
 
-## 0.2.1: 2005-04-29
+## 0.2.2: 2015-05-29
+
+ * `droonga-request`
+   * Works correctly with HTTP protocol. (regression)
+   * The `--[no-]exit-on-response` option is removed because it is nonsense.
+ * Add `--dry-run` option for `droonga-add`, `droonga-system-status` and `droonga-groonga` commands.
+   You can try them without sending messages.
+ * `droonga-groonga` now supports conversion of multiple Groonga commands given via the standard input.
+
+## 0.2.1: 2015-04-29
 
  * Required fields of input messages are automatically completed by default.
  * Input messages are automatically validated by default.

data/droonga-client.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "droonga-message-pack-packer"
   spec.add_runtime_dependency "fluent-logger"
+  spec.add_runtime_dependency "grn2drn", ">= 1.0.5"
   spec.add_runtime_dependency "msgpack"
   spec.add_runtime_dependency "rack"
   spec.add_runtime_dependency "slop", "<= 3.6.0"

data/lib/droonga/client.rb

@@ -25,6 +25,7 @@ require "droonga/client/message_validator"
 
 module Droonga
   class Client
+    DEFAULT_PROTOCOL = :droonga
     DEFAULT_HOST = Socket.gethostname
     DEFAULT_HOST.force_encoding("US-ASCII") if DEFAULT_HOST.ascii_only?
     DEFAULT_PORT = 10031
@@ -34,6 +35,7 @@ module Droonga
     DEFAULT_TIMEOUT_SECONDS = 3
 
     attr_writer :on_error
+    attr_reader :protocol
 
     class ConnectionError < StandardError
       def initialize(error)
@@ -83,6 +85,7 @@ module Droonga
     # @option options [Boolean] :validation (true)
     #   Do or do not validate input messages.
     def initialize(options={})
+      @protocol = options[:protocol] || DEFAULT_PROTOCOL
       @connection = create_connection(options)
       @connection.on_error = lambda do |error|
         on_error(ConnectionError.new(error))
@@ -91,7 +94,8 @@ module Droonga
       @completion = options[:completion] != false
       @validation = options[:validation] != false
 
-      @completer = MessageCompleter.new(:default_timeout => options[:default_timeout],
+      @completer = MessageCompleter.new(:default_dataset => options[:default_dataset],
+                                        :default_timeout => options[:default_timeout],
                                         :default_target_role => options[:default_target_role])
       @validator = MessageValidator.new
     end
@@ -122,9 +126,30 @@ module Droonga
       @connection.close
     end
 
+    def complete(message)
+      case @protocol
+      when :http
+        http_request = @connection.build_request(message)
+        http_headers = {}
+        http_request.canonical_each do |name, value|
+          http_headers[name] = value
+        end
+        {
+          "method"  => http_request.method,
+          "path"    => http_request.path,
+          "headers" => http_headers,
+          "body"    => http_request.body,
+        }
+      when :droonga
+        do_completion(message, :completion => true)
+      else
+        nil
+      end
+    end
+
     private
     def create_connection(options)
-      case options[:protocol] || :droonga
+      case @protocol
       when :http
         Connection::HTTP.new(options)
       when :droonga

data/lib/droonga/client/connection/droonga-protocol/coolio.rb

@@ -302,7 +302,7 @@ module Droonga
               port = @sender.peeraddr[1]
               detail = message
               error = ConnectionError.new(host, port, detail)
-              yield(error)
+              yield(error) if block_given?
             end
           end
 

data/lib/droonga/client/connection/http.rb

@@ -87,8 +87,14 @@ module Droonga
             end
           else
             thread = Thread.new do
-              send(message, options) do |response|
-                yield(response.body)
+              catch do |tag|
+                send(message, options) do |response|
+                  begin
+                    yield(response.body)
+                  rescue LocalJumpError
+                    throw(tag)
+                  end
+                end
               end
             end
             Request.new(thread)
@@ -142,7 +148,7 @@ module Droonga
           request = build_request(message)
           http.start do
             http.request(request) do |response|
-              yield(response)
+              yield(response) if block_given?
             end
           end
         end
@@ -153,15 +159,18 @@ module Droonga
         def close
         end
 
-        private
         def build_request(message)
           http_method = message["method"] || "GET"
           http_headers = message["headers"] || {}
-          case http_method
+          case http_method.to_s.upcase
           when "POST"
             request = Net::HTTP::Post.new(build_path(message, {}),
                                           http_headers)
-            request.body = JSON.generate(message["body"])
+            body = message["body"]
+            if body.is_a?(Hash) or body.is_a?(Array)
+              body = JSON.generate(body)
+            end
+            request.body = body
             request
           when "GET"
             parameters = message["body"] || {}
@@ -172,9 +181,10 @@ module Droonga
           end
         end
 
+        private
         def build_path(message, parameters)
           type = message["type"]
-          base_path = message["path"] || "/#{type}"
+          base_path = message["path"] || build_droonga_path(type)
           if parameters.empty?
             base_path
           else
@@ -182,6 +192,11 @@ module Droonga
           end
         end
 
+        def build_droonga_path(type)
+          type = type.gsub(".", "/")
+          "/droonga/#{type}"
+        end
+
         def on_error(error)
           @on_error.call(error) if @on_error
         end

data/lib/droonga/client/message_completer.rb

@@ -23,6 +23,7 @@ module Droonga
       def initialize(options={})
         @options = options
         @fixed_date = @options[:fixed_date]
+        @default_dataset = @options[:default_dataset]
         @default_timeout = @options[:default_timeout]
         @default_target_role = @options[:default_target_role]
       end
@@ -30,13 +31,16 @@ module Droonga
       def complete(message)
         id   = message["id"] || generate_id
         date = message["date"] || @fixed_date || new_date
+        dataset = message["dataset"] || @default_dataset
         if not have_timeout?(message) and @default_timeout
           message["timeout"] = @default_timeout
         end
         if not message["targetRole"].nil? and @default_target_role
           message["targetRole"] = @default_target_role
         end
-        message.merge("id" => id, "date" => date)
+        message.merge("id"      => id,
+                      "date"    => date,
+                      "dataset" => dataset)
       end
 
       private

data/lib/droonga/client/version.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013-2014 Droonga Project
+# Copyright (C) 2013-2015 Droonga Project
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,6 +17,6 @@
 
 module Droonga
   class Client
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/lib/droonga/command/base.rb

@@ -33,6 +33,10 @@ module Droonga
         options = Slop.parse(:help => true) do |option|
           yield(option) if block_given?
 
+          option.on(:"dry-run",
+                    "Only reports messages to be sent to the engine.",
+                    :default => false)
+
           option.separator("Connections:")
           option.on(:host=,
                     "Host name of the engine node.",
@@ -48,13 +52,13 @@ module Droonga
                     "Dataset name for the sending message.",
                     :default => Client::DEFAULT_DATASET)
           option.on("receiver-host=",
-                    "Host name of this host.",
+                    "Host name of the computer you are running this command.",
                     :default => Client::DEFAULT_HOST)
           option.on("target-role=",
-                    "Role of engine nodes which should receive the message.",
+                    "Role of engine nodes which should process the message.",
                     :default => Client::DEFAULT_TARGET_ROLE)
           option.on("timeout=",
-                    "Time to terminate unresponsive connections (in seconds).",
+                    "Time to terminate unresponsive connections, in seconds.",
                     :default => Client::DEFAULT_TIMEOUT_SECONDS)
         end
         @options = options
@@ -63,12 +67,21 @@ module Droonga
         raise MissingRequiredParameter.new
       end
 
-      def request(message)
+      def request(message, &block)
+        if @options[:"dry-run"]
+          if @options[:pretty]
+            puts(JSON.pretty_generate(message))
+          else
+            puts(JSON.generate(message))
+          end
+          return nil
+        end
+
         response = nil
         open do |client|
           response = client.request(message)
         end
-        response
+        yield response
       end
 
       def send(message)

metadata

@@ -1,139 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: droonga-client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Droonga Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: droonga-message-pack-packer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fluent-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: grn2drn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: packnga
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Droonga client for Ruby
@@ -148,8 +162,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .yardopts
+- ".gitignore"
+- ".yardopts"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -184,12 +198,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []