groonga-client-cli 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cec98629d85e45b31f3cb92744e4638d601d55b9
-  data.tar.gz: de5fae05fd79ac2e17f2f363cfa2099d7972be37
+  metadata.gz: c82b12d0de833f9acac8900b657d0c7b53a46937
+  data.tar.gz: 2bed7bc3ac9546910ed7f0f86a98a99a5cebda1f
 SHA512:
-  metadata.gz: 16c7a7fa838785268fcb6c4a904019b61cade772c83e6434b3b19506ee96276ba418a0b15e3fb40455f304eac5d4bb115e3b488293f48fce1fd33884e17fa88d
-  data.tar.gz: d11a7acc1db319ca488b5a55a690348e8df19779e96209863a85764e3ab55b689efd0ca3dc54687935064ff0eb3c0c8659867020a0ee1e0d56ba19ad49467e16
+  metadata.gz: 9501e8dc97d619b77798b8d1f43e6f0b88ae41f1d4bf512e52792642818fef019239b70c965e6df5da13a02afac43d21a91deaf8aa26dabab9778135ac2bc4fc
+  data.tar.gz: ae2b556f17c9c50846c85bb0e6cd8a0d23cb9bc1727e2359832b2f1506498acc2a2b1242d1f67b25534d39e85f466b4a0a61a3d4c7aede7cf0119284311b4bc4

data/README.md

@@ -1,5 +1,8 @@
 # README
 
+NOTE: This gem is merged into groonga-client gem. Use groonga-client
+instead of this.
+
 ## Name
 
 groonga-client-cli

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # NEWS
 
+## 1.0.4 - 2016-12-20
+
+### Improvements
+
+  * Merged into groonga-client gem.
+
 ## 1.0.3 - 2016-08-19
 
 ### Improvements

data/groonga-client-cli.gemspec

@@ -52,12 +52,8 @@ Gem::Specification.new do |spec|
   spec.files += [".yardopts"]
   spec.files += Dir.glob("lib/**/*.rb")
   spec.files += Dir.glob("doc/text/*")
-  Dir.chdir("bin") do
-    spec.executables = Dir.glob("*")
-  end
 
-  spec.add_runtime_dependency("groonga-client", ">= 0.1.6")
-  spec.add_runtime_dependency("groonga-command-parser")
+  spec.add_runtime_dependency("groonga-client", ">= 0.3.6")
 
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")

data/lib/groonga-client-cli/version.rb

@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module GroongaClientCLI
-  VERSION = "1.0.3"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-client
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
-- !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'
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -98,8 +84,7 @@ description: Groonga command line clients can work without Groonga. `groonga` co
   provided by Groonga can only use for GQTP but they can use for both GQTP and HTTP.
 email:
 - kou@clear-code.com
-executables:
-- groonga-client
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -107,11 +92,9 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- bin/groonga-client
 - doc/text/lgpl-2.1.txt
 - doc/text/news.md
 - groonga-client-cli.gemspec
-- lib/groonga-client-cli/groonga-client.rb
 - lib/groonga-client-cli/version.rb
 homepage: https://github.com/ranguba/groonga-client-cli
 licenses:
@@ -133,9 +116,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Groonga-client-cli provides command line Groonga clients.
 test_files: []
-has_rdoc: 

data/bin/groonga-client

@@ -1,23 +0,0 @@
-#!/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 "groonga-client-cli/groonga-client"
-
-client = GroongaClientCLI::GroongaClient.new
-exit(client.run(ARGV))

data/lib/groonga-client-cli/groonga-client.rb

@@ -1,233 +0,0 @@
-# Copyright (C) 2015-2016  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 "securerandom"
-
-require "groonga/command/parser"
-
-require "groonga/client"
-
-require "groonga-client-cli/version"
-
-module GroongaClientCLI
-  class GroongaClient
-    def initialize
-      @protocol = :http
-      @host     = "localhost"
-      @port     = nil
-
-      @read_timeout = Groonga::Client::Default::READ_TIMEOUT
-
-      @chunk = false
-
-      @runner_options = {
-        :split_load_chunk_size => 10000,
-        :generate_request_id   => false,
-      }
-    end
-
-    def run(argv)
-      command_file_paths = parse_command_line(argv)
-
-      @client = Groonga::Client.new(:protocol => @protocol,
-                                    :host     => @host,
-                                    :port     => @port,
-                                    :read_timeout => @read_timeout,
-                                    :chunk    => @chunk,
-                                    :backend  => :synchronous)
-      runner = Runner.new(@client, @runner_options)
-
-      if command_file_paths.empty?
-        $stdin.each_line do |line|
-          runner << line
-        end
-      else
-        command_file_paths.each do |command_file_path|
-          File.open(command_file_path) do |command_file|
-            last_line = nil
-            command_file.each_line do |line|
-              last_line = line
-              runner << line
-            end
-            if last_line and !last_line.end_with?("\n")
-              runner << "\n"
-            end
-          end
-        end
-      end
-      runner.finish
-
-      true
-    end
-
-    private
-    def parse_command_line(argv)
-      parser = OptionParser.new
-      parser.version = 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(", ")}]",
-                "(#{@protocol})") do |protocol|
-        @protocol = protocol
-      end
-
-      parser.on("--host=HOST",
-                "Groonga server to be connected.",
-                "(#{@host})") do |host|
-        @host = host
-      end
-
-      parser.on("--port=PORT", Integer,
-                "Port number of Groonga server to be connected.",
-                "(auto)") do |port|
-        @port = port
-      end
-
-      parser.on("--read-timeout=TIMEOUT", Integer,
-                "Timeout on reading response from Groonga server.",
-                "You can disable timeout by specifying -1.",
-                "(#{@read_timeout})") do |timeout|
-        @read_timeout = timeout
-      end
-
-      parser.on("--split-load-chunk-size=SIZE", Integer,
-                "Split a large load to small loads.",
-                "Each small load has at most SIZE records.",
-                "Set 0 to SIZE to disable this feature.",
-                "(#{@runner_options[:split_load_chunk_size]})") do |size|
-        @runner_options[:split_load_chunk_size] = size
-      end
-
-      parser.on("--[no-]generate-request-id",
-                "Add auto generated request ID to all commands.",
-                "(#{@runner_options[:generate_request_id]})") do |boolean|
-        @runner_options[:generate_request_id] = boolean
-      end
-
-      parser.on("--[no-]chunk",
-                "Use \"Transfer-Encoding: chunked\" for load command.",
-                "HTTP only.",
-                "(#{@chunk})") do |boolean|
-        @chunk = boolean
-      end
-
-      command_file_paths = parser.parse(argv)
-
-      @port ||= default_port(@protocol)
-
-      command_file_paths
-    end
-
-    def default_port(protocol)
-      case protocol
-      when :http
-        10041
-      when :gqtp
-        10043
-      end
-    end
-
-    class Runner
-      def initialize(client, options={})
-        @client = client
-        @split_load_chunk_size = options[:split_load_chunk_size] || 10000
-        @generate_request_id   = options[:generate_request_id]
-        @load_values = []
-        @parser = create_command_parser
-      end
-
-      def <<(line)
-        @parser << line
-      end
-
-      def finish
-        @parser.finish
-      end
-
-      private
-      def create_command_parser
-        parser = Groonga::Command::Parser.new
-
-        parser.on_command do |command|
-          run_command(command)
-        end
-
-        parser.on_load_columns do |command, columns|
-          command[:columns] ||= columns.join(",")
-        end
-
-        parser.on_load_value do |command, value|
-          unless command[:values]
-            @load_values << value
-            if @load_values.size == @split_load_chunk_size
-              consume_load_values(command)
-            end
-          end
-          command.original_source.clear
-        end
-
-        parser.on_load_complete do |command|
-          if command[:values]
-            run_command(client, command)
-          else
-            consume_load_values(command)
-          end
-        end
-
-        parser
-      end
-
-      def consume_load_values(load_command)
-        return if @load_values.empty?
-
-        values_json = "["
-        @load_values.each_with_index do |value, i|
-          values_json << "," unless i.zero?
-          values_json << "\n"
-          values_json << JSON.generate(value)
-        end
-        values_json << "\n]\n"
-        load_command[:values] = values_json
-        run_command(load_command)
-        @load_values.clear
-        load_command[:values] = nil
-      end
-
-      def run_command(command)
-        command[:request_id] ||= SecureRandom.uuid if @generate_request_id
-        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
-    end
-  end
-end