pbs 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57460fc7fac20af4c859698d601fc5b8ea3ec53b
-  data.tar.gz: f60a0a6ac99e28696b9569bbb94bee38d1ec3114
+  metadata.gz: b212013b27cadbfb9bd8d45021f8e51a3b2fae9e
+  data.tar.gz: ea65f5cafc2aa97f110816e784c12b8d81a570fa
 SHA512:
-  metadata.gz: a23bc11cabe603ce5cfef73be6a0d9e2da756010e17e25d288abaee633ae85e87c4641e160f19fc2d98a75715477c842c388483e0ce0f56b228e8b579df94169
-  data.tar.gz: 898aec140d814a5bdcbfbd11efa47e87c2ec24803f03d851d4a7a5554336e048079ee18039ceb4aede07140d3655826e12f00d9071fec5b5a523953e55e7e776
+  metadata.gz: d3a5352bd95687a144b9c8103479a112f475e37249da4031a8e87c5aa4811472a9325344e12124be6d146db4b590dcb3b4f2b1a05e3624370188d0779597c9c4
+  data.tar.gz: 2bfa0dc4d1f7754d76337b4bf4a463059f8de27e5e35669478afe7631213032d0878618eea95a25c463d8577f3bca027227def9a29ab3247a57c2ae0b6509c9c

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 *.swp
+/vendor/bundle

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Unreleased
 
+## 2.0.4 (2017-03-28)
+
+Bugfixes:
+
+  - support reservation id for submitting job with `qsub`
+  - added workaround for users who specify queue in batch script
+
 ## 2.0.3 (2016-11-04)
 
 Bugfixes:

data/lib/pbs/batch.rb

@@ -362,6 +362,8 @@ module PBS
           ['-F', value.to_s]
         when :init_work_dir
           ['-d', value.to_s] # sets PBS_O_INITDIR
+        when :reservation_id
+          ['-W', "x=advres:#{value}"] # use resource manager extensions for Moab
         # everything else
         else
           ['-W', "#{key}=#{value}"]
@@ -371,13 +373,15 @@ module PBS
       # 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  = []
+        params += ["-q", "#{queue}"] unless queue.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 << script
 
         env = {
+          "PBS_DEFAULT"     => "#{host}",
           "LD_LIBRARY_PATH" => "#{lib}:#{ENV['LD_LIBRARY_PATH']}"
         }
         cmd = bin.join("qsub").to_s

data/lib/pbs/version.rb

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

data/pbs.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "ffi", "~> 1.9", ">= 1.9.6"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "pry", "~> 0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pbs
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Jeremy Nicklas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 description: Ruby wrapper for the Torque C library utilizing Ruby-FFI. This has been
   successfully tested with Torque 4.2.10 and greater. Your mileage may vary.
 email:
@@ -105,4 +119,3 @@ specification_version: 4
 summary: Ruby gem that uses FFI to interface with Adaptive Computing's resource manager
   Torque
 test_files: []
-has_rdoc: