dynobattery 0.1.3 → 0.1.4

data/Rakefile

@@ -4,7 +4,7 @@ require 'echoe'
 require 'net/http'
 require 'heroku'
 
-Echoe.new('dynobattery', '0.1.3') do |p|  
+Echoe.new('dynobattery', '0.1.4') do |p|  
   p.description     = "Submit request operations for dyno calculations on Heroku"  
   p.url             = "http://github.com/fedesoria/dynobattery"  
   p.author          = "Federico Soria"  
@@ -14,3 +14,5 @@ Echoe.new('dynobattery', '0.1.3') do |p|
 end  
   
 Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
+
+

data/dynobattery.gemspec

@@ -2,21 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dynobattery}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Federico Soria"]
-  s.date = %q{2010-07-08}
+  s.date = %q{2010-09-09}
   s.description = %q{Submit request operations for dyno calculations on Heroku}
   s.email = %q{federico@dospuntocero.com.mx}
   s.extra_rdoc_files = ["README.rdoc", "lib/dynobattery.rb"]
-  s.files = ["Manifest", "README.rdoc", "Rakefile", "dynobattery.gemspec", "lib/dynobattery.rb"]
+  s.files = ["Manifest", "README.rdoc", "Rakefile", "dynobattery.gemspec", "lib/dynobattery.rb", "test/test_dynobattery.rb"]
   s.homepage = %q{http://github.com/fedesoria/dynobattery}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Dynobattery", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{dynobattery}
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Submit request operations for dyno calculations on Heroku}
+  s.test_files = ["test/test_dynobattery.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/dynobattery.rb

@@ -4,28 +4,58 @@ class DynoBattery
   end
   
   def call(env)
-    if defined?(DYNO_DOMAIN)
-      uri = URI.parse("http://dyno-battery.heroku.com/")
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.open_timeout = 3
-      http.read_timeout = 3
-      start = Time.now  
-      status, headers, response = @app.call(env)  
-      stop = Time.now
-      if defined?(DYNO_USER) && defined?(DYNO_PASSWORD)
-        get_dynos
-        http.post("/heroku","name=#{DYNO_DOMAIN}&date=#{start.to_s}&time=#{"%10.6f" % (stop - start)}&dyno=#{@dynos}")
+    dup._call(env)
+  end
+  
+  def _call(env)
+    if defined?(DYNOBATTERY_ID)
+      req = Rack::Request.new(env)
+      @params = req.params
+      if env["PATH_INFO"] =~ /^\/add_dyno/ and @params["id"] == DYNOBATTERY_ID
+        add_dyno
+        [200, {"Content-Type" => "text/plain"}, ["Dyno +1"]]
+      elsif env["PATH_INFO"] =~ /^\/remove_dyno/ and @params["id"] == DYNOBATTERY_ID
+        remove_dyno
+        [200, {"Content-Type" => "text/plain"}, ["Dyno -1"]]
       else
-        http.post("/heroku","name=#{DYNO_DOMAIN}&date=#{start.to_s}&time=#{"%10.6f" % (stop - start)}")
+        uri = URI.parse("http://dyno-battery.heroku.com/")
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.open_timeout = 3
+        http.read_timeout = 3
+        start = Time.now  
+        status, headers, response = @app.call(env)  
+        stop = Time.now
+        http.post("/heroku","name=#{DYNOBATTERY_ID}&date=#{start.to_s}&time=#{"%10.6f" % (stop - start)}&dyno=#{env['HTTP_X_HEROKU_DYNOS_IN_USE']}")
+        [status, headers, response]
       end
+    else
+      [status, headers, response]
     end
-    [status, headers, response]
   end
   
   
+
+  # deprecated for env["HTTP_X_HEROKU_DYNOS_IN_USE"]
   def get_dynos
-    heroku = Heroku::Client.new(DYNO_USER, DYNO_PASSWORD)
-    @dynos = heroku.info(DYNO_DOMAIN)[:dynos]
+    setup_heroku_client
+    @heroku_app = @heroku.info(DYNO_DOMAIN)
+  end
+  
+  
+  def add_dyno
+    setup_heroku_client
+    get_dynos
+    @heroku.set_dynos(@heroku_app[:name],@heroku_app[:dynos] + 1)
+  end
+  
+  def remove_dyno
+    setup_heroku_client
+    get_dynos
+    @heroku.set_dynos(@heroku_app[:name],@heroku_app[:dynos] - 1)
+  end
+  
+  def setup_heroku_client
+    @heroku = Heroku::Client.new(DYNO_USER, DYNO_PASSWORD)
   end
   
 end

data/test/test_dynobattery.rb

@@ -0,0 +1,32 @@
+# require 'helper'
+require 'rubygems'
+require 'dynobattery'
+require 'heroku'
+require 'test/unit'
+require "contest"
+require "rack/test"
+
+class TestDynobattery < Test::Unit::TestCase
+
+  
+
+
+  
+  test "no constants are setup" do
+    battery = DynoBattery.new(nil)
+    assert_raise(NameError){ battery.get_dynos  }
+  end
+  
+  test "get number of dynos" do
+    setup_test
+    battery = DynoBattery.new(nil)
+    assert_instance_of(String, battery.get_dynos)
+  end
+  
+  
+
+  
+  
+  
+  
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Federico Soria
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 -05:00
+date: 2010-09-09 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - Rakefile
 - dynobattery.gemspec
 - lib/dynobattery.rb
+- test/test_dynobattery.rb
 has_rdoc: true
 homepage: http://github.com/fedesoria/dynobattery
 licenses: []
@@ -69,5 +70,5 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Submit request operations for dyno calculations on Heroku
-test_files: []
-
+test_files: 
+- test/test_dynobattery.rb