dyno_scaler 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2RiYzBkZGQ3NDE1N2IwNzc0M2QyMTEwZDhjMmI1NTBmNjgxYmMzNA==
+  data.tar.gz: !binary |-
+    ZWRhYjU2YzM4Y2U1MDFmYmVjOGUzNzU3NjI0YjdkMzM0OTJiOTgxMg==
+SHA512:
+  metadata.gz: !binary |-
+    YTc5Mjg1ZThiOGRlNjZhY2ZhYzY2NzQzYjU3ZWUyNGEzMjllNzAyZDVmNGZi
+    NGZmNWEwZTRjZDdjYTY1ZWYxYWIwNmQ3Mzg3OWEwODI5OTI2ZDA4ZGMxOGMw
+    Yjg2NTNkZGFiMmIwMzk5NjVkZDkwNDA3YzAyM2I4OTA0MGU1YzQ=
+  data.tar.gz: !binary |-
+    ZDkwYzA2ZjdmNWNiOGZlZjkwOTMzMjVmMDg0NTI4ZTllMjAyZDkzMGM3NTMx
+    NjY2MjI2YThmYmZhOTAzNTQ4N2FhMjI4OWUwMzM0NDQzYzI1OTFmZjMyZGZk
+    YmQ1ZGM5N2M3Y2Q0N2IyNzExNjI2MjdiODgxMjkxYzY0Mzg0MDk=

data/.rspec

@@ -1,4 +1,3 @@
 --color
 --format documentation
---debug
 --drb

data/.travis.yml

@@ -1,5 +1,7 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
   - jruby-19mode # JRuby in 1.9 mode
+services:
+  - redis-server
+bundler_args: --without development

data/Gemfile

@@ -10,11 +10,17 @@ group(:development) do
 
   platforms :jruby do
     gem 'ruby-debug'
-    gem 'jruby-openssl'
   end
 end
 
+platforms :jruby do
+  gem 'jruby-openssl'
+end
+
 group(:test) do
   gem 'simplecov', require: false
+  gem 'rspec'
+  gem 'resque'
+  gem 'girl_friday'
   gem 'rails'
 end

data/Gemfile.lock

@@ -1,76 +1,112 @@
 PATH
   remote: .
   specs:
-    dyno_scaler (0.2.0)
+    dyno_scaler (0.3.0)
       activesupport
       heroku-api
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (0.6.1)
-      actionpack (>= 0.9.5)
-    actionpack (1.4.0)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
+    actionmailer (4.1.1)
+      actionpack (= 4.1.1)
+      actionview (= 4.1.1)
+      mail (~> 2.5.4)
+    actionpack (4.1.1)
+      actionview (= 4.1.1)
+      activesupport (= 4.1.1)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+    activerecord (4.1.1)
+      activemodel (= 4.1.1)
+      activesupport (= 4.1.1)
+      arel (~> 5.0.0)
+    activesupport (4.1.1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
     bouncy-castle-java (1.5.0147)
-    builder (3.0.4)
-    columnize (0.3.6)
-    connection_pool (1.0.0)
-    debugger (1.6.0)
+    builder (3.2.2)
+    columnize (0.8.9)
+    connection_pool (1.2.0)
+    debugger (1.6.7)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.1)
+      debugger-ruby_core_source (~> 1.3.5)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.2)
-    diff-lcs (1.2.4)
-    excon (0.22.1)
+    debugger-ruby_core_source (1.3.5)
+    diff-lcs (1.2.5)
+    docile (1.1.3)
+    erubis (2.7.0)
+    excon (0.33.0)
     girl_friday (0.11.2)
       connection_pool (~> 1.0)
       rubinius-actor
-    heroku-api (0.3.11)
-      excon (~> 0.22.1)
-    i18n (0.6.1)
-    jruby-openssl (0.8.8)
+    heroku-api (0.3.18)
+      excon (~> 0.27)
+      multi_json (~> 1.8)
+    hike (1.2.3)
+    i18n (0.6.9)
+    jruby-openssl (0.9.4)
       bouncy-castle-java (>= 1.5.0147)
+    json (1.8.1)
+    json (1.8.1-java)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    minitest (5.3.4)
     mono_logger (1.1.0)
-    multi_json (1.7.4)
+    multi_json (1.10.1)
+    polyglot (0.3.4)
     rack (1.5.2)
-    rack-protection (1.5.0)
+    rack-protection (1.5.3)
       rack
-    rails (0.9.5)
-      actionmailer (>= 0.6.1)
-      actionpack (>= 1.4.0)
-      activerecord (>= 1.6.0)
-      rake (>= 0.4.15)
-    rake (10.0.4)
-    redis (3.0.4)
-    redis-namespace (1.3.0)
-      redis (~> 3.0.0)
-    resque (1.24.1)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.1.1)
+      actionmailer (= 4.1.1)
+      actionpack (= 4.1.1)
+      actionview (= 4.1.1)
+      activemodel (= 4.1.1)
+      activerecord (= 4.1.1)
+      activesupport (= 4.1.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.1)
+      sprockets-rails (~> 2.0)
+    railties (4.1.1)
+      actionpack (= 4.1.1)
+      activesupport (= 4.1.1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.3.2)
+    redis (3.0.7)
+    redis-namespace (1.4.1)
+      redis (~> 3.0.4)
+    resque (1.25.2)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
-      redis-namespace (~> 1.2)
+      redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
+    rspec-mocks (2.14.6)
     rubinius-actor (0.0.2)
       rubinius-core-api
     rubinius-core-api (0.0.1)
@@ -79,16 +115,33 @@ GEM
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4-java)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sinatra (1.4.2)
-      rack (~> 1.5, >= 1.5.2)
+    simplecov (0.8.2)
+      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)
+    sprockets (2.12.1)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.1.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    thor (0.19.1)
+    thread_safe (0.3.3)
+    thread_safe (0.3.3-java)
     tilt (1.4.1)
-    tzinfo (0.3.37)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (1.2.0)
+      thread_safe (~> 0.1)
     vegas (0.1.11)
       rack (>= 1.0.0)
 

data/README.md

@@ -1,9 +1,10 @@
 # DynoScaler
 
-[![alt build status][1]][2]
+[![build status][1]][2]
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/dtmtec/dyno_scaler/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 
-[1]: https://travis-ci.org/dtmconsultoria/dyno_scaler.png?branch=master
-[2]: http://travis-ci.org/dtmconsultoria/dyno_scaler
+[1]: https://travis-ci.org/dtmtec/dyno_scaler.png
+[2]: http://travis-ci.org/dtmtec/dyno_scaler
 
 Scale your dyno workers on Heroku as needed, pay only for what you use!
 

data/dyno_scaler.gemspec

@@ -19,8 +19,4 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "heroku-api"
   gem.add_dependency "activesupport"
-
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "resque"
-  gem.add_development_dependency "girl_friday"
 end

data/lib/dyno_scaler/version.rb

@@ -1,3 +1,3 @@
 module DynoScaler
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/dyno_scaler/workers/resque.rb

@@ -15,6 +15,10 @@ module DynoScaler
         enable_scaling_down
       end
 
+      def scale(&block)
+        self.class.scale(&block)
+      end
+
       module ClassMethods
         def after_perform_scale_down(*args)
           info = ::Resque.info
@@ -27,7 +31,7 @@ module DynoScaler
         end
 
         def after_enqueue_scale_up(*args)
-          if scale_up_enabled?
+          if scale_up_enabled? && !scaling?
             if DynoScaler.configuration.async?
               DynoScaler.configuration.async.call(::Resque.info.merge(action: :scale_up))
             else
@@ -54,6 +58,18 @@ module DynoScaler
           self.scale_down_enabled = false
         end
 
+        def scaling?
+          @scaling
+        end
+
+        def scale(&block)
+          @scaling = true
+          result = block.call if block_given?
+          dyno_scaler_manager.scale_with(::Resque.info)
+          @scaling = false
+          result
+        end
+
         private
           def dyno_scaler_manager
             @manager ||= DynoScaler::Manager.new

data/spec/dyno_scaler/heroku_spec.rb

@@ -6,10 +6,10 @@ describe DynoScaler::Heroku do
   subject(:heroku_client) { DynoScaler::Heroku.new application, options }
 
   describe "scaling workers" do
-    let(:heroku_api) { mock(::Heroku::API, :post_ps_scale => false) }
+    let(:heroku_api) { double(::Heroku::API, :post_ps_scale => false) }
 
     before do
-      ::Heroku::API.stub!(:new).and_return(heroku_api)
+      ::Heroku::API.stub(:new).and_return(heroku_api)
     end
 
     let(:quantity) { 2 }

data/spec/dyno_scaler/manager_spec.rb

@@ -5,7 +5,7 @@ describe DynoScaler::Manager do
 
   subject(:manager) { DynoScaler::Manager.new }
 
-  let(:heroku) { mock(DynoScaler::Heroku, scale_workers: false) }
+  let(:heroku) { double(DynoScaler::Heroku, scale_workers: false) }
 
   let(:workers)      { 0 }
   let(:pending_jobs) { 0 }
@@ -27,7 +27,7 @@ describe DynoScaler::Manager do
     config.application = 'my-app'
     config.enabled = true
 
-    DynoScaler::Heroku.stub!(:new).with(config.application).and_return(heroku)
+    DynoScaler::Heroku.stub(:new).with(config.application).and_return(heroku)
   end
 
   shared_examples_for "disabled" do
@@ -348,7 +348,7 @@ describe DynoScaler::Manager do
   end
 
   describe "running workers" do
-    let(:heroku) { mock(DynoScaler::Heroku, scale_workers: false, running_workers: 2) }
+    let(:heroku) { double(DynoScaler::Heroku, scale_workers: false, running_workers: 2) }
 
     its(:running_workers) { should eq(heroku.running_workers) }
   end

data/spec/dyno_scaler/workers/resque_spec.rb

@@ -17,23 +17,25 @@ class SampleJob
 end
 
 describe DynoScaler::Workers::Resque do
-  let(:manager) { mock(DynoScaler::Manager, scale_up: false, scale_down: false) }
+  let(:manager) { double(DynoScaler::Manager, scale_up: false, scale_down: false) }
 
   let(:workers) { 0 }
   let(:working) { 0 }
   let(:pending) { 1 }
 
   before do
-    Resque.stub!(:info).and_return({
+    Resque.stub(:info).and_return({
       workers: workers,
       working: working,
       pending: pending
     })
 
     SampleJob.reset!
-    DynoScaler::Manager.stub!(:new).and_return(manager)
+    DynoScaler::Manager.stub(:new).and_return(manager)
   end
 
+  after { DynoScaler.configuration.async = false }
+
   def work_off(queue)
     job = Resque::Job.reserve(queue)
     job ? job.perform : fail("No jobs for queue '#{queue}'.")
@@ -63,6 +65,25 @@ describe DynoScaler::Workers::Resque do
       end
     end
 
+    context "when it is scaling" do
+      before { SampleJob.stub(:scaling?).and_return(true) }
+
+      it "does not scales up" do
+        manager.should_not_receive(:scale_up)
+        Resque.enqueue(SampleJob)
+      end
+
+      context "and async is configured" do
+        let(:config) { DynoScaler.configuration }
+        before { config.async = true }
+
+        it "does not calls the given async processor" do
+          config.async.should_not_receive(:call)
+          Resque.enqueue(SampleJob)
+        end
+      end
+    end
+
     context "when scaling up is disabled" do
       before { SampleJob.disable_scaling_up }
       after  { SampleJob.enable_scaling_up  }
@@ -75,7 +96,7 @@ describe DynoScaler::Workers::Resque do
 
     context "when an error occurs while scaling up" do
       before do
-        manager.stub!(:scale_up).and_raise("error")
+        manager.stub(:scale_up).and_raise("error")
       end
 
       it "does not raises it" do
@@ -135,6 +156,56 @@ describe DynoScaler::Workers::Resque do
     end
   end
 
+  describe "#scale" do
+    it "calls the Klass.scale" do
+      block = Proc.new { |a| }
+      SampleJob.should_receive(:scale).and_yield(block)
+      SampleJob.new.scale(&block)
+    end
+  end
+
+  describe ".scale" do
+    before { manager.stub(:scale_with) }
+
+    it "should not be scaling before it is run" do
+      SampleJob.should_not be_scaling
+      SampleJob.scale { }
+    end
+
+    it "should not be scaling after it is run" do
+      SampleJob.scale { }
+      SampleJob.should_not be_scaling
+    end
+
+    it "calls the given block" do
+      called = false
+      SampleJob.scale do
+        called = true
+      end
+
+      called.should be_true
+    end
+
+    it "sets scaling? to true inside the given block" do
+      SampleJob.scale do
+        SampleJob.should be_scaling
+      end
+    end
+
+    it "returns the result of the block" do
+      result = SampleJob.scale do
+        'some value'
+      end
+
+      result.should eq('some value')
+    end
+
+    it "scales with Resque.info" do
+      manager.should_receive(:scale_with).with(Resque.info)
+      SampleJob.scale {}
+    end
+  end
+
   describe "after performing" do
     before do
       Resque.enqueue(SampleJob)
@@ -184,7 +255,7 @@ describe DynoScaler::Workers::Resque do
 
     context "when an error occurs while scaling down" do
       before do
-        manager.stub!(:scale_down).and_raise("error")
+        manager.stub(:scale_down).and_raise("error")
       end
 
       it "does not raises it" do

data/spec/spec_helper.rb

@@ -10,6 +10,11 @@ ENV['RACK_ENV'] ||= 'test'
 
 Bundler.require :default, ENV['RACK_ENV']
 
+begin
+  require 'debugger'
+rescue LoadError
+end
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: dyno_scaler
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Vicente Mundim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,55 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: resque
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: girl_friday
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -124,33 +71,26 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2224126621468173424
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2224126621468173424
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Scale your dyno workers on Heroku as needed
 test_files:
 - spec/dyno_scaler/configuration_spec.rb