rocketjob 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c01cfe6dbadea5f8d327a520b68c7262b1bcff96
-  data.tar.gz: 4e52926f26dc216852bae81f780b48103a5625fe
+  metadata.gz: b2d5bd2e258623a70cb2ac81bb559db1302d2c40
+  data.tar.gz: 5e478b33ac8e404496ca112536dcd57e24d3b369
 SHA512:
-  metadata.gz: 3286460b8ce4f27c31c47226b5d157c62541114f0c645b1260ff6cbe86cdd23f985bd6c180024b2812bf8b0ca650634e186f28faf0f5a87c0648a2cdd3edcff3
-  data.tar.gz: 26af31595e81983ab38e70fbc2b2d1c5101a876bfa2fcfdf9a465648e87269f42c70ee9fb580b9bfda6cfbacec18d67d36d502d235d3a22e0e7e8d5a372947af
+  metadata.gz: 6c39b919588cd3f58490294e92ef2233f397a867b4e3bf41073e16374238348f6a2ec892a2dfbcc73ed838ef62c3344a6a3d7ec9289e70ba4ee575cf5ab096a7
+  data.tar.gz: 07603275a4346907ea05613012582cbf746571011d25bb4bb42d3bfa022932c8867030025a338e83aa21f8de9eb597e9cee83d9cb34e3eb9175054da8c2101d9

data/lib/rocket_job/job.rb

@@ -234,6 +234,11 @@ module RocketJob
       end
     end
 
+    # Returns a human readable duration the job has taken
+    def duration
+      seconds_as_duration(seconds)
+    end
+
     # A job has expired if the expiry time has passed before it is started
     def expired?
       started_at.nil? && expires_at && (expires_at < Time.now)
@@ -241,7 +246,7 @@ module RocketJob
 
     # Returns [Hash] status of this job
     def as_json
-      attrs = serializable_hash(methods: :seconds)
+      attrs = serializable_hash(methods: [:seconds, :duration])
       attrs.delete('result') unless collect_output?
       case
       when running?
@@ -268,9 +273,7 @@ module RocketJob
 
     def status(time_zone='Eastern Time (US & Canada)')
       h = as_json
-      if seconds = h.delete('seconds')
-        h['duration'] = seconds_as_duration(seconds)
-      end
+      h.delete('seconds')
       h.delete('perform_method') if h['perform_method'] == :perform
       h.dup.each_pair do |k,v|
         case
@@ -317,11 +320,13 @@ module RocketJob
 
     def before_complete
       self.percent_complete = 100
-      self.completed_at = Time.now
+      self.completed_at     = Time.now
+      self.worker_name      = nil
     end
 
     def before_fail
       self.completed_at = Time.now
+      self.worker_name      = nil
     end
 
     def before_retry
@@ -330,6 +335,7 @@ module RocketJob
 
     def before_pause
       self.completed_at = Time.now
+      self.worker_name      = nil
     end
 
     def before_resume
@@ -338,13 +344,14 @@ module RocketJob
 
     def before_abort
       self.completed_at = Time.now
+      self.worker_name      = nil
     end
 
     # Returns a human readable duration from the supplied [Float] number of seconds
     def seconds_as_duration(seconds)
       time = Time.at(seconds)
       if seconds >= 1.day
-        "#{seconds / 1.day}d #{time.strftime('%-Hh %-Mm %-Ss')}"
+        "#{(seconds / 1.day).to_i}d #{time.strftime('%-Hh %-Mm %-Ss')}"
       elsif seconds >= 1.hour
         time.strftime('%-Hh %-Mm %-Ss')
       elsif seconds >= 1.minute

data/lib/rocket_job/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module RocketJob #:nodoc
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/test/job_worker_test.rb

@@ -40,7 +40,7 @@ class WorkerTest < Minitest::Test
           assert_equal true, @job.completed?
           assert_equal 2,    Jobs::TestJob.result
 
-          assert       @job.worker_name
+          assert_nil   @job.worker_name
           assert       @job.completed_at
           assert       @job.created_at
           assert_nil   @job.description

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm