grntest 1.8.3 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0013159908bcac111c7776f0a3dadd4e9566c1ca864359e48165f602046d26b8'
-  data.tar.gz: f586bb84d9337cd155f83c60e246a5f0920b7b80b57038ea111f14d1bef4d806
+  metadata.gz: 700629c1af3524674871aadb97ae4fccf658accb7694b7700fea6d4d1f926acb
+  data.tar.gz: a671e1928b1dd25d5462e19294d34060fe45356b35a984219322cbe67567b695
 SHA512:
-  metadata.gz: ba6a8777de61c2327f98266c485cc9d0a94932faaab380c6bae046d43cb08ce74fba40d25f71bc180cd60cb40839b343486a03fa474ee59017aa93864beebcb4
-  data.tar.gz: 801eace8ff064342b324fc33d23da68f803a44dcbe48782dc1c9ba49bd74057869496824fa60c71042588f77c86a8d46066c930e3ae9ac7af778d6bd2a57977f
+  metadata.gz: 6025788a9481e12bd9627b9b48152a20e8d9665a6f4449575e75389ce409da784bcefd6f409e2e462be5ec42c352f78784ebdd4e2d793ae411907c9907f24206
+  data.tar.gz: dae5d48fc1887d63a47c961f1beb8db167e808ebf8f435d70f667f22740e7d1b8e08e57eb3f59bbbd8b2894443f0b5ac78b630a2d55fa20cceaa679b1530dd15

data/doc/text/news.md

@@ -1,5 +1,18 @@
 # News
 
+## 1.8.5: 2026-09-04
+
+### Improvements
+
+  * `#@generate-series`: Improved performance.
+
+## 1.8.4: 2026-03-16
+
+### Improvements
+
+  * Changed to use non-blocking mode for pipe between `grntest` and
+    `groonga` for stable test result.
+
 ## 1.8.3: 2025-04-29
 
 ### Improvements

data/grntest.gemspec

@@ -49,7 +49,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency("groonga-log")
   spec.add_runtime_dependency("groonga-query-log", ">= 1.4.1")
   spec.add_runtime_dependency("groonga-synonym")
-  spec.add_runtime_dependency("json", ">= 2.11.3")
+  spec.add_runtime_dependency("json", ">= 2.12.0")
   spec.add_runtime_dependency("msgpack")
   spec.add_runtime_dependency("rexml")
 

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

@@ -308,12 +308,13 @@ module Grntest
         @context.collect_query_log = (options[0] == "true")
       end
 
-      def each_generated_series_chunk(evaluator, start, stop)
+      def each_generated_series_chunk(template, start, stop)
+        evaluator = TemplateEvaluator.new(template, :i)
         max_chunk_size = 1 * 1024 * 1024 # 1MiB
         chunk_size = 0
         records = []
         (Integer(start)..Integer(stop)).each do |i|
-          record = evaluator.evaluate(i: i).to_json
+          record = evaluator.evaluate(i).to_json
           records << record
           chunk_size += record.bytesize
           if chunk_size > max_chunk_size
@@ -327,8 +328,7 @@ module Grntest
 
       def execute_directive_generate_series(parser, line, content, options)
         start, stop, table, template, = options
-        evaluator = TemplateEvaluator.new(template.force_encoding("UTF-8"))
-        each_generated_series_chunk(evaluator,
+        each_generated_series_chunk(template.force_encoding("UTF-8"),
                                     Integer(start),
                                     Integer(stop)) do |records|
           source = "load --table #{table}\n"
@@ -502,7 +502,7 @@ module Grntest
         return input if @substitutions.empty?
         @substitutions.each_value do |pattern, substituted_evaluator, _|
           input = input.gsub(pattern) do
-            substituted_evaluator.evaluate(match_data: Regexp.last_match)
+            substituted_evaluator.evaluate(Regexp.last_match)
           end
         end
         input
@@ -512,7 +512,7 @@ module Grntest
         return input if @substitutions.empty?
         @substitutions.each_value do |pattern, _, normalized_evaluator|
           input = input.gsub(pattern) do
-            normalized_evaluator.evaluate(match_data: Regexp.last_match)
+            normalized_evaluator.evaluate(Regexp.last_match)
           end
         end
         input
@@ -524,9 +524,11 @@ module Grntest
         substituted.force_encoding("UTF-8")
         normalized.force_encoding("UTF-8")
         substituted_evaluator =
-          TemplateEvaluator.new("<<STRING.chomp\n#{substituted}\nSTRING")
+          TemplateEvaluator.new("<<STRING.chomp\n#{substituted}\nSTRING",
+                                :match_data)
         normalized_evaluator =
-          TemplateEvaluator.new("<<STRING.chomp\n#{normalized}\nSTRING")
+          TemplateEvaluator.new("<<STRING.chomp\n#{normalized}\nSTRING",
+                                :match_data)
         @substitutions[pattern] = [
           compile_pattern(pattern),
           substituted_evaluator,

data/lib/grntest/template-evaluator.rb

@@ -15,16 +15,17 @@
 
 module Grntest
   class TemplateEvaluator
-    def initialize(template)
+    def initialize(template, *variable_names)
       @template = template
+      @compiled = eval(<<-TEMPLATE)
+        lambda do |#{variable_names.join(", ")}|
+#{@template}
+        end
+      TEMPLATE
     end
 
-    def evaluate(**local_variables)
-      _binding = binding
-      local_variables.each do |name, value|
-        _binding.local_variable_set(name, value)
-      end
-      _binding.eval(@template)
+    def evaluate(*values)
+      @compiled.call(*values)
     end
   end
 end

data/lib/grntest/test-runner.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2024  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2026  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
@@ -13,11 +13,12 @@
 # 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 "pathname"
 require "fileutils"
+require "io/nonblock"
+require "pathname"
+require "socket"
 require "tempfile"
 require "timeout"
-require "socket"
 
 require "groonga-log"
 require "json"
@@ -270,7 +271,9 @@ module Grntest
 
     def open_pipe
       IO.pipe("ASCII-8BIT") do |input_read, input_write|
+        input_write.nonblock = false
         IO.pipe("ASCII-8BIT") do |output_read, output_write|
+          output_write.nonblock = false
           yield(input_read, input_write, output_read, output_write)
         end
       end

data/lib/grntest/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2025  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2026  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.8.3"
+  VERSION = "1.8.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.5
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: 2.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -283,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.16
 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.