grntest 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e90468027680b461a1633c49db9f3feb7babd1a0c2e81a4aad381ade35b4fb3
-  data.tar.gz: 31b1cc050ea4b70ed08082a0b5443586676aa5d77c0512287736ee1837b4c371
+  metadata.gz: 72bf123c2803dad061e343733c748d2c66ce4fb649e146cf089707b28bc24eb7
+  data.tar.gz: 808f8b5ede307bab1f5e3e933944e487113b8f22272fe6226d3411986e9a2eac
 SHA512:
-  metadata.gz: f8067b106d13ebd121cd96d43eb82b807adb81fe89ea26df1ea4eeb8dfdd6be096e14fdbeeb6ca00528d5704d0d53d6123e28d45973fb5bb283990c59101e090
-  data.tar.gz: b8eb794be911a7dc8b7eb74172b4cb109cafe74a945cfc3ca3e626d90a54a36ca61058c91883238b579d4c0a92578a58d46b2aff4a7dbb1c4086059a0109245e
+  metadata.gz: e39d5e003dd5ad5d48aa71b64b306c882413a27d873fb95c130cc00b5c4538271363f3a04cb44cfdd535a591c1c98479cc41a2558d5a0c7854bbb3793b6ce9b0
+  data.tar.gz: c39924d196aa19cbdf0db12a7660ac6ed7b545e78b6c6852261b9f178b4acc899ba3c8f9ee875042f2700849a2ef3b3db915d72805f5a47552d6c8d358e593c7

data/doc/text/news.md

@@ -1,5 +1,16 @@
 # News
 
+## 1.4.2: 2020-05-30
+
+### Improvements
+
+  * Removed log level normalization.
+
+  * Added `require-platform` directive.
+
+  * Added support for normalizing IO open/close log message with
+    additional message.
+
 ## 1.4.1: 2020-05-30
 
 ### Improvements

data/lib/grntest/execution-context.rb

@@ -37,6 +37,7 @@ module Grntest
     attr_writer :suppress_backtrace
     attr_writer :collect_query_log
     attr_writer :debug
+    attr_accessor :platform
     def initialize
       @logging = true
       @base_directory = Pathname(".")
@@ -66,6 +67,7 @@ module Grntest
       @suppress_backtrace = true
       @collect_query_log = false
       @debug = false
+      @platform = guess_platform
     end
 
     def logging?
@@ -173,5 +175,18 @@ module Grntest
         "so"
       end
     end
+
+    def guess_platform
+      case RUBY_PLATFORM
+      when /mingw|mswin/
+        "windows"
+      when /darwin/
+        "macos"
+      when /linux/
+        "linux"
+      else
+        "unknown"
+      end
+    end
   end
 end

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

@@ -374,6 +374,19 @@ module Grntest
         @ignore_log_patterns.delete(pattern)
       end
 
+      def execute_directive_require_platform(parser, line, content, options)
+        platform, = options
+        if platform.start_with?("!")
+          if @context.platform == platform[1..-1]
+            omit("require platform: #{platform} (#{@context.platform})")
+          end
+        else
+          if @context.platform != platform
+            omit("require platform: #{platform} (#{@context.platform})")
+          end
+        end
+      end
+
       def execute_directive(parser, line, content)
         command, *options = Shellwords.split(content)
         case command
@@ -421,6 +434,8 @@ module Grntest
           execute_directive_add_ignore_log_pattern(parser, line, content, options)
         when "remove-ignore-log-pattern"
           execute_directive_remove_ignore_log_pattern(parser, line, content, options)
+        when "require-platform"
+          execute_directive_require_platform(parser, line, content, options)
         else
           log_input(line)
           log_error("#|e| unknown directive: <#{command}>")
@@ -544,14 +559,15 @@ module Grntest
 
       def normalize_log(entry)
         case entry.message
-        when /\A(\[io\]\[(?:open|close)\]) <(.*?)>\z/
+        when /\A(\[io\]\[(?:open|close)\]) (.*?)<(.*?)>\z/
           tag = $1
-          path = $2
+          io_message = $2
+          path = $3
           normalized_path = File.basename(path)
-          normalized_message = "#{tag} <#{normalized_path}>"
+          normalized_message = "#{tag} #{io_message}<#{normalized_path}>"
           case entry.log_level
-          when :info, :debug
-            normalized_log_level = :debug
+          when :information, :debug
+            normalized_log_level = :dump
           else
             normalized_log_level = entry.log_level
           end

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.1"
+  VERSION = "1.4.2"
 end

metadata

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