groonga-client-cli 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f6b53e1dfe99a482a13537a085c3401281f453b
-  data.tar.gz: 0c86154bfd649729b9626dbf79d39ecd397b36dc
+  metadata.gz: 1db474cd35e6959f4ed20f3fc7e2a4c507ce6d84
+  data.tar.gz: 547eae2da424c2a1ee1cb6aa33609cf461006c8f
 SHA512:
-  metadata.gz: 55d2867d94b9fe7c5574bc9267cc6be955c50e9bf8d5f7862902078663eeb4964a0ae08095c647a4c52f81a2aa5718f6c94dbff54f28f730f0c7b6356ef835ba
-  data.tar.gz: 1198a6e963cc5ae90e12abd663bacdae46ef80c45913d4195b14919bfc18625f833ab704eb1ed73f498cb8c692ced5c011be3d96e6938d33e3ee3b80104c7cfe
+  metadata.gz: eaa9f3cbf276885a41a32ddc7a5f84b5162d21560332d6d9af25c7addaaae45f5a0c0d3f57136720762689416d124e62950ebf529cd57ad80fa48aa5e1af5023
+  data.tar.gz: 2a4d4278ccdbea02affc3b6f1b5fc8284b0b5a6222f441784cf5406d9b4add62c74044959ffa26c3e598f9e33069744493717d98f629c27457627feac35acd00

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # NEWS
 
+## 1.0.2 - 2016-03-16
+
+### Improvements
+
+  * Accepted file that doesn't have newline at the end.
+  * Added `--generate-request-id` option that sets automatically
+    generated request ID to each command.
+
 ## 1.0.1 - 2015-06-10
 
 ### Improvements

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Kouhei Sutou <kou@clear-code.com>
+# 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
@@ -17,6 +17,7 @@
 require "ostruct"
 require "optparse"
 require "json"
+require "securerandom"
 
 require "groonga/command/parser"
 
@@ -35,6 +36,7 @@ module GroongaClientCLI
 
       @runner_options = {
         :split_load_chunk_size => 10000,
+        :generate_request_id   => false,
       }
     end
 
@@ -55,12 +57,18 @@ module GroongaClientCLI
       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
@@ -110,6 +118,12 @@ module GroongaClientCLI
         @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
+
       command_file_paths = parser.parse(argv)
 
       @port ||= default_port(@protocol)
@@ -130,6 +144,7 @@ module GroongaClientCLI
       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
@@ -138,6 +153,10 @@ module GroongaClientCLI
         @parser << line
       end
 
+      def finish
+        @parser.finish
+      end
+
       private
       def create_command_parser
         parser = Groonga::Command::Parser.new
@@ -181,6 +200,7 @@ module GroongaClientCLI
       end
 
       def run_command(command)
+        command[:request_id] ||= SecureRandom.uuid if @generate_request_id
         response = @client.execute(command)
         case command.output_type
         when :json

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.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-client
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Groonga-client-cli provides command line Groonga clients.