fleiss 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0786905f08fa028fa92f0d422db3d26acc173b57dbf403b5fe1b20dc2bfb8e73'
-  data.tar.gz: f6f13c6d6c86e456a7779bc06119b2d4e7ed61daa1bbd9438014a0e356daedd0
+  metadata.gz: e9eb58758de53588746446aedfbd877e9b84d361de7650185265b9973aeff0b3
+  data.tar.gz: d5f1ac77ce8f6dbef855c6a4e0f2eecdad56a7f8a5fc30f5851d95934eb92453
 SHA512:
-  metadata.gz: 67ae6d5b939e7c83cfa69bba4d0ecbacabbed12a0c474289a9162a82928a2aea78aaaa6d96bf66700f10e06c548ac10fbe3008b7562be1133ed09bfdc33b3713
-  data.tar.gz: 609b536863e02bc91eb093b839f64ec518090bd722eaffa163162cccff537d3cd87f5991c0a366abd403a5a3fb701d1a581830d3d820439d0d74d80e30638812
+  metadata.gz: c1b97a6658b29170a51a85df91611ff562f319d03f29626bbcf3069858e19cf7cc5aed4cfec7b0508fc90a1899cf325b84fef67e9c270842609acb62cbe0fad7
+  data.tar.gz: 28dccc2dced0062b9355f75da37989f2c008bd3b6d3be0d8cac4c8c3ea637eb41f4b94a747e10abd19ef6f85e51d45f01db62c581f1dee0b98377f6affb6cb3f

data/.rubocop.yml

@@ -1,5 +1,5 @@
 inherit_from:
-  - https://storage.googleapis.com/bsm-misc/rubocop.yml
+  - https://bitbucket.org/bsm/misc/raw/master/rubocop/default.yml
 
 Security/Open:
   Exclude:

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+rvm:
+  - 2.5
+  - 2.4
+before_install:
+  - mysql -e 'CREATE DATABASE fleiss_test;'
+  - psql -c 'CREATE DATABASE fleiss_test;' -U postgres
+services:
+  - postgresql
+  - mysql
+env:
+  - DATABASE_URL=sqlite3:///tmp/fleiss_test.sqlite3
+  - DATABASE_URL=mysql2://travis@127.0.0.1/fleiss_test
+  - DATABASE_URL=postgresql://127.0.0.1/fleiss_test

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fleiss (0.1.0)
+    fleiss (0.1.1)
       activejob (>= 5.0)
       activerecord (>= 5.0)
       concurrent-ruby
@@ -9,16 +9,16 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activejob (5.2.1)
-      activesupport (= 5.2.1)
+    activejob (5.2.2)
+      activesupport (= 5.2.2)
       globalid (>= 0.3.6)
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activerecord (5.2.1)
-      activemodel (= 5.2.1)
-      activesupport (= 5.2.1)
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
+    activerecord (5.2.2)
+      activemodel (= 5.2.2)
+      activesupport (= 5.2.2)
       arel (>= 9.0)
-    activesupport (5.2.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -33,9 +33,11 @@ GEM
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.1)
     minitest (5.11.3)
+    mysql2 (0.5.2)
     parallel (1.12.1)
     parser (2.5.3.0)
       ast (~> 2.4.0)
+    pg (1.1.3)
     powerpack (0.1.2)
     rainbow (3.0.0)
     rake (12.3.1)
@@ -52,7 +54,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.60.0)
+    rubocop (0.61.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
@@ -73,6 +75,8 @@ PLATFORMS
 DEPENDENCIES
   bundler
   fleiss!
+  mysql2
+  pg
   rake
   rspec
   rubocop

data/fleiss.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'fleiss'
-  s.version       = '0.1.0'
+  s.version       = '0.1.1'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(Minimialist background jobs backed by ActiveJob and ActiveRecord.)
@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'concurrent-ruby'
 
   s.add_development_dependency 'bundler'
+  s.add_development_dependency 'mysql2'
+  s.add_development_dependency 'pg'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rubocop'

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

@@ -68,19 +68,23 @@ module Fleiss
         # @param [String] owner
         # @return [Boolean] true if job was started.
         def start(owner, now: Time.zone.now)
-          self.class.pending(now)
-              .where(id: id)
-              .update_all(started_at: now, owner: owner) == 1
+          with_lock do
+            self.class.pending(now)
+                .where(id: id)
+                .update_all(started_at: now, owner: owner) == 1
+          end
         end
 
         # Marks a job as finished.
         # @param [String] owner
         # @return [Boolean] true if successful.
         def finish(owner, now: Time.zone.now)
-          self.class
-              .in_progress(owner)
-              .where(id: id)
-              .update_all(finished_at: now) == 1
+          with_lock do
+            self.class
+                .in_progress(owner)
+                .where(id: id)
+                .update_all(finished_at: now) == 1
+          end
         end
       end
     end

data/lib/fleiss/worker.rb

@@ -57,31 +57,24 @@ class Fleiss::Worker
   private
 
   def run_cycle
-    jobs = next_batch
-    while !@stopped && capacity.positive? && !jobs.empty?
-      job = jobs.shift
+    capacity = @pool.max_length - @pool.scheduled_task_count + @pool.completed_task_count
+    return unless capacity.positive?
+
+    batch = Fleiss.backend
+                  .in_queue(queues)
+                  .pending
+                  .limit(capacity)
+                  .to_a
+
+    batch.each do |job|
+      break if @stopped
+
       @pool.post { perform(job) }
     end
   rescue StandardError => e
     handle_exception e, 'running cycle'
   end
 
-  def capacity
-    num = @pool.max_length - @pool.scheduled_task_count + @pool.completed_task_count
-    num.positive? ? num : 0
-  end
-
-  def next_batch
-    slots = capacity
-    return [] if slots.zero?
-
-    Fleiss.backend
-          .in_queue(queues)
-          .pending
-          .limit(slots)
-          .to_a
-  end
-
   def perform(job)
     return unless job.start(uuid)
 

data/spec/fleiss/backend/active_record_spec.rb

@@ -95,6 +95,18 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
     expect(rec.started_at).to be_within(2.seconds).of(Time.zone.now)
   end
 
+  it 'should lock atomically' do
+    24.times do
+      TestJob.perform_later
+    end
+    counts = (1..4).map do |n|
+      Thread.new do
+        described_class.pending.to_a.count {|j| j.start "owner-#{n}" }
+      end
+    end.map(&:value)
+    expect(counts.sum).to eq(24)
+  end
+
   it 'should finish' do
     job = TestJob.perform_later
     rec = retrieve(job)

data/spec/spec_helper.rb

@@ -12,12 +12,11 @@ ActiveJob::Base.logger = Logger.new(nil)
 
 Time.zone_default = Time.find_zone!('UTC')
 
-ActiveRecord::Base.configurations['test'] = {
-  'adapter'  => 'sqlite3',
-  'database' => Tempfile.new(['fleiss-test', '.sqlite3']).path,
-  'pool'     => 20,
-}
+database_url = ENV['DATABASE_URL'] || "sqlite3://#{Tempfile.new(['fleiss-test', '.sqlite3']).path}"
+ActiveRecord::Base.configurations['test'] = { 'url' => database_url, 'pool' => 20 }
+
 ActiveRecord::Base.establish_connection :test
+ActiveRecord::Base.connection.drop_table('fleiss_jobs', if_exists: true)
 ActiveRecord::Migration.suppress_messages do
   Fleiss::Backend::ActiveRecord::Migration.migrate(:up)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fleiss
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2018-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  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: pg
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +161,7 @@ files:
 - ".editorconfig"
 - ".gitignore"
 - ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE