sfrest 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc74108bd6ad403fcf6bfa7125dad70952c7c4ecf7b136bd606e2f699d54970a
-  data.tar.gz: a875b7a8864b004b5c38bfc368b63c75b51a7f921bde919817dc57365819604f
+  metadata.gz: 94bd205352e9ec9465614828f2a5bb1b602217568ca5135b4c30223f0f16ec63
+  data.tar.gz: 9fdbde3ff4ba1b1811625b2eb48a3aa22c1f54e652747dc6ab6adf2fb3875348
 SHA512:
-  metadata.gz: a62fd336bf56a3ca2bf888b062c9a640412c3ed55775f9a8336ec514e2a2d6e560ec6f1540f8faa01c18c601dddf0bb130a7f3faa68eeff1512579d348c3fce0
-  data.tar.gz: 9679eb844a8c32d97b78cec5e87ddd01b23e013b965178186407a519fc2a7e25176c5e0b6a70383559b7340b654a8bf059e60373e606fa0e80624ef3db9bfbe5
+  metadata.gz: ce166dabdbc263441fc183a38f5b85700c0775a2b69249b2587c42950c441a6bf701814b786ebb1f307412dce7b9b357aaeda7b060c89bfea9259a0650bf2646
+  data.tar.gz: 7f98365d4da5f5121040b63fc6db432e3f67b2b368e365fef6f477c76de811fc5c8f6ba985fbe38e38acb660268b5b5833868c26d258534e050177078d57168e

data/lib/sfrest/task.rb

@@ -60,14 +60,22 @@ module SFRest
       false
     end
 
+    # Get the status of a wip task by id.
+    # @param [Integer] task_id
+    # @return [Hash{"wip_task" => {"id" => Integer, "status" => Integer}, "time" => timestamp}]
+    def task_status(task_id)
+      current_path = "/api/v1/wip/task/#{task_id}/status"
+      res = @conn.get(current_path)
+      raise InvalidDataError, "No wip task returned for task id #{task_id}" if res['wip_task'].nil?
+      raise InvalidDataError, "No task status returned for task id #{task_id}" if res['wip_task']['status'].nil?
+      res['wip_task']['status']
+    end
+
     # Returns true only if WIP reports the status as running
     # @param [Integer] task_id
     # @return [Boolean]
     def task_running?(task_id)
-      task_path = "/api/v1/wip/task/#{task_id}/status"
-
-      res = @conn.get task_path
-      status = res['wip_task']['status']
+      status = task_status task_id
       status_running?(status)
     end
 
@@ -75,10 +83,7 @@ module SFRest
     # @param [Integer] task_id
     # @return [Boolean]
     def task_completed?(task_id)
-      task_path = "/api/v1/wip/task/#{task_id}/status"
-
-      res = @conn.get task_path
-      status = res['wip_task']['status']
+      status = task_status task_id
       status_completed?(status)
     end
 
@@ -87,10 +92,7 @@ module SFRest
     # @param [Integer] task_id
     # @return [Boolean]
     def task_done?(task_id)
-      task_path = "/api/v1/wip/task/#{task_id}/status"
-
-      res = @conn.get task_path
-      status = res['wip_task']['status']
+      status = task_status task_id
       status_done?(status)
     end
 
@@ -98,10 +100,7 @@ module SFRest
     # @param [Integer] task_id
     # @return [Boolean]
     def task_killed?(task_id)
-      task_path = "/api/v1/wip/task/#{task_id}/status"
-
-      res = @conn.get task_path
-      status = res['wip_task']['status']
+      status = task_status task_id
       status_killed?(status)
     end
 
@@ -109,10 +108,7 @@ module SFRest
     # @param [Integer] task_id
     # @return [Boolean]
     def task_errored?(task_id)
-      task_path = "/api/v1/wip/task/#{task_id}/status"
-
-      res = @conn.get task_path
-      status = res['wip_task']['status']
+      status = task_status task_id
       status_error?(status)
     end
 

data/lib/sfrest/version.rb

@@ -1,4 +1,4 @@
 module SFRest
   # Just tracks the version of sfrest.
-  VERSION = '0.0.16'.freeze
+  VERSION = '0.0.17'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfrest
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - ACSF Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon