sidecloq 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc79f44db3f6f94b4de477d87b170b6a8f0af0bf
-  data.tar.gz: c2cdd0e3641298003d3ae8f3b8072876b86f8316
+  metadata.gz: b27e2e4e4be57df8dd1786682b5b60581c56ad16
+  data.tar.gz: 9dff323de41c33ac48524b1ac8ab280790ec8b10
 SHA512:
-  metadata.gz: cd2cf8af352b2c6c3a77dff7e00ca9d2124cd0145a242390d4c874bc7cefdd638a8cca97531a0a86042e4513aa4b9b19ec3d6225298e586ceac9f32845889f08
-  data.tar.gz: efacb0bce951f43c692e03b07536321baea03d448ed5d463a65f83aaa10b1697ba1acbfd04fd296d9c5c5017d4264ffb66991f05ddaa53af8da6f7cee9d3155d
+  metadata.gz: 9f23da51d63a47876d1030350f76d8d34b6486234bdcf53f8b9c7753b9b046cf23d46a1bb9aa632406a0ab3d7faae3a531083578f89802564b39b299ffe53619
+  data.tar.gz: c5db5145e7b68be1e43380874584465919e85f05597c550faf404349ea2f354753515b0533dc8d22fc013dc7778f8d4c7040746d9b444a9142cdea55813eb29b

data/.travis.yml

@@ -5,23 +5,26 @@ services:
   - redis-server
 rvm:
   - 2.0.0
-  - 2.1.8
+  - 2.1.10
   - 2.2.4
   - 2.3.0
   - ruby-head
   - jruby-9.0.4.0
   - jruby-head
-  - rbx-2.6
-  - rbx-2.7
+  - rbx-2.10
+  - rbx-2.11
+  - rbx-3.69
 env:
   - "sidekiq=master"
   - "sidekiq=stable"
-  - "sidekiq=3.5.3"
+  - "sidekiq=3.5.4"
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+    - rvm: rbx-2.10
+    - rvm: rbx-2.11
+    - rvm: rbx-3.69
     - env: "sidekiq=master"
-addons:
-  code_climate:
-    repo_token: dee2fdcb3562533038a22e862c0fc91a6f1fa38730cd2b77177655e5b9507c83
+after_success:
+  - bundle exec codeclimate-test-reporter

data/Gemfile

@@ -17,4 +17,12 @@ sidekiq_dep =
 
 gem 'sidekiq', sidekiq_dep
 
-gem 'codeclimate-test-reporter', group: :test, require: false
+# rack >= 2.0 requires ruby >= 2.2.2
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2.2")
+  gem 'rack', '< 2.0'
+end
+
+group :test do
+  gem "simplecov"
+  gem "codeclimate-test-reporter", "~> 1.0.0"
+end

data/README.md

@@ -30,7 +30,7 @@ Sidecloq is:
   Sidekiq 4, which no longer uses Celluloid.
 - **Clean:** Sidecloq leverages only the public API of Sidekiq, and does
   not pollute the Sidekiq namespace.
-- **Easy to deploy:** Sidecloq boots with all Sideqik processes,
+- **Easy to deploy:** Sidecloq boots with all Sidekiq processes,
   automatically.  Leader election ensures only one process enqueues
   jobs, and a new leader is automatically chosen should the current
   leader die.
@@ -55,7 +55,7 @@ Sidekiq, you can run Sidecloq.
 Tell Sidecloq where your schedule file is located:
 
 ```ruby
-Sidcloq.configure do |config|
+Sidecloq.configure do |config|
   config[:schedule_file] = "path/to/myschedule.yml"
 end
 ```
@@ -119,6 +119,17 @@ it's corresponding "Enqueue now" button.
 
 ![Sidecloq web ui extension screenshot](assets/screenshot.png)
 
+## Notes
+
+If you are running MRI < 2.2.2, you will need to make sure you are using
+rack < 2.0.  You can do this by adding:
+
+```ruby
+gem 'rack', '< 2.0'
+```
+
+To your app's Gemfile.
+
 ## Contributing
 
 Bug reports and pull requests are welcome.

data/lib/sidecloq/schedule.rb

@@ -23,7 +23,7 @@ module Sidecloq
 
         redis { |r| r.hgetall(REDIS_KEY) }.tap do |h|
           h.each do |name, config|
-            specs[name] = MultiJson.decode(config)
+            specs[name] = JSON.parse(config)
           end
         end
       end
@@ -68,7 +68,7 @@ module Sidecloq
     def save_all_to_redis
       redis do |r|
         @job_specs.each do |name, spec|
-          r.hset(REDIS_KEY, name, MultiJson.encode(spec))
+          r.hset(REDIS_KEY, name, spec.to_json)
         end
       end
     end

data/lib/sidecloq/scheduler.rb

@@ -1,5 +1,5 @@
 module Sidecloq
-  # Scheduler enqeues jobs according to the given schedule
+  # Scheduler enqueues jobs according to the given schedule
   class Scheduler
     include Utils
 
@@ -61,9 +61,9 @@ module Sidecloq
     end
 
     def safe_enqueue_job(name, spec)
-      logger.info "enqueueing #{name}"
+      logger.info "enqueuing #{name}"
 
-      # failed enqeueuing should not b0rk stuff
+      # failed enqueuing should not b0rk stuff
       begin
         enqueue_job!(spec)
       rescue => e

data/lib/sidecloq/version.rb

@@ -1,3 +1,3 @@
 module Sidecloq
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/sidecloq/web.rb

@@ -11,8 +11,10 @@ module Sidecloq
       end
 
       app.post '/recurring/:name/enqueue' do |name|
+        job_name = respond_to?(:route_params) ? route_params[:name] : name
+
         # rubocop:disable Lint/AssignmentInCondition
-        if spec = Sidecloq::Schedule.from_redis.job_specs[name]
+        if spec = Sidecloq::Schedule.from_redis.job_specs[job_name]
           Sidekiq::Client.push(spec)
         end
         # rubocop:enableLint/AssignmentInCondition

data/lib/sidecloq.rb

@@ -1,7 +1,7 @@
 require 'sidekiq'
 require 'concurrent'
+require 'json'
 require 'redlock'
-require 'multi_json'
 require 'rufus-scheduler'
 
 require 'sidecloq/utils'

data/{sidetoq.gemspec → sidecloq.gemspec}

@@ -23,11 +23,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'redlock', '~> 0.1.2'
   # mimics some dev dependencies of sidekiq:
   spec.add_dependency 'concurrent-ruby'
-  spec.add_dependency 'sinatra', '~> 1.4', '>= 1.4.6'
-  spec.add_dependency 'redis-namespace', '~> 1.5', '>= 1.5.2'
-  spec.add_dependency 'multi_json', '~> 1.11'
   spec.add_dependency 'rufus-scheduler', '~> 3.1', '>= 3.1.10'
 
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'redis-namespace', '~> 1.5', '>= 1.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidecloq
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Matt Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-27 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -58,60 +58,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.6
-- !ruby/object:Gem::Dependency
-  name: redis-namespace
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +106,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.2
 description: Recurring jobs for Sidekiq
 email:
 - robinson.matty@gmail.com
@@ -181,7 +147,7 @@ files:
 - lib/sidecloq/utils.rb
 - lib/sidecloq/version.rb
 - lib/sidecloq/web.rb
-- sidetoq.gemspec
+- sidecloq.gemspec
 - web/views/recurring.erb
 homepage: http://github.com/mattyr/sidecloq
 licenses: