osc-machete 2.0.0.pre1 → 2.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe29b9e8fa7070fd4c9bfa478b099139b3dae53e
-  data.tar.gz: f9f4ebb8a5e5f1c826cee99dd6222a78e4992161
+  metadata.gz: 00b1524199570027e478eda1a0cc138cfe19c176
+  data.tar.gz: 33984c5911b6d573ccb152def90b129bc4d1573c
 SHA512:
-  metadata.gz: 6891917bb5a5642affd5523c63668093a4b5249b9dbc85220d23eda7950465d01872fb982766c918a29345b394a55ea7cc1179f9e383216ed10f11905af9cd87
-  data.tar.gz: 3a0056549f935f4ba18b4b0bbf3ec41ccb8011dc27f3ac35e272f589086c3971bbb7873c8c6a6bf6f62a96d72de8a241847db207979c5a29a6c818749ec9a886
+  metadata.gz: bb042baf00cc3d323db113d28d8cc7d0530ecebcbce25b4be7157161199698ac28ee079237050e72fae3285ac2000a3e14882096a504b68f8602cd9a63878d05
+  data.tar.gz: b2147e8540d40e2befc8b9dd5201ae7178d70fcca2bad6cb234c97a86d1155c33199913af7a4417905e7c2111ab46686900da61b75bb04313b7a985aec503f01

data/lib/osc/machete/job.rb

@@ -56,7 +56,7 @@ require 'pathname'
 #   @return [String, nil] path of the job script, or nil if not set
 #
 class OSC::Machete::Job
-  attr_reader :pbsid, :script_path, :account_string
+  attr_reader :pbsid, :script_path, :account_string, :host
 
   class << self
     # set this to change the billable account that is used by default

data/lib/osc/machete/torque_helper.rb

@@ -8,11 +8,13 @@ require 'pbs'
 # == FIXME: This contains no state whatsoever. It should probably be changed into a module.
 class OSC::Machete::TorqueHelper
   # FIXME: Use ood_cluster gem
-  PREFIX = '/usr/local/torque/default'
+  LIB = ENV['TORQUE_LIB'] || '/opt/torque/lib64'
+  BIN = ENV['TORQUE_BIN'] || '/opt/torque/bin'
   HOSTS = {
     'oakley' => 'oak-batch.osc.edu',
     'ruby'   => 'ruby-batch.osc.edu',
-    'quick'  => 'quick-batch.osc.edu'
+    'quick'  => 'quick-batch.osc.edu',
+    'owens'  => 'owens-batch.ten.osc.edu'
   }
 
   # Alias to initialize a new object.
@@ -64,7 +66,8 @@ class OSC::Machete::TorqueHelper
     # isn't properly handled and the job gets limited to 4GB
     pbs = PBS::Batch.new(
       host: HOSTS.fetch( host || host_from_script_pbs_header(script) ),
-      prefix: PREFIX
+      lib: LIB,
+      bin: BIN
     )
 
     headers = { depend: qsub_dependencies_header(depends_on) }
@@ -116,7 +119,8 @@ class OSC::Machete::TorqueHelper
     id = pbsid.to_s
     pbs = PBS::Batch.new(
       host: HOSTS.fetch( host || host_from_pbsid(id) ),
-      prefix: PREFIX
+      lib: LIB,
+      bin: BIN
     )
 
     status = pbs.get_job(id, filters: [:job_state])
@@ -134,7 +138,8 @@ class OSC::Machete::TorqueHelper
     id = pbsid.to_s
     pbs = PBS::Batch.new(
       host: HOSTS.fetch( host || host_from_pbsid(id) ),
-      prefix: PREFIX
+      lib: LIB,
+      bin: BIN
     )
 
     pbs.delete_job(id)
@@ -152,6 +157,8 @@ class OSC::Machete::TorqueHelper
         "ruby"
       elsif (File.open(script) { |f| f.read =~ /#PBS -q @quick-batch/ })
         "quick"
+      elsif (File.open(script) { |f| f.read =~ /#PBS -q @owens-batch/ })
+        "owens"
       else
         "oakley"  # DEFAULT
       end
@@ -165,6 +172,8 @@ class OSC::Machete::TorqueHelper
         "ruby"
       elsif (pbsid =~ /quick/ )
         "quick"
+      elsif (pbsid =~ /owens/ )
+        "owens"
       else
         "oakley"  # DEFAULT
       end

data/lib/osc/machete/version.rb

@@ -1,6 +1,6 @@
 module OSC
   module Machete
     # The current gem version
-    VERSION = "2.0.0.pre1"
+    VERSION = "2.0.0.pre2"
   end
 end

data/test/test_torque_helper_live.rb

@@ -30,7 +30,7 @@ class TestTorqueHelperLive < Minitest::Test
     #   This raises an issue mentioning that it is not being submitted on the
     #   correct host, comment out the raise to skip the live tests.
     #   Maybe this would be better accomplished with a separate rake task.
-    @submit_host = "websvcs08.osc.edu"
+    @submit_host = "webdev02.hpc.osc.edu"
 
     @job_state_queued = OSC::Machete::Status.queued
     @job_state_completed = OSC::Machete::Status.passed

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osc-machete
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre1
+  version: 2.0.0.pre2
 platform: ruby
 authors:
 - Eric Franz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler