grntest 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 942d6904ffdb299bc06a436416abbd5161be865c
-  data.tar.gz: 4fe3d75f0d6cd99c5c3aac7586ef812ca6f1d6d1
+  metadata.gz: bd1dbfd1fb004cc82763f563295077345a51f146
+  data.tar.gz: 37937cc7289f27f9aa2c5473a35f5b7b93587771
 SHA512:
-  metadata.gz: 2d15beda7b6fe693091a2b3d90d1f6ce3277846044d8f5376795e4d160ed79989c3ae6e5361d7ed3e950bbbb11297cbbf27ecacbb960ce471c3e06713475b1ba
-  data.tar.gz: bc6903386c278bbeed019106da7b833fa4a8aff775f57fbf31b12799515f101c9da026fddb00d0a4f6ee5bf47d54c7a45788df8decdff93aa4c069c1e1da4e4d
+  metadata.gz: 3b891df58ceb4ff9982bdec75d63bd19317fd5135a1432c687e40d38410731c394394f54777d4458aaa22565f7b32e4684fdaa4354e1009d1c789e9b2854a1d0
+  data.tar.gz: 2ccea2683b2487db0dd832e0f1678d1a726fc432b21aa56905c96fcffef8bd3e9ab41fea6efdf2fce3d88300b051196c4aac971941dcd754c4228954ae908aa5

data/README.md

@@ -6,8 +6,8 @@ grntest
 
 ## Description
 
-Grntest is a testing framework for groonga. You can write a test for
-groonga by writing groonga commands and expected result.
+Grntest is a testing framework for Groonga. You can write a test for
+Groonga by writing Groonga commands and expected result.
 
 ## Install
 
@@ -548,7 +548,7 @@ database.
 
 ## Examples
 
-See [test/command/ directory in groonga's
+See [test/command/ directory in Groonga's
 source](https://github.com/groonga/groonga/tree/master/test/command). It
 has many test scripts and uses many useful features. They will help you.
 

data/doc/text/news.md

@@ -1,5 +1,17 @@
 # News
 
+## 1.0.6: 2014-08-16
+
+### Improvements
+
+  * Supported normalizing path in error message.
+  * Improved backtrace log detection.
+    [groonga-dev,02650] [Reported by Naoya Murakami]
+
+### Thanks
+
+  * Naoya Murakami
+
 ## 1.0.5: 2014-02-13
 
 ### Improvements

data/grntest.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   entries = readme.split(/^\#\#\s(.*)$/)
   description = clean_white_space.call(entries[entries.index("Description") + 1])
   spec.summary, spec.description, = description.split(/\n\n+/, 3)
-  spec.license = "GPLv3 or later"
+  spec.license = "GPL-3.0+"
   spec.files = ["README.md", "Rakefile", "Gemfile", "#{spec.name}.gemspec"]
   spec.files += [".yardopts"]
   spec.files += Dir.glob("lib/**/*.rb")

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

@@ -302,7 +302,14 @@ module Grntest
       end
 
       def backtrace_log_message?(message)
-        message.start_with?("/")
+        case message
+        when /\A\//
+          true
+        when /\Agroonga\(\) \[0x[\da-f]+\]\z/
+          true
+        else
+          false
+        end
       end
 
       def error_response?(response, type)

data/lib/grntest/test-runner.rb

@@ -411,7 +411,7 @@ EOF
         when :output
           normalized_result << normalize_output(content, options)
         when :error
-          normalized_result << normalize_raw_content(content)
+          normalized_result << normalize_error(content)
         when :n_leaked_objects
           result.n_leaked_objects = content
         end
@@ -435,7 +435,8 @@ EOF
           return $!.message
         end
         normalized_status = normalize_status(status)
-        normalized_output_content = [normalized_status, *values]
+        normalized_values = normalize_values(values)
+        normalized_output_content = [normalized_status, *normalized_values]
         normalized_output = JSON.generate(normalized_output_content)
         if normalized_output.bytesize > @max_n_columns
           normalized_output = JSON.pretty_generate(normalized_output_content)
@@ -463,10 +464,43 @@ EOF
       else
         message, backtrace = rest
         _ = backtrace # for suppress warnings
+        message = normalize_path_in_error_message(message)
         [[return_code, 0.0, 0.0], message]
       end
     end
 
+    def normalize_values(values)
+      values.collect do |value|
+        if value.is_a?(Hash) and value["exception"]
+          exception = Marshal.load(Marshal.dump(value["exception"]))
+          message = exception["message"]
+          exception["message"] = normalize_path_in_error_message(message)
+          value.merge("exception" => exception)
+        else
+          value
+        end
+      end
+    end
+
+    def normalize_error(content)
+      content = normalize_path_in_error_message(content)
+      normalize_raw_content(content)
+    end
+
+    def normalize_path_in_error_message(content)
+      case content
+      when /\A(.*'fopen: failed to open mruby script file: )<(.+?)>'(.*)\z/
+        pre = $1
+        path = $2
+        post = $3
+        normalized_path = File.basename(path)
+        post = "" unless post.end_with?(")")
+        "#{pre}<#{normalized_path}>'#{post}"
+      else
+        content
+      end
+    end
+
     def test_script_path
       @worker.test_script_path
     end

data/lib/grntest/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,132 +9,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   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: msgpack
   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
     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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: packnga
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -146,38 +146,38 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
+- Gemfile
 - README.md
 - Rakefile
-- Gemfile
+- bin/grntest
+- doc/text/gpl-3.0.txt
+- doc/text/news.md
 - grntest.gemspec
-- .yardopts
-- lib/grntest/reporters.rb
-- lib/grntest/test-runner.rb
+- lib/grntest/base-result.rb
+- lib/grntest/error.rb
 - lib/grntest/execution-context.rb
-- lib/grntest/executors/standard-io-executor.rb
+- lib/grntest/executors.rb
 - lib/grntest/executors/base-executor.rb
 - lib/grntest/executors/http-executor.rb
-- lib/grntest/worker.rb
-- lib/grntest/tester.rb
-- lib/grntest/version.rb
-- lib/grntest/error.rb
+- lib/grntest/executors/standard-io-executor.rb
+- lib/grntest/reporters.rb
+- lib/grntest/reporters/base-reporter.rb
 - lib/grntest/reporters/inplace-reporter.rb
 - lib/grntest/reporters/mark-reporter.rb
 - lib/grntest/reporters/stream-reporter.rb
-- lib/grntest/reporters/base-reporter.rb
-- lib/grntest/base-result.rb
-- lib/grntest/test-suites-runner.rb
-- lib/grntest/executors.rb
 - lib/grntest/response-parser.rb
-- doc/text/news.md
-- doc/text/gpl-3.0.txt
-- test/executors/test-standard-io-executor.rb
+- lib/grntest/test-runner.rb
+- lib/grntest/test-suites-runner.rb
+- lib/grntest/tester.rb
+- lib/grntest/version.rb
+- lib/grntest/worker.rb
 - test/executors/test-base-executor.rb
+- test/executors/test-standard-io-executor.rb
 - test/run-test.rb
-- bin/grntest
 homepage: https://github.com/groonga/grntest
 licenses:
-- GPLv3 or later
+- GPL-3.0+
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -185,23 +185,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.13
+rubygems_version: 2.2.2
 signing_key: 
 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.
+summary: Grntest is a testing framework for Groonga. You can write a test for Groonga
+  by writing Groonga commands and expected result.
 test_files:
-- test/executors/test-standard-io-executor.rb
 - test/executors/test-base-executor.rb
+- test/executors/test-standard-io-executor.rb
 - test/run-test.rb
 has_rdoc: