fleiss 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d7f27ee73ed5c0434f79ec98f0c249f4f41ece528807cabc3efd29f8ebf79c0
-  data.tar.gz: e597168cfb8931240110ad45b4ee49937128bdb4dce826d142954253ce29dc9d
+  metadata.gz: 3433257ea2a501706212f8876c0c9636a00028a6c9616daf86d66aa36d0dbd9a
+  data.tar.gz: d792288414d281a0667fd8100475eb45ec610c3330fce5e0d8434aa3d3ac50fe
 SHA512:
-  metadata.gz: 737815c833f1ff98e4c18c54709b7671ecd26cabb8500e5f93375a4ac528b4a8344381fe906db2e27726e2217de036a406aa83263514e2475798e5a15831f037
-  data.tar.gz: dae7da18743673e38465150031a48734e7911d7894c0131a8d9469d472650f30ea53a73d6217bcc6c4f237c93fa8dfd147ad9df4ac3542e1f015e75dbbda4c4c
+  metadata.gz: 0fbf7922526ece6336986a26e69bfcf84263d3183ab39bb296f82ae1b08994af912d52f7d06ab16dee5f31c1100643814e220aa2052b6ca408b459ad8efb4a8d
+  data.tar.gz: a23fe3139ea3f1f891847343333e476de1edc1bf35b24279122b734f2867a15b66d5da9cfa77c37820e511a97c40a240bc4e3c7ae77c721020591119f8c3652f

data/.rubocop.yml

@@ -1,5 +1,9 @@
-inherit_from:
-  - https://gitlab.com/bsm/misc/raw/master/rubocop/default.yml
+inherit_gem:
+  rubocop-bsm:
+    - default.yml
+inherit_mode:
+  merge:
+    - Exclude
 
 AllCops:
   TargetRubyVersion: "2.6"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fleiss (0.4.0)
+    fleiss (0.4.1)
       activejob (>= 6.0)
       activerecord (>= 6.0)
       concurrent-ruby
@@ -9,66 +9,86 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activejob (6.0.3.1)
-      activesupport (= 6.0.3.1)
+    activejob (6.1.1)
+      activesupport (= 6.1.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activerecord (6.0.3.1)
-      activemodel (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activesupport (6.0.3.1)
+    activemodel (6.1.1)
+      activesupport (= 6.1.1)
+    activerecord (6.1.1)
+      activemodel (= 6.1.1)
+      activesupport (= 6.1.1)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    ast (2.4.0)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.1)
+    concurrent-ruby (1.1.8)
+    diff-lcs (1.4.4)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.8.2)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.1)
+    minitest (5.14.3)
     mysql2 (0.5.3)
-    parallel (1.19.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
     pg (1.2.3)
+    rack (2.2.3)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.3)
+    regexp_parser (2.0.3)
     rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.84.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
+    rubocop (1.8.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.0.3)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
-      parser (>= 2.7.0.1)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.0)
+      parser (>= 2.7.1.5)
+    rubocop-bsm (0.5.4)
+      rubocop (~> 1.0)
+      rubocop-performance
+      rubocop-rails
+      rubocop-rake
+      rubocop-rspec
+    rubocop-performance (1.9.2)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.9.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.90.0, < 2.0)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.1.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
     sqlite3 (1.4.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.3.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -80,7 +100,7 @@ DEPENDENCIES
   pg
   rake
   rspec
-  rubocop
+  rubocop-bsm
   sqlite3
 
 BUNDLED WITH

data/bin/fleiss

@@ -5,8 +5,8 @@ $LOAD_PATH.push(lib_dir) unless $LOAD_PATH.include?(lib_dir)
 
 require 'fleiss/cli'
 
-STDOUT.sync = true
-STDERR.sync = true
+$stdout.sync = true
+$stderr.sync = true
 
 cli = Fleiss::CLI.instance
 begin
@@ -14,7 +14,7 @@ begin
   cli.run!
 rescue ArgumentError => e
   warn " ! #{e.message}\n"
-  STDERR.puts
+  $stderr.puts
   warn cli.parser
   exit 1
 rescue StandardError => e

data/fleiss.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'fleiss'
-  s.version       = '0.4.0'
+  s.version       = '0.4.1'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(Minimialist background jobs backed by ActiveJob and ActiveRecord.)
@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pg'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rubocop-bsm'
   s.add_development_dependency 'sqlite3'
 end

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

@@ -8,7 +8,9 @@ module Fleiss
           scope :in_queue, ->(qs) { where(queue_name: Array.wrap(qs)) }
           scope :finished, -> { where.not(finished_at: nil) }
           scope :not_finished, -> { where(finished_at: nil) }
-          scope :not_expired,  ->(now = Time.zone.now) { where(arel_table[:expires_at].eq(nil).or(arel_table[:expires_at].gt(now))) }
+          scope :not_expired,  lambda {|now = Time.zone.now|
+                                 where(arel_table[:expires_at].eq(nil).or(arel_table[:expires_at].gt(now)))
+                               }
           scope :started,      -> { where(arel_table[:started_at].not_eq(nil)) }
           scope :not_started,  -> { where(arel_table[:started_at].eq(nil)) }
           scope :scheduled,    ->(now = Time.zone.now) { where(arel_table[:scheduled_at].gt(now)) }
@@ -102,9 +104,12 @@ module Fleiss
         private
 
         def with_isolation(&block)
-          return yield unless self.class.connection.supports_transaction_isolation?
-
-          self.class.transaction(isolation: :repeatable_read, &block)
+          conn = self.class.connection
+          if conn.supports_transaction_isolation? && conn.adapter_name != 'SQLite'
+            self.class.transaction(isolation: :repeatable_read, &block)
+          else
+            yield
+          end
         end
       end
     end

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

@@ -3,7 +3,7 @@ require 'fleiss/backend/active_record'
 module Fleiss
   module Backend
     class ActiveRecord
-      class Migration < ::ActiveRecord::Migration[5.0]
+      class Migration < ::ActiveRecord::Migration[6.0]
         def change
           create_table :fleiss_jobs do |t|
             t.string :queue_name, limit: 50, null: false

data/spec/fleiss/backend/active_record_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
     described_class.find(job.provider_job_id)
   end
 
-  it 'should persist jobs' do
+  it 'persists jobs' do
     job = TestJob.perform_later
     rec = retrieve(job)
 
@@ -28,25 +28,25 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
     )
   end
 
-  it 'should enqueue with delay' do
+  it 'enqueues with delay' do
     job = TestJob.set(wait: 1.day).perform_later
     rec = retrieve(job)
     expect(rec.scheduled_at).to be_within(2.seconds).of(1.day.from_now)
   end
 
-  it 'should enqueue with priority' do
+  it 'enqueues with priority' do
     job = TestJob.set(priority: 8).perform_later
     rec = retrieve(job)
     expect(rec.priority).to eq(8)
   end
 
-  it 'should expose active job ID' do
+  it 'exposes active job ID' do
     job = TestJob.perform_later
     rec = retrieve(job)
     expect(rec.job_id.size).to eq(36)
   end
 
-  it 'should scope pending' do
+  it 'scopes pending' do
     j1 = TestJob.perform_later
     expect(retrieve(j1).start('owner')).to be_truthy
     expect(retrieve(j1).finish('owner')).to be_truthy
@@ -58,7 +58,7 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
     expect(described_class.pending.ids).to eq [j4.provider_job_id, j2.provider_job_id]
   end
 
-  it 'should scope in_progress' do
+  it 'scopes in_progress' do
     _j1 = TestJob.perform_later
     j2 = TestJob.perform_later
     expect(retrieve(j2).start('owner')).to be_truthy
@@ -72,14 +72,14 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
     expect(described_class.in_progress('owner').ids).to eq [j2.provider_job_id]
   end
 
-  it 'should scope by queue' do
+  it 'scopes by queue' do
     j1 = TestJob.perform_later
     j2 = TestJob.set(queue: 'other').perform_later
     expect(described_class.in_queue('test-queue').ids).to eq [j1.provider_job_id]
     expect(described_class.in_queue('other').ids).to eq [j2.provider_job_id]
   end
 
-  it 'should start' do
+  it 'starts' do
     job = TestJob.perform_later
     rec = retrieve(job)
     expect(rec.start('owner')).to be_truthy
@@ -88,7 +88,7 @@ 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
+  it 'locks atomically' do
     24.times do
       TestJob.perform_later
     end
@@ -100,7 +100,7 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
     expect(counts.sum).to eq(24)
   end
 
-  it 'should finish' do
+  it 'finishes' do
     job = TestJob.perform_later
     rec = retrieve(job)
     expect(rec.finish('owner')).to be_falsey
@@ -112,7 +112,7 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
     expect(rec.finished_at).to be_within(2.seconds).of(Time.zone.now)
   end
 
-  it 'should reschedule' do
+  it 'reschedules' do
     job = TestJob.perform_later
     rec = retrieve(job)
     expect(rec.reschedule('owner')).to be_falsey

data/spec/fleiss/executor_spec.rb

@@ -3,9 +3,10 @@ require 'fleiss/executor'
 
 RSpec.describe Fleiss::Executor do
   subject { described_class.new max_size: 2 }
+
   after   { subject.kill }
 
-  it 'should check capacity' do
+  it 'checks capacity' do
     expect(described_class.new.capacity).to eq(1)
 
     expect(subject.capacity).to eq(2)
@@ -15,7 +16,7 @@ RSpec.describe Fleiss::Executor do
     expect(subject.capacity).to eq(0)
   end
 
-  it 'should discard execution when capacity is reached' do
+  it 'discards execution when capacity is reached' do
     n = Concurrent::AtomicFixnum.new(0)
     10.times do
       10.times { subject.post { n.increment } }

data/spec/fleiss/worker_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe Fleiss::Worker do
     expect(yield).to be_truthy
   end
 
-  it 'should run' do
+  it 'runs' do
     # seed 24 jobs
     24.times {|n| TestJob.perform_later(n) }
     wait_for { Fleiss.backend.not_finished.count.positive? }
@@ -39,7 +39,7 @@ RSpec.describe Fleiss::Worker do
     expect(TestJob.performed).to match_array(0..23)
   end
 
-  it 'should handle failing jobs' do
+  it 'handles failing jobs' do
     TestJob.perform_later('raise')
     wait_for { Fleiss.backend.not_finished.count.zero? }
     expect(Fleiss.backend.finished.count).to eq(1)

data/spec/fleiss_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 RSpec.describe Fleiss do
-  it 'should have a backend' do
+  it 'has a backend' do
     expect(described_class.backend).to eq(Fleiss::Backend::ActiveRecord)
   end
 
-  it 'should enqueue' do
+  it 'enqueues' do
     expect do
       TestJob.set(wait: 1.week).perform_later
     end.to change { described_class.backend.count }.by(1)

data/spec/spec_helper.rb

@@ -44,7 +44,7 @@ class TestJob < ActiveJob::Base
 end
 
 RSpec.configure do |c|
-  c.after :each do
+  c.after do
     TestJob.performed.clear
     Fleiss.backend.delete_all
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fleiss
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-bsm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Minimialist background jobs backed by ActiveJob and ActiveRecord.