workless_revived 1.2.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98e47054154aee4abcc5275e895a0ce1695370b4
-  data.tar.gz: 3d1aacf639ccafff4f39b05932cdd2a57fd3121e
+  metadata.gz: ef58f3d586079df9d5adf482bae320be8dd2ac8b
+  data.tar.gz: 719f686eb694190dd6f7020ec325ecbccb2a979d
 SHA512:
-  metadata.gz: 23bf9f4b9e0d9cdebf6f731d87f19d574ebdb99f59dc5130875b7a6719a853958dd5336ad3fe09ad480e44717da504fb38b224d13025917ac3b87d4dd72a67b4
-  data.tar.gz: c27916acaa6088249f0d264be8f3ea78c38100c90eedcccfd61191be47eaead40147d32dee2bf2b2c593bce91bc0464f87aef894aefde780616d63b57665fb3b
+  metadata.gz: 1a260a84ed1ced0d76d84bd97a818af27a8ae225933d5f79ae96637291ca7da31c58227caedba4d0fb1edfbeefcb121006e6e9ec82d6183e7dc0766aa4442ed7
+  data.tar.gz: b023d243fc50803b11a879afe83cfc75e30856ee705620b984fb1773ce73f343171dd5672a298b98fd6976c1971fbcbf9a918fa8f6b6590999fe8bef28a5accb

data/README.md

@@ -11,8 +11,13 @@ It is designed to be used when you're using Heroku as a host and have the need t
 
 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.
+
 ## Updates
 
+* 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
@@ -31,21 +36,13 @@ Workless should work correctly with Rubies 2.0.0 and up. It is compatible with D
 
 Ruby | Rails  | Delayed Job
 ---------- | ------ | -----
-2.0.0  | 3.2.22 | 2.0.7
-2.2.4      | 4.2    | 2.1.4
-2.3.0      | 5.0    | 4.1.2
+2.2.5      | 4.2    | 2.1.4
+2.3.1      | 5.0    | 4.1.2
 
 ## 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 3.x with latest delayed_job 3.x using active record
-
-<pre>
-gem "delayed_job_active_record"
-gem "workless", "~> 1.1.3"
-</pre>
-
 ### For rails 4.x with latest delayed_job 3.x using active record
 
 <pre>
@@ -87,7 +84,7 @@ There are three other scalers included. Note that if you are running on the Aspe
 
 <pre>
 Delayed::Job.scaler = :heroku
-Delayed::Job.scaler = :heroku_cedar
+Delayed::Job.scaler = :heroku
 Delayed::Job.scaler = :local
 </pre>
 

data/lib/workless/initialize.rb

@@ -1,4 +1,4 @@
-Delayed::Worker.max_attempts = 3
+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)

data/lib/workless/middleware/workless_checker.rb

@@ -7,14 +7,9 @@ class WorklessChecker
     status, headers, response = @app.call(env)
     return [status, headers, response] if file?(headers) || empty?(response)
 
-    Delayed::Job.scaler.up if Delayed::Job.scaler.jobs.size > 0
-    response_body = nil
-    if status == 200 && !response.body.frozen? && html_request?(headers, response)
-      response_body = response.body << "\n<!-- workless jobs: #{Delayed::Job.scaler.jobs.size} -->"
-      headers['Content-Length'] = response_body.bytesize.to_s
-    end
+    Delayed::Job.scaler.up unless Delayed::Job.scaler.jobs.empty?
 
-    [status, headers, response_body ? [response_body] : response]
+    [status, headers, response]
   end
 
   # fix issue if response's body is a Proc
@@ -30,8 +25,4 @@ class WorklessChecker
   def file?(headers)
     headers['Content-Transfer-Encoding'] == 'binary'
   end
-
-  def html_request?(headers, response)
-    headers['Content-Type'] && headers['Content-Type'].include?('text/html') && response.body.include?('<html')
-  end
 end

data/lib/workless/scaler.rb

@@ -2,7 +2,6 @@ module Delayed
   module Workless
     module Scaler
       autoload :Heroku,      'workless/scalers/heroku'
-      autoload :HerokuCedar, 'workless/scalers/heroku_cedar'
       autoload :Local,       'workless/scalers/local'
       autoload :Null,        'workless/scalers/null'
 
@@ -10,9 +9,15 @@ module Delayed
         base.send :extend, ClassMethods
         if base.to_s =~ /ActiveRecord/
           base.class_eval do
-            after_commit 'self.class.scaler.down'.to_sym, on: :update, if: proc { |r| !r.failed_at.nil? }
-            after_commit 'self.class.scaler.down'.to_sym, on: :destroy, if: proc { |r| r.destroyed? || !r.failed_at.nil? }
-            after_commit 'self.class.scaler.up'.to_sym, on: :create
+            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
@@ -39,7 +44,7 @@ module Delayed
       module ClassMethods
         def scaler
           @scaler ||= if ENV.include?('HEROKU_API_KEY')
-                        Scaler::HerokuCedar
+                        Scaler::Heroku
                       else
                         Scaler::Local
           end

data/lib/workless/scalers/base.rb

@@ -5,17 +5,13 @@ module Delayed
     module Scaler
       class Base
         def self.jobs
-          if Rails.version >= '3.0.0'
-            Delayed::Job.where(failed_at: nil)
-          else
-            Delayed::Job.all(conditions: { failed_at: nil })
-          end
+          Delayed::Job.where(failed_at: nil)
         end
       end
 
       module HerokuClient
         def client
-          @client ||= ::Heroku::API.new(api_key: ENV['HEROKU_API_KEY'])
+          @client ||= ::PlatformAPI.connect(ENV['HEROKU_API_KEY'])
         end
       end
     end

data/lib/workless/scalers/heroku.rb

@@ -1,4 +1,4 @@
-require 'heroku-api'
+require 'platform-api'
 
 module Delayed
   module Workless
@@ -7,15 +7,45 @@ module Delayed
         extend Delayed::Workless::Scaler::HerokuClient
 
         def self.up
-          client.put_workers(ENV['APP_NAME'], 1) if workers == 0
+          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
-          client.put_workers(ENV['APP_NAME'], 0) unless jobs.count > 0 || workers == 0
+          return if workers == workers_needed
+          updates = { "quantity": workers_needed }
+          client.formation.update(ENV['APP_NAME'], 'worker', updates)
         end
 
         def self.workers
-          client.get_ps(ENV['APP_NAME']).body.count { |p| p['process'] =~ /worker\.\d?/ }
+          client.formation.info(ENV['APP_NAME'], 'worker')['quantity']
+        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

data/lib/workless_revived.rb

@@ -1,4 +1,3 @@
-require 'heroku-api'
 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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workless_revived
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 2.0.0
 platform: ruby
 authors:
 - davidakachaos
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: heroku-api
+  name: platform-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,7 +94,6 @@ files:
 - lib/workless/scaler.rb
 - lib/workless/scalers/base.rb
 - lib/workless/scalers/heroku.rb
-- lib/workless/scalers/heroku_cedar.rb
 - lib/workless/scalers/local.rb
 - lib/workless/scalers/null.rb
 - lib/workless_revived.rb
@@ -110,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/workless/scalers/heroku_cedar.rb

@@ -1,49 +0,0 @@
-require 'heroku-api'
-
-module Delayed
-  module Workless
-    module Scaler
-      class HerokuCedar < Base
-        extend Delayed::Workless::Scaler::HerokuClient
-
-        def self.up
-          client.post_ps_scale(ENV['APP_NAME'], 'worker', workers_needed) if workers_needed > min_workers && workers < workers_needed
-        end
-
-        def self.down
-          client.post_ps_scale(ENV['APP_NAME'], 'worker', workers_needed) unless workers == workers_needed
-        end
-
-        def self.workers
-          client.get_ps(ENV['APP_NAME']).body.count { |p| p['process'] =~ /worker\.\d?/ }
-        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