osc-machete 1.2.2 → 2.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5904fa772fa67f531313d32b25d6fb94f4eccc7
-  data.tar.gz: 66f7f2bffcbce2a8f7e056d11494bcd77ec8b192
+  metadata.gz: fe29b9e8fa7070fd4c9bfa478b099139b3dae53e
+  data.tar.gz: f9f4ebb8a5e5f1c826cee99dd6222a78e4992161
 SHA512:
-  metadata.gz: 356d323852feadf4591dc0d93a5cb9076da76b39063c4cb3fed2b987b4f102a9d33336ca0dfdff32e4b3eb69b852797a2154ca4b9a9f27b1697c157d6472ce21
-  data.tar.gz: 15c2d2cda266fce71a985fe14f6f5d4ed28d8f006b7bf40f6e18e46ee4322682a95253711e389b0e0fdf9ecf9c985c1e98a94e880f35410da8abdb0070569365
+  metadata.gz: 6891917bb5a5642affd5523c63668093a4b5249b9dbc85220d23eda7950465d01872fb982766c918a29345b394a55ea7cc1179f9e383216ed10f11905af9cd87
+  data.tar.gz: 3a0056549f935f4ba18b4b0bbf3ec41ccb8011dc27f3ac35e272f589086c3971bbb7873c8c6a6bf6f62a96d72de8a241847db207979c5a29a6c818749ec9a886

data/CHANGELOG.md

@@ -5,64 +5,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-## [1.2.2] - 2017-08-04
-
-### Fixed
-
-- host name for Ruby Cluster changed
-
-## [1.2.1] - 2016-12-16
-
-### Fixed
-
-- host name for Quick Cluster changed
-
-## [1.2.0] - 2016-09-06
-
-### Added
-
-- TorqueHelper.default= so we can specify a different TorqueHelper
-- TorqueHelper#pbs to get the PBS::Batch object for the given id, script, or host.
-  This lets us change the TorqueHelper instance used as a default with a
-  different TorqueHelper class or instance that has a different implementation
-  of TorqueHelper#pbs.
-- (OSC specific) Owens cluster support
-- (OSC specific) LIB and BIN for specifying torque lib locations
-
-### Changed
-
-- Depends on latest version of pbs ruby gem 2.0
-- TorqueHelper.default returns the same instance every time (which is now
-  memoized) instead of creating a new instance
-
-### Deprecated
-
-- `OSC::Machete::User` - use `OodSupport::User` instead
-- `OSC::Machete::Process` - use `OodSupport::Process` instead
-
-### Fixed
-
-- yardoc documentation for OSC::Machete::Status class methods
-- deprecation warnings by using File.exist? instead of File.exists?
-
-## [1.1.4] - 2016-08-17
-
-### Added
-
-- `Job#host` getter (which should have been there but was accidentally omitted)
-
-## [1.1.3] - 2016-06-07
-
-### Fixed
-
-- README and gemspec docs update for rubygems.org release
-
-## [1.1.2] - 2016-06-07
-
-### Fixed
-
-- Copyright in LICENSE.txt
-
 ## [1.1.1] - 2016-02-24
 
 ### Fixed
@@ -137,13 +79,7 @@ lib/osc/machete/torque_helper.rb _(still an internal class right now, not meant
 
 Previous release of osc-machete
 
-[Unreleased]: https://github.com/AweSim-OSC/osc-machete/compare/v1.2.2...master
-[1.2.2]: https://github.com/AweSim-OSC/osc-machete/compare/v1.2.1...v1.2.2
-[1.2.1]: https://github.com/AweSim-OSC/osc-machete/compare/v1.2.0...v1.2.1
-[1.2.0]: https://github.com/AweSim-OSC/osc-machete/compare/v1.1.4...v1.2.0
-[1.1.4]: https://github.com/AweSim-OSC/osc-machete/compare/v1.1.3...v1.1.4
-[1.1.3]: https://github.com/AweSim-OSC/osc-machete/compare/v1.1.2...v1.1.3
-[1.1.2]: https://github.com/AweSim-OSC/osc-machete/compare/v1.1.1...v1.1.2
+[Unreleased]: https://github.com/AweSim-OSC/osc-machete/compare/v1.1.1...master
 [1.1.1]: https://github.com/AweSim-OSC/osc-machete/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/AweSim-OSC/osc-machete/compare/v1.0.1...v1.1.0
 [1.0.1]: https://github.com/AweSim-OSC/osc-machete/compare/v1.0.0...v1.0.1

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, :host
+  attr_reader :pbsid, :script_path, :account_string
 
   class << self
     # set this to change the billable account that is used by default
@@ -205,7 +205,7 @@ class OSC::Machete::Job
       # something if the script name is munged
 
       # recursively delete the directory after killing the job
-      Pathname.new(path).rmtree if path && rmdir && File.exist?(path)
+      Pathname.new(path).rmtree if path && rmdir && File.exists?(path)
     end
   end
 

data/lib/osc/machete/process.rb

@@ -1,13 +1,10 @@
 # Class that maintains the User and additional methods for the process.
 # Helper methods provided use the Process module underneath.
 #
-# @deprecated Please use {http://www.rubydoc.info/gems/ood_support/OodSupport/Process OodSupport::Process} instead.
 class OSC::Machete::Process
 
   def initialize
     @user = OSC::Machete::User.from_uid(Process.uid)
-
-    warn "[DEPRECATION] `OSC::Machete::Process` is deprecated. Please use `OodSupport::Process` instead (see ood_support gem)."
   end
 
   # The system name of the process user

data/lib/osc/machete/status.rb

@@ -55,42 +55,27 @@ class OSC::Machete::Status
   end
 
 
-  # NOTE: on yard documentation: to do something like what I do below,
-  # documenting a set of class methods, you must have the documentation block be
-  # inside the `class << self` block or else the last documented method will be
-  # ignored or hidden if newlines exist between each @!method block. If no
-  # newlines exist, like below, the entire block would have been ignored.
-  # Also, indenting the tags for the rest of the methods is required when
-  # omitting newlines, otherwise, each method includes all of the returns below
-  # it - so yard displays 6 return Status lines for the method.
-  #
-  # Why do we have no newlines here? So that "View source" on each of these
-  # class methods points to the block itself.
+  # TODO: these methods are previously declared so we can document them easily
+  # if there is a better way to document class methods we'll do that
+
+  # @return [Status]
+  def self.undetermined() end
+  # @return [Status] 
+  def self.not_submitted() end
+  # @return [Status]
+  def self.passed() end
+  # @return [Status] 
+  def self.failed() end
+  # @return [Status]
+  def self.running() end
+  # @return [Status] 
+  def self.queued() end
+  # @return [Status] 
+  def self.held() end
+  # @return [Status] 
+  def self.suspended() end
+
   class << self
-    # @!method undetermined
-    #   A 'null' special case for Status
-    #   @return [Status]
-    #
-    # @!method not_submitted
-    #   @return [Status]
-    #
-    # @!method passed
-    #   @return [Status]
-    #
-    # @!method failed
-    #   @return [Status]
-    #
-    # @!method running
-    #   @return [Status]
-    #
-    # @!method queued
-    #   @return [Status]
-    #
-    # @!method held
-    #   @return [Status]
-    #
-    # @!method suspended
-    #   @return [Status]
     VALUES_HASH.each do |char, name|
       define_method(name) do
         OSC::Machete::Status.new(char)
@@ -99,28 +84,22 @@ class OSC::Machete::Status
   end
 
   # @!method undetermined?
-  # @return [Boolean] true if undetermined
-
+  #   the Status value Null object
+  #   @return [Boolean] true if undetermined
   # @!method not_submitted?
-  # @return [Boolean] true if not_submitted
-
+  #   @return [Boolean] true if not_submitted
   # @!method failed?
-  # @return [Boolean] true if failed
-
+  #   @return [Boolean] true if failed
   # @!method passed?
-  # @return [Boolean] true if passed
-
+  #   @return [Boolean] true if passed
   # @!method held?
-  # @return [Boolean] true if held
-
+  #   @return [Boolean] true if held
   # @!method queued?
-  # @return [Boolean] true if queued
-
+  #   @return [Boolean] true if queued
   # @!method running?
-  # @return [Boolean] true if running
-
+  #   @return [Boolean] true if running
   # @!method suspended?
-  # @return [Boolean] true if suspended
+  #   @return [Boolean] true if suspended
   VALUES_HASH.each do |char, name|
     define_method("#{name}?") do
       self == OSC::Machete::Status.new(char)

data/lib/osc/machete/torque_helper.rb

@@ -8,31 +8,24 @@ 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
-  LIB = ENV['TORQUE_LIB'] || '/opt/torque/lib64'
-  BIN = ENV['TORQUE_BIN'] || '/opt/torque/bin'
+  PREFIX = '/usr/local/torque/default'
   HOSTS = {
     'oakley' => 'oak-batch.osc.edu',
-    'ruby'   => 'ruby-batch.ten.osc.edu',
-    'quick'  => 'quick-batch.ten.osc.edu',
-    'owens'  => 'owens-batch.ten.osc.edu',
-    :default => 'oak-batch.osc.edu'
+    'ruby'   => 'ruby-batch.osc.edu',
+    'quick'  => 'quick-batch.osc.edu'
   }
 
-  class << self
-    #@!attribute default
-    #  @return [TorqueHelper] default TorqueHelper instance to use
-    attr_writer :default
-    def default
-      @default ||= self::new()
-    end
+  # Alias to initialize a new object.
+  def self.default
+    self::new()
   end
 
   # Returns an OSC::Machete::Status ValueObject for a char
   #
   # @param [String] char The Torque status char
   #
-  # @example Passed
-  #   status_for_char("C") #=> OSC::Machete::Status.passed
+  # @example Completed
+  #   status_for_char("C") #=> OSC::Machete::Status.completed
   # @example Queued
   #   status_for_char("W") #=> OSC::Machete::Status.queued
   #
@@ -65,6 +58,15 @@ class OSC::Machete::TorqueHelper
   #
   # Bills against the project specified by the primary group of the user.
   def qsub(script, host: nil, depends_on: {}, account_string: nil)
+    # if the script is set to run on Oakley in PBS headers
+    # this is to obviate current torque filter defect in which
+    # a script with PBS header set to specify oak-batch ends
+    # 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
+    )
+
     headers = { depend: qsub_dependencies_header(depends_on) }
     headers.clear if headers[:depend].empty?
 
@@ -78,7 +80,7 @@ class OSC::Machete::TorqueHelper
       headers[PBS::ATTR[:A]] = default_account_string
     end
 
-    pbs(host: host, script: script).submit_script(script, headers: headers, qsub: true)
+    pbs.submit_script(script, headers: headers, qsub: true)
   end
 
   # convert dependencies hash to a PBS header string
@@ -112,7 +114,12 @@ class OSC::Machete::TorqueHelper
   # @return [Status] The job state
   def qstat(pbsid, host: nil)
     id = pbsid.to_s
-    status = pbs(host: host, id: id).get_job(id, filters: [:job_state])
+    pbs = PBS::Batch.new(
+      host: HOSTS.fetch( host || host_from_pbsid(id) ),
+      prefix: PREFIX
+    )
+
+    status = pbs.get_job(id, filters: [:job_state])
     status_for_char status[id][:job_state][0] # get status from status char value
   rescue PBS::UnkjobidError
     OSC::Machete::Status.passed
@@ -125,30 +132,16 @@ class OSC::Machete::TorqueHelper
   # @return [nil]
   def qdel(pbsid, host: nil)
     id = pbsid.to_s
-    pbs(host: host, id: id).delete_job(id)
+    pbs = PBS::Batch.new(
+      host: HOSTS.fetch( host || host_from_pbsid(id) ),
+      prefix: PREFIX
+    )
+
+    pbs.delete_job(id)
   rescue PBS::UnkjobidError
     # Common use case where trying to delete a job that is no longer in the system.
   end
 
-  def pbs(host: nil, id: nil, script: nil)
-    if host
-      # actually check if host is "oakley" i.e. a cluster key
-      host = HOSTS.fetch(host.to_s, host.to_s)
-    else
-      # try to determine host
-      key = host_from_pbsid(id) if id
-      key = host_from_script_pbs_header(script) if script && key.nil?
-
-      host = HOSTS.fetch(key, HOSTS.fetch(:default))
-    end
-
-    PBS::Batch.new(
-      host: host,
-      lib: LIB,
-      bin: BIN
-    )
-  end
-
   private
     # return the name of the host to use based on the pbs header
     # TODO: Think of a more efficient way to do this.
@@ -159,8 +152,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
     end
 
@@ -172,8 +165,8 @@ class OSC::Machete::TorqueHelper
         "ruby"
       elsif (pbsid =~ /quick/ )
         "quick"
-      elsif (pbsid =~ /owens/ )
-        "owens"
+      else
+        "oakley"  # DEFAULT
       end
     end
 end

data/lib/osc/machete/user.rb

@@ -1,7 +1,6 @@
 # Class that maintains the name and home identifiers of a User.
 # Helper methods provided use the Etc module underneath.
 #
-# @deprecated Please use {http://www.rubydoc.info/gems/ood_support/OodSupport/User OodSupport::User} instead.
 class OSC::Machete::User
 
   attr_reader :name
@@ -20,8 +19,6 @@ class OSC::Machete::User
   #
   def initialize(username = Etc.getpwuid.name)
     @name = username
-
-    warn "[DEPRECATION] `OSC::Machete::User` is deprecated. Please use `OodSupport::User` instead (see ood_support gem)."
   end
 
   # factory method to produce a User from specified uid

data/lib/osc/machete/version.rb

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

data/test/fixtures/quick.sh

@@ -1,7 +1,7 @@
 #PBS -l walltime=00:30:00
 #PBS -l nodes=1:ppn=12
 #PBS -S /bin/bash
-#PBS -q @quick-batch.ten.osc.edu
+#PBS -q @quick-batch.osc.edu
 #PBS -N foobar
 #PBS -j oe
 #PBS -r n

data/test/test_job_dir.rb

@@ -34,6 +34,6 @@ class TestJobDir < Minitest::Test
     # Create unique directory
     new_jobdir = OSC::Machete::JobDir.new(@parent).new_jobdir
     Dir.mkdir(new_jobdir)
-    assert Dir.exist?("#{@parent}/9"), "Directory was not created: #{@parent}/9"
+    assert Dir.exists?("#{@parent}/9"), "Directory was not created: #{@parent}/9"
   end
 end

data/test/test_location.rb

@@ -24,41 +24,41 @@ class TestLocation < Minitest::Test
   def test_render_default_replace_template
     setup_render
     @location1.render("")
-    assert_equal true,  File.exist?("#{@dir1}/file.txt")
-    assert_equal false, File.exist?("#{@dir1}/file.txt.mustache")
+    assert_equal true,  File.exists?("#{@dir1}/file.txt")
+    assert_equal false, File.exists?("#{@dir1}/file.txt.mustache")
   end
 
   def test_render_user_replace_template
     setup_render
     @location1.render("", {replace: true})
-    assert_equal true,  File.exist?("#{@dir1}/file.txt")
-    assert_equal false, File.exist?("#{@dir1}/file.txt.mustache")
+    assert_equal true,  File.exists?("#{@dir1}/file.txt")
+    assert_equal false, File.exists?("#{@dir1}/file.txt.mustache")
   end
 
   def test_render_user_doesnt_replace_template
     setup_render
     @location1.render("", {replace: false})
-    assert_equal true,  File.exist?("#{@dir1}/file.txt")
-    assert_equal true,  File.exist?("#{@dir1}/file.txt.mustache")
+    assert_equal true,  File.exists?("#{@dir1}/file.txt")
+    assert_equal true,  File.exists?("#{@dir1}/file.txt.mustache")
   end
 
   def test_copy_to_shouldnt_copy_developer_files
     setup_copy_to
     
     @location1.copy_to(@dir2)
-    assert_equal true,  Dir.exist?("#{@dir2}")
-    assert_equal false, Dir.exist?("#{@dir2}/.git")
-    assert_equal false, Dir.exist?("#{@dir2}/.svn")
-    assert_equal false, Dir.exist?("#{@dir2}/test.dir.1")
-    assert_equal true,  Dir.exist?("#{@dir2}/test.dir.2")
-    assert_equal true,  File.exist?("#{@dir2}/test.1")
-    assert_equal false, File.exist?("#{@dir2}/test.2")
-    assert_equal true,  File.exist?("#{@dir2}/test.3")
-    assert_equal false, File.exist?("#{@dir2}/test.4")
-    assert_equal false, File.exist?("#{@dir2}/test.dir.2/test.1")
-    assert_equal false, File.exist?("#{@dir2}/test.dir.2/test.2")
-    assert_equal true,  File.exist?("#{@dir2}/test.dir.2/test.4")
-    assert_equal false, File.exist?("#{@dir2}/.gitignore")
+    assert_equal true,  Dir.exists?("#{@dir2}")
+    assert_equal false, Dir.exists?("#{@dir2}/.git")
+    assert_equal false, Dir.exists?("#{@dir2}/.svn")
+    assert_equal false, Dir.exists?("#{@dir2}/test.dir.1")
+    assert_equal true,  Dir.exists?("#{@dir2}/test.dir.2")
+    assert_equal true,  File.exists?("#{@dir2}/test.1")
+    assert_equal false, File.exists?("#{@dir2}/test.2")
+    assert_equal true,  File.exists?("#{@dir2}/test.3")
+    assert_equal false, File.exists?("#{@dir2}/test.4")
+    assert_equal false, File.exists?("#{@dir2}/test.dir.2/test.1")
+    assert_equal false, File.exists?("#{@dir2}/test.dir.2/test.2")
+    assert_equal true,  File.exists?("#{@dir2}/test.dir.2/test.4")
+    assert_equal false, File.exists?("#{@dir2}/.gitignore")
   end
   
   

data/test/test_torque_helper.rb

@@ -106,7 +106,7 @@ class TestTorqueHelper < Minitest::Test
   # Test that qdel works for quick batch
   def test_qdel_quick
     PBS::Batch.any_instance.stubs(:delete_job).returns(true)
-    assert_equal true, @shell.qdel("123.quick-batch.ten.osc.edu")
+    assert_equal true, @shell.qdel("123.quick-batch.osc.edu")
     PBS::Batch.any_instance.unstub(:delete_job)
   end
 
@@ -120,18 +120,18 @@ class TestTorqueHelper < Minitest::Test
   # Test that qdel throws exception on PBS exception
   def test_qdel_throws_exception
     PBS::Batch.any_instance.stubs(:delete_job).raises(PBS::Error)
-    assert_raises(PBS::Error) { @shell.qdel("123.quick-batch.ten.osc.edu") }
+    assert_raises(PBS::Error) { @shell.qdel("123.quick-batch.osc.edu") }
     PBS::Batch.any_instance.unstub(:delete_job)
 
     PBS::Batch.any_instance.stubs(:delete_job).raises(PBS::SystemError)
-    assert_raises(PBS::SystemError) { @shell.qdel("123.quick-batch.ten.osc.edu") }
+    assert_raises(PBS::SystemError) { @shell.qdel("123.quick-batch.osc.edu") }
     PBS::Batch.any_instance.unstub(:delete_job)
   end
 
   # Test that qdel doesn't throw exception if Unknown Job Id exception
   def test_qdel_doesnt_throw_exception_on_unknown_job_id
     PBS::Batch.any_instance.stubs(:delete_job).raises(PBS::UnkjobidError)
-    @shell.qdel("123.quick-batch.ten.osc.edu")
+    @shell.qdel("123.quick-batch.osc.edu")
     PBS::Batch.any_instance.unstub(:delete_job)
   end
   
@@ -206,49 +206,4 @@ class TestTorqueHelper < Minitest::Test
     PBS::Batch.any_instance.unstub(:submit_script)
     @shell.unstub(:default_account_string)
   end
-
-  def test_pbs_default_host
-    s = @shell.pbs
-    assert_equal 'oak-batch.osc.edu', s.host
-    assert_equal OSC::Machete::TorqueHelper::LIB, s.lib.to_s
-    assert_equal OSC::Machete::TorqueHelper::BIN, s.bin.to_s
-  end
-
-  def test_pbs_host_variations
-    # you can use the cluster ids
-    assert_equal 'ruby-batch.ten.osc.edu', @shell.pbs(host: 'ruby').host
-
-    # or you can use the host itself
-    assert_equal 'ruby-batch.osc.edu', @shell.pbs(host: 'ruby-batch.osc.edu').host
-    assert_equal '@ruby-batch', @shell.pbs(host: '@ruby-batch').host
-
-    assert_equal 'ruby-batch.ten.osc.edu', @shell.pbs(id: '4567').host
-    assert_equal 'ruby-batch.ten.osc.edu', @shell.pbs(script: @script_ruby).host
-    assert_equal 'oak-batch.osc.edu', @shell.pbs(script: @script_oakley).host
-  end
-
-  def test_setting_default_torque_helper
-    d = OSC::Machete::TorqueHelper.default
-
-    assert_equal 'oak-batch.osc.edu', OSC::Machete::TorqueHelper.default.pbs.host
-
-    # this is an example of how you can quickly modify the default behavior of
-    # a TorqueHelper instance to provide a new host, id, and script
-    d2 = OSC::Machete::TorqueHelper.new
-    class << d2
-      def pbs(host: nil, id: nil, script: nil)
-        PBS::Batch.new(
-          host: "ruby-batch.osc.edu",
-          lib: LIB,
-          bin: BIN
-        )
-      end
-    end
-
-    OSC::Machete::TorqueHelper.default = d2
-
-    assert_equal 'ruby-batch.osc.edu', OSC::Machete::TorqueHelper.default.pbs.host
-
-    OSC::Machete::TorqueHelper.default = d
-  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 = "webdev02.hpc.osc.edu"
+    @submit_host = "websvcs08.osc.edu"
 
     @job_state_queued = OSC::Machete::Status.queued
     @job_state_completed = OSC::Machete::Status.passed
@@ -71,7 +71,7 @@ class TestTorqueHelperLive < Minitest::Test
 
       # Qstat it to make sure it's queued.
       live_status = torque.qstat(live_job)
-      assert_includes OSC::Machete::Status.active_values, live_status
+      assert_equal @job_state_queued, live_status
 
       # Delete it and assert true returned.
       live_delete_status = torque.qdel(live_job)
@@ -102,7 +102,7 @@ class TestTorqueHelperLive < Minitest::Test
 
       # Qstat it to make sure it's queued.
       live_status = torque.qstat(live_job)
-      assert_includes OSC::Machete::Status.active_values, live_status
+      assert_equal @job_state_queued, live_status
 
       # Delete it and assert true returned.
       live_delete_status = torque.qdel(live_job)
@@ -128,11 +128,11 @@ class TestTorqueHelperLive < Minitest::Test
     if Socket.gethostname == @submit_host
       # Submit a small job.
       live_job = torque.qsub(@script_ruby)
-      assert_match(/^\d+$/, live_job)
+      assert_match /^\d+$/, live_job
 
       # Qstat it to make sure it's queued.
       live_status = torque.qstat(live_job)
-      assert_includes OSC::Machete::Status.active_values, live_status
+      assert_equal @job_state_queued, live_status
 
       # Delete it and assert true returned.
       live_delete_status = torque.qdel(live_job)
@@ -157,11 +157,11 @@ class TestTorqueHelperLive < Minitest::Test
     if Socket.gethostname == @submit_host
       # Submit a small job.
       live_job = torque.qsub(@script_quick, host: 'quick')
-      assert_match(/\d+.quick-batch.ten.osc.edu/, live_job)
+      assert_match /\d+.quick-batch.osc.edu/, live_job
 
       # Qstat it to make sure it's queued.
       live_status = torque.qstat(live_job)
-      assert_includes OSC::Machete::Status.active_values, live_status
+      assert_equal @job_state_queued, live_status
 
       # Delete it and assert true returned.
       live_delete_status = torque.qdel(live_job)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osc-machete
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0.pre1
 platform: ruby
 authors:
 - Eric Franz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -149,9 +149,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
@@ -175,3 +175,4 @@ test_files:
 - test/test_status.rb
 - test/test_torque_helper.rb
 - test/test_torque_helper_live.rb
+has_rdoc: