heroku_resque_autoscaler 0.1.0 → 0.1.1

data/.rspec

@@ -0,0 +1 @@
+--color

data/README.md

@@ -8,7 +8,7 @@ Inspired by [@darkhelmet](https://github.com/darkhelmet)'s
 
 ## Current Version
 
-0.1.0
+0.1.1
 
 
 ## Requirements
@@ -94,6 +94,22 @@ rspec spec
 ```
 
 
+## Coverage
+
+```bash
+rspec spec
+open coverage/index.html
+```
+
+## Releases
+
+```bash
+vi lib/heroku_resque_autoscaler/version.rb # change version
+vi README.md # change version
+rake release
+```
+
+
 ## License
 
 Copyright (c) 2012 G5

data/heroku_resque_autoscaler.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "heroku-api", "~> 0.3.5"
   gem.add_dependency "resque", "~> 1.23.0"
-  
+
+  gem.add_development_dependency "simplecov", "~> 0.7.1"
   gem.add_development_dependency "rspec", "~> 2.11.0"
   gem.add_development_dependency "guard-rspec", "~> 2.1.0"
   gem.add_development_dependency "rb-fsevent", "~> 0.9.2"

data/lib/heroku_resque_autoscaler/configuration.rb

@@ -35,18 +35,10 @@ module HerokuResqueAutoscaler
 
     # Returns a hash of all configurable options merged with +hash+
     #
-    # @param [Hash] hash A set of configuration options that will take 
+    # @param [Hash] hash A set of configuration options that will take
     # precedence over the defaults
     def merge(hash)
       to_hash.merge(hash)
     end
-
-    def validate_presence(options)
-      OPTIONS.each_pair do |key, value|
-        if options[key].nil?
-          raise HerokuResqueAutoscaler::ConfigurationException, "#{key} is missing"
-        end
-      end
-    end
   end
 end

data/lib/heroku_resque_autoscaler/version.rb

@@ -1,3 +1,3 @@
 module HerokuResqueAutoscaler
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/lib/heroku_resque_autoscaler/scaler_spec.rb

@@ -12,11 +12,28 @@ describe HerokuResqueAutoscaler do
   before :each do
     @heroku = mock(Heroku::API)
     HerokuResqueAutoscaler::Scaler.stub(:heroku).and_return(@heroku)
+
+    HerokuResqueAutoscaler.configure do |config|
+      config.heroku_api_key = "api-key"
+      config.heroku_app_name = "app-name"
+    end
+  end
+
+  let(:heroku_app_name) { "app-name" }
+
+  context ".api_key" do
+    it "returns api key" do
+      HerokuResqueAutoscaler::Scaler.api_key.should == "api-key"
+    end
   end
 
-  let(:heroku_app) {ENV['HEROKU_APP_NAME']}
+  context ".app_name" do
+    it "returns app name" do
+      HerokuResqueAutoscaler::Scaler.app_name.should == "app-name"
+    end
+  end
 
-  context "#workers" do
+  context ".workers" do
     it "returns the number of workers from the Heroku application" do
       Excon.stub(method: :get) do |params|
         { status: 200,
@@ -29,20 +46,20 @@ describe HerokuResqueAutoscaler do
       end
       connection = Excon.new("http://example.com", mock: true)
       response = connection.request(method: :get)
-      @heroku.should_receive(:get_ps).with(heroku_app).and_return(response)
+      @heroku.should_receive(:get_ps).with(heroku_app_name).and_return(response)
       HerokuResqueAutoscaler::Scaler.workers.should == 2
     end
   end
 
-  context "#workers=" do
+  context ".workers=" do
     it "sets the number of workers on Heroku to some quantity" do
       quantity = 10
-      @heroku.should_receive(:post_ps_scale).with(heroku_app, :worker, quantity)
+      @heroku.should_receive(:post_ps_scale).with(heroku_app_name, :worker, quantity)
       HerokuResqueAutoscaler::Scaler.workers = quantity
     end
   end
 
-  context "#job_count" do
+  context ".job_count" do
     it "returns the Resque job count" do
       num_pending = 10
       Resque.should_receive(:info).and_return({:pending => num_pending})
@@ -50,11 +67,19 @@ describe HerokuResqueAutoscaler do
     end
   end
 
-  context "#num_desired_heroku_workers" do
+  context ".working_job_count" do
+    it "returns the Resque working job count" do
+      num_working = 10
+      Resque.should_receive(:info).and_return({:working => num_working})
+      HerokuResqueAutoscaler::Scaler.working_job_count.should == num_working
+    end
+  end
+
+  context ".num_desired_heroku_workers" do
     it "returns the number of workers we should have (1 worker per x jobs)" do
       num_jobs = 100
       HerokuResqueAutoscaler::Scaler.stub(:job_count).and_return(num_jobs)
-      HerokuResqueAutoscalerTestClass.num_desired_heroku_workers.should == 5 
+      HerokuResqueAutoscalerTestClass.num_desired_heroku_workers.should == 5
 
       num_jobs = 38
       HerokuResqueAutoscaler::Scaler.unstub(:job_count)
@@ -64,7 +89,7 @@ describe HerokuResqueAutoscaler do
       num_jobs = 1
       HerokuResqueAutoscaler::Scaler.unstub(:job_count)
       HerokuResqueAutoscaler::Scaler.stub(:job_count).and_return(num_jobs)
-      HerokuResqueAutoscalerTestClass.num_desired_heroku_workers.should == 1 
+      HerokuResqueAutoscalerTestClass.num_desired_heroku_workers.should == 1
 
       num_jobs = 10000
       HerokuResqueAutoscaler::Scaler.unstub(:job_count)
@@ -73,7 +98,7 @@ describe HerokuResqueAutoscaler do
     end
   end
 
-  context "#after_perform_scale_down" do
+  context ".after_perform_scale_down" do
     it "scales down the workers to zero if there are no jobs pending" do
       HerokuResqueAutoscaler::Scaler.stub(:job_count).and_return(0)
       HerokuResqueAutoscaler::Scaler.stub(:workers).and_return(1)
@@ -89,7 +114,7 @@ describe HerokuResqueAutoscaler do
     end
   end
 
-  context "#after_enqueue_scale_up" do
+  context ".after_enqueue_scale_up" do
     it "ups the amount of workers if there are not enough" do
       num_workers = 5
       num_desired_workers = 6

data/spec/spec_helper.rb

@@ -1,3 +1,11 @@
+require 'simplecov'
+SimpleCov.start
+
+require 'rubygems'
+require 'rspec'
+require 'rspec/autorun'
+
+
 RSpec.configure do |config|
-  config.color = true
+  config.order = "random"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_resque_autoscaler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.23.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +132,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE
 - README.md
@@ -123,7 +140,6 @@ files:
 - heroku_resque_autoscaler.gemspec
 - lib/heroku_resque_autoscaler.rb
 - lib/heroku_resque_autoscaler/configuration.rb
-- lib/heroku_resque_autoscaler/exceptions.rb
 - lib/heroku_resque_autoscaler/scaler.rb
 - lib/heroku_resque_autoscaler/version.rb
 - spec/lib/heroku_resque_autoscaler/configuration_spec.rb
@@ -142,18 +158,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1170907037778639333
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1170907037778639333
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/heroku_resque_autoscaler/exceptions.rb

@@ -1,3 +0,0 @@
-module GithubHerokuDeployer
-  class ConfigurationException < StandardError; end
-end