ood_core 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cf4709dc9c8753f8229ae67403a0498e9cb8602
-  data.tar.gz: 2f555177a357923753dc246aa4c56811349d4b74
+  metadata.gz: 13f67ce37546552c1f3b8849dca41458b066cb36
+  data.tar.gz: 56142c67e2210211d4525982abb5254999306b6a
 SHA512:
-  metadata.gz: 702a25970cf24f9cda29e2adbd57c64003fc3cc60cc07b1da89f2d1c4bb5fb3153e688081c58139fd8ba7cb5623f6a08e16cbbf13737ee61194d1aafcb3d5a8a
-  data.tar.gz: ff5b02ee6b00d43b14568ad91768fcd8b1c8bde7166c112b2df215702bb1f7632e0e154e1954bb974ed1a3e1c71736e3f2aa88385d1d8563e20ab2759ea45ab7
+  metadata.gz: 56cfa06bd1d20bb00bc1362a1dbc484c03c600c7f30525fe51b483bfe6fe950b81c33fcd6ec214815cf538670525a46c423aea5a4e3a23aa44d2cc11ff31b115
+  data.tar.gz: 03d29f9582ae5609c159fad74825f16f96de0ff091aa150ad6f9cdf8a4b8899148ab8f0220fb8f6bbe18d438ec15784a9f95d6432883d658d13ee21781cd8cf7

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## Unreleased
 
+## 0.0.3 (2017-04-28)
+
+Features:
+
+  - provide support for slurm conf file
+
+Bugfixes:
+
+  - correct code documentation for `Script#min_phys_memory`
+  - fix for login feature being allowed on all clusters even if not defined
+
 ## 0.0.2 (2017-04-27)
 
 Features:

data/lib/ood_core/cluster.rb

@@ -64,7 +64,7 @@ module OodCore
     # Whether the login feature is allowed
     # @return [Boolean] is login allowed
     def login_allow?
-      allow? && !login.empty?
+      allow? && !login_config.empty?
     end
 
     # Build a job adapter from the job configuration

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

@@ -8,13 +8,15 @@ module OodCore
 
       # Build the Slurm adapter from a configuration
       # @param config [#to_h] the configuration for job adapter
-      # @option config [#to_s] :cluster ('') The cluster to communicate with
-      # @option config [#to_s] :bin ('') Path to slurm client binaries
+      # @option config [Object] :cluster (nil) The cluster to communicate with
+      # @option config [Object] :conf (nil) Path to the slurm conf
+      # @option config [Object] :bin (nil) Path to slurm client binaries
       def self.build_slurm(config)
         c = config.to_h.symbolize_keys
-        cluster = c.fetch(:cluster, "").to_s
-        bin  = c.fetch(:bin, "").to_s
-        slurm = Adapters::Slurm::Batch.new(cluster: cluster, bin: bin)
+        cluster = c.fetch(:cluster, nil)
+        conf    = c.fetch(:conf, nil)
+        bin     = c.fetch(:bin, nil)
+        slurm = Adapters::Slurm::Batch.new(cluster: cluster, conf: conf, bin: bin)
         Adapters::Slurm.new(slurm: slurm)
       end
     end
@@ -31,9 +33,15 @@ module OodCore
           # The cluster of the Slurm batch server
           # @example CHPC's kingspeak cluster
           #   my_batch.cluster #=> "kingspeak"
-          # @return [String] the cluster name
+          # @return [String, nil] the cluster name
           attr_reader :cluster
 
+          # The path to the Slurm configuration file
+          # @example For Slurm 10.0.0
+          #   my_batch.conf.to_s #=> "/usr/local/slurm/10.0.0/etc/slurm.conf
+          # @return [Pathname, nil] path to slurm conf
+          attr_reader :conf
+
           # The path to the Slurm client installation binaries
           # @example For Slurm 10.0.0
           #   my_batch.bin.to_s #=> "/usr/local/slurm/10.0.0/bin
@@ -44,10 +52,12 @@ module OodCore
           # from
           class Error < StandardError; end
 
-          # @param cluster [#to_s] the cluster name
+          # @param cluster [#to_s, nil] the cluster name
+          # @param conf [#to_s, nil] path to the slurm conf
           # @param bin [#to_s] path to slurm installation binaries
-          def initialize(cluster: "", bin: "")
-            @cluster = cluster.to_s
+          def initialize(cluster: nil, bin: nil, conf: nil)
+            @cluster = cluster && cluster.to_s
+            @conf    = conf    && Pathname.new(conf.to_s)
             @bin     = Pathname.new(bin.to_s)
           end
 
@@ -80,7 +90,7 @@ module OodCore
             args += ["-j", id.to_s] unless id.to_s.empty?
             lines = call("squeue", *args).split("\n").map(&:strip)
 
-            lines.drop(cluster.empty? ? 1 : 2).map do |line|
+            lines.drop(cluster ? 2 : 1).map do |line|
               Hash[options.keys.zip(line.split(delim))]
             end
           end
@@ -132,8 +142,9 @@ module OodCore
             def call(cmd, *args, env: {}, stdin: "")
               cmd = bin.join(cmd.to_s).to_s
               args  = args.map(&:to_s)
-              args += ["-M", cluster] unless cluster.empty?
+              args += ["-M", cluster] if cluster
               env = env.to_h
+              env["SLURM_CONF"] = conf.to_s if conf
               o, e, s = Open3.capture3(env, cmd, *args, stdin_data: stdin.to_s)
               s.success? ? o : raise(Error, e)
             end

data/lib/ood_core/job/script.rb

@@ -82,8 +82,9 @@ module OodCore
       # @return [Fixnum, nil] scheduling priority
       attr_reader :priority
 
-      # The minmimum amount of physical memory in kilobyte that should be available
-      # for the job
+      # The minimum amount of physical memory in kilobyte for all nodes or per
+      # node (dependent upon the resource manager) that should be available for
+      # the job
       # @return [Fixnum, nil] minimum physical memory
       attr_reader :min_phys_memory
 

data/lib/ood_core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jeremy Nicklas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support