groonga-query-log 1.5.5 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62d9d663acc92d9e648326faa03dfb49fab7e8a9363e3850925791dc8b306560
-  data.tar.gz: a7ad80e766ab25620599580c99a873bb9494cb3bda1182846863d427088e5b92
+  metadata.gz: 5c477ce5c66bac482f0c94777fb0b5c2a6b6bf6c7ef3f84a6020ecff4d70c28d
+  data.tar.gz: 612d7313d065141312414bc7e1b932efb150fbfff136011d6847027050f0f2a2
 SHA512:
-  metadata.gz: 5f0ccad0775f92a9eba4ff48f5a6ab6a111fca087b9e17adf04b89582d57cbe2d41e24bb65988cd4844013f8251e587e8898cdd6baa44050a68062ffbec191aa
-  data.tar.gz: b55069b32eb97c1b8ee8132a5bf60b62200e7c95f2f630dc93c4e83d2d7052b64993ebb064ed8fdbf66aeddd8cf1d1e011b215b965b112e9744e82f421b1f139
+  metadata.gz: d3e9f5212cd1367c8db624aad41d29b8769f21704987cf32ebccf98f652515696244c1f199e48cf800c25f793e09a014d738e1ec63dc23ce59f86febfa3747b6
+  data.tar.gz: acab0c65ed1a853589479e189ae0271c7965ac31aee4bfb675091ceb9d97992d9cac65be60b21b6105a674a2eb5072a9c919740cf51998a48870e29a912adb08

data/doc/text/news.md

@@ -1,16 +1,16 @@
 # News
 
-## 1.5.5: 2019-10-24
+## 1.5.6: 2019-11-26
 
 ### Improvements
 
-  * `run-regression-test`: Added `--performance-choose-strategy` option.
+  * `run-regression-test`: Outputted report to stdout by default.
 
-### Improvements
+## 1.5.5: 2019-10-24
 
-  * `run-regression-test`: Added `--mail-from` option.
+### Improvements
 
-  * `format-regression-test-logs`: Added support for slow queries.
+  * `run-regression-test`: Added `--performance-choose-strategy` option.
 
 ## 1.5.4: 2019-10-23
 

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

@@ -80,7 +80,6 @@ module GroongaQueryLog
           smtp_auth_password: nil,
           smtp_starttls: false,
           smtp_port: 25,
-          path: "#{@working_directory}/results",
         }
       end
 
@@ -95,12 +94,17 @@ module GroongaQueryLog
 
         notifier = MailNotifier.new(@notifier_options)
         notifier.notify_started
+
         start_time = Time.now
         tester = Tester.new(old_groonga_server,
                             new_groonga_server,
                             tester_options)
         success = tester.run
-        notifier.notify_finished(success, Time.now - start_time)
+        elapsed_time = Time.now - start_time
+
+        report = format_report(success, elapsed_time)
+        notifier.notify_finished(success, report)
+        puts(report)
 
         success
       end
@@ -346,10 +350,15 @@ module GroongaQueryLog
         parser
       end
 
+      def results_directory
+        @working_directory + "results"
+      end
+
       def directory_options
         {
           :input_directory   => @input_directory,
           :working_directory => @working_directory,
+          :results_directory => results_directory,
         }
       end
 
@@ -404,6 +413,34 @@ module GroongaQueryLog
                           server_options)
       end
 
+      def format_report(success, elapsed_time)
+        formatted = format_elapsed_time(elapsed_time)
+        if success
+          formatted << "Success"
+        else
+          formatted << "Failure"
+          output = StringIO.new
+          formetter = FormatRegressionTestLogs.new(output: output)
+          formetter.run([results_directory])
+          formatted << "Report:\n"
+          formatted << output.string
+        end
+        formatted
+      end
+
+      def format_elapsed_time(elapsed_time)
+        elapsed_seconds = elapsed_time % 60
+        elapsed_minutes = elapsed_time / 60 % 60
+        elapsed_hours = elapsed_time / 60 / 60 % 24
+        elapsed_days = elapsed_time / 60 / 60 / 24
+        "Elapsed: %ddays %02d:%02d:%02d\n" % [
+          elapsed_days,
+          elapsed_hours,
+          elapsed_minutes,
+          elapsed_seconds
+        ]
+      end
+
       module Loggable
         def puts(*args)
           $stdout.puts(*args)
@@ -561,6 +598,8 @@ module GroongaQueryLog
           @new = new
           @input_directory = options[:input_directory] || Pathname.new(".")
           @working_directory = options[:working_directory] || Pathname.new(".")
+          @results_directory =
+            options[:results_directory] || (@working_directory + "results")
           @n_clients = options[:n_clients] || 1
           @stop_on_failure = options[:stop_on_failure]
           @options = options
@@ -708,7 +747,7 @@ module GroongaQueryLog
         end
 
         def test_log_path(query_log_path)
-          @working_directory + "results" + "#{query_log_path.basename}.log"
+          @results_directory + "#{query_log_path.basename}.log"
         end
 
         def use_persistent_cache?
@@ -719,7 +758,6 @@ module GroongaQueryLog
       class MailNotifier
         def initialize(options)
           @options = options
-          @path = @options[:path] || "results"
         end
 
         def notify_started
@@ -729,39 +767,18 @@ module GroongaQueryLog
           send_mail(subject, "")
         end
 
-        def notify_finished(success, elapsed_time)
+        def notify_finished(success, report)
           return unless @options[:mail_to]
 
-          output = StringIO.new
-          formetter = FormatRegressionTestLogs.new(output: output)
-          formetter.run([@path])
-          formatted_log = output.string
-
-          content = format_elapsed_time(elapsed_time)
           if success
             subject = @options[:mail_subject_on_success]
           else
             subject = @options[:mail_subject_on_failure]
-            content << "Report:\n"
-            content << formatted_log
           end
-          send_mail(subject, content)
+          send_mail(subject, report)
         end
 
         private
-        def format_elapsed_time(elapsed_time)
-          elapsed_seconds = elapsed_time % 60
-          elapsed_minutes = elapsed_time / 60 % 60
-          elapsed_hours = elapsed_time / 60 / 60 % 24
-          elapsed_days = elapsed_time / 60 / 60 / 24
-          "Elapsed: %ddays %02d:%02d:%02d\n" % [
-            elapsed_days,
-            elapsed_hours,
-            elapsed_minutes,
-            elapsed_seconds
-          ]
-        end
-
         def send_mail(subject, content)
           header = <<-HEADER
 MIME-Version: 1.0

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

@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module GroongaQueryLog
-  VERSION = "1.5.5"
+  VERSION = "1.5.6"
 end

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

@@ -83,6 +83,13 @@ class RunRegressionTestCommandTest < Test::Unit::TestCase
             "Date: #{@now}\r\n")
   end
 
+  def normalize_output(output)
+    output
+      .gsub(/^\[.*\n/, "")
+      .gsub(/^Running.*\n/, "")
+      .gsub(/^Elapsed: \d+days \d{2}:\d{2}:\d{2}$/, "Elapsed: 0days 00:00:00")
+  end
+
   def fixture_path(*components)
     super("run-regression-test", *components)
   end
@@ -93,6 +100,16 @@ class RunRegressionTestCommandTest < Test::Unit::TestCase
     end
   end
 
+  def test_success
+    success, output = run_command([])
+    assert_equal([
+                   true,
+                   "Elapsed: 0days 00:00:00\n" +
+                   "Success\n"
+                 ],
+                [success, normalize_output(output)])
+  end
+
   def test_mail_from
     success, _output = run_command(["--smtp-server", @smtp_host,
                                     "--smtp-port", @smtp_port.to_s,
@@ -156,7 +173,7 @@ QUIT
         :path => fixture_path("mail-notifier/success.log"),
       }
       notifier = MailNotifier.new(options)
-      notifier.notify_finished(true, 3000)
+      notifier.notify_finished(true, "report")
       assert_equal(<<-REQUEST.gsub(/\n/, "\r\n").b, normalized_smtp_request)
 EHLO 127.0.0.1
 MAIL FROM:<#{options[:mail_from]}>
@@ -172,8 +189,7 @@ To: #{options[:mail_to]}
 Subject: Success
 Date: #{@now}
 
-Elapsed: 0days 00:50:00
-
+report
 .
 QUIT
       REQUEST
@@ -190,7 +206,7 @@ QUIT
         :path => fixture_path("mail-notifier/failure.log"),
       }
       notifier = MailNotifier.new(options)
-      notifier.notify_finished(false, 3000)
+      notifier.notify_finished(false, "report")
       assert_equal(<<-REQUEST.gsub(/\n/, "\r\n").b, normalized_smtp_request)
 EHLO 127.0.0.1
 MAIL FROM:<#{options[:mail_from]}>
@@ -206,24 +222,7 @@ To: #{options[:mail_to]}
 Subject: Failure
 Date: #{@now}
 
-Elapsed: 0days 00:50:00
-Report:
-Command:
-/d/select?table=Logs&match_columns=message&query=%E7%84%BC%E8%82%89
-Name: select
-Arguments:
-  match_columns: message
-  query: 焼肉
-  table: Logs
---- old
-+++ new
-@@ -1,5 +1,5 @@
- [[[2],
-   [["_id", "UInt32"], ["message", "Text"]],
-   [1, "log message1: 焼肉"],
--  [2, "log message2: 焼肉"]]]
-+  [3, "log message3: 焼肉"]]]
-
+report
 .
 QUIT
       REQUEST

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charty