hirefireapp 0.0.3 → 0.0.4

data/bin/hirefireapp

@@ -31,9 +31,10 @@ else
     exit 1
   end
 
-  if response =~ /\[HireFireApp\:\s/
+  if response =~ /HireFire/
     puts response
   else
     puts "Could not find HireFireApp at #{url}."
+    exit 1
   end
 end

data/hirefireapp.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |gem|
 
   # General configuration / information
   gem.name        = 'hirefireapp'
-  gem.version     = '0.0.3'
+  gem.version     = '0.0.4'
   gem.platform    = Gem::Platform::RUBY
   gem.authors     = 'Michael van Rooijen'
   gem.email       = 'meskyanichi@gmail.com'

data/lib/hirefireapp/middleware.rb

@@ -13,12 +13,8 @@ module HireFireApp
     end
 
     ##
-    # Simple router. If a request come in at the "test" url (the url to test if HireFire is properly installed)
-    # then we return information about the current environment (orm, odm, kvs, worker library, etc). Returns "Not Found"
-    # and specified "what wasn't found" in case the environment isn't complete (e.g. the worker library could not be found).
-    #
-    # HireFireApp.com will always ping to the "info?" url. This will return JSON format containing the current job queue
-    # for the given worker library, as well as the queue_wait_time
+    # Return a HTML response if the "test url" has been requested.
+    # Return a JSON requested if the "info url" has been requested.
     #
     def call(env)
       @env = env
@@ -33,32 +29,33 @@ module HireFireApp
     end
 
     ##
-    # Response body - This is the data that gets returned to the requester
-    # depending on which URL was requested.
+    # If the "test url" has been requested, we'll return information regarding the HireFire installation in HTML format.
+    # If the "info url" has been regarding, we'll return the job count for the worker library (if applicable)
+    # in JSON format.
     #
     def each(&block)
       if test?
-        block.call "[HireFireApp: #{ok}] Worker: #{worker} - Mapper: #{mapper}"
+        out =  "\n"
+        out << "[HireFire][Web]    OK\n"
+        out << "[HireFire][Worker] #{worker_ok} (Library: #{worker_library}, Mapper: #{mapper_library})\n\n"
+
+        if worker_library =~ /Not Found/
+          out << "HireFire is able to auto-scale your web dynos, but not your worker dynos.\n"
+        else
+          out << "HireFire is able to auto-scale both your web, as well as your worker dynos."
+        end
+
+        block.call out
       elsif info?
-        block.call %|{"job_count":#{job_count || 'null'}, "queue_wait_time":#{queue_wait_time}}|
+        block.call %|{"job_count":#{job_count || "null"}}|
       end
     end
 
     private
 
     ##
-    # Returns the time it took to allow the request
-    # (delayed by the queue) in miliseconds
-    #
-    # @request [Integer] the queue wait time in miliseconds
-    #
-    def queue_wait_time
-      @env["HTTP_X_HEROKU_QUEUE_WAIT_TIME"].to_i
-    end
-
-    ##
-    # Counts the amount of jobs that are currently queued
-    # and show be processed as soon as possible (aka the ones that are pending)
+    # Returns the amount of queued jobs that are scheduled to be processed
+    # at this time, or in the past, but not in the future.
     #
     # @returns [Fixnum, nil] job_count returns nil if something went wrong
     #
@@ -77,7 +74,7 @@ module HireFireApp
     ##
     # Makes Delayed::Job count the amount of currently pending jobs.
     # It'll use the ActiveRecord ORM, or the Mongoid ODM depending on
-    # which of them is defined.
+    # which is defined.
     #
     # If ActiveRecord 2 (or earlier) is being used, ActiveRecord::Relation doesn't
     # exist, and we'll have to use the old :conditions hash notation.
@@ -106,7 +103,7 @@ module HireFireApp
     end
 
     ##
-    # Makes Resque count the amount of currently pending jobs.
+    # Returns the amount of jobs in the queue + the ones that are being processed
     #
     # @returns [Fixnum] resque_job_count
     #  the number of jobs pending + the amount of workers currently working
@@ -116,11 +113,12 @@ module HireFireApp
     end
 
     ##
-    # Returns the name of the mapper, or "Not Found" if not found
+    # Returns the name of the mapper as a string, or "Not Found" if
+    # the mapper could not be found
     #
     # @returns [String]
     #
-    def mapper
+    def mapper_library
       if defined?(Redis) and defined?(Resque)
         "Redis"
       elsif defined?(Delayed::Worker)
@@ -137,11 +135,12 @@ module HireFireApp
     end
 
     ##
-    # Returns the name of the worker type, or "Not Found" if not found
+    # Returns the name of the worker library, or "Not Found" if the worker library
+    # could not be found / is not supported
     #
     # @returns [String]
     #
-    def worker
+    def worker_library
       if defined?(Delayed::Job)
         "Delayed Job"
       elsif defined?(Resque)
@@ -152,13 +151,14 @@ module HireFireApp
     end
 
     ##
-    # Returns "OK" if both the mapper and worker were found
+    # Returns "OK" if both the mapper and worker were found, or "INCOMPLETE"
+    # if either of them could not be found
     #
     # @returns [String]
     #
-    def ok
-      if mapper =~ /Not Found/ or worker =~ /Not Found/
-        "Incomplete"
+    def worker_ok
+      if mapper_library =~ /Not Found/ or worker_library =~ /Not Found/
+        "INCOMPLETE"
       else
         "OK"
       end

metadata

@@ -1,28 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hirefireapp
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-05 00:00:00 +02:00
-default_executable: 
+date: 2011-08-25 00:00:00.000000000 Z
 dependencies: []
-
-description: HireFireApp.com - The Heroku Process Manager - Autoscaling your web and worker dynos saving you time and money!
+description: HireFireApp.com - The Heroku Process Manager - Autoscaling your web and
+  worker dynos saving you time and money!
 email: meskyanichi@gmail.com
-executables: 
+executables:
 - hirefireapp
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - README.md
 - bin/hirefireapp
@@ -30,33 +26,29 @@ files:
 - lib/hirefireapp.rb
 - lib/hirefireapp/middleware.rb
 - lib/hirefireapp/railtie.rb
-has_rdoc: true
 homepage: http://hirefireapp.com/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: HireFireApp.com - The Heroku Process Manager - Autoscaling your web and worker dynos!
+summary: HireFireApp.com - The Heroku Process Manager - Autoscaling your web and worker
+  dynos!
 test_files: []
-