lib/rocketjob.rb in rocketjob-1.3.0 vs lib/rocketjob.rb in rocketjob-2.0.0.rc1

@@ -1,39 +1,61 @@
 # encoding: UTF-8
-require 'mongo'
+require 'semantic_logger'
+require 'rocket_job/extensions/mongo'
 require 'mongo_ha'
 require 'mongo_mapper'
-require 'semantic_logger'
 require 'rocket_job/version'
 
 # @formatter:off
 module RocketJob
-  autoload :CLI,            'rocket_job/cli'
-  autoload :Config,         'rocket_job/config'
-  autoload :DirmonEntry,    'rocket_job/dirmon_entry'
-  autoload :Heartbeat,      'rocket_job/heartbeat'
-  autoload :Job,            'rocket_job/job'
-  autoload :JobException,   'rocket_job/job_exception'
-  autoload :Worker,         'rocket_job/worker'
-  module Concerns
-    autoload :Worker,       'rocket_job/concerns/worker'
-    autoload :Singleton,    'rocket_job/concerns/singleton'
+  autoload :CLI,               'rocket_job/cli'
+  autoload :Config,            'rocket_job/config'
+  autoload :DirmonEntry,       'rocket_job/dirmon_entry'
+  autoload :Heartbeat,         'rocket_job/heartbeat'
+  autoload :Job,               'rocket_job/job'
+  autoload :JobException,      'rocket_job/job_exception'
+  autoload :Worker,            'rocket_job/worker'
+
+  module Plugins
+    module Job
+      autoload :Callbacks,     'rocket_job/plugins/job/callbacks'
+      autoload :Defaults,      'rocket_job/plugins/job/defaults'
+      autoload :StateMachine,  'rocket_job/plugins/job/state_machine'
+      autoload :Logger,        'rocket_job/plugins/job/logger'
+      autoload :Model,         'rocket_job/plugins/job/model'
+      autoload :Persistence,   'rocket_job/plugins/job/persistence'
+      autoload :Worker,        'rocket_job/plugins/job/worker'
+    end
+    autoload :Document,        'rocket_job/plugins/document'
+    autoload :Restart,         'rocket_job/plugins/restart'
+    autoload :Singleton,       'rocket_job/plugins/singleton'
+    autoload :StateMachine,    'rocket_job/plugins/state_machine'
   end
+
   module Jobs
-    autoload :DirmonJob,    'rocket_job/jobs/dirmon_job'
+    autoload :DirmonJob,       'rocket_job/jobs/dirmon_job'
+    autoload :SimpleJob,       'rocket_job/jobs/simple_job'
   end
 
   # @formatter:on
   # Returns a human readable duration from the supplied [Float] number of seconds
   def self.seconds_as_duration(seconds)
-    time = Time.at(seconds)
-    if seconds >= 1.day
-      "#{(seconds / 1.day).to_i}d #{time.strftime('%-Hh %-Mm %-Ss')}"
-    elsif seconds >= 1.hour
-      time.strftime('%-Hh %-Mm %-Ss')
-    elsif seconds >= 1.minute
-      time.strftime('%-Mm %-Ss')
+    return nil unless seconds
+    if seconds >= 86400.0 # 1 day
+      "#{(seconds / 86400).to_i}d #{Time.at(seconds).strftime('%-Hh %-Mm')}"
+    elsif seconds >= 3600.0 # 1 hour
+      Time.at(seconds).strftime('%-Hh %-Mm')
+    elsif seconds >= 60.0 # 1 minute
+      Time.at(seconds).strftime('%-Mm %-Ss')
+    elsif seconds >= 1.0 # 1 second
+      "#{'%.3f' % seconds}s"
     else
-      time.strftime('%-Ss')
+      duration = seconds * 1000
+      if defined? JRuby
+        "#{duration.to_i}ms"
+      else
+        duration < 10.0 ? "#{'%.3f' % duration}ms" : "#{'%.1f' % duration}ms"
+      end
     end
   end
+
 end