sqewer 6.0.4 → 6.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c01fe984f9f8a0f14ac243acbeb97518a6f8565
-  data.tar.gz: 1680b7c37647421ae21f65e1b6216abb6268908f
+  metadata.gz: 767a22e397deea673d08fa54d539b187a0063c79
+  data.tar.gz: ac6fb77bc19292447dde3c6e0a609dd31faa78fd
 SHA512:
-  metadata.gz: c72f623b84f949fbf2f07c730db64190264c97725dc7b92a589b3c4f49df5be0735f0a9bc2ff7102a26ad4d265bc89d76a8a9458fe5ce6c304d288c7c10819d2
-  data.tar.gz: f70f886f23800c51bdcdaf3e8a169038082bfad097c2dc2b1f5e79bde4e483bdd4c2034e65f0dd9de90229a35f3b56fa24232f39a51dd66030fc360eed965064
+  metadata.gz: '027792d46b88babaa41e0429387b68754f0341e24b5846c15c8c3edab024ec4874e905bc55ecf438ed63f84fb1ddba75f047186e4299d5308853a008c3f8d941'
+  data.tar.gz: 6095e328ffc6c58cb3c0c480ca4c2cb3388ae1f94b1100f4533348001815c1e0635e8f8fd2bf01b760924326f33d6efbe92704766043101798854edbadbeeb16

data/.travis.yml

@@ -1,9 +1,21 @@
+gemfile:
+  - gemfiles/Gemfile.rails-4.2.x
+  - gemfiles/Gemfile.rails-5.0.x
+  - gemfiles/Gemfile.rails-5.1.x
 rvm:
-- 2.2.2
-- 2.3.3
-- 2.4.1
-sudo: false
+  - 2.3.7
+  - 2.4.5
+  - 2.5.1
 cache: bundler
+sudo: false
 env:
   global:
   - AWS_REGION=eu-central-1
+matrix:
+  exclude:
+  - rvm: 2.3.7
+    gemfile: gemfiles/Gemfile.rails-5.0.x
+  - rvm: 2.3.7
+    gemfile: gemfiles/Gemfile.rails-5.1.x
+  - rvm: 2.5.1
+    gemfile: gemfiles/Gemfile.rails-4.2.x

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 6.0.5
+- Limit ActiveJob compatibility to 4.2 and later, and add Travis test
+  setup for multiple Ruby versions and Rails versions up to and including 5.1
+
 ### 6.0.4
 - If running on an AWS EC2 instance and retrieving AWS credentials from the instance metadata, Sqewer will now retry up to five times if the instance metadata are not available. This fixes intermittent `Aws::Errors::MissingCredentialsError` exceptions.
 

data/gemfiles/Gemfile.rails-4.2.x

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+# Gemspec as base dependency set
+gemspec path: __dir__ + '/..'
+
+gem 'sqlite3', '~> 1.3.6'
+gem 'activejob', "~> 4.2"
+gem 'activerecord', "~> 4.2"

data/gemfiles/Gemfile.rails-5.0.x

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+# Gemspec as base dependency set
+gemspec path: __dir__ + '/..'
+
+gem 'sqlite3', '~> 1.3.6'
+gem 'activejob', "~> 5", "< 5.1"
+gem 'activerecord', "~> 5", "< 5.1"

data/gemfiles/Gemfile.rails-5.1.x

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+# Gemspec as base dependency set
+gemspec path: __dir__ + '/..'
+
+gem 'sqlite3', '~> 1.3.6'
+gem 'activejob', "~> 5.1", "< 5.2"
+gem 'activerecord', "~> 5.1", "< 5.2"

data/lib/sqewer/extensions/active_job_adapter.rb

@@ -8,12 +8,14 @@ module ActiveJob
       prepend PerformWithKeywords
     end
   end
+
   module QueueAdapters
     # Handle Rails ActiveJob through sqewer.
     # Set it up like so:
     #
     #    Rails.application.config.active_job.queue_adapter = :sqewer
     class SqewerAdapter
+
       # Works as a Job for sqewer, and wraps an ActiveJob Worker which responds to perform()
       class Performable
 
@@ -67,20 +69,18 @@ module ActiveJob
         
       end
 
-      class << self
-        def enqueue(active_job) #:nodoc:
-          wrapped_job = Performable.from_active_job(active_job)
+      def enqueue(active_job) #:nodoc:
+        wrapped_job = Performable.from_active_job(active_job)
 
-          Sqewer.submit!(wrapped_job)
-        end
+        Sqewer.submit!(wrapped_job)
+      end
 
-        def enqueue_at(active_job, timestamp) #:nodoc:
-          wrapped_job = Performable.from_active_job(active_job)
+      def enqueue_at(active_job, timestamp) #:nodoc:
+        wrapped_job = Performable.from_active_job(active_job)
 
-          delta_t = (timestamp - Time.now.to_i).to_i
+        delta_t = (timestamp - Time.now.to_i).to_i
 
-          Sqewer.submit!(wrapped_job, delay_seconds: delta_t)
-        end
+        Sqewer.submit!(wrapped_job, delay_seconds: delta_t)
       end
     end
   end

data/lib/sqewer/version.rb

@@ -1,3 +1,3 @@
 module Sqewer
-  VERSION = '6.0.4'
+  VERSION = '6.0.5'
 end

data/sqewer.gemspec

@@ -29,18 +29,22 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "aws-sdk-sqs", "1.3.0"
+  spec.add_runtime_dependency "aws-sdk-sqs", "~> 1"
   spec.add_runtime_dependency "rack"
   spec.add_runtime_dependency "very_tiny_state_machine"
   spec.add_runtime_dependency "ks"
   spec.add_runtime_dependency "retriable"
   
-  spec.add_development_dependency "bundler", "~> 1"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "activejob", "~> 4.2.6"
+  
+  # The Rails deps can be relaxed, they are specified more exactly in the gemfiles/
+  # for testing against a specific Rails version
+  spec.add_development_dependency "activerecord", ">= 4.2"
+  spec.add_development_dependency "activejob", ">= 4.2"
+
   spec.add_development_dependency "rspec-wait"
-  spec.add_development_dependency "activerecord", "~> 4.2"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "dotenv"
   spec.add_development_dependency "simplecov"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sqewer
 version: !ruby/object:Gem::Version
-  version: 6.0.4
+  version: 6.0.5
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-19 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -123,47 +123,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: activejob
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: rspec-wait
+  name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rspec-wait
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +226,9 @@ files:
 - bin/sqewer
 - bin/sqewer_rails
 - example.env
+- gemfiles/Gemfile.rails-4.2.x
+- gemfiles/Gemfile.rails-5.0.x
+- gemfiles/Gemfile.rails-5.1.x
 - lib/sqewer.rb
 - lib/sqewer/atomic_counter.rb
 - lib/sqewer/cli.rb
@@ -267,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Process jobs from SQS