grntest 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dde3b6cf798791dc6aeafd6b352238f07c7380203fee2e8972593fec9bfc6f7
-  data.tar.gz: 6b12f9e76f353417c5ad8c195db96a17029fd52ee8322c4d683215db17245758
+  metadata.gz: 2e1250a739ad90db6969395e873269deeb2a19b08c99c8dfc121a8ff803282bc
+  data.tar.gz: d42dde8e1cfd602b07b3d6a86569c66609dbc9ea5d769f0d6c7dc9148c69ea3f
 SHA512:
-  metadata.gz: 314b08a7d51b374159b9dc0e325b17c3c2b12e981e2508e7266132bb9e91c6ec4c2d7694d6d23435412595caf703a62a3980a7193842fc967f4f20a60c7650a1
-  data.tar.gz: 5d628089f0b428905fce39011c1acb827fca80932bcb139f632f891665a3bad0d3a74f7c1b403bab791c67c518f69e7c3065ee3f285dbab6d955cf02693f72f9
+  metadata.gz: c8210a78653d3aa6067e0c9577931b1398f61b120a42570be03aee42ea8b56a458e807dd92f381312fdced2773d53a82d20cb0f331322c1f88d1eb104c1d82d0
+  data.tar.gz: d6eefca78c861859116fe65f9a87d17b2d573a8a9e22611b5290247be77223d2abffadb3faa3e74eff46b7ad27b46bab32a6f701afb2fc4ddba6be0fe45c4fdb

data/doc/text/news.md

@@ -1,5 +1,17 @@
 # News
 
+## 1.3.3: 2019-05-12
+
+### Improvements
+
+  * Added `eval` directive.
+
+  * Added `plugins_directory` expandable variable.
+
+  * Added `libtool_directory` expandable variable.
+
+  * Added `plugin_extension` expandable variable.
+
 ## 1.3.2: 2019-05-09
 
 ### Improvements

data/lib/grntest/execution-context.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2019  Kouhei Sutou <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
@@ -17,6 +17,8 @@ module Grntest
   class ExecutionContext
     attr_writer :logging
     attr_accessor :base_directory, :temporary_directory_path, :db_path
+    attr_accessor :plugins_directory
+    attr_accessor :plugin_extension
     attr_accessor :groonga_suggest_create_dataset
     attr_accessor :result
     attr_accessor :output_type
@@ -35,6 +37,8 @@ module Grntest
       @base_directory = Pathname(".")
       @temporary_directory_path = Pathname("tmp")
       @db_path = Pathname("db")
+      @plugins_directory = nil
+      @plugin_extension = guess_plugin_extension
       @groonga_suggest_create_dataset = "groonga-suggest-create-dataset"
       @n_nested = 0
       @result = []
@@ -101,6 +105,15 @@ module Grntest
       @db_path.relative_path_from(@temporary_directory_path)
     end
 
+    def libtool_directory
+      @plugins_directory.find do |sub_path|
+        if sub_path.directory? and sub_path.basename.to_s == ".libs"
+          return ".libs/"
+        end
+      end
+      ""
+    end
+
     def omitted?
       @omitted
     end
@@ -132,5 +145,15 @@ module Grntest
         @query_log = nil
       end
     end
+
+    private
+    def guess_plugin_extension
+      case RUBY_PLATFORM
+      when /mingw|mswin/
+        "dll"
+      else
+        "so"
+      end
+    end
   end
 end

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

@@ -315,6 +315,11 @@ module Grntest
         end
       end
 
+      def execute_directive_eval(parser, line, content, options)
+        groonga_command = content.split(" ", 2)[1]
+        parser << "#{expand_variables(groonga_command)}\n"
+      end
+
       def execute_directive(parser, line, content)
         command, *options = Shellwords.split(content)
         case command
@@ -348,6 +353,8 @@ module Grntest
           execute_directive_collect_query_log(line, content, options)
         when "generate-series"
           execute_directive_generate_series(parser, line, content, options)
+        when "eval"
+          execute_directive_eval(parser, line, content, options)
         else
           log_input(line)
           log_error("#|e| unknown directive: <#{command}>")

data/lib/grntest/test-runner.rb

@@ -134,6 +134,7 @@ module Grntest
         context.temporary_directory_path = directory_path
         context.db_path = db_path
         context.base_directory = @tester.base_directory.expand_path
+        context.plugins_directory = @tester.plugins_directory.expand_path
         context.groonga_suggest_create_dataset =
           @tester.groonga_suggest_create_dataset
         context.output_type = @tester.output_type

data/lib/grntest/tester.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2019  Kouhei Sutou <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
@@ -415,6 +415,14 @@ module Grntest
       end
     end
 
+    def plugins_directory
+      groonga_path = Pathname(@groonga)
+      unless groonga_path.absolute?
+        groonga_path = Pathname(resolve_command_path(@groonga)).expand_path
+      end
+      groonga_path.parent.parent + "plugins"
+    end
+
     private
     def load_tests(*targets)
       default_group_name = "."
@@ -471,7 +479,7 @@ module Grntest
       @vagrind_gen_suppressions = false
     end
 
-    def command_exist?(name)
+    def resolve_command_path(name)
       exeext = RbConfig::CONFIG["EXEEXT"]
       ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
         raw_candidate = File.join(path, name)
@@ -480,10 +488,14 @@ module Grntest
           "#{raw_candidate}#{exeext}",
         ]
         candidates.each do |candidate|
-          return true if File.executable?(candidate)
+          return candidate if File.executable?(candidate)
         end
       end
-      false
+      nil
+    end
+
+    def command_exist?(name)
+      not resolve_command_path(name).nil?
     end
 
     def guess_color_availability

data/lib/grntest/variable-expander.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2016-2019  Kouhei Sutou <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
@@ -28,6 +28,12 @@ module Grntest
           @context.db_path.parent.to_s
         when "base_directory"
           @context.base_directory.to_s
+        when "plugins_directory"
+          @context.plugins_directory.to_s
+        when "libtool_directory"
+          @context.libtool_directory
+        when "plugin_extension"
+          @context.plugin_extension
         else
           matched
         end

data/lib/grntest/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2019  Kouhei Sutou <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.2"
+  VERSION = "1.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-09 00:00:00.000000000 Z
+date: 2019-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs