disc 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65752990e4c8bb6460341783b4646d78098752f5
-  data.tar.gz: de08052069da3cd2d1147ed2cd4afcaff2b2bd7d
+  metadata.gz: 7e27c1afc35fddfc586142db0d638d01359e2805
+  data.tar.gz: 80c10659857e47428b32b03afa824705f7a31f99
 SHA512:
-  metadata.gz: faac2698db6e1125aa696b8d3bb54a932fbc74a30947dbb6f7aa6987579145c007913f6da41851ebc0b796b82bdf1f90dd1c2948e373d4d7812030fefe19515e
-  data.tar.gz: 8db24310748e9c68a29f51b57d6fe6f887e5eaa867b6fed2aa99d88150f71583e2d91f5ab33804bf9f64cd193507efe53f3a3304f2a5b1106aaedde65d0409dd
+  metadata.gz: b9fc19d235cccc931573cd69bf9b8d103f6a3330632467d60ec77e5cb85963585ae11ddca194d2b63e17445e10108b5689edaec3fb2ff9c108af26a95d018250
+  data.tar.gz: 9ae8526e66733e2e7c8a91751474a9b1f0a01a9d96b8e6f1e2f9af57cf57db9d697330e9c9e4a5f08ff90faa500334edcbaf70c4f0ed903f49c6eeb7780dd38d

data/bin/disc

@@ -5,10 +5,24 @@ require ENV.fetch('DISC_REQUIRE')
 
 if defined?(Celluloid)
   concurrency = ENV.fetch('DISC_CONCURRENCY', '25').to_i
-  STDOUT.puts("[Notice] Disc running in celluloid-mode! Current DISC_CONCURRENCY is #{ concurrency }.")
+  STDOUT.puts(
+    "[Notice] Disc running in celluloid-mode! Current DISC_CONCURRENCY is\
+ #{ concurrency }."
+  )
 
+  class Disc::WorkerGroup < Celluloid::SupervisionGroup
+    pool Disc::Worker,
+          size: ENV.fetch('DISC_CONCURRENCY', '25').to_i,
+          as: :worker_pool,
+          args: [{ run: true }]
+  end
+
+  Disc::WorkerGroup.run
 
 else
-  STDOUT.puts("[Notice] Disc running in non-threaded mode, make sure to `require 'cellulloid'` for a significant powerup!")
+  STDOUT.puts(
+    "[Notice] Disc running in non-threaded mode, make sure to `require 'cellulloid'`\
+for a significant powerup!"
+  )
   Disc::Worker.run
 end

data/disc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'disc'
-  s.version           = '0.0.3'
+  s.version           = '0.0.4'
   s.summary           = 'A simple disque and powerful job implementation'
   s.description       = ''
   s.authors           = ['pote']

data/disc_init_example.rb

@@ -1 +1,2 @@
+require 'celluloid'
 Dir.glob('./**/*.rb') { |f| require_relative f }

data/lib/disc.rb

@@ -27,6 +27,8 @@ class Disc
   end
 
   class Worker
+    include Celluloid if defined?(Celluloid)
+
     attr_reader :disque,
                 :queues,
                 :timeout,
@@ -36,20 +38,24 @@ class Disc
       new.run
     end
 
-    def initialize(disque: nil , queues: nil, count: 1, timeout: nil)
-      @disque = disque || Disc.disque
-      @count, @timeout = count, timeout
+    def initialize(options = {})
+      @disque = options[:disque] || Disc.disque
+      @count = (options[:count] || ENV.fetch('DISQUE_COUNT', '1')).to_i
+      @timeout = (options[:timeout] || ENV.fetch('DISQUE_TIMEOUT', '2000')).to_i
+
       @queues = case
-                when queues.is_a?(Array)
-                  queues
-                when queues.is_a?(String)
-                  queues.split(',')
-                when queues.nil?
+                when options[:queues].is_a?(Array)
+                  options[:queues]
+                when options[:queues].is_a?(String)
+                  options[:queues].split(',')
+                when options[:queues].nil?
                   ENV.fetch('QUEUES', 'default').split(',')
                 else
                   raise 'Invalid Disque Queues'
                 end
 
+      self.run if options[:run]
+
       self
     end
 

metadata

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