grntest 1.0.3 → 1.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2c4da22645c51bc7a2f74a60d727f04fc123f9f3
+  data.tar.gz: 9f01ad9f0c434f3922fda5b2db584861a9e79a19
+SHA512:
+  metadata.gz: 1b740176e04d147d62c040eb1c98dc98619ffe033008aa44214e1475874b4308368d127d221784f4c8a52b85ec875755380c1f5a3837ed26de0dee34565f1ed8
+  data.tar.gz: 953b462900e9ecc68df27bf9bfd6996c1870450871a200774842aa9c9a5fa3df98bf9d28805893c6fb32c67a39bc6f201be763c071691ae02c2013e788ae419d

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # News
 
+## 1.0.4: 2013-12-16
+
+### Improvements
+
+  * Supported `groogna-command-parser` gem.
+
 ## 1.0.3: 2013-08-12
 
 This is a minor improvment release.

data/grntest.gemspec

@@ -1,6 +1,6 @@
 # -*- mode: ruby; coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2013  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
@@ -45,7 +45,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency("json")
   spec.add_runtime_dependency("msgpack")
-  spec.add_runtime_dependency("groonga-command")
+  spec.add_runtime_dependency("groonga-command-parser")
 
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")

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

@@ -19,7 +19,7 @@ require "pathname"
 require "fileutils"
 require "shellwords"
 
-require "groonga/command"
+require "groonga/command/parser"
 
 require "grntest/error"
 require "grntest/execution-context"
@@ -54,10 +54,10 @@ module Grntest
             script_file.each_line do |line|
               begin
                 parser << line
-              rescue Error, Groonga::Command::ParseError
+              rescue Error, Groonga::Command::Parser::Error
                 line_info = "#{script_path}:#{script_file.lineno}:#{line.chomp}"
                 log_error("#{line_info}: #{$!.message}")
-                if $!.is_a?(Groonga::Command::ParseError)
+                if $!.is_a?(Groonga::Command::Parser::Error)
                   @context.abort
                 else
                   log_error("#{line_info}: #{$!.message}")
@@ -77,7 +77,17 @@ module Grntest
         parser.on_command do |command|
           execute_command(command)
         end
+        parser.on_load_value do |command, value|
+          command.values ||= []
+          command.values << value
+        end
         parser.on_load_complete do |command|
+          if command.columns
+            command[:columns] = command.columns.join(", ")
+          end
+          if command.values
+            command[:values] = JSON.generate(command.values)
+          end
           execute_command(command)
         end
         parser.on_comment do |comment|
@@ -240,12 +250,21 @@ module Grntest
       def execute_command(command)
         extract_command_info(command)
         log_input("#{command.original_source}\n")
-        response = send_command(command)
-        type = @output_type
-        log_output(response)
-        log_error(extract_important_messages(read_all_log))
+        begin
+          response = send_command(command)
+        rescue => error
+          log_error("# error: #{error.class}: #{error.message}")
+          error.backtrace.each do |line|
+            log_error("# error: #{line}")
+          end
+          @context.error
+        else
+          type = @output_type
+          log_output(response)
+          log_error(extract_important_messages(read_all_log))
 
-        @context.error if error_response?(response, type)
+          @context.error if error_response?(response, type)
+        end
       end
 
       def read_all_log

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

@@ -26,24 +26,21 @@ module Grntest
         super(context)
         @host = host
         @port = port
+        @read_timeout = 3
       end
 
       def send_command(command)
-        url = "http://#{@host}:#{@port}#{command.to_uri_format}"
-        begin
-          open(url) do |response|
-            "#{response.read}\n"
-          end
-        rescue OpenURI::HTTPError
-          message = "Failed to get response from groonga: #{$!}: <#{url}>"
-          raise Error.new(message)
+        if command.name == "load"
+          send_load_command(command)
+        else
+          send_normal_command(command)
         end
       end
 
       def ensure_groonga_ready
         n_retried = 0
         begin
-          send_command("status")
+          send_command(command("status"))
         rescue SystemCallError
           n_retried += 1
           sleep(0.1)
@@ -52,9 +49,54 @@ module Grntest
         end
       end
 
+      def shutdown
+        send_command(command("shutdown"))
+      end
+
       def create_sub_executor(context)
         self.class.new(@host, @port, context)
       end
+
+      private
+      def command(command_line)
+        Groonga::Command::Parser.parse(command_line)
+      end
+
+      MAX_URI_SIZE = 4096
+      def send_load_command(command)
+        if command.to_uri_format.size <= MAX_URI_SIZE
+          return send_normal_command(command)
+        end
+
+        values = command.arguments.delete(:values)
+        request = Net::HTTP::Post.new(command.to_uri_format)
+        request.content_type = "application/json; charset=UTF-8"
+        request.body = values
+        response = Net::HTTP.start(@host, @port) do |http|
+          http.read_timeout = @read_timeout
+          http.request(request)
+        end
+        normalize_response_data(response.body)
+      end
+
+      def send_normal_command(command)
+        url = "http://#{@host}:#{@port}#{command.to_uri_format}"
+        begin
+          open(url, :read_timeout => @read_timeout) do |response|
+            normalize_response_data(response.read)
+          end
+        rescue OpenURI::HTTPError
+          $!.io.read
+        end
+      end
+
+      def normalize_response_data(raw_response_data)
+        if raw_response_data.empty?
+          raw_response_data
+        else
+          "#{raw_response_data}\n"
+        end
+      end
     end
   end
 end

data/lib/grntest/reporters.rb

@@ -22,7 +22,7 @@ require "grntest/reporters/inplace-reporter"
 module Grntest
   module Reporters
     class << self
-      def create_repoter(tester)
+      def create_reporter(tester)
         case tester.reporter
         when :mark
           MarkReporter.new(tester)

data/lib/grntest/test-runner.rb

@@ -299,11 +299,25 @@ EOC
           end
           yield(executor)
         ensure
-          executor.send_command("shutdown")
+          executor.shutdown
           wait_groonga_http_shutdown(pid_file_path)
         end
       ensure
-        Process.waitpid(pid) if pid
+        ensure_process_finished(pid)
+      end
+    end
+
+    def ensure_process_finished(pid)
+      return if pid.nil?
+
+      n_retries = 0
+      loop do
+        finished_pid = Process.waitpid(pid, Process::WNOHANG)
+        break if finished_pid
+        n_retries += 1
+        break if n_retries > 10
+        Process.kill(:TERM, pid)
+        sleep(0.1)
       end
     end
 

data/lib/grntest/test-suites-runner.rb

@@ -135,7 +135,7 @@ module Grntest
     end
 
     def create_reporter
-      Reporters.create_repoter(@tester)
+      Reporters.create_reporter(@tester)
     end
   end
 end

data/lib/grntest/version.rb

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.0.4
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -10,150 +9,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: groonga-command
+  name: groonga-command-parser
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: packnga
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -197,27 +178,26 @@ files:
 homepage: https://github.com/groonga/grntest
 licenses:
 - GPLv3 or later
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+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: