groonga-client 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24d9b067756feca3932e30fc97c2b30b51f164d1
-  data.tar.gz: 007f34f0eb3767476411ef0cf30cf367fc4de47a
+  metadata.gz: 837550f5d3d1eeec4eb0e92880c66f897f40fd12
+  data.tar.gz: ffe2005c27525c1b162603c903551aac1bf0bfe8
 SHA512:
-  metadata.gz: 67cff454d8de8faecb954f4151aa5187db57da7b0e087df24ab5d3da9221629e38a2a93151ec2a699482762c2e8240413eb0d4e739fa2c93b6c1d7f643f9dde7
-  data.tar.gz: 66c4c1282b138064e7e6b2613f684d5448c65a155e3831670a94ac4ab045a9bbdac135c800d7082bb7d7349154b8d125df6a92e83e8e933ff0eeed9e10354508
+  metadata.gz: d301825f48a0157aadc8f7772e502514816057584af795abd71f9433e2e4aaf09b7a8379974533e2023f5560e0d50e33a370e9a469b1095e7a0bf54f291ca614
+  data.tar.gz: 14af40e9d242b61acb46f8ebe28886c4118a0b0a64a9920fb7e237a522c8909004ddcabed86e104740a214248f545b19e78ee40990195426feeff03ae2e272a7

data/bin/groonga-client

@@ -0,0 +1,114 @@
+#!/usr/bin/env ruby
+# -*- mode: ruby -*-
+#
+# Copyright (C) 2015  Kouhei Sutou <kou@clear-code.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "ostruct"
+require "optparse"
+require "json"
+
+require "groonga/command/parser"
+
+require "groonga/client"
+
+def default_port(protocol)
+  case protocol
+  when :http
+    10041
+  when :gqtp
+    10043
+  end
+end
+
+def run_command(client, command)
+  response = client.execute(command)
+  case command.output_type
+  when :json
+    puts(JSON.pretty_generate([response.header, response.body]))
+  when :xml
+    puts(response.raw)
+  else
+    puts(response.body)
+  end
+end
+
+options = OpenStruct.new
+options.protocol = :http
+options.host     = "localhost"
+options.port     = nil
+
+parser = OptionParser.new
+parser.version = Groonga::Client::VERSION
+parser.banner += " GROONGA_COMMAND_FILE1 GROONGA_COMMAND_FILE2 ..."
+parser.separator("")
+parser.separator("Connection:")
+available_protocols = [:http, :gqtp]
+parser.on("--protocol=PROTOCOL", [:http, :gqtp],
+          "Protocol to connect to Groonga server.",
+          "[#{available_protocols.join(", ")}]",
+          "(#{options.protocol})") do |protocol|
+  options.protocol = protocol
+end
+parser.on("--host=HOST",
+          "Groonga server to be connected.",
+          "(#{options.host})") do |host|
+  options.host = host
+end
+parser.on("--port=PORT", Integer,
+          "Port number of Groonga server to be connected.",
+          "(auto)") do |port|
+  options.port = port
+end
+command_file_paths = parser.parse!(ARGV)
+
+options.port ||= default_port(options.protocol)
+
+client = Groonga::Client.new(:protocol => options.protocol,
+                             :host     => options.host,
+                             :port     => options.port,
+                             :backend  => :synchronous)
+parser = Groonga::Command::Parser.new
+parser.on_command do |command|
+  run_command(client, command)
+end
+
+parser.on_load_columns do |command, columns|
+  command[:columns] ||= columns.join(",")
+end
+values = []
+parser.on_load_value do |_, value|
+  values << value
+end
+parser.on_load_complete do |command|
+  command[:values] ||= Yajl::Encoder.encode(values)
+  run_command(client, command)
+  values.clear
+end
+
+if command_file_paths.empty?
+  $stdin.each_line do |line|
+    parser << line
+  end
+else
+  command_file_paths.each do |command_file_path|
+    File.open(command_file_path) do |command_file|
+      command_file.each_line do |line|
+        parser << line
+      end
+    end
+  end
+end

data/doc/text/news.md

@@ -1,5 +1,12 @@
 # NEWS
 
+## 0.1.1 - 2015-04-20
+
+### Improvements
+
+  * groonga-client: Add a command that sends Groonga commands to a
+    Groonga server.
+
 ## 0.1.0 - 2014-11-05
 
 ### Improvements

data/groonga-client.gemspec

@@ -1,7 +1,7 @@
 # -*- mode: ruby; coding: utf-8 -*-
 #
 # Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2014-2015  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -43,12 +43,13 @@ Gem::Specification.new do |spec|
   spec.files += Dir.glob("lib/**/*.rb")
   spec.files += Dir.glob("doc/text/*")
   spec.test_files += Dir.glob("test/**/*")
-  # Dir.chdir("bin") do
-  #   spec.executables = Dir.glob("*")
-  # end
+  Dir.chdir("bin") do
+    spec.executables = Dir.glob("*")
+  end
 
   spec.add_runtime_dependency("gqtp", ">= 1.0.4")
   spec.add_runtime_dependency("groonga-command", ">= 1.0.8")
+  spec.add_runtime_dependency("groonga-command-parser")
 
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")

data/lib/groonga/client/protocol/http/synchronous.rb

@@ -97,7 +97,8 @@ module Groonga
               command[:values] = raw_values
               request = Net::HTTP::Post.new(path, headers)
               request.content_type = "application/json"
-              request.body = raw_values
+              request.content_length = raw_values.bytesize
+              request.body_stream = StringIO.new(raw_values)
               http.request(request)
             else
               http.get(command.to_uri_format, headers)

data/lib/groonga/client/version.rb

@@ -18,6 +18,6 @@
 
 module Groonga
   class Client
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/test/response/test-table-list.rb

@@ -4,9 +4,34 @@ class TestResponseTableList < Test::Unit::TestCase
   include TestResponseHelper
 
   def test_table_list
-    header = [0,1372430096.70991,0.000522851943969727]
-    body = [[["id","UInt32"],["name","ShortText"],["path","ShortText"],["flags","ShortText"],["domain","ShortText"],["range","ShortText"],["default_tokenizer","ShortText"],["normalizer","ShortText"]],
-      [256,"Test","/tmp/test.db.0000100","TABLE_HASH_KEY|PERSISTENT",nil,nil,nil,nil]]
+    header = [
+      0,
+      1372430096.70991,
+      0.000522851943969727,
+    ]
+    columns = [
+      ["id",                "UInt32"],
+      ["name",              "ShortText"],
+      ["path",              "ShortText"],
+      ["flags",             "ShortText"],
+      ["domain",            "ShortText"],
+      ["range",             "ShortText"],
+      ["default_tokenizer", "ShortText"],
+      ["normalizer",        "ShortText"],
+    ]
+    body = [
+      columns,
+      [
+        256,
+        "Test",
+        "/tmp/test.db.0000100",
+        "TABLE_HASH_KEY|PERSISTENT",
+        nil,
+        nil,
+        nil,
+        nil,
+      ],
+    ]
     raw_response = [header, body].to_json
 
     response = parse_raw_response("table_list", raw_response)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Haruka Yoshihara
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gqtp
@@ -40,6 +40,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.8
+- !ruby/object:Gem::Dependency
+  name: groonga-command-parser
+  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
@@ -147,7 +161,8 @@ email:
 - yshr04hrk@gmail.com
 - kou@clear-code.com
 - tfortress58@gmail.com
-executables: []
+executables:
+- groonga-client
 extensions: []
 extra_rdoc_files: []
 files:
@@ -155,6 +170,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- bin/groonga-client
 - doc/text/news.md
 - groonga-client.gemspec
 - lib/groonga/client.rb