hirefireapp 0.0.4 → 0.0.5

data/hirefireapp.gemspec

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

data/lib/hirefireapp/middleware.rb

@@ -40,9 +40,9 @@ module HireFireApp
         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"
+          out << "HireFire is able to manage 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."
+          out << "HireFire is able to manage both your web, as well as your worker dynos."
         end
 
         block.call out
@@ -73,8 +73,8 @@ 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 is defined.
+    # It'll use the ActiveRecord ORM, Mongoid ODM or MongoMapper ODM
+    # depending on 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.
@@ -82,7 +82,7 @@ module HireFireApp
     # @returns [Fixnum] delayed_job_count the amount of jobs currently pending
     #
     def count_delayed_job
-      if defined?(ActiveRecord) and Delayed::Worker.backend.to_s =~ /ActiveRecord/
+      if defined?(ActiveRecord) and backend?(/ActiveRecord/)
         if defined?(ActiveRecord::Relation)
           Delayed::Job.
           where(:failed_at => nil).
@@ -94,7 +94,12 @@ module HireFireApp
             ]
           ).count
         end
-      elsif defined?(Mongoid) and Delayed::Worker.backend.to_s =~ /Mongoid/
+      elsif defined?(Mongoid) and backend?(/Mongoid/)
+        Delayed::Job.where(
+          :failed_at  => nil,
+          :run_at.lte => Time.now
+        ).count
+      elsif defined?(MongoMapper) and backend?(/MongoMapper/)
         Delayed::Job.where(
           :failed_at  => nil,
           :run_at.lte => Time.now
@@ -122,10 +127,12 @@ module HireFireApp
       if defined?(Redis) and defined?(Resque)
         "Redis"
       elsif defined?(Delayed::Worker)
-        if defined?(ActiveRecord) and Delayed::Worker.backend.to_s =~ /ActiveRecord/
+        if defined?(ActiveRecord) and backend?(/ActiveRecord/)
           "Active Record"
-        elsif defined?(Mongoid) and Delayed::Worker.backend.to_s =~ /Mongoid/
+        elsif defined?(Mongoid) and backend?(/Mongoid/)
           "Mongoid"
+        elsif defined?(MongoMapper) and backend?(/MongoMapper/)
+          "Mongo Mapper"
         else
           "Not Found"
         end
@@ -164,6 +171,16 @@ module HireFireApp
       end
     end
 
+    ##
+    # Returns "true" if the mapper is used by Delayed::Job backend
+    #
+    # @returns [Boolean]
+    #
+    def backend?(mapper)
+      return true if Delayed::Worker.backend.to_s =~ mapper
+      false
+    end
+
     ##
     # Returns true if the PATH_INFO matches the test url
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hirefireapp
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-25 00:00:00.000000000 Z
+date: 2011-09-12 00:00:00.000000000 Z
 dependencies: []
 description: HireFireApp.com - The Heroku Process Manager - Autoscaling your web and
   worker dynos saving you time and money!
@@ -46,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: HireFireApp.com - The Heroku Process Manager - Autoscaling your web and worker