workless_revived 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1b7ad8709a855ee550f89d8e625b09adcc4537d
-  data.tar.gz: e8717366d5e0f4219c492f8ce331bed955e4af0d
+  metadata.gz: bc48e65a2dfdc03c5d0d766f95b4e523afcf57f5
+  data.tar.gz: 95bd2aa297cb10a8c2b1bcb5b6cf5c2500303d6f
 SHA512:
-  metadata.gz: 6b0a92c8fe566645285dbd89abae5abb15d1ff813f730e6deecaaf93f9b5072361884ad45359f10b56fa481df571c6112595f4115836cd3b88c9716c581d5136
-  data.tar.gz: 6f5d491a5ab5191ecf37e706fa95f06acab0a858c0a49d1a7582254d29ed1b401efe63eebb906bf9f0e26f5786a523d832994ea6a72cc32c3ab2fbaabadaed00
+  metadata.gz: 2233d9fbcbcdc8b4a2b3af19623fc326dac7868ad103a02b5acae3ca78c2c5621ec5f6067c7719465595a20ad4489bc89ed11bf02f0b2b9f586f507bee9c4df1
+  data.tar.gz: 72f0300443bcd38f1669b62df4c07e8b5edca8cbce754d9be8c85e44e52e52254bacb7c23e5cd3d70ba971b2b29d98e151b365c77720493f95c1f83bdc8c5ae8

data/README.md

@@ -1,132 +1,8 @@
-[![Build Status](https://secure.travis-ci.org/davidakachaos/workless_revived.png?branch=master)](http://travis-ci.org/davidakachaos/workless_revived)
-[![Gem Version](https://badge.fury.io/rb/workless_revived.png)](http://badge.fury.io/rb/workless_revived)
-[![Test Coverage](https://coveralls.io/repos/davidakachaos/workless_revived/badge.png?branch=master)](https://coveralls.io/r/davidakachaos/workless_revived)
+# Workless Revived is deprecated!
+This gem has been deprecated! [Workless](https://github.com/lostboy/workless) is back!
+Please adjust your Gemfiles to point to the original Workless gem, it contains all adjustments from this fork!
 
-# Workless Revived
+I will start closing issues here and reffer you to the original gem. @lostboy and myself are currently maintaining the original gem.
 
-This gem was originally created by [lostboy](https://github.com/lostboy). Since he became inactive, I've decided to revive this project under a new(ish) name.
-
-This is an addon for delayed_job (> 2.0.0) http://github.com/collectiveidea/delayed_job
-It is designed to be used when you're using Heroku as a host and have the need to do background work with delayed job but you don't want to leave the workers running all the time as it costs money.
-
-By adding the gem to your project and configuring our Heroku app with some config variables workless should do the rest.
-
-:warning: **[The Legacy API will be sunset on April 15th, 2017](https://devcenter.heroku.com/changelog-items/862)** :warning:
-Please upgrade to version 2.0.0 as soon as you can. Version 2.0.0 is released on March 1st, 2017.
-
-## Heroku Stack Heroku-16 update
-Version 2.1.0 changed the config for setting the Heroku API key. This will now reside in WORKLESS_API_KEY. Please change this key in your Heroku setup when upgrading this gem!
-
-## Updates
-
-* Version 2.1.0 CHANGE! In order to be compatible with the latest Heroku Stack (see [#11](https://github.com/davidakachaos/workless_revived/issues/11) by @unmultimedio  ) I have changed the name for the HEROKU_API_KEY variable to WORKLESS_API_KEY
-* Version 2.0.0 Updated to use latest version of the Heroku API. Drops support for old style Heroku
-* Version 1.3.0 DROPS SUPPORT FOR OLDER RUBY AND RAILS VERSIONS!
-* Version 1.2.5 Added middleware to check on delayed jobs, fixed Rails 5 support
-* Version 1.2.4 drops support for older versions!
-* Version 1.2.3 replaces multiple commit callback with two callbacks for compatibility by @lostboy
-* Version 1.2.2 includes after_commit fix by @collectiveip
-* Version 1.2.1 includes support for Rails 4 & DJ 4 by @florentmorin
-* Version 1.2.0 includes new support for Sequel by @davidakachaos
-* Version 1.1.3 includes changes by @radanskoric to reduce number of heroku api calls
-* Version 1.1.2 includes a change by @davidakachaos to scale workers using after_commit
-* Version 1.1.1 includes a fix from @filiptepper and @fixr to correctly scale workers
-* Version 1.1.0 has been released, this adds support for scaling using multiple workers thanks to @jaimeiniesta and @davidakachaos.
-* Version 1.0.0 has been released, this brings compatibility with delayed_job 3 and compatibility with Rails 2.3.x and up.
-
-## Compatibility
-
-Workless should work correctly with Rubies 2.0.0 and up. It is compatible with Delayed Job since version 2.0.7 up to the latest version 4.1.2, the table below shows tested compatibility with ruby, rails and delayed_job
-
-Ruby | Rails  | Delayed Job
----------- | ------ | -----
-2.2.5      | 4.2    | 2.1.4
-2.3.1      | 5.0    | 4.1.2
-2.4.1      | 5.1    | 4.1.3
-
-## Installation
-
-Add the workless gem and the delayed_job gem to your project Gemfile and update your bundle. Its is recommended to specify the gem version for delayed_job
-
-### For rails 4.x with latest delayed_job 3.x using active record
-
-<pre>
-gem "delayed_job_active_record"
-gem "workless_revived", "~> 1.2.4"
-</pre>
-
-### For rails 5.x with latest delayed_job 3.x using active record
-
-<pre>
-gem "delayed_job_active_record"
-gem "workless_revived", "~> 1.2.4"
-</pre>
-
-
-If you don't specify delayed_job in your Gemfile workless will bring it in, most likely the latest version (4.1.2)
-
-Add your Heroku app name / [API key](https://devcenter.heroku.com/articles/authentication) as config vars to your Heroku instance.
-
-<pre>
-heroku config:add WORKLESS_API_KEY=yourapikey APP_NAME=yourherokuappname
-</pre>
-
-## Failing Jobs
-
-In the case of failed jobs Workless will only shut down the dj worker if all attempts have been tried. By default Delayed Job will try 25 times to process a job with ever increasing time delays between each unsucessful attempt. Because of this Workless configures Delayed Job to try failed jobs only 3 times to reduce the amount of time a worker can be running while trying to process them.
-
-## Configuration
-
-Workless can be disabled by using the null scaler that will ignore the workers requests to scale up and down. In an environment file add this in the config block:
-
-<pre>
-config.after_initialize do
-  Delayed::Job.scaler = :null
-end
-</pre>
-
-There are three other scalers included. Note that if you are running on the Aspen or Bamboo stacks on Heroku and you don't explicitly specify the scaler, the heroku scaler will be used automatically.
-
-<pre>
-Delayed::Job.scaler = :heroku
-Delayed::Job.scaler = :heroku
-Delayed::Job.scaler = :local
-</pre>
-
-The local scaler uses @adamwiggins rush library http://github.com/adamwiggins/rush to start and stop workers on a local machine. The local scaler also relies on script/delayed_job (which in turn requires the daemon gem). If you have been using foreman to run your workers, go back and see the delayed_job [setup instructions](https://github.com/collectiveidea/delayed_job/blob/master/README.md).
-
-The heroku scaler works on the Aspen and Bamboo stacks while the heroku_cedar scaler only works on the new Cedar stack.
-
-## Scaling to multiple workers
-
-As an experimental feature for the Cedar stack, Workless can scale to more than 1 worker based on the current work load. You just need to define these config variables on your app, setting the values you want:
-
-<pre>
-heroku config:add WORKLESS_MAX_WORKERS=10
-heroku config:add WORKLESS_MIN_WORKERS=0
-heroku config:add WORKLESS_WORKERS_RATIO=50
-</pre>
-
-In this example, it will scale up to a maximum of 10 workers, firing up 1 worker for every 50 jobs on the queue. The minimum will be 0 workers, but you could set it to a higher value if you want.
-
-## How does Workless work?
-
-- `Delayed::Workless::Scaler` is mixed into the `Delayed::Job` class, which adds a bunch of callbacks to it.
-- When a job is created on the database, a `create` callback starts a worker.
-- The worker runs the job, which removes it from the database.
-- A `destroy` callback stops the worker.
-
-## Note on Patches/Pull Requests
-
-* Please fork the project.
-* Make your feature addition or bug fix.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request.
-
-## Copyright
-
-Copyright (c) 2010 lostboy.
-Copyright (c) 2016 davidakachaos.
-
-See LICENSE for details.
+# Thanks for all the fish
+And I will see you at [our new home](https://github.com/lostboy/workless)

metadata

@@ -1,103 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: workless_revived
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - davidakachaos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: workless
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: platform-api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rush
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: delayed_job
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.7
-- !ruby/object:Gem::Dependency
-  name: rspec
-  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'
+        version: 2.2.0
 description: Extension to Delayed Job to enable workers to scale up when needed
 email: davidakachaos@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
 - README.md
-- lib/workless/initialize.rb
-- lib/workless/middleware/workless_checker.rb
-- lib/workless/railtie.rb
-- lib/workless/scaler.rb
-- lib/workless/scalers/base.rb
-- lib/workless/scalers/heroku.rb
-- lib/workless/scalers/local.rb
-- lib/workless/scalers/null.rb
-- lib/workless_revived.rb
-- rails/init.rb
 homepage: http://github.com/davidakachaos/workless_revived
 licenses: []
 metadata: {}
@@ -113,7 +46,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.4
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -121,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Use delayed job workers only when theyre needed on Heroku

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 lostboy
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/workless/initialize.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-Delayed::Worker.max_attempts ||= 3
-Delayed::Backend::ActiveRecord::Job.send(:include, Delayed::Workless::Scaler) if defined?(Delayed::Backend::ActiveRecord::Job)
-Delayed::Backend::Mongoid::Job.send(:include, Delayed::Workless::Scaler) if defined?(Delayed::Backend::Mongoid::Job)
-Delayed::Backend::MongoMapper::Job.send(:include, Delayed::Workless::Scaler) if defined?(Delayed::Backend::MongoMapper::Job)
-Delayed::Backend::Sequel::Job.send(:include, Delayed::Workless::Scaler) if defined?(Delayed::Backend::Sequel::Job)

data/lib/workless/middleware/workless_checker.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-class WorklessChecker
-  def initialize(app)
-    @app = app
-  end
-
-  def call(env)
-    status, headers, response = @app.call(env)
-    return [status, headers, response] if file?(headers) || empty?(response)
-
-    Delayed::Job.scaler.up unless Delayed::Job.scaler.jobs.empty?
-
-    [status, headers, response]
-  end
-
-  # fix issue if response's body is a Proc
-  def empty?(response)
-    # response may be ["Not Found"], ["Move Permanently"], etc.
-    (response.is_a?(Array) && response.size <= 1) ||
-      !response.respond_to?(:body) ||
-      !response.body.respond_to?(:empty?) ||
-      response.body.empty?
-  end
-
-  # if send file?
-  def file?(headers)
-    headers['Content-Transfer-Encoding'] == 'binary'
-  end
-end

data/lib/workless/railtie.rb

@@ -1,11 +0,0 @@
-require 'rails'
-require 'delayed_job'
-
-module Delayed
-  class Railtie < Rails::Railtie
-    initializer :after_initialize do |config|
-      require 'workless/initialize'
-      config.middleware.use WorklessChecker
-    end
-  end
-end

data/lib/workless/scaler.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-module Delayed
-  module Workless
-    module Scaler
-      autoload :Heroku,      'workless/scalers/heroku'
-      autoload :Local,       'workless/scalers/local'
-      autoload :Null,        'workless/scalers/null'
-
-      def self.included(base)
-        base.send :extend, ClassMethods
-        if base.to_s =~ /ActiveRecord/
-          base.class_eval do
-            after_commit(on: :update, if: proc { |r| !r.failed_at.nil? }) do 
-              self.class.scaler.down
-            end
-            after_commit(on: :destroy, if: proc { |r| r.destroyed? || !r.failed_at.nil? }) do
-              self.class.scaler.down
-            end
-            after_commit(on: :create) do 
-              self.class.scaler.up
-            end
-          end
-        elsif base.to_s =~ /Sequel/
-          base.send(:define_method, 'after_destroy') do
-            super
-            self.class.scaler.down
-          end
-          base.send(:define_method, 'after_create') do
-            super
-            self.class.scaler.up
-          end
-          base.send(:define_method, 'after_update') do
-            super
-            self.class.scaler.down
-          end
-        else
-          base.class_eval do
-            after_destroy 'self.class.scaler.down'
-            after_create 'self.class.scaler.up'
-            after_update 'self.class.scaler.down', unless: proc { |r| r.failed_at.nil? }
-          end
-        end
-      end
-
-      module ClassMethods
-        def scaler
-          @scaler ||= if ENV.include?('WORKLESS_API_KEY')
-                        Scaler::Heroku
-                      else
-                        Scaler::Local
-          end
-        end
-
-        def scaler=(scaler)
-          @scaler = "Delayed::Workless::Scaler::#{scaler.to_s.camelize}".constantize
-        end
-      end
-    end
-  end
-end

data/lib/workless/scalers/base.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'delayed_job'
-
-module Delayed
-  module Workless
-    module Scaler
-      class Base
-        def self.jobs
-          Delayed::Job.where(failed_at: nil)
-        end
-      end
-
-      module HerokuClient
-        def client
-          @client ||= ::PlatformAPI.connect(ENV['WORKLESS_API_KEY'])
-        end
-      end
-    end
-  end
-end

data/lib/workless/scalers/heroku.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require 'platform-api'
-
-module Delayed
-  module Workless
-    module Scaler
-      class Heroku < Base
-        extend Delayed::Workless::Scaler::HerokuClient
-
-        def self.up
-          return unless workers_needed > min_workers && workers < workers_needed
-          updates = { "quantity": workers_needed }
-          client.formation.update(ENV['APP_NAME'], 'worker', updates)
-        end
-
-        def self.down
-          return if workers == workers_needed
-          updates = { "quantity": workers_needed }
-          client.formation.update(ENV['APP_NAME'], 'worker', updates)
-        end
-
-        def self.workers
-          client.formation.info(ENV['APP_NAME'], 'worker')['quantity'].to_i
-        end
-
-        # Returns the number of workers needed based on the current number of pending jobs and the settings defined by:
-        #
-        # ENV['WORKLESS_WORKERS_RATIO']
-        # ENV['WORKLESS_MAX_WORKERS']
-        # ENV['WORKLESS_MIN_WORKERS']
-        #
-        def self.workers_needed
-          [[(jobs.count.to_f / workers_ratio).ceil, max_workers].min, min_workers].max
-        end
-
-        def self.workers_ratio
-          if ENV['WORKLESS_WORKERS_RATIO'].present? && (ENV['WORKLESS_WORKERS_RATIO'].to_i != 0)
-            ENV['WORKLESS_WORKERS_RATIO'].to_i
-          else
-            100
-          end
-        end
-
-        def self.max_workers
-          ENV['WORKLESS_MAX_WORKERS'].present? ? ENV['WORKLESS_MAX_WORKERS'].to_i : 1
-        end
-
-        def self.min_workers
-          ENV['WORKLESS_MIN_WORKERS'].present? ? ENV['WORKLESS_MIN_WORKERS'].to_i : 0
-        end
-      end
-    end
-  end
-end

data/lib/workless/scalers/local.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require 'rush'
-
-module Delayed
-  module Workless
-    module Scaler
-      class Local < Base
-        def self.executable_prefix
-          if defined? Delayed::Compatibility.executable_prefix
-            Delayed::Compatibility.executable_prefix
-          else
-            'script'
-          end
-        end
-
-        def self.up
-          if workers == 0
-            Rush::Box.new[Rails.root].bash("#{executable_prefix}/delayed_job start -i workless", background: true)
-            sleep 1
-          end
-          true
-        end
-
-        def self.down
-          if workers > 0 && jobs.count == 0
-            Rush::Box.new[Rails.root].bash("#{executable_prefix}/delayed_job stop -i workless", background: true)
-          end
-          true
-        end
-
-        def self.workers
-          Rush::Box.new.processes.filter(cmdline: /delayed_job start -i workless|delayed_job.workless/).size
-        end
-      end
-    end
-  end
-end

data/lib/workless/scalers/null.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Delayed
-  module Workless
-    module Scaler
-      class Null < Base
-        def self.up
-        end
-
-        def self.down
-        end
-      end
-    end
-  end
-end

data/lib/workless_revived.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-require File.dirname(__FILE__) + '/workless/scalers/base'
-require File.dirname(__FILE__) + '/workless/scaler'
-require File.dirname(__FILE__) + '/workless/middleware/workless_checker' if defined?(Rails::Railtie)
-require File.dirname(__FILE__) + '/workless/railtie' if defined?(Rails::Railtie)

data/rails/init.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require File.dirname(__FILE__) + '/../lib/workless/initialize'