rocketjob 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faa325cab5ef48e8da02dc8310ab2a2098670b7b
-  data.tar.gz: 273ee417e36f6e69123c345d967d92e1efd77c1c
+  metadata.gz: abb40a0f5b7abce954efc71891845f43088af58b
+  data.tar.gz: 554a9d1df074fff449db727ce2bba2dcae8867b0
 SHA512:
-  metadata.gz: c833153f3eb38d8e7c5bcdb1c691dc5edc51fbde013e07a0f7a5c488cee848c77b573218c4cb1f04da2b06a6feadb8e30bd435dcbc3516e0291330eff459cd2a
-  data.tar.gz: 70cfc47e8b4383d2d61fc6ed99d4672784a4128ebb03f270a7ef667a1f6217a754d2a6a937e92caf909e9850ca78c85f4bb688aa89e970b3b32369abcfc68863
+  metadata.gz: 0ef4cff6fac8bb64b10b8b4be0a2c4b2e009510f964619423c8604ed78710a0712fe2a2cdf3e5a88450d233eaba74d999d6094f344f6ae53841abd223f1c622b
+  data.tar.gz: 7fcb27f62e344fe38ca20fae4178e021baafa955644abf9420d8970a250d7c59a24c41e488201bc47b140d03aad03a8772618ae68df0cc22e8c8757be3ee4afb

data/lib/rocket_job/cli.rb

@@ -2,6 +2,7 @@ require 'optparse'
 require 'semantic_logger'
 require 'mongoid'
 require 'rocketjob'
+require 'rocket_job/extensions/mongoid/factory'
 module RocketJob
   # Command Line Interface parser for RocketJob
   class CLI
@@ -35,7 +36,7 @@ module RocketJob
       write_pidfile
 
       # In case Rails did not load the Mongoid Config
-      RocketJob::Config.load!(environment, mongo_config, symmetric_encryption_config) if Mongoid::Config.clients.empty?
+      RocketJob::Config.load!(environment, mongo_config, symmetric_encryption_config) if ::Mongoid::Config.clients.empty?
 
       opts               = {}
       opts[:name]        = name if name
@@ -132,8 +133,8 @@ module RocketJob
       # Enable SemanticLogger signal handling for this process
       SemanticLogger.add_signal_handler
 
-      Mongoid.logger       = SemanticLogger[Mongoid]
-      Mongo::Logger.logger = SemanticLogger[Mongo]
+      ::Mongoid.logger       = SemanticLogger[::Mongoid]
+      ::Mongo::Logger.logger = SemanticLogger[::Mongo]
     end
 
     # Eager load files in jobs folder

data/lib/rocket_job/extensions/mongoid/factory.rb

@@ -0,0 +1,13 @@
+require 'mongoid/factory'
+
+module RocketJob
+  module MongoidFactory
+    def from_db(*args)
+      super(*args)
+    rescue NameError => exc
+      RocketJob::Job.instantiate(attributes, selected_fields)
+    end
+  end
+end
+
+::Mongoid::Factory.include(RocketJob::MongoidFactory)

data/lib/rocket_job/performance.rb

@@ -1,5 +1,6 @@
 require 'csv'
 require 'yaml'
+require 'optparse'
 module RocketJob
   class Performance
     attr_accessor :count, :servers, :workers, :version, :ruby, :environment, :mongo_config

data/lib/rocket_job/plugins/job/model.rb

@@ -45,7 +45,7 @@ module RocketJob
           field :collect_output, type: Boolean, default: false, class_attribute: true
 
           # Run this job no earlier than this time
-          field :run_at, type: Time
+          field :run_at, type: Time, user_editable: true
 
           # If a job has not started by this time, destroy it
           field :expires_at, type: Time, copy_on_restart: true
@@ -245,6 +245,22 @@ module RocketJob
           queued? && run_at.present? && (run_at > Time.now)
         end
 
+        # Return [true|false] whether this job is sleeping.
+        # I.e. No workers currently working on this job even if it is running.
+        def sleeping?
+          running? && (worker_count == 0)
+        end
+
+        # Returns [Integer] the number of workers currently working on this job.
+        def worker_count
+          running? && worker_name.present? ? 1 : 0
+        end
+
+        # Returns [Array<String>] names of workers currently working this job.
+        def worker_names
+          running? && worker_name.present? ? [worker_name] : []
+        end
+
         # Returns [Hash] status of this job
         def as_json
           attrs = serializable_hash(methods: [:seconds, :duration])

data/lib/rocket_job/version.rb

@@ -1,3 +1,3 @@
 module RocketJob #:nodoc
-  VERSION = '3.4.0'
+  VERSION = '3.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -84,6 +84,7 @@ files:
 - lib/rocket_job/config.rb
 - lib/rocket_job/dirmon_entry.rb
 - lib/rocket_job/extensions/mongo/logging.rb
+- lib/rocket_job/extensions/mongoid/factory.rb
 - lib/rocket_job/extensions/rocket_job_adapter.rb
 - lib/rocket_job/heartbeat.rb
 - lib/rocket_job/job.rb