groonga-query-log 1.5.9 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99da1139f30806bb7ead68b469c2122368bcad8ea91586160096751e3919b4ab
-  data.tar.gz: ab791f07d33e784531372dd3c4cad59e57e1ae38d778529a3b65dbd8ea1d4466
+  metadata.gz: '023904fd821f10549843a393066606dc362b18cf37a0fdf367dad9fa2112510b'
+  data.tar.gz: 13c88359ceff1ac99c0a56c9c53deac527c1fd2158c62ebaef70ade2a623b149
 SHA512:
-  metadata.gz: 9ae76dd7338c155860f1b74dea49fc202baeaa4216018dda0e2c22144663c4ea93db08a4042f3487c429bd565281876d46d9348a4fa27e510c082f9dcb065507
-  data.tar.gz: 6d4f6912e00abd0a0ff41c18bcbbd3c251dab17a9d142974ab0719e5dbb5309e97f7fe174ec7cd239cddd0cf1b15c8940b7da2d31e4f8c7c723337d0902940a7
+  metadata.gz: 981cb090997ecb1644b4e891e60bae06a985b0a84abb4c186ca69f053c3c024ea16cc7333a95b9f57d50392ad2fb00aca6633447a9e4b296ea6c6a1b02046792
+  data.tar.gz: 94c88472305982b6f1be3833d2dbc7a79223def680cfb7f424ce197edab06dc2360cc087c4221b038b3cbb2697d93bdfa97883d77db6c8fee22b4d4f61f94d20

data/doc/text/news.md

@@ -1,9 +1,19 @@
 # News
 
-## 1.5.9: 2020-04-06
+## 1.6.0: 2020-04-15
+
+### Improvements
+
+  * `format-regression-test-logs`: Ensured using UTF-8 for input.
 
 ### Fixes
 
+  * `verify-server`: Fixed a executed commands count bug on failure.
+
+## 1.5.9: 2020-04-06
+
+### Improvements
+
   * `replay`: Added `--output-type` option.
 
   * `replay`: Added support for outputting logs to stdout.

data/lib/groonga-query-log/command/format-regression-test-logs.rb

@@ -50,12 +50,12 @@ module GroongaQueryLog
             if File.directory?(path)
               Find.find(path) do |sub_path|
                 next unless File.file?(sub_path)
-                File.open(sub_path) do |file|
+                File.open(sub_path, encoding: "UTF-8") do |file|
                   format_log(file, sub_path)
                 end
               end
             else
-              File.open(path) do |file|
+              File.open(path, encoding: "UTF-8") do |file|
                 format_log(file, path)
               end
             end

data/lib/groonga-query-log/command/run-regression-test.rb

@@ -462,11 +462,11 @@ module GroongaQueryLog
                         n_leaked_objects,
                         n_executed_commands)
         formatted = format_elapsed_time(elapsed_time)
-        formatted << "Number of executed commands: #{n_executed_commands}\n"
+        formatted << "The number of executed commands: #{n_executed_commands}\n"
         if success
           formatted << "Success\n"
         else
-          formatted << "Failure"
+          formatted << "Failure\n"
         end
         unless n_leaked_objects.zero?
           formatted << "\nLeaked: #{n_leaked_objects}"

data/lib/groonga-query-log/command/verify-server.rb

@@ -31,11 +31,20 @@ module GroongaQueryLog
 
       def run(command_line, &callback)
         input_paths = create_parser.parse(command_line)
-        same = true
         verifier = ServerVerifier.new(@options)
+        begin
+          verify(verifier, input_paths, &callback)
+        ensure
+          @n_executed_commands = verifier.n_executed_commands
+        end
+      end
+
+      private
+      def verify(verifier, input_paths, &callback)
         if input_paths.empty?
-          same = verifier.verify($stdin, &callback)
+          verifier.verify($stdin, &callback)
         else
+          same = true
           input_paths.each do |input_path|
             case input_path
             when /\.tar\.gz\z/
@@ -52,12 +61,10 @@ module GroongaQueryLog
               end
             end
           end
+          same
         end
-        @n_executed_commands = verifier.n_executed_commands
-        same
       end
 
-      private
       def verify_tar_gz(verifier, tar_gz_path, &callback)
         same = true
         Zlib::GzipReader.open(tar_gz_path) do |gzip|

data/lib/groonga-query-log/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module GroongaQueryLog
-  VERSION = "1.5.9"
+  VERSION = "1.6.0"
 end

data/test/command/test-run-regression-test.rb

@@ -92,7 +92,7 @@ class RunRegressionTestCommandTest < Test::Unit::TestCase
   end
 
   def n_executed_commands(output)
-    output.slice(/^Number of executed commands:\s+(\d+)/, 1).to_i
+    output.slice(/^The number of executed commands:\s+(\d+)/, 1).to_i
   end
 
   def fixture_path(*components)
@@ -110,7 +110,7 @@ class RunRegressionTestCommandTest < Test::Unit::TestCase
     assert_equal([
                    true,
                    "Elapsed: 0days 00:00:00\n" +
-                   "Number of executed commands: #{@n_commands}\n" +
+                   "The number of executed commands: #{@n_commands}\n" +
                    "Success\n"
                  ],
                 [success, normalize_output(output)])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.6.0
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charty