ood_core 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 948be1edf24a4e534669547d92b6ad56cc229183442a27705941bd959085a09a
-  data.tar.gz: 700a6c5073641233ac36553350d4ab451e0b01d73f885bc7bd2695b81479b6fa
+SHA1:
+  metadata.gz: 9f4136abfa563b5a8e552a4ea23fb28886d0504e
+  data.tar.gz: 8fd45406db0789e635ae41ca52021d7317eac883
 SHA512:
-  metadata.gz: fcc1aa968fe78132164a5ba3ab6e6165f1f64b950ca1e3862b00020aec9915c1458e52897005a0057b6ca4d9205c3b463f8f9b421e85f9da75778fe27734b371
-  data.tar.gz: 74af322ccb4e8f50c350d190bacc65440fb3ab79791a4cb03f5d081131a0d72ad186f43b647621d57053f4da717a59cd9efae9f8cb7c6c377b34ec4563faf100
+  metadata.gz: 1cc80ddf1f1d99e10c96ade0fcc70cd6cb96638fc204dbc6ecf8533bf7753d9c80077486f1a7cb15e2270e11aba0366fdec8dbb20cfcb00e0d6bfd33f7e03894
+  data.tar.gz: e1f944deee57a03dd800bd4217b1c7f125e087edd284a87ab3dae4b655231c8b511d83e256a7df24afa66c76b72e95fd8fe60a549dd45f525ca6016fe8d21fb3

data/CHANGELOG.md

@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [0.7.1] - 2019-01-11
+### Fixed
+- Fixed crash when libdrmaa is used to query for a job no longer in the queue
 
 ## [0.7.0] - 2018-12-26
 ### Added
@@ -153,7 +156,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial release!
 
-[Unreleased]: https://github.com/OSC/ood_core/compare/v0.7.0...HEAD
+[Unreleased]: https://github.com/OSC/ood_core/compare/v0.7.1...HEAD
+[0.7.1]: https://github.com/OSC/ood_core/compare/v0.7.0...v0.7.1
 [0.7.0]: https://github.com/OSC/ood_core/compare/v0.6.0...v0.7.0
 [0.6.0]: https://github.com/OSC/ood_core/compare/v0.5.1...v0.6.0
 [0.5.1]: https://github.com/OSC/ood_core/compare/v0.5.0...v0.5.1

data/lib/ood_core/job/adapters/sge.rb

@@ -93,7 +93,7 @@ module OodCore
         def info_all
           @batch.get_all
         rescue Batch::Error => e
-            raise JobAdapterError, e.message
+          raise JobAdapterError, e.message
         end
 
         # Retrieve info for all jobs for a given owner or owners from the

data/lib/ood_core/job/adapters/sge/batch.rb

@@ -66,17 +66,21 @@ class OodCore::Job::Adapters::Sge::Batch
     argv += ['-u', owner] unless owner.nil?
     REXML::Parsers::StreamParser.new(call(*argv), listener).parse
 
-    listener.parsed_jobs.map{|job_hash| OodCore::Job::Info.new(**post_process_qstat_job_hash(job_hash))}
+    listener.parsed_jobs.map{
+      |job_hash| OodCore::Job::Info.new(
+        **post_process_qstat_job_hash(job_hash)
+      )
+    }
   end
 
   # Get OodCore::Job::Info for a job_id that may still be in the queue
   # 
-  # If libdrmaa is not loaded then we cannot use DRMAA. Using
-  # DRMAA provides better job status and should always be chosen if it is possible.
+  # If libdrmaa is not loaded then we cannot use DRMAA. Using DRMAA provides
+  # better job status and should always be chosen if it is possible.
   # 
-  # When qstat is called in XML mode for a job id that is not in the queue invalid XML
-  # is returned. The second line of the invalid XML contains the string '<unknown_jobs'
-  # which will be used to recognize this case.
+  # When qstat is called in XML mode for a job id that is not in the queue
+  # invalid XML is returned. The second line of the invalid XML contains the
+  # string '<unknown_jobs' which will be used to recognize this case.
   # 
   # @param job_id [#to_s]
   # @return [OodCore::Job::Info]
@@ -105,6 +109,9 @@ class OodCore::Job::Adapters::Sge::Batch
       unless results =~ /unknown_jobs/
         raise e, "REXML::ParseException error and command '#{argv.join(' ')}' produced results that didn't contain string 'unknown_jobs'. ParseException: #{e.message}"
       end
+    rescue StandardError => e
+      # Note that DRMAA is not guaranteed to be defined, hence the tests
+      raise e unless ( can_use_drmaa? && e.is_a?(DRMAA::DRMAAInvalidJobError))  # raised when job is not found
     end
 
     job_info

data/lib/ood_core/version.rb

@@ -1,4 +1,4 @@
 module OodCore
   # The current version of {OodCore}
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/ood_core.gemspec

@@ -6,8 +6,8 @@ require 'ood_core/version'
 Gem::Specification.new do |spec|
   spec.name          = "ood_core"
   spec.version       = OodCore::VERSION
-  spec.authors       = ["Jeremy Nicklas", "Morgan Rodgers"]
-  spec.email         = ["jnicklas@osc.edu", "mrodgers@osc.edu"]
+  spec.authors       = ["Eric Franz", "Morgan Rodgers", "Jeremy Nicklas"]
+  spec.email         = ["efranz@osc.edu", "mrodgers@osc.edu", "jnicklas@osc.edu"]
 
   spec.summary       = %q{Open OnDemand core library}
   spec.description   = %q{Open OnDemand core library that provides support for an HPC Center to globally define HPC services that web applications can then take advantage of.}

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
-- Jeremy Nicklas
+- Eric Franz
 - Morgan Rodgers
+- Jeremy Nicklas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-27 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support
@@ -118,8 +119,9 @@ dependencies:
 description: Open OnDemand core library that provides support for an HPC Center to
   globally define HPC services that web applications can then take advantage of.
 email:
-- jnicklas@osc.edu
+- efranz@osc.edu
 - mrodgers@osc.edu
+- jnicklas@osc.edu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -193,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Open OnDemand core library