heroku-resque-workers-scaler 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80444234023d5416075b0d6d274537223ec8b57b
-  data.tar.gz: f844a65e4d590cd1bdc7485981a97eb1f148b845
+  metadata.gz: 6ee8ee0ed0f37c02accec1a1ee9edf01609bf884
+  data.tar.gz: a0ba98bd4f554f905a534de5c7bccbf43f5e0575
 SHA512:
-  metadata.gz: 0278d725ae5a814419f546978d3633957c51bf8e2547c6e43141338225abaa518ff7933d465073cd71c779988c4c4ee3707041f1b39efd49fb90160be38d180c
-  data.tar.gz: d37a1fb67d184dcdc10c5c38b70163e830715bc73b08a66dd45fd69b0fb0f5677a555bfe22bdd8f5c92b0a1b9f12c9562b0f5d3ca038af2282fa08eea4c1916d
+  metadata.gz: cfaa5aef014100ab64f24a8adbe7245c994741ade4225894d459fd551417e828555677c27427e7295fe062d52c5b352a853bcc866774aef81031ee2902c82c8d
+  data.tar.gz: edf368619612f0293b8f9ab21efa4bcdf859778b38265742a6e56ea249a20c54437e2c27d18e8a8120ef4c38d9d5fa321438345eecd5affe7dd11224e192203f

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.rspec

@@ -0,0 +1 @@
+--color --fail-fast

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.1.2
+script: bundle exec rspec spec

data/CHANGELOG.md

@@ -1,7 +1,14 @@
+# Changelog  VERSION = '0.3.1'
+
+* bug fix
+  * we never can be scale down worker on safe mode
+
+[Fullcahnges](https://github.com/joel/heroku-resque-workers-scaler/pull/9)
+
 # Changelog  VERSION = '0.3.0'
-* feature 
+* feature
   * Add another mode for thresholds
-  
+
 * bug fix
   * fix size of working job count at ZERO instead of one
 

data/Gemfile

@@ -4,5 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
+  gem 'coveralls', require: false
   gem 'pry'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    heroku-resque-workers-scaler (0.3.0)
+    heroku-resque-workers-scaler (0.3.1)
       platform-api (~> 0.2.0)
       resque (~> 1.25.2)
 
@@ -10,9 +10,16 @@ GEM
   specs:
     addressable (2.3.6)
     coderay (1.1.0)
+    coveralls (0.7.1)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
+    docile (1.1.5)
     erubis (2.7.0)
     excon (0.39.5)
     heroics (0.0.12)
@@ -22,6 +29,7 @@ GEM
       multi_json (>= 1.9.2)
       netrc
     method_source (0.8.2)
+    mime-types (2.3)
     moneta (0.8.0)
     mono_logger (1.1.0)
     multi_json (1.10.1)
@@ -46,6 +54,9 @@ GEM
       redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
+    rest-client (1.7.2)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -59,12 +70,21 @@ GEM
       rspec-support (~> 3.1.0)
     rspec-support (3.1.0)
     safe_yaml (1.0.3)
+    simplecov (0.9.0)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
     slop (3.6.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.19.1)
     tilt (1.4.1)
+    tins (1.3.3)
     vegas (0.1.11)
       rack (>= 1.0.0)
     webmock (1.18.0)
@@ -75,6 +95,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  coveralls
   heroku-resque-workers-scaler!
   pry
   psych (~> 2.0.6)

data/README.md

@@ -1,3 +1,13 @@
+[![Code Climate](https://codeclimate.com/github/joel/heroku-resque-workers-scaler.png)](https://codeclimate.com/github/joel/heroku-resque-workers-scaler)
+
+[![Dependency Status](https://gemnasium.com/joel/heroku-resque-workers-scaler.png)](https://gemnasium.com/joel/heroku-resque-workers-scaler)
+
+[![Build Status](https://travis-ci.org/joel/heroku-resque-workers-scaler.png?branch=master)](https://travis-ci.org/joel/heroku-resque-workers-scaler) (Travis CI)
+
+[![Coverage Status](https://coveralls.io/repos/joel/heroku-resque-workers-scaler/badge.png)](https://coveralls.io/r/joel/heroku-resque-workers-scaler)
+
+[![Gem Version](https://badge.fury.io/rb/heroku-resque-workers-scaler.svg)](http://badge.fury.io/rb/heroku-resque-workers-scaler)
+
 # heroku-resque-workers-scaler
 
 Auto scale your resque workers on Heroku. Original code by darkhelmet:

data/lib/heroku-resque-workers-scaler/scaler.rb

@@ -18,13 +18,21 @@ module HerokuResqueAutoScale
 
         quantity = quantity.to_i
 
-        if safe_mode? and setting_this_number_of_workers_will_scale_down? quantity
-          return unless all_jobs_have_been_processed?
+        if safe_mode?
+          if scale_down? quantity
+            return false unless all_jobs_have_been_processed?
+          end
         end
+
         result = @@heroku.formation.update(app_name, worker_name, { quantity: quantity })
         result['quantity'] == quantity
       end
 
+      def shut_down_workers!
+        @@heroku.formation.update(app_name, worker_name, { quantity: 0 })
+        nil
+      end
+
       def job_count
         Resque.info[:pending].to_i
       end
@@ -39,7 +47,7 @@ module HerokuResqueAutoScale
         ENV['HEROKU_APP_NAME']
       end
 
-      def setting_this_number_of_workers_will_scale_down? quantity
+      def scale_down? quantity
         quantity < workers
       end
 
@@ -110,6 +118,6 @@ module HerokuResqueAutoScale
   def scale_down
     # Nothing fancy, just shut everything down if we have no pending jobs
     # and one working job (which is this job)
-    Scaler.workers = 0 if Scaler.job_count.zero? && Scaler.working_job_count.zero?
+    Scaler.shut_down_workers! if Scaler.job_count.zero? && Scaler.working_job_count <= 1
   end
 end

data/lib/heroku-resque-workers-scaler/version.rb

@@ -1,3 +1,3 @@
 module HerokuResqueAutoScale
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/heroku-resque-workers-scaler/scaler_spec.rb

@@ -54,7 +54,7 @@ describe HerokuResqueAutoScale::Scaler do
       before { allow(HerokuResqueAutoScale::Scaler).to receive(:safe_mode?) { true }}
 
       context 'when about to scale down' do
-        before { allow(HerokuResqueAutoScale::Scaler).to receive(:setting_this_number_of_workers_will_scale_down?) { true }}
+        before { allow(HerokuResqueAutoScale::Scaler).to receive(:scale_down?) { true }}
 
         context 'when there are some jobs left to process' do
           before { allow(HerokuResqueAutoScale::Scaler).to receive(:all_jobs_have_been_processed?) { false }}

data/spec/spec_helper.rb

@@ -2,12 +2,15 @@ require 'heroku-resque-workers-scaler'
 require 'bundler/setup'
 
 require 'resque'
+require 'coveralls'
 
 begin
   require 'pry'
 rescue LoadError
 end
 
+Coveralls.wear!
+
 RSpec.configure do |config|
   config.mock_with :rspec
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-resque-workers-scaler
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Mark Quezada
@@ -103,9 +103,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".document"
 - ".gitignore"
+- ".rspec"
 - ".rvmrc"
+- ".travis.yml"
 - CHANGELOG.md
 - COMMANDS
 - Gemfile