grntest 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c677198eaacb9883f7cd6ca46f7b7cf0ee6d5aea
-  data.tar.gz: 8b50e54a05791eaf15370b1951eac4b831a52e31
+  metadata.gz: a2e33b36b6199c83bc97b514f7d2942cba652840
+  data.tar.gz: b2110017d594ff0b64639d003b3456b7c027abce
 SHA512:
-  metadata.gz: d8d191e4fd6029fedfa9a4b346514f280ad133266e8acb236a0c0f46ee9b35a6e8cff38e7b84c3f8d13c894ab82c20a610ed4d9c7ab1d62d2fe18552c50efa69
-  data.tar.gz: 0421f9e8c25fce0adbcaa43c6503737c71c8bcd2c49f167ef57c3333eabc00a7172314599c2dcb945cf0deaf56ba80e6fa8c2fc11db02253f22cf8e1991c560a
+  metadata.gz: d5c763cd7853c9a47bea09db3af4a6dd60d16f4836cbea6bfe7dff232b1cc06a28f04b0b69096ed5155966f2c0bfafb99cef091fb46b51f8edc6ef7490fdfa38
+  data.tar.gz: 7f36ce4674303db798adecb3c1d62dcd89d9a93b4fd948045f6a3c3ea8bf4797fb089f7e117bb0977703349d715af272e065f5df99879442e5339a7212105afe

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # News
 
+## 1.1.4: 2016-04-26
+
+### Improvements
+
+  * Supported Windows.
+
 ## 1.1.3: 2016-03-20
 
 ### Improvements

data/grntest.gemspec

@@ -45,6 +45,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency("json")
   spec.add_runtime_dependency("msgpack")
+  spec.add_runtime_dependency("diff-lcs")
   spec.add_runtime_dependency("groonga-command-parser")
 
   spec.add_development_dependency("bundler")

data/lib/grntest/diff-reporter.rb

@@ -0,0 +1,78 @@
+# Copyright (C) 2016  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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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 "diff/lcs"
+require "diff/lcs/hunk"
+
+module Grntest
+  class DiffReporter
+    def initialize(expected, actual)
+      @expected = expected
+      @actual = actual
+    end
+
+    def report
+      expected_lines = @expected.lines.collect(&:chomp)
+      actual_lines = @actual.lines.collect(&:chomp)
+      diffs = Diff::LCS.diff(expected_lines,
+                             actual_lines)
+      return if diffs.empty?
+
+      report_expected_label("(expected)")
+      report_actual_label("(actual)")
+
+      context_n_lines = 3
+      previous_hunk = nil
+      file_length_diff = 0
+      diffs.each do |diff|
+        begin
+          hunk = Diff::LCS::Hunk.new(expected_lines,
+                                     actual_lines,
+                                     diff,
+                                     context_n_lines,
+                                     file_length_diff)
+          next if previous_hunk.nil?
+          next if hunk.merge(previous_hunk)
+
+          report_hunk(previous_hunk)
+        ensure
+          previous_hunk = hunk
+        end
+      end
+      report_hunk(previous_hunk)
+    end
+
+    private
+    def expected_mark
+      "-"
+    end
+
+    def actual_mark
+      "+"
+    end
+
+    def report_expected_label(content)
+      puts("#{expected_mark * 3} #{content}")
+    end
+
+    def report_actual_label(content)
+      puts("#{actual_mark * 3} #{content}")
+    end
+
+    def report_hunk(hunk)
+      puts(hunk.diff(:unified))
+    end
+  end
+end

data/lib/grntest/execution-context.rb

@@ -35,6 +35,7 @@ module Grntest
       @result = []
       @output_type = "json"
       @log = nil
+      @query_log = nil
       @on_error = :default
       @abort_tag = nil
       @omitted = false
@@ -99,5 +100,17 @@ module Grntest
     def abort
       throw @abort_tag
     end
+
+    def close_logs
+      if @log
+        @log.close
+        @log = nil
+      end
+
+      if @query_log
+        @query_log.close
+        @query_log = nil
+      end
+    end
   end
 end

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

@@ -226,6 +226,10 @@ module Grntest
 
       def execute_directive_omit(line, content, options)
         reason, = options
+        omit(reason)
+      end
+
+      def omit(reason)
         @output_type = "raw"
         log_output("omit: #{reason}")
         @context.omit
@@ -292,9 +296,15 @@ module Grntest
       end
 
       def execute_suggest_create_dataset(dataset_name)
-        command_line = [@context.groonga_suggest_create_dataset,
-                        @context.db_path.to_s,
-                        dataset_name]
+        if @context.groonga_suggest_create_dataset.nil?
+          omit("groonga-suggest-create-dataset isn't specified")
+        end
+
+        command_line = [
+          @context.groonga_suggest_create_dataset,
+          @context.db_path.to_s,
+          dataset_name,
+        ]
         packed_command_line = command_line.join(" ")
         log_input("#{packed_command_line}\n")
         begin
@@ -384,6 +394,8 @@ module Grntest
         case message
         when /\A\//
           true
+        when /\[a-zA-Z]:\//
+          true
         when /\Agroonga\(\) \[0x[\da-f]+\]\z/
           true
         when /\A\d+\s+(?:lib\S+\.dylib|\S+\.so|groonga|nginx|\?\?\?)\s+

data/lib/grntest/platform.rb

@@ -0,0 +1,24 @@
+# Copyright (C) 2016  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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module Grntest
+  module Platform
+    class << self
+      def windows?
+        /mswin|mingw|cygwin/ === RUBY_PLATFORM
+      end
+    end
+  end
+end

data/lib/grntest/reporters/base-reporter.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2016  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
@@ -13,6 +13,8 @@
 # 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 "grntest/diff-reporter"
+
 module Grntest
   module Reporters
     class BaseReporter
@@ -93,16 +95,31 @@ module Grntest
       end
 
       def report_diff(expected, actual)
+        if @tester.diff == "internal"
+          run_diff_reporter(expected, actual)
+        else
+          run_diff_command(expected, actual)
+        end
+      end
+
+      def run_diff_command(expected, actual)
         create_temporary_file("expected", expected) do |expected_file|
           create_temporary_file("actual", actual) do |actual_file|
             diff_options = @tester.diff_options.dup
-            diff_options.concat(["--label", "(expected)", expected_file.path,
-                                 "--label", "(actual)", actual_file.path])
+            diff_options += [
+              "--label", "(expected)", expected_file.path,
+              "--label", "(actual)", actual_file.path,
+            ]
             system(@tester.diff, *diff_options)
           end
         end
       end
 
+      def run_diff_reporter(expected, actual)
+        reporter = DiffReporter.new(expected, actual)
+        reporter.report
+      end
+
       def report_test(worker, result)
         report_marker(result)
         print("[#{worker.id}] ") if @tester.n_workers > 1

data/lib/grntest/test-runner.rb

@@ -19,6 +19,7 @@ require "tempfile"
 
 require "json"
 
+require "grntest/platform"
 require "grntest/error"
 require "grntest/log-parser"
 require "grntest/executors"
@@ -139,6 +140,7 @@ module Grntest
         check_memory_leak(context)
         result.omitted = context.omitted?
         result.actual = context.result
+        context.close_logs
       end
     end
 
@@ -186,17 +188,23 @@ module Grntest
           groonga_input = input_write
           groonga_output = output_read
 
-          input_fd = input_read.to_i
-          output_fd = output_write.to_i
           env = {}
-          spawn_options = {
-            input_fd => input_fd,
-            output_fd => output_fd
-          }
+          spawn_options = {}
           command_line = groonga_command_line(context, spawn_options)
+          if Platform.windows?
+            spawn_options[:in] = input_read
+            spawn_options[:out] = output_write
+          else
+            input_fd = input_read.to_i
+            output_fd = output_write.to_i
+            spawn_options[input_fd] = input_fd
+            spawn_options[output_fd] = output_fd
+            command_line += [
+              "--input-fd", input_fd.to_s,
+              "--output-fd", output_fd.to_s,
+            ]
+          end
           command_line += [
-            "--input-fd", input_fd.to_s,
-            "--output-fd", output_fd.to_s,
             context.relative_db_path.to_s,
           ]
           pid = Process.spawn(env, *command_line, spawn_options)
@@ -466,21 +474,26 @@ http {
     end
 
     def create_empty_database(db_path)
-      output_fd = Tempfile.new("create-empty-database")
+      output_file = Tempfile.new("create-empty-database")
       env = {
         "GRN_FMALLOC_PROB" => nil,
       }
-      create_database_command = [
-        @tester.groonga,
-        "--output-fd", output_fd.to_i.to_s,
+      options = {}
+      create_database_command = [@tester.groonga]
+      if Platform.windows?
+        options[:out] = output_file
+      else
+        options[output_file.fileno] = output_file.fileno
+        create_database_command += [
+          "--output-fd", output_file.fileno.to_s,
+        ]
+      end
+      create_database_command += [
         "-n", db_path,
-        "shutdown"
+        "shutdown",
       ]
-      options = {
-        output_fd.to_i => output_fd.to_i
-      }
       system(env, *create_database_command, options)
-      output_fd.close(true)
+      output_file.close(true)
     end
 
     def normalize_actual_result(result)
@@ -502,7 +515,12 @@ http {
       result.actual = normalized_result
     end
 
+    def normalize_new_line(content)
+      content.gsub(/\r\n/, "\n")
+    end
+
     def normalize_raw_content(content)
+      content = normalize_new_line(content)
       "#{content}\n".force_encoding("ASCII-8BIT")
     end
 

data/lib/grntest/tester.rb

@@ -13,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 "rbconfig"
 require "optparse"
 require "pathname"
 
@@ -40,25 +41,25 @@ module Grntest
         parser.on("--groonga=COMMAND",
                   "Use COMMAND as groonga command",
                   "(#{tester.groonga})") do |command|
-          tester.groonga = command
+          tester.groonga = normalize_command(command)
         end
 
         parser.on("--groonga-httpd=COMMAND",
                   "Use COMMAND as groonga-httpd command for groonga-httpd tests",
                   "(#{tester.groonga_httpd})") do |command|
-          tester.groonga_httpd = command
+          tester.groonga_httpd = normalize_command(command)
         end
 
         parser.on("--groonga-suggest-create-dataset=COMMAND",
                   "Use COMMAND as groonga_suggest_create_dataset command",
                   "(#{tester.groonga_suggest_create_dataset})") do |command|
-          tester.groonga_suggest_create_dataset = command
+          tester.groonga_suggest_create_dataset = normalize_command(command)
         end
 
         available_interfaces = [:stdio, :http]
         available_interface_labels = available_interfaces.join(", ")
         parser.on("--interface=INTERFACE", available_interfaces,
-                  "Use INTERFACE for communicating groonga",
+                  "Use INTERFACE for communicating Groonga",
                   "[#{available_interface_labels}]",
                   "(#{tester.interface})") do |interface|
           tester.interface = interface
@@ -100,6 +101,7 @@ module Grntest
 
         parser.on("--diff=DIFF",
                   "Use DIFF as diff command",
+                  "Use --diff=internal to use internal differ",
                   "(#{tester.diff})") do |diff|
           tester.diff = diff
           tester.diff_options.clear
@@ -157,13 +159,13 @@ module Grntest
         end
 
         parser.on("--gdb[=COMMAND]",
-                  "Run groonga on gdb and use COMMAND as gdb",
+                  "Run Groonga on gdb and use COMMAND as gdb",
                   "(#{tester.default_gdb})") do |command|
           tester.gdb = command || tester.default_gdb
         end
 
         parser.on("--valgrind[=COMMAND]",
-                  "Run groonga on valgrind and use COMMAND as valgrind",
+                  "Run Groonga on valgrind and use COMMAND as valgrind",
                   "(#{tester.default_valgrind})") do |command|
           tester.valgrind = command || tester.default_valgrind
         end
@@ -213,6 +215,22 @@ module Grntest
         parser
       end
 
+      def normalize_command(command)
+        if File.executable?(command)
+          return File.expand_path(command)
+        end
+
+        exeext = RbConfig::CONFIG["EXEEXT"]
+        unless exeext.empty?
+          command_exe = "#{command}#{exeext}"
+          if File.executable?(command_exe)
+            return File.expand_path(command_exe)
+          end
+        end
+
+        command
+      end
+
       def parse_name_or_pattern(name)
         if /\A\/(.+)\/\z/ =~ name
           Regexp.new($1, Regexp::IGNORECASE)
@@ -239,6 +257,9 @@ module Grntest
       @groonga = "groonga"
       @groonga_httpd = "groonga-httpd"
       @groonga_suggest_create_dataset = "groonga-suggest-create-dataset"
+      unless command_exist?(@groonga_suggest_create_dataset)
+        @groonga_suggest_create_dataset = nil
+      end
       @interface = :stdio
       @output_type = "json"
       @testee = "groonga"
@@ -345,6 +366,7 @@ module Grntest
       targets.each do |target|
         target_path = Pathname(target)
         next unless target_path.exist?
+        target_path = target_path.cleanpath
         if target_path.directory?
           load_tests_under_directory(tests, target_path)
         else
@@ -373,9 +395,12 @@ module Grntest
       if command_exist?("cut-diff")
         @diff = "cut-diff"
         @diff_options = ["--context-lines", "10"]
-      else
+      elsif command_exist?("diff")
         @diff = "diff"
         @diff_options = ["-u"]
+      else
+        @diff = "internal"
+        @diff_options = []
       end
     end
 
@@ -391,9 +416,16 @@ module Grntest
     end
 
     def command_exist?(name)
+      exeext = RbConfig::CONFIG["EXEEXT"]
       ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
-        absolute_path = File.join(path, name)
-        return true if File.executable?(absolute_path)
+        raw_candidate = File.join(path, name)
+        candidates = [
+          raw_candidate,
+          "#{raw_candidate}#{exeext}",
+        ]
+        candidates.each do |candidate|
+          return true if File.executable?(candidate)
+        end
       end
       false
     end

data/lib/grntest/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2016  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.1.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-20 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -39,6 +39,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  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: groonga-command-parser
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +169,7 @@ files:
 - doc/text/news.md
 - grntest.gemspec
 - lib/grntest/base-result.rb
+- lib/grntest/diff-reporter.rb
 - lib/grntest/error.rb
 - lib/grntest/execution-context.rb
 - lib/grntest/executors.rb
@@ -163,6 +178,7 @@ files:
 - lib/grntest/executors/standard-io-executor.rb
 - lib/grntest/log-entry.rb
 - lib/grntest/log-parser.rb
+- lib/grntest/platform.rb
 - lib/grntest/query-log-entry.rb
 - lib/grntest/query-log-parser.rb
 - lib/grntest/reporters.rb