grntest 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e087007c74f9b61344ed535c71c018afa2ef0aa8bb10f6de910418b6ce1e794
-  data.tar.gz: de8df8defdb777227644bcd539aa5bfbd855962bec50a1baf7ec3bf58d5cf315
+  metadata.gz: c74faa2722964ab0d9f2f78a7fea2e3e1275d28e0639c10f9bfaef7597d3e73f
+  data.tar.gz: b0462e4805ec8c3c04b81a3330be27ad8af703a1dbcdb95db08ef28e954f6a95
 SHA512:
-  metadata.gz: 5c147cd30f72093e219d592a4db77f9f9675681987e1c3acb7561cf1c1a6cf8c41bf29fe008ab504505f4499c7c6643f7dbb5fabd7d37259f162f1748c891208
-  data.tar.gz: 5c39f666cd0dc957523404aa3cb294a82a3ead1af84c0e37f395dbb6933983bc3468fb02254663398fc1fd6f569132e90db7b11975036ede974ff60e4690d99e
+  metadata.gz: 3d10fa6674ffa249bc0555fad4b460d48505b4cc8abdc640956ebd403b3784ac1bf80f52a5bd39e5956167904bd0eb4624e8b0dc3f3fe1cfc9c923bad88d9ad5
+  data.tar.gz: 60133bca88d982074f54cc3426298d692fb34c3432e800c1f1427c4de2af2ca158a28415456b670d81502f1fc87fc26cb5b7e11c09a1df4770dec34b44602ca1

data/doc/text/news.md

@@ -1,5 +1,19 @@
 # News
 
+## 1.3.5: 2020-03-02
+
+### Improvements
+
+  * Added support for Ruby 2.3 again.
+
+  * Changed to use `URI#open` to suppress a warning.
+
+  * Added support for Apache Arrow as load data format.
+
+  * Added `require-input-type` directive.
+
+  * Added `--use-http-post` option.
+
 ## 1.3.4: 2019-10-11
 
 ### Improvements

data/grntest.gemspec

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2012-2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -44,11 +44,13 @@ Gem::Specification.new do |spec|
   end
 
   spec.add_runtime_dependency("diff-lcs")
+  spec.add_runtime_dependency("groonga-command", ">= 1.4.7")
   spec.add_runtime_dependency("groonga-command-parser")
   spec.add_runtime_dependency("groonga-log")
   spec.add_runtime_dependency("groonga-query-log", ">= 1.4.1")
   spec.add_runtime_dependency("json")
   spec.add_runtime_dependency("msgpack")
+  spec.add_runtime_dependency("rexml")
 
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")

data/lib/grntest/execution-context.rb

@@ -21,6 +21,8 @@ module Grntest
     attr_accessor :plugin_extension
     attr_accessor :groonga_suggest_create_dataset
     attr_accessor :result
+    attr_writer :use_http_post
+    attr_accessor :input_type
     attr_accessor :output_type
     attr_accessor :on_error
     attr_accessor :abort_tag
@@ -42,6 +44,8 @@ module Grntest
       @groonga_suggest_create_dataset = "groonga-suggest-create-dataset"
       @n_nested = 0
       @result = []
+      @use_http_post = false
+      @input_type = "json"
       @output_type = "json"
       @log = nil
       @query_log = nil
@@ -62,6 +66,10 @@ module Grntest
       @logging
     end
 
+    def use_http_post?
+      @use_http_post
+    end
+
     def suppress_backtrace?
       @suppress_backtrace or debug?
     end

data/lib/grntest/executors/base-executor.rb

@@ -320,6 +320,13 @@ module Grntest
         parser << "#{expand_variables(groonga_command)}\n"
       end
 
+      def execute_directive_require_input_type(parser, line, content, options)
+        input_type, = options
+        unless @context.input_type == input_type
+          omit("require input type: #{input_type}")
+        end
+      end
+
       def execute_directive(parser, line, content)
         command, *options = Shellwords.split(content)
         case command
@@ -355,6 +362,8 @@ module Grntest
           execute_directive_generate_series(parser, line, content, options)
         when "eval"
           execute_directive_eval(parser, line, content, options)
+        when "require-input-type"
+          execute_directive_require_input_type(parser, line, content, options)
         else
           log_input(line)
           log_error("#|e| unknown directive: <#{command}>")
@@ -436,7 +445,7 @@ module Grntest
         unless lines.empty?
           timeout = Time.now + @context.read_timeout
           while Time.now < timeout
-            break if /rc=-?\d+$/.match?(lines.last)
+            break if /rc=-?\d+$/ =~ lines.last
             additional_content = read_all_readable_content(context.query_log,
                                                            first_timeout: 0)
             next if additional_content.empty?

data/lib/grntest/executors/http-executor.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,6 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+require "net/http"
 require "open-uri"
 
 require "grntest/executors/base-executor"
@@ -60,18 +59,33 @@ module Grntest
           return send_normal_command(command)
         end
 
-        values = command.arguments.delete(:values)
-        if lines.size >= 2 and lines[1].start_with?("[")
-          unless /\s--columns\s/ =~ lines.first
-            command.arguments.delete(:columns)
+        case @context.input_type
+        when "apache-arrow"
+          command[:input_type] = "apache-arrow"
+          content_type = "application/x-apache-arrow-streaming"
+          arrow_table = command.build_arrow_table
+          if arrow_table
+            buffer = Arrow::ResizableBuffer.new(1024)
+            arrow_table.save(buffer, format: :stream)
+            body = buffer.data.to_s
+          else
+            body = ""
           end
-          body = lines[1..-1].join
+          command.arguments.delete(:values)
         else
-          body = values
+          content_type = "application/json; charset=UTF-8"
+          values = command.arguments.delete(:values)
+          if lines.size >= 2 and lines[1].start_with?("[")
+            unless /\s--columns\s/ =~ lines.first
+              command.arguments.delete(:columns)
+            end
+            body = lines[1..-1].join
+          else
+            body = values
+          end
         end
-
         request = Net::HTTP::Post.new(command.to_uri_format)
-        request.content_type = "application/json; charset=UTF-8"
+        request.content_type = content_type
         request.body = body
         response = Net::HTTP.start(@host, @port) do |http|
           http.read_timeout = read_timeout
@@ -81,16 +95,25 @@ module Grntest
       end
 
       def send_normal_command(command)
-        url = "http://#{@host}:#{@port}#{command.to_uri_format}"
+        path_with_query = command.to_uri_format
+        if @context.use_http_post?
+          path, query = path_with_query.split("?", 2)
+          request = Net::HTTP::Post.new(path)
+          request.content_type = "application/x-www-form-urlencoded"
+          request.body = query
+        else
+          request = Net::HTTP::Get.new(path_with_query)
+        end
+        url = "http://#{@host}:#{@port}#{path_with_query}"
         begin
-          open(url, :read_timeout => read_timeout) do |response|
-            normalize_response_data(command, response.read)
+          response = Net::HTTP.start(@host, @port) do |http|
+            http.read_timeout = read_timeout
+            http.request(request)
           end
+          normalize_response_data(command, response.body)
         rescue SystemCallError
           message = "failed to read response from Groonga: <#{url}>: #{$!}"
           raise Error.new(message)
-        rescue OpenURI::HTTPError
-          $!.io.read
         rescue Net::HTTPBadResponse
           message = "bad response from Groonga: <#{url}>: "
           message << "#{$!.class}: #{$!.message}"

data/lib/grntest/test-runner.rb

@@ -137,6 +137,8 @@ module Grntest
         context.plugins_directory = @tester.plugins_directory.expand_path
         context.groonga_suggest_create_dataset =
           @tester.groonga_suggest_create_dataset
+        context.use_http_post = @tester.use_http_post?
+        context.input_type = @tester.input_type
         context.output_type = @tester.output_type
         context.timeout = @tester.timeout
         context.timeout = 0 if @tester.gdb

data/lib/grntest/tester.rb

@@ -65,6 +65,21 @@ module Grntest
           tester.interface = interface
         end
 
+        parser.on("--[no-]use-http-post",
+                  "Use POST to send command by HTTP",
+                  "(#{tester.use_http_post?})") do |boolean|
+          tester.use_http_post = boolean
+        end
+
+        available_input_types = ["json", "apache-arrow"]
+        available_input_type_labels = available_input_types.join(", ")
+        parser.on("--input-type=TYPE", available_input_types,
+                  "Use TYPE as the input type on load",
+                  "[#{available_input_type_labels}]",
+                  "(#{tester.input_type})") do |type|
+          tester.input_type = type
+        end
+
         available_output_types = ["json", "msgpack"]
         available_output_type_labels = available_output_types.join(", ")
         parser.on("--output-type=TYPE", available_output_types,
@@ -277,7 +292,11 @@ module Grntest
     end
 
     attr_accessor :groonga, :groonga_httpd, :groonga_suggest_create_dataset
-    attr_accessor :interface, :output_type, :testee
+    attr_accessor :interface
+    attr_writer :use_http_post
+    attr_accessor :input_type
+    attr_accessor :output_type
+    attr_accessor :testee
     attr_accessor :base_directory, :database_path, :diff, :diff_options
     attr_accessor :n_workers
     attr_accessor :output
@@ -303,6 +322,8 @@ module Grntest
         @groonga_suggest_create_dataset = nil
       end
       @interface = :stdio
+      @use_http_post = false
+      @input_type = "json"
       @output_type = "json"
       @testee = "groonga"
       @base_directory = Pathname(".")
@@ -349,6 +370,10 @@ module Grntest
       end
     end
 
+    def use_http_post?
+      @use_http_post
+    end
+
     def keep_database?
       @keep_database
     end

data/lib/grntest/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Grntest
-  VERSION = "1.3.4"
+  VERSION = "1.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2020-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: groonga-command
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.7
 - !ruby/object:Gem::Dependency
   name: groonga-command-parser
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +109,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  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
@@ -241,13 +269,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.2.0.pre1
 signing_key: 
 specification_version: 4
 summary: Grntest is a testing framework for Groonga. You can write a test for Groonga
   by writing Groonga commands and expected result.
 test_files:
-- test/run-test.rb
 - test/executors/test-base-executor.rb
 - test/executors/test-standard-io-executor.rb
+- test/run-test.rb