grntest 1.6.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6671c17849f4aafbc27163d7c5a387b877fbc330b867dd5b8970366d936ace93
-  data.tar.gz: 3b9262457bbb69d422c1a33ab85572a81a4afd34f86554a3abecc0e96530629d
+  metadata.gz: 738937a2c9b0aaaaca52666b1e473316e8061d723089088a354ba5866b74f09f
+  data.tar.gz: 130ba969e61ea492878c06fbce47b8d1dbf9eaefcbc1af8d8c34bec99c26b46f
 SHA512:
-  metadata.gz: 6993e535ae22bfa319ab2b0b60b6a499075056663f2765cb2e9aa10a3a81270afa58022c81183a56ac6fff4cea5ac4fd5f3089cce700c2970fdd00d0bb4b3e8a
-  data.tar.gz: f18839c07ad5e48ac14168c209e26148b6aad7c3281b1aa36e527906920ca0ffc651d3e1b7aa575ef03e5aeb3be23e074c518857812f7d6706032eef1bd9dc81
+  metadata.gz: 65b744a5acd3abcce3904eb9ce012815659f02938987af6e90d449df161725630864c299f47e7ccc0fc8779bd095293459c7a446a55aa50775b96ade2337de01
+  data.tar.gz: 9af7a26b36f338e4da106dedc330d14a80e30043bd5ef0a8b2c247f8403957d30ad2dde25113a4a61488d2d4ce26f654b4e17de4323373006091d4640a65828c

data/doc/text/news.md

@@ -1,5 +1,18 @@
 # News
 
+## 1.6.2: 2023-08-24
+
+### Improvements
+
+  * reporter: stream: Changed to show "start" message in multi-workers
+    mode.
+
+## 1.6.1: 2023-08-11
+
+### Improvements
+
+  * `--n-workers`: Use the max number of cores by default.
+
 ## 1.6.0: 2023-07-21
 
 ### Improvements

data/lib/grntest/reporters/base-reporter.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2023  Sutou Kouhei <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
@@ -28,11 +28,19 @@ module Grntest
 
       private
       def synchronize
-        @mutex.synchronize do
+        if single_worker?
           yield
+        else
+          @mutex.synchronize do
+            yield
+          end
         end
       end
 
+      def single_worker?
+        @tester.n_workers == 1
+      end
+
       def report_summary(result)
         puts(statistics_header)
         puts(colorize(statistics(result), result))
@@ -120,16 +128,19 @@ module Grntest
         reporter.report
       end
 
+      def report_full_test_name(worker)
+        print("#{worker.suite_name}/#{worker.test_name}")
+      end
+
       def report_test(worker, result)
         report_marker(result)
-        print("[#{worker.id}] ") if @tester.n_workers > 1
+        print("[#{worker.id}] ") if single_worker?
         puts(worker.suite_name)
         print("  #{worker.test_name}")
         report_test_result(result, worker.status)
       end
 
-      def report_test_result(result, label)
-        message = test_result_message(result, label)
+      def report_right_message(message)
         message_width = string_width(message)
         rest_width = @term_width - @current_column
         if rest_width > message_width
@@ -138,6 +149,10 @@ module Grntest
         puts(message)
       end
 
+      def report_test_result(result, label)
+        report_right_message(test_result_message(result, label))
+      end
+
       def test_result_message(result, label)
         elapsed_time = result.elapsed_time
         formatted_elapsed_time = "%.4fs" % elapsed_time

data/lib/grntest/reporters/stream-reporter.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2023  Sutou Kouhei <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
@@ -31,6 +29,7 @@ module Grntest
       end
 
       def on_suite_start(worker)
+        return unless single_worker?
         if worker.suite_name.bytesize <= @term_width
           puts(worker.suite_name)
         else
@@ -40,36 +39,61 @@ module Grntest
       end
 
       def on_test_start(worker)
-        print("  #{worker.test_name}")
-        @output.flush
+        synchronize do
+          if single_worker?
+            print("  #{worker.test_name}")
+          else
+            report_full_test_name(worker)
+            report_right_message("[start]")
+          end
+          @output.flush
+        end
       end
 
       def on_test_success(worker, result)
-        report_test_result(result, worker.status)
+        synchronize do
+          report_full_test_name(worker) unless single_worker?
+          report_test_result(result, worker.status)
+        end
       end
 
       def on_test_failure(worker, result)
-        report_test_result(result, worker.status)
-        report_failure(result)
+        synchronize do
+          report_full_test_name(worker) unless single_worker?
+          report_test_result(result, worker.status)
+          report_failure(result)
+        end
       end
 
       def on_test_leak(worker, result)
-        report_test_result(result, worker.status)
-        report_actual(result) unless result.checked?
+        synchronize do
+          report_full_test_name(worker) unless single_worker?
+          report_test_result(result, worker.status)
+          report_actual(result) unless result.checked?
+        end
       end
 
       def on_test_omission(worker, result)
-        report_test_result(result, worker.status)
-        report_actual(result)
+        synchronize do
+          report_full_test_name(worker) unless single_worker?
+          report_test_result(result, worker.status)
+          report_actual(result)
+        end
       end
 
       def on_test_omission_suppressed(worker, result)
-        report_test_result(result, worker.status)
+        synchronize do
+          report_full_test_name(worker) unless single_worker?
+          report_test_result(result, worker.status)
+        end
       end
 
       def on_test_no_check(worker, result)
-        report_test_result(result, worker.status)
-        report_actual(result)
+        synchronize do
+          report_full_test_name(worker) unless single_worker?
+          report_test_result(result, worker.status)
+          report_actual(result)
+        end
       end
 
       def on_test_finish(worker, result)

data/lib/grntest/tester.rb

@@ -199,7 +199,8 @@ module Grntest
         end
 
         parser.on("--n-workers=N", Integer,
-                  "Use N workers to run tests") do |n|
+                  "Use N workers to run tests",
+                  "(#{tester.n_workers})") do |n|
           tester.n_workers = n
         end
 
@@ -382,7 +383,7 @@ module Grntest
       @base_directory = Pathname(".")
       @database_path = nil
       @reporter = nil
-      @n_workers = 1
+      @n_workers = guess_n_cores
       @output = $stdout
       @keep_database = false
       @use_color = nil
@@ -544,6 +545,28 @@ module Grntest
       runner.run(test_suites)
     end
 
+    def guess_n_cores
+      begin
+        if command_exist?("nproc")
+          # Linux
+          Integer(`nproc`.strip, 10)
+        elsif command_exist?("sysctl")
+          # macOS
+          Integer(`sysctl -n hw.logicalcpu`.strip, 10)
+        else
+          # Windows
+          value = ENV["NUMBER_OF_PROCESSORS"]
+          if value
+            Integer(value, 10)
+          else
+            1
+          end
+        end
+      rescue ArgumentError
+        1
+      end
+    end
+
     def detect_suitable_diff
       if command_exist?("cut-diff")
         @diff = "cut-diff"

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.6.0"
+  VERSION = "1.6.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.2
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-21 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs