grntest 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88fbad2fdde680dc3110737087f9818240bd130ea4c61c14478d89577dd99420
-  data.tar.gz: e98f331062e055f4fd914ef1916dc4859614e1ef0c9f3a16c978d00d73d05a23
+  metadata.gz: 79fb44c3eebc5c70ba4d7a0c6821d653d77b6bb7c20791a86cd973bbf90fa970
+  data.tar.gz: 95ed0edd5d3f25e2f9d450edda7f0f58ad16354ab66c8163d9cfdc353610db6c
 SHA512:
-  metadata.gz: 4e51b3927eb61e1232ade4c179a140eddd68d41d5231f4bee0e7b356cce389d8b72c110f5217418d9e214fa071486bd3ffe55e61e2e9def19b90b425e193e2ca
-  data.tar.gz: bd7a5ad8f297572b51f797f359ae2c42d9a01a013d6c48c6d3e168d648bf32af405ec0f8af36f1e0fef84a86756ccb2b918988a35696ed3af505e50dd23350bc
+  metadata.gz: bdfaf0c54e4dd784827fbb3f2ff34acfe1dce69ef168260ede87f6d570dd190490199aec105fc2a1357c6cd46a1b4da80c993373402044d0655dac821680921e
+  data.tar.gz: 583b24ab3901660faa706728df925c592dfaf8746df548f4bfee78a710b1bf10951bad1087b3df951ca8d8e8baecd5a00852b2cebd2eccd5fbf0f22f962e1332

data/doc/text/news.md

@@ -1,5 +1,12 @@
 # News
 
+## 1.4.7: 2020-12-08
+
+### Improvements
+
+  * `require-apache-arrow`: Added support for version check of Apache
+    Arrow in Groonga.
+
 ## 1.4.6: 2020-12-08
 
 ### Improvements

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

@@ -45,7 +45,7 @@ module Grntest
         @custom_important_log_levels = []
         @ignore_log_patterns = {}
         @sleep_after_command = nil
-        @status_response = nil
+        @raw_status_response = nil
         @features = nil
       end
 
@@ -345,9 +345,27 @@ module Grntest
         end
       end
 
+      def status_response
+        @status_response ||= JSON.parse(@raw_status_response)[1]
+      end
+
+      def apache_arrow_version
+        (status_response["apache_arrow"] || {})["version"]
+      end
+
       def execute_directive_require_apache_arrow(line, content, options)
+        version, = options
+        _apache_arrow_version = apache_arrow_version
+        if _apache_arrow_version.nil?
+          omit("require Apache Arrow support in Groonga")
+        end
         unless defined?(::Arrow)
-          omit("require Apache Arrow")
+          omit("require Red Arrow in grntest")
+        end
+        return if version.nil?
+        if Gem::Version.new(version) < Gem::Version.new(_apache_arrow_version)
+          omit("require Apache Arrow #{version} in Groonga: " +
+               _apache_arrow_version)
         end
       end
 
@@ -402,7 +420,7 @@ module Grntest
       def features
         return @features if @features
         @features = []
-        JSON.parse(@status_response)[1]["features"].each do |name, available|
+        status_response["features"].each do |name, available|
           @features << name if available
         end
         @features.sort!

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

@@ -61,7 +61,7 @@ module Grntest
       def ensure_groonga_ready
         n_retried = 0
         begin
-          @status_response = send_command(command("status"))
+          @raw_status_response = send_command(command("status"))
         rescue Error
           n_retried += 1
           sleep(0.1)

data/lib/grntest/executors/standard-io-executor.rb

@@ -44,7 +44,7 @@ module Grntest
       def ensure_groonga_ready
         @input.print("status\n")
         @input.flush
-        @status_response = @output.gets
+        @raw_status_response = @output.gets
       end
 
       def create_sub_executor(context)

data/lib/grntest/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Grntest
-  VERSION = "1.4.6"
+  VERSION = "1.4.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - Kouhei Sutou