pbs 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c42c7352f3bed19c09615d1478787d9a806c1231
-  data.tar.gz: e97cd9bbecb3f5c3cc032a8c6d98eda8e48228b0
+  metadata.gz: 57460fc7fac20af4c859698d601fc5b8ea3ec53b
+  data.tar.gz: f60a0a6ac99e28696b9569bbb94bee38d1ec3114
 SHA512:
-  metadata.gz: c54720352ae8cb8fa44a2c00738bfba451cdfebad7d73b00a310e5e88d6083bd6db9271dccb48918ba64df9b3dd8083101125fafa5fc0a30264f1f31ca3df89e
-  data.tar.gz: a50902c7b82d77d6e17d502b6f19e7a6aa36f346478831728b5edea822aaebb01c7740cf860bf16b737539382ea4b4d610df983cd820e6b0403913dcd28ee81c
+  metadata.gz: a23bc11cabe603ce5cfef73be6a0d9e2da756010e17e25d288abaee633ae85e87c4641e160f19fc2d98a75715477c842c388483e0ce0f56b228e8b579df94169
+  data.tar.gz: 898aec140d814a5bdcbfbd11efa47e87c2ec24803f03d851d4a7a5554336e048079ee18039ceb4aede07140d3655826e12f00d9071fec5b5a523953e55e7e776

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Unreleased
 
+## 2.0.3 (2016-11-04)
+
+Bugfixes:
+
+  - better support `qsub` CLI arguments
+
 ## 2.0.2 (2016-08-17)
 
 Bugfixes:

data/lib/pbs/batch.rb

@@ -319,19 +319,62 @@ module PBS
         end
       end
 
+      # Mapping of Torque attribute to `qsub` arguments
+      def qsub_arg(key, value)
+        case key
+        # common attributes
+        when :Execution_Time
+          ['-a', value.to_s]
+        when :Checkpoint
+          ['-c', value.to_s]
+        when :Error_Path
+          ['-e', value.to_s]
+        when :fault_tolerant
+          ['-f']
+        when :Hold_Types
+          ['-h']
+        when :Join_Path
+          ['-j', value.to_s]
+        when :Keep_Files
+          ['-k', value.to_s]
+        when :Mail_Points
+          ['-m', value.to_s]
+        when :Output_Path
+          ['-o', value.to_s]
+        when :Priority
+          ['-p', value.to_s]
+        when :Rerunable
+          ['-r', value.to_s]
+        when :job_array_request
+          ['-t', value.to_s]
+        when :User_List
+          ['-u', value.to_s]
+        when :Account_Name
+          ['-A', value.to_s]
+        when :Mail_Users
+          ['-M', value.to_s]
+        when :Job_Name
+          ['-N', value.to_s]
+        when :Shell_Path_List
+          ['-S', value.to_s]
+        # uncommon attributes
+        when :job_arguments
+          ['-F', value.to_s]
+        when :init_work_dir
+          ['-d', value.to_s] # sets PBS_O_INITDIR
+        # everything else
+        else
+          ['-W', "#{key}=#{value}"]
+        end
+      end
+
       # Submit a script using Torque binary
       # NB: The binary includes many useful filters and is preferred
       def qsub_submit(script, queue, headers, resources, envvars)
         params  = ["-q", "#{queue}@#{host}"]
-        params += resources.map{|k,v| ["-l", "#{k}=#{v}"]}.flatten unless resources.empty?
+        params += headers.map {|k,v| qsub_arg(k,v)}.flatten
+        params += resources.map{|k,v| ["-l", "#{k}=#{v}"]}.flatten
         params += ["-v", envvars.map{|k,v| "#{k}=#{v}"}.join(",")] unless envvars.empty?
-        params += headers.map do |k,v|
-          if param = ATTR.key(k) and param.length == 1
-            ["-#{param}", "#{v}"]
-          else
-            ["-W", "#{k}=#{v}"]
-          end
-        end.flatten
         params << script
 
         env = {

data/lib/pbs/version.rb

@@ -1,4 +1,4 @@
 module PBS
   # The current version of PBS
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pbs
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Jeremy Nicklas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi