fleiss 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f5d2237b3a3bb01c8998c273a9fbb4f65cbf75b737df03187db2315c1efa93d
-  data.tar.gz: c80f8f0423dea4b516e824ccb669ec2e34abb6c2365adbe5cea937101526c429
+  metadata.gz: 6f4d85ef0b2ad7bfb482ec68a3ee93ac2d9a6298cb32583b1bec22dd0c59f170
+  data.tar.gz: 126d02197dc2c427dcfab96e79aee80d27b3ca709a0443a07131516031cd8d2c
 SHA512:
-  metadata.gz: e497a57b2aec4333ce4cde801a7bcf631546158c1b4c1d2b2a663ca997066438f01bb14b5103637cbb661c168e403c4b21014dbe92ee2fb927806a377b788f21
-  data.tar.gz: 7d18e086ebe3ca8f6d8c0c025ca302abdfa487487548c38664d18904cd5c3a8d7e1997132054af334c5cbb1e8863b01fcdf176546f7d9d300e30443a2958bbe0
+  metadata.gz: b4104bc953340edc36e2ef2c54ca55428cbc4334c1ff1b833b5dbe242c649bd55eef6b4fca58eb626a6cba3da5e8e9d71d8035e46fb0f3035afad8176b5cbb3f
+  data.tar.gz: 8ccafa26982aa0b09f8bd1b5a3e664d6c66610e4cffa36cf3bfa0b0327b2d315529a5d7231d1a683a50b2a20b9a44d74b2b0f504c4d0d0af3d904a09589cf980

data/.gitignore

@@ -1,2 +1,3 @@
 .rubocop-*
 pkg/
+spec/tmp

data/.rubocop.yml

@@ -2,7 +2,7 @@ inherit_from:
   - https://gitlab.com/bsm/misc/raw/master/rubocop/default.yml
 
 AllCops:
-  TargetRubyVersion: "2.4"
+  TargetRubyVersion: "2.5"
 
 Security/Open:
   Exclude:

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 rvm:
   - 2.6
   - 2.5
-  - 2.4
 before_install:
   - gem install bundler
   - mysql -e 'CREATE DATABASE fleiss_test;'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fleiss (0.3.0)
+    fleiss (0.3.1)
       activejob (>= 5.0)
       activerecord (>= 5.0)
       concurrent-ruby
@@ -9,63 +9,65 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+    activejob (6.0.2.1)
+      activesupport (= 6.0.2.1)
       globalid (>= 0.3.6)
-    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.3)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
+      zeitwerk (~> 2.2)
     ast (2.4.0)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.6.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.2)
-    minitest (5.11.3)
-    mysql2 (0.5.2)
-    parallel (1.17.0)
-    parser (2.6.3.0)
+    jaro_winkler (1.5.4)
+    minitest (5.14.0)
+    mysql2 (0.5.3)
+    parallel (1.19.1)
+    parser (2.7.0.3)
       ast (~> 2.4.0)
-    pg (1.1.4)
+    pg (1.2.2)
     rainbow (3.0.0)
-    rake (12.3.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rake (13.0.1)
+    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.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.71.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    sqlite3 (1.3.13)
+    sqlite3 (1.4.2)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
@@ -78,7 +80,7 @@ DEPENDENCIES
   rake
   rspec
   rubocop
-  sqlite3 (~> 1.3.6)
+  sqlite3
 
 BUNDLED WITH
-   2.0.1
+   2.1.4

data/fleiss.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'fleiss'
-  s.version       = '0.3.0'
+  s.version       = '0.3.1'
   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.4'
+  s.required_ruby_version = '>= 2.5'
 
   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', '~> 1.3.6'
+  s.add_development_dependency 'sqlite3'
 end

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

@@ -8,10 +8,10 @@ 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,  ->(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)) }
+          scope :scheduled,    ->(now = Time.zone.now) { where(arel_table[:scheduled_at].gt(now)) }
         end
 
         module ClassMethods
@@ -20,7 +20,7 @@ module Fleiss
           end
 
           # @return [ActiveRecord::Relation] pending scope
-          def pending(now=Time.zone.now)
+          def pending(now = Time.zone.now)
             not_finished
               .not_expired(now)
               .not_started

data/lib/fleiss/cli.rb

@@ -22,7 +22,7 @@ module Fleiss
       @opts = DEFAULT_OPTIONS.dup
     end
 
-    def parse!(argv=ARGV)
+    def parse!(argv = ARGV)
       parser.parse!(argv)
 
       # Check config file

data/lib/fleiss/executor.rb

@@ -15,7 +15,7 @@ class Fleiss::Executor < Concurrent::SimpleExecutorService
 
   private
 
-  def ns_initialize(opts={})
+  def ns_initialize(opts = {})
     super()
     @max_size = opts.fetch(:max_size, 1).to_i
   end

data/spec/spec_helper.rb

@@ -5,15 +5,19 @@ require 'fleiss'
 require 'fleiss/backend/active_record/migration'
 require 'active_job'
 require 'active_job/queue_adapters/fleiss_adapter'
-require 'tempfile'
+require 'fileutils'
 
 ActiveJob::Base.queue_adapter = :fleiss
 ActiveJob::Base.logger = Logger.new(nil)
 
 Time.zone_default = Time.find_zone!('UTC')
 
-database_url = ENV['DATABASE_URL'] || "sqlite3://#{Tempfile.new(['fleiss-test', '.sqlite3']).path}"
-ActiveRecord::Base.configurations['test'] = { 'url' => database_url, 'pool' => 20 }
+tmpdir = File.expand_path('./tmp', __dir__)
+FileUtils.rm_rf tmpdir
+FileUtils.mkdir_p tmpdir
+
+database_url = ENV['DATABASE_URL'] || "sqlite3://#{tmpdir}/fleiss-test.sqlite3"
+ActiveRecord::Base.configurations = { 'test' => { 'url' => database_url, 'pool' => 20 } }
 
 ActiveRecord::Base.establish_connection :test
 ActiveRecord::Base.connection.drop_table('fleiss_jobs', if_exists: true)
@@ -32,7 +36,7 @@ class TestJob < ActiveJob::Base
     72.hours
   end
 
-  def perform(msg=nil)
+  def perform(msg = nil)
     raise 'Failing' if msg == 'raise'
 
     self.class.performed.push(msg)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fleiss
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2020-03-02 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: 1.3.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 description: Run background jobs with your favourite stack.
 email:
 - info@blacksquaremedia.com
@@ -195,14 +195,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Minimialist background jobs backed by ActiveJob and ActiveRecord.