oni 4.1.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4b4738a5669401fa905d283e4edd281aa7887747
-  data.tar.gz: 0b961cee5c6dfb02026cf774ed36a1e787923a59
+SHA256:
+  metadata.gz: 84e61e1f126f7c501b4182d2322fec884ed1919a1e390c07f260e9a6ff06f3ed
+  data.tar.gz: a0f2c4f830f421199d548b328455b7db84888a508b1135d1738f4733b6f3d479
 SHA512:
-  metadata.gz: fd755fdced951be0b3f71fee761f720de550533939d83e5c02e39b7b29c01f8b49ad1d340c3c13a5369c36b74780c63f1578726713a38a5f9f675c3177d4a540
-  data.tar.gz: 5e6330b01276fbf0efe9dda7f97e54dd7fe6819250e2caa889ff7a8c735b0944c2af0a1d9a00a2e74c2c66f49bc9674e5675c85472cb02ccc13847ca179725a7
+  metadata.gz: 5301a19390c41d67d0ae4517f4cdf37450d86f9ac2b756339de309cb1a4c1aa0be9584609c1a40d58c997c9dab0445b218e9889565914460f9e2a3c798b4e91f
+  data.tar.gz: 8cd91c4be8cb85e570bd0108b0b70bd0a8571e32d5ee0220de132380f368832f9df4578a199b48e8bcd91373ed7ced89fdba700f60bc1f5a922b8a855816a744

data/lib/oni/configurable.rb

@@ -38,12 +38,9 @@ module Oni
     #
     def option(name, default = nil)
       value = self.class.options[name.to_sym]
+      value = default if default and !value
 
-      if default and !value
-        value = default
-      end
-
-      return value.respond_to?(:call) ? value.call : value
+      if value.respond_to? :call then value.call else value end
     end
 
     ##
@@ -102,6 +99,7 @@ module Oni
           set(option, value)
         end
       end
-    end # ClassMethods
-  end # Configurable
-end # Oni
+
+    end
+  end
+end

data/lib/oni/daemon.rb

@@ -13,7 +13,14 @@ module Oni
   class Daemon
     include Configurable
 
-    attr_reader :workers
+    attr_reader :daemon_workers
+
+    ##
+    # The default amount of worker to start.
+    #
+    # @return [Fixnum]
+    #
+    DEFAULT_WORKER_AMOUNT = 1
 
     ##
     # The default amount of threads to start.
@@ -34,7 +41,7 @@ module Oni
     # is defined.
     #
     def initialize
-      @workers = []
+      @daemon_workers = {}
 
       after_initialize if respond_to?(:after_initialize)
     end
@@ -49,17 +56,14 @@ module Oni
     def start
       before_start if respond_to?(:before_start)
 
-      if threads > 0
-        threads.times do
-          workers << spawn_thread
-        end
+      return run_thread   if threads <= 1
+      return spawn_worker if workers <= 1
 
-        workers.each(&:join)
-
-      # If we don't have any threads run in non threaded mode.
-      else
-        run_thread
-      end
+      Array.new workers do |i|
+        Thread.new do
+          Process.wait fork{ spawn_worker i+1 } while true
+        end
+      end.each(&:join)
     rescue => error
       error(error)
     end
@@ -70,8 +74,14 @@ module Oni
     # be shut down *immediately*.
     #
     def stop
-      workers.each(&:kill)
-      workers.clear
+      daemon_workers.each do |pid, worker_threads|
+        worker_threads.each(&:kill)
+        worker_threads.clear
+      end
+    end
+
+    def workers
+      option :workers, DEFAULT_WORKER_AMOUNT
     end
 
     ##
@@ -80,7 +90,7 @@ module Oni
     # @return [Fixnum]
     #
     def threads
-      return option(:threads, DEFAULT_THREAD_AMOUNT)
+      option :threads, DEFAULT_THREAD_AMOUNT
     end
 
     ##
@@ -168,6 +178,19 @@ module Oni
       return option(:mapper).new
     end
 
+    ##
+    # Spawns a new thread that waits for daemon input.
+    #
+    # @return [Thread]
+    #
+    def spawn_worker i = nil
+      Process.setproctitle "#{$0}: worker #{i}" if i
+
+      daemon_workers[Process.pid] = Array.new threads do
+        spawn_thread
+      end.each(&:join)
+    end
+
     ##
     # Spawns a new thread that waits for daemon input.
     #
@@ -198,5 +221,6 @@ module Oni
 
       retry
     end
-  end # Daemon
-end # Oni
+
+  end
+end

data/lib/oni/daemons/sqs.rb

@@ -20,6 +20,7 @@ module Oni
     #   information on the available options.
     #
     class SQS < Daemon
+
       ##
       # Checks if the `queue_name` option is set.
       #
@@ -31,8 +32,14 @@ module Oni
       # Polls an SQS queue for a message and processes it.
       #
       def receive
-        queue.poll(poll_options) do |message|
-          yield message
+        poll_options.merge! max_number_of_messages: 10
+
+        queue.poll poll_options do |messages|
+          next yield messages unless messages.is_a? Array
+
+          messages.each do |message|
+            yield message
+          end
         end
       end
 
@@ -64,6 +71,7 @@ module Oni
 
         return response.queue_url
       end
-    end # SQS
-  end # Daemons
-end # Oni
+
+    end
+  end
+end

data/lib/oni/version.rb

@@ -1,3 +1,3 @@
 module Oni
-  VERSION = '4.1.0'
+  VERSION = '4.2.1'
 end # Oni

data/oni.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |gem|
 
   gem.summary     = 'Framework for building concurrent daemons in Ruby.'
   gem.description = gem.summary
-  gem.has_rdoc    = 'yard'
   gem.license     = 'MIT'
 
   gem.required_ruby_version = '>= 1.9.3'
@@ -30,5 +29,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'kramdown'
+  gem.add_development_dependency 'pry'
   gem.add_development_dependency 'aws-sdk', '~> 2.0'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: oni
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Yorick Peterse
 - Wilco van Duinkerken
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-26 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -95,6 +95,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 description: Framework for building concurrent daemons in Ruby.
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -129,11 +143,11 @@ files:
 - lib/oni/worker.rb
 - lib/oni/wrapped_error.rb
 - oni.gemspec
-homepage: 
+homepage:
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,9 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Framework for building concurrent daemons in Ruby.
 test_files: []