pbs 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ad4146d23f9e6cdabb8fd29d0acef07e9ebc931
-  data.tar.gz: 2af9fd377f59eba1a511a4437777d8fc83b9ca52
+  metadata.gz: c42c7352f3bed19c09615d1478787d9a806c1231
+  data.tar.gz: e97cd9bbecb3f5c3cc032a8c6d98eda8e48228b0
 SHA512:
-  metadata.gz: 1dc0e94fc987178c1b6044206b1e9f1bd288b6448638d57c29aa18762c8dbccacf8f04def9e4ae868d9fd0bff1c9c9dcfc7473a0b9d833fd94dc8dca3c260b00
-  data.tar.gz: e8d0dbf079d8e4512ce5d54dcab71326bb78e7548c0597d6a16622b4e3d28511f203164b4d294bf8a53ea5c2452177b89c92ddcec7e6822e7b66a6ffc550d616
+  metadata.gz: c54720352ae8cb8fa44a2c00738bfba451cdfebad7d73b00a310e5e88d6083bd6db9271dccb48918ba64df9b3dd8083101125fafa5fc0a30264f1f31ca3df89e
+  data.tar.gz: a50902c7b82d77d6e17d502b6f19e7a6aa36f346478831728b5edea822aaebb01c7740cf860bf16b737539382ea4b4d610df983cd820e6b0403913dcd28ee81c

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Unreleased
 
+## 2.0.2 (2016-08-17)
+
+Bugfixes:
+
+  - fixes Ruby version requirement to 2.2.0+
+  - removes unused prefix directory option
+
 ## 2.0.1 (2016-08-10)
 
 Features:

data/README.md

@@ -27,7 +27,11 @@ installation as:
 
 ```ruby
 # Create new batch object for OSC's Oakley batch server
-oakley = PBS::Batch.new(host: 'oak-batch.osc.edu', prefix: '/usr/local/torque/default')
+oakley = PBS::Batch.new(
+  host: 'oak-batch.osc.edu',
+  lib: '/usr/local/torque/default/lib',
+  bin: '/usr/local/torque/bin'
+)
 
 # Get status information for this batch server
 # see http://linux.die.net/man/7/pbs_server_attributes

data/lib/pbs/batch.rb

@@ -13,41 +13,21 @@ module PBS
     # @example For Torque 5.0.0
     #   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
+    attr_reader :lib
 
     # 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
+    attr_reader :bin
 
     # @param host [#to_s] the batch server host
-    # @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, **_)
+    # @param lib [#to_s] path to torque installation libraries
+    # @param bin [#to_s] path to torque installation binaries
+    def initialize(host:, lib: "", bin: "", **_)
       @host    = host.to_s
-      @prefix  = Pathname.new(prefix)
-      @lib     = Pathname.new(lib) if lib
-      @bin     = Pathname.new(bin) if bin
+      @lib     = Pathname.new(lib.to_s)
+      @bin     = Pathname.new(bin.to_s)
     end
 
     # Convert object to hash
@@ -252,7 +232,7 @@ module PBS
     # @example Put job '10219837.oak-batch.osc.edu' on hold
     #   my_conn.hold_job('10219837.oak-batch.osc.edu')
     # @param id [#to_s] the id of the job
-    # @param type [Symbol] type of hold to be applied
+    # @param type [#to_s] type of hold to be applied
     # @return [void]
     def hold_job(id, type: :u)
       connect do |cid|
@@ -268,7 +248,7 @@ module PBS
     # @example Release job '10219837.oak-batch.osc.edu' from hold
     #   my_conn.release_job('10219837.oak-batch.osc.edu')
     # @param id [#to_s] the id of the job
-    # @param type [Symbol] type of hold to be removed
+    # @param type [#to_s] type of hold to be removed
     # @return [void]
     def release_job(id, type: :u)
       connect do |cid|
@@ -311,7 +291,7 @@ module PBS
     # @param qsub [Boolean] whether use library or binary for submission
     # @return [String] the id of the job that was created
     def submit_script(script, queue: nil, headers: {}, resources: {}, envvars: {}, qsub: true)
-      send(qsub ? :qsub_submit : :pbs_submit, script, queue, headers, resources, envvars)
+      send(qsub ? :qsub_submit : :pbs_submit, script.to_s, queue.to_s, headers, resources, envvars)
     end
 
     # Submit a script expanded into a string to the batch server
@@ -335,7 +315,7 @@ module PBS
 
         connect do |cid|
           attropl = Torque::Attropl.from_hash attribs
-          Torque.pbs_submit cid, attropl, script.to_s, queue.to_s, nil
+          Torque.pbs_submit cid, attropl, script, queue, nil
         end
       end
 
@@ -352,7 +332,7 @@ module PBS
             ["-W", "#{k}=#{v}"]
           end
         end.flatten
-        params << script.to_s
+        params << script
 
         env = {
           "LD_LIBRARY_PATH" => "#{lib}:#{ENV['LD_LIBRARY_PATH']}"

data/lib/pbs/version.rb

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

data/pbs.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = '~> 2.2'
+  spec.required_ruby_version = '>= 2.2.0'
 
   spec.add_runtime_dependency "ffi", "~> 1.9", ">= 1.9.6"
   spec.add_development_dependency "bundler", "~> 1.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pbs
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Jeremy Nicklas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -89,9 +89,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="