always 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed19cd7a3109c141b0537f2229876cc00f5d0a70740095b810b281c47fe44834
-  data.tar.gz: 793763757135f8492edb8bb6b6abb6b9ee19459c7e35d3acde3ac13f0c97a230
+  metadata.gz: 915799402627806352f8d56f7050ae8c42ea03c9946eb60d46a983c1a0a7a13e
+  data.tar.gz: 5619766648e561e87b3df2dd07836b38a299d2d20b997bceee1df55a1db11e46
 SHA512:
-  metadata.gz: 3c09324fe351d257d252e466e9be7d263ffb0e9781d1134b777ae207ee0321779273b82771d595fad47f4ca67ed2bebbc4a8864758c0f522f0233f66b5745b79
-  data.tar.gz: 44c0a7f8d9117e69845c58577b6f40ccd29f7292e07c9df0cc18a05870a3fb4b5795c85cc0bfcd5434c543ed5575a081b35de6cc7a402ef59d70459ac87659de
+  metadata.gz: 50a3a60c35527a9f4d442f1c36ae79074cfc91d980eb0e530dfe092e1ffbcefc25ce879184d4ddf2fec76a1d02222eb484b40c4fb43f1de5a9eaf4a6b1181dd4
+  data.tar.gz: f006db78431ce7293bd8ed4d0d2f851dc9fb2f5cb475fa499af9dcad842a031b3c544046e4e0aa302ef59a9359e6540eb9a6c03b4a7db617be98f22670effbe0

data/.rubocop.yml

@@ -27,3 +27,6 @@ AllCops:
   TargetRubyVersion: 3.2
   SuggestExtensions: false
   NewCops: enable
+
+Layout/EndOfLine:
+  EnforcedStyle: lf

data/always.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = '>=3.2'
   s.name = 'always'
-  s.version = '0.0.3'
+  s.version = '0.0.4'
   s.license = 'MIT'
   s.summary = 'A simple Ruby framework that spins a loop forever, in a background thread'
   s.description =

data/lib/always.rb

@@ -44,7 +44,7 @@ require 'concurrent/atom'
 # License:: MIT
 class Always
   # The version of the framework.
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 
   # Constructor.
   # @param [Integer] total The number of threads to run
@@ -83,16 +83,22 @@ class Always
 
     (0..@total - 1).each do |i|
       @threads[i] = Thread.new do
-        body(i, pause, &)
-        @cycles.swap { |c| c + 1 }
+        body(pause, &)
       end
     end
   end
 
   # Stop them all.
   def stop
-    @threads.each(&:terminate)
-    @threads = []
+    raise 'It is not running now, call .start() first' if @threads.empty?
+
+    @threads.delete_if do |t|
+      t.kill
+      sleep(0.001) while t.alive?
+      true
+    end
+    @cycles.swap { |_| 0 }
+    @errors.swap { |_| 0 }
   end
 
   # Represent its internal state as a string.
@@ -106,15 +112,11 @@ class Always
   private
 
   # rubocop:disable Lint/RescueException
-  def body(idx, pause)
+  def body(pause, &)
     loop do
-      begin
-        yield
-      rescue Exception => e
-        @errors.swap { |c| c + 1 }
-        @on_error&.call(e, idx)
-      end
-      sleep(pause)
+      one(&)
+      @cycles.swap { |c| c + 1 }
+      sleep(pause) unless pause.zero?
     rescue Exception
       # If we reach this point, we must not even try to
       # do anything. Here we must quietly ignore everything
@@ -122,4 +124,13 @@ class Always
     end
   end
   # rubocop:enable Lint/RescueException
+
+  # rubocop:disable Lint/RescueException
+  def one
+    yield
+  rescue Exception => e
+    @errors.swap { |c| c + 1 }
+    @on_error&.call(e)
+  end
+  # rubocop:enable Lint/RescueException
 end

data/test/test_always.rb

@@ -39,7 +39,7 @@ class TestAlways < Minitest::Test
   def test_with_error
     a = Always.new(5)
     failures = 0
-    a.on_error { |_e, i| failures += i }.start do
+    a.on_error { |_e| failures += 1 }.start do
       raise 'intentionally'
     end
     sleep(0.1)
@@ -48,12 +48,23 @@ class TestAlways < Minitest::Test
   end
 
   def test_converts_to_string
-    a = Always.new(5)
-    a.start do
-      # nothing
-    end
-    assert(a.to_s.start_with?('5/'))
+    n = 6
+    a = Always.new(6)
+    a.start { sleep(0.01) }
+    sleep(0.1)
+    threads, cycles, errors = a.to_s.split('/')
+    assert_equal(n, threads.to_i)
+    assert(cycles.to_i.positive?)
+    assert(errors.to_i.zero?)
+    a.stop
+  end
+
+  def test_stops_correctly
+    a = Always.new(6)
+    a.start { sleep(0.01) }
+    sleep(0.01)
     a.stop
+    assert_equal('0/0/0', a.to_s)
   end
 
   def test_with_counter

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: always
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Yegor Bugayenko