pbs 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b983a1e056e48ac1fb0973f565910ecaa7b59e8
-  data.tar.gz: 72ea5ac4e9b96137f9d234f44ea9912bb4aef298
+  metadata.gz: 2ad4146d23f9e6cdabb8fd29d0acef07e9ebc931
+  data.tar.gz: 2af9fd377f59eba1a511a4437777d8fc83b9ca52
 SHA512:
-  metadata.gz: afe01c15267f13df46e452dab396cf568af6751fe4a92648f174b2d3a2af30443b902115938a28c9e4e7e37b0e436e1d37f13f616c3eff0a61c68f1912956c64
-  data.tar.gz: ef15244b9433ffff530d12da0a90a01a3e7d017c127028005f3831322f7cfac1a7c84c07cdf0c9ffdfc64d8ba3c47f53ae62cec06bd1d37d7141cfdf287e0a61
+  metadata.gz: 1dc0e94fc987178c1b6044206b1e9f1bd288b6448638d57c29aa18762c8dbccacf8f04def9e4ae868d9fd0bff1c9c9dcfc7473a0b9d833fd94dc8dca3c260b00
+  data.tar.gz: e8d0dbf079d8e4512ce5d54dcab71326bb78e7548c0597d6a16622b4e3d28511f203164b4d294bf8a53ea5c2452177b89c92ddcec7e6822e7b66a6ffc550d616

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Unreleased
 
+## 2.0.1 (2016-08-10)
+
+Features:
+
+  - batch object can be initialized with lib/bin directories
+
 ## 2.0.0 (2016-08-05)
 
 Features:

data/lib/pbs/batch.rb

@@ -9,23 +9,51 @@ module PBS
     # @return [String] the batch server host
     attr_reader :host
 
-    # The path to the Torque client installation
+    # The path to the Torque client installation libraries
     # @example For Torque 5.0.0
-    #   my_conn.prefix.to_s #=> "/usr/local/torque/5.0.0"
-    # @return [Pathname, nil] path to torque installation
-    attr_reader :prefix
+    #   my_conn.lib.to_s #=> "/usr/local/torque/5.0.0/lib"
+    # @return [Pathname] path to torque libraries
+    def lib
+      @lib ||=
+        if @prefix.join('lib').directory?
+          @prefix.join('lib')
+        elsif @prefix.join('lib32').directory?
+          @prefix.join('lib32')
+        elsif @prefix.join('lib64').directory?
+          @prefix.join('lib64')
+        else
+          @prefix
+        end
+    end
+
+    # The path to the Torque client installation binaries
+    # @example For Torque 5.0.0
+    #   my_conn.bin.to_s #=> "/usr/local/torque/5.0.0/bin"
+    # @return [Pathname] path to torque binaries
+    def bin
+      @bin ||=
+        if @prefix.join('bin').directory?
+          @prefix.join('bin')
+        else
+          @prefix
+        end
+    end
 
     # @param host [#to_s] the batch server host
-    # @param prefix [#to_s, nil] path to torque installation
-    def initialize(host:, prefix: nil, **_)
+    # @param prefix [#to_s] path to torque installation
+    # @param lib [#to_s, nil] path to torque installation libraries
+    # @param bin [#to_s, nil] path to torque installation binaries
+    def initialize(host:, prefix: '', lib: nil, bin: nil, **_)
       @host    = host.to_s
-      @prefix  = Pathname.new(prefix) if prefix
+      @prefix  = Pathname.new(prefix)
+      @lib     = Pathname.new(lib) if lib
+      @bin     = Pathname.new(bin) if bin
     end
 
     # Convert object to hash
     # @return [Hash] the hash describing this object
     def to_h
-      {host: host, prefix: prefix}
+      {host: host, lib: lib, bin: bin}
     end
 
     # The comparison operator
@@ -54,7 +82,7 @@ module PBS
     # @yieldparam cid [Fixnum] connection id from established batch server connection
     # @yieldreturn the final value of the block
     def connect(&block)
-      Torque.lib = prefix ? prefix.join('lib', 'libtorque.so') : nil
+      Torque.lib = lib.join('libtorque.so')
       cid = Torque.pbs_connect(host)
       Torque.raise_error(cid.abs) if cid < 0  # raise error if negative connection id
       begin
@@ -326,7 +354,11 @@ module PBS
         end.flatten
         params << script.to_s
 
-        o, e, s = Open3.capture3(prefix.join("bin", "qsub").to_s, *params)
+        env = {
+          "LD_LIBRARY_PATH" => "#{lib}:#{ENV['LD_LIBRARY_PATH']}"
+        }
+        cmd = bin.join("qsub").to_s
+        o, e, s = Open3.capture3(env, cmd, *params)
         raise PBS::Error, e unless s.success?
         o.chomp
       end

data/lib/pbs/version.rb

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

metadata

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