fleiss 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94c1519f479dcb78d6e96d73cdf56b750371d64d2129e49ff20a82535c69ece1
-  data.tar.gz: 3a3d640790d631ed73b2594801ffe3769105d3ecded703e2213d6474622dc5fb
+  metadata.gz: 5f5d2237b3a3bb01c8998c273a9fbb4f65cbf75b737df03187db2315c1efa93d
+  data.tar.gz: c80f8f0423dea4b516e824ccb669ec2e34abb6c2365adbe5cea937101526c429
 SHA512:
-  metadata.gz: 06faa820062f68549d50122e79dc8848b62e29097321dd6ea891dfceaca97d3501f5559e1ca6cb2bc2164960ed9b219a3ea1703916f4e27f84fa54ca7378e11a
-  data.tar.gz: a01c87c032fd5f6e3b3d36538022ec06042a94e41c4a3e043347281d1fa1edcf0c2781f6545ede2282c1a0d82ad02967a4b1f229966fdf8196a1ce4804317b4d
+  metadata.gz: e497a57b2aec4333ce4cde801a7bcf631546158c1b4c1d2b2a663ca997066438f01bb14b5103637cbb661c168e403c4b21014dbe92ee2fb927806a377b788f21
+  data.tar.gz: 7d18e086ebe3ca8f6d8c0c025ca302abdfa487487548c38664d18904cd5c3a8d7e1997132054af334c5cbb1e8863b01fcdf176546f7d9d300e30443a2958bbe0

data/.rubocop.yml

@@ -1,5 +1,8 @@
 inherit_from:
-  - https://bitbucket.org/bsm/misc/raw/master/rubocop/default.yml
+  - https://gitlab.com/bsm/misc/raw/master/rubocop/default.yml
+
+AllCops:
+  TargetRubyVersion: "2.4"
 
 Security/Open:
   Exclude:

data/.travis.yml

@@ -1,8 +1,10 @@
 language: ruby
 rvm:
+  - 2.6
   - 2.5
   - 2.4
 before_install:
+  - gem install bundler
   - mysql -e 'CREATE DATABASE fleiss_test;'
   - psql -c 'CREATE DATABASE fleiss_test;' -U postgres
 services:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fleiss (0.2.1)
+    fleiss (0.3.0)
       activejob (>= 5.0)
       activerecord (>= 5.0)
       concurrent-ruby
@@ -9,36 +9,35 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activejob (5.2.2)
-      activesupport (= 5.2.2)
+    activejob (5.2.3)
+      activesupport (= 5.2.3)
       globalid (>= 0.3.6)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
       arel (>= 9.0)
-    activesupport (5.2.2)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
     ast (2.4.0)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
-    globalid (0.4.1)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.4.0)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.1)
+    jaro_winkler (1.5.2)
     minitest (5.11.3)
     mysql2 (0.5.2)
-    parallel (1.12.1)
-    parser (2.5.3.0)
+    parallel (1.17.0)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
-    pg (1.1.3)
-    powerpack (0.1.2)
+    pg (1.1.4)
     rainbow (3.0.0)
     rake (12.3.2)
     rspec (3.8.0)
@@ -47,27 +46,26 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.62.0)
+    rubocop (0.71.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    ruby-progressbar (1.10.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
     sqlite3 (1.3.13)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
@@ -80,7 +78,7 @@ DEPENDENCIES
   rake
   rspec
   rubocop
-  sqlite3
+  sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.17.2
+   2.0.1

data/bin/fleiss

@@ -13,12 +13,12 @@ begin
   cli.parse!
   cli.run!
 rescue ArgumentError => e
-  STDERR.puts " ! #{e.message}\n"
+  warn " ! #{e.message}\n"
   STDERR.puts
-  STDERR.puts cli.parser
+  warn cli.parser
   exit 1
 rescue StandardError => e
-  STDERR.puts e.message
-  STDERR.puts e.backtrace.join("\n")
+  warn e.message
+  warn e.backtrace.join("\n")
   exit 1
 end

data/fleiss.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'fleiss'
-  s.version       = '0.2.1'
+  s.version       = '0.3.0'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(Minimialist background jobs backed by ActiveJob and ActiveRecord.)
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^spec/}) }
   s.test_files    = `git ls-files -z -- spec/*`.split("\x0")
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 2.2'
+  s.required_ruby_version = '>= 2.4'
 
   s.add_dependency 'activejob', '>= 5.0'
   s.add_dependency 'activerecord', '>= 5.0'
@@ -24,5 +24,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rubocop'
-  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'sqlite3', '~> 1.3.6'
 end

data/lib/fleiss/backend/active_record/concern.rb

@@ -15,6 +15,10 @@ module Fleiss
         end
 
         module ClassMethods
+          def wrap_perform(&block)
+            connection_pool.with_connection(&block)
+          end
+
           # @return [ActiveRecord::Relation] pending scope
           def pending(now=Time.zone.now)
             not_finished

data/lib/fleiss/executor.rb

@@ -0,0 +1,22 @@
+require 'fleiss'
+require 'concurrent/executor/simple_executor_service'
+
+class Fleiss::Executor < Concurrent::SimpleExecutorService
+  attr_reader :max_size
+
+  def post(&block)
+    super unless capacity.zero?
+  end
+
+  def capacity
+    val = @max_size - @count.value
+    val.positive? ? val : 0
+  end
+
+  private
+
+  def ns_initialize(opts={})
+    super()
+    @max_size = opts.fetch(:max_size, 1).to_i
+  end
+end

data/lib/fleiss/worker.rb

@@ -1,6 +1,5 @@
 require 'fleiss'
-require 'concurrent/executor/fixed_thread_pool'
-require 'concurrent/atomic/atomic_fixnum'
+require 'fleiss/executor'
 require 'securerandom'
 
 class Fleiss::Worker
@@ -20,13 +19,13 @@ class Fleiss::Worker
   def initialize(queues: [Fleiss::DEFAULT_QUEUE], concurrency: 10, wait_time: 1)
     @uuid      = SecureRandom.uuid
     @queues    = Array(queues)
-    @pool      = Concurrent::FixedThreadPool.new(concurrency, fallback_policy: :discard)
+    @pool      = Fleiss::Executor.new(max_size: concurrency)
     @wait_time = wait_time
   end
 
   # Run starts the worker
   def run
-    log(:info) { "Worker #{uuid} starting - queues: #{queues.inspect}, concurrency: #{@pool.max_length}" }
+    log(:info) { "Worker #{uuid} starting - queues: #{queues.inspect}, concurrency: #{@pool.max_size}" }
     loop do
       run_cycle
       sleep @wait_time
@@ -50,19 +49,21 @@ class Fleiss::Worker
   end
 
   def run_cycle
-    return if @pool.shuttingdown?
+    return unless @pool.running?
 
-    capacity = @pool.max_length - @pool.scheduled_task_count + @pool.completed_task_count
-    return unless capacity.positive?
+    limit = @pool.capacity
+    return unless limit.positive?
 
     batch = Fleiss.backend
                   .in_queue(queues)
                   .pending
-                  .limit(capacity)
+                  .limit(limit)
                   .to_a
 
     batch.each do |job|
-      @pool.post { perform(job) }
+      @pool.post do
+        Fleiss.backend.wrap_perform { perform(job) }
+      end
     end
   rescue StandardError => e
     handle_exception e, 'running cycle'

data/spec/fleiss/executor_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'fleiss/executor'
+
+RSpec.describe Fleiss::Executor do
+  subject { described_class.new max_size: 2 }
+  after   { subject.kill }
+
+  it 'should check capacity' do
+    expect(described_class.new.capacity).to eq(1)
+
+    expect(subject.capacity).to eq(2)
+    subject.post { sleep(1) }
+    expect(subject.capacity).to eq(1)
+    subject.post { sleep(1) }
+    expect(subject.capacity).to eq(0)
+  end
+
+  it 'should discard execution when capacity is reached' do
+    n = Concurrent::AtomicFixnum.new(0)
+    10.times do
+      10.times { subject.post { n.increment } }
+      sleep(0.001)
+    end
+    subject.shutdown
+    subject.wait_for_termination(1)
+    expect(n.value).to be_within(10).of(20)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fleiss
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -140,16 +140,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 description: Run background jobs with your favourite stack.
 email:
 - info@blacksquaremedia.com
@@ -176,8 +176,10 @@ files:
 - lib/fleiss/backend/active_record/concern.rb
 - lib/fleiss/backend/active_record/migration.rb
 - lib/fleiss/cli.rb
+- lib/fleiss/executor.rb
 - lib/fleiss/worker.rb
 - spec/fleiss/backend/active_record_spec.rb
+- spec/fleiss/executor_spec.rb
 - spec/fleiss/worker_spec.rb
 - spec/fleiss_spec.rb
 - spec/spec_helper.rb
@@ -193,20 +195,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Minimialist background jobs backed by ActiveJob and ActiveRecord.
 test_files:
 - spec/fleiss/backend/active_record_spec.rb
+- spec/fleiss/executor_spec.rb
 - spec/fleiss/worker_spec.rb
 - spec/fleiss_spec.rb
 - spec/spec_helper.rb