ood_core 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa0b9b86a34c8968e6903b35e81a835c9fd6c595
-  data.tar.gz: 6f6cb53b9d3e4afe6e027b29bf52a77e5b8f146b
+  metadata.gz: ec6f497f2c284f0ff82e4523a4deb37eee2cb9e7
+  data.tar.gz: 3d8c7a43d9b35fcc5b6e6f29ae58d7f1b5192f71
 SHA512:
-  metadata.gz: 133a7548725f986cab0eb69cd36bee91b28d38ff7bda87511d3c88bff582e6f595db3bbe8f1179530cefd9bd71a5385e41120963055bc6dc048a1b9c078e1290
-  data.tar.gz: e1d76582d175f7f72f442d0d1c6bbe4df7dedb969415970331f726da88d6dceeea6141af7aec922cc27985f2790f082049db8e52194b078ccce413dd8261e7c0
+  metadata.gz: a0d8048e7402f17dfd4d9f7504adbe23c142f4a0c6e3100b4ae4ce5feadbd24e9c7430ac19dee00b7e3127f328c3227e5051c4d41abb64025c02a662dcd09c20
+  data.tar.gz: 53c70e68d490a1a196d0caab502f0040b7765582e52b39cbd8ca036112c39f6d933fd48f7957d8fd3e63ffdd19a3b492ebc00147396ca5306f4baf8ba411b84b

data/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.1.1] - 2017-09-08
+
+### Fixed
+
+- fix crash when calling `Adapters::Lsf#info(id:)` with "invalid" id
+- optimize `Adapters::Lsf#info_where_owner` by using `bjobs -u $USER` when a single user is specified
+
 ## [0.1.0] - 2017-07-17
 
 ### Changed
@@ -77,7 +84,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Initial release!
 
-[Unreleased]: https://github.com/OSC/ood_core/compare/v0.1.0...HEAD
+[Unreleased]: https://github.com/OSC/ood_core/compare/v0.1.1...HEAD
+[0.1.1]: https://github.com/OSC/ood_core/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/OSC/ood_core/compare/v0.0.5...v0.1.0
 [0.0.5]: https://github.com/OSC/ood_core/compare/v0.0.4...v0.0.5
 [0.0.4]: https://github.com/OSC/ood_core/compare/v0.0.3...v0.0.4

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

@@ -19,6 +19,8 @@ module OodCore
 
     module Adapters
       class Lsf < Adapter
+        using Refinements::ArrayExtensions
+
         # @api private
         attr_reader :batch, :helper
 
@@ -102,6 +104,23 @@ module OodCore
           raise JobAdapterError, e.message
         end
 
+        # Retrieve info for all of the owner's jobs from the resource manager
+        # @raise [JobAdapterError] if something goes wrong getting job info
+        # @return [Array<Info>] information describing submitted jobs
+        # @see Adapter#info_where_owner
+        def info_where_owner(owner)
+          owners = Array.wrap(owner).map(&:to_s)
+          if owners.count > 1
+            super
+          elsif owners.count == 0
+            []
+          else
+	    batch.get_jobs_for_user(owners.first).map { |v| info_for_batch_hash(v) }
+	  end
+        rescue Batch::Error => e
+          raise JobAdapterError, e.message
+        end
+
         # Retrieve job status from resource manager
         # @param id [#to_s] the id of the job
         # @raise [JobAdapterError] if something goes wrong getting job status

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

@@ -30,8 +30,11 @@ class OodCore::Job::Adapters::Lsf::Batch
   # @raise [Error] if `bjobs` command exited unsuccessfully
   # @return [Array<Hash>] list of details for jobs
   def get_jobs
-    #TODO: split into get_all_jobs, get_my_jobs
-    args = bjobs_default_args
+    get_jobs_for_user("all")
+  end
+
+  def get_jobs_for_user(user)
+    args = %W( -u #{user} -a -w -W )
     parse_bjobs_output(call("bjobs", *args))
   end
 
@@ -40,15 +43,10 @@ class OodCore::Job::Adapters::Lsf::Batch
   # @raise [Error] if `bjobs` command exited unsuccessfully
   # @return [Hash] details of specified job
   def get_job(id:)
-    args = bjobs_default_args
-    args << id.to_s
+    args = %W( -a -w -W #{id.to_s} )
     parse_bjobs_output(call("bjobs", *args)).first
   end
 
-  def bjobs_default_args
-    %w( -u all -a -w -W )
-  end
-
   # status fields available from bjobs
   def fields
     %i(id user status queue from_host exec_host name submit_time
@@ -57,9 +55,11 @@ class OodCore::Job::Adapters::Lsf::Batch
 
   # helper method
   def parse_bjobs_output(response)
-    return [] if response =~ /No job found/ || response.nil?
+    return [] if response.nil? || response.strip.empty?
 
     lines = response.split("\n")
+    raise Error, "bjobs output in different format than expected: #{lines.inspect}" unless lines.count > 1
+
     columns = lines.shift.split
 
     validate_bjobs_output_columns(columns)

data/lib/ood_core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jeremy Nicklas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-17 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support