ood_core 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac5caf10cd563acf0e8ef6a4b7d421b5718dc097
-  data.tar.gz: c9e401652e388868a2d583751ef94d50ccb2f22a
+  metadata.gz: 9190913080e7b7448422cca14c7687a78dc32c65
+  data.tar.gz: 9afbd8380ad02e09840274c20e1f10d5c36569ad
 SHA512:
-  metadata.gz: db745be6e2bcc4a7c4bfcd31d0a47c50bb948be84d24c2bc5f45c7bab6bbf46e22d82ed86120087ce6c0e6d554d323acef53b4adde3ffc7eb801216cc419f986
-  data.tar.gz: '096513b3c128b32c81b19784ef56164ef74e158dbd72d37b47d51063cd6b89daac03a00abf632421cf4e3687390930b5bb3c3771b5eb7290c91fb54a2757bf21'
+  metadata.gz: 7728af206991073f9f32bcb12a8afa1b278899e62b7b0560ae813d6bdd6d97ae6ae7b872c39cc1be30afeb6054b42bfd6661b41950e0a58f3542253fcbff6163
+  data.tar.gz: efea743a3f4cf18d0beed8ad22c9934206ca60e5e351f01ef555a028d370f422fa55ecfd91a1f06d3e447692a1395ad5c0de43697c03fb766741750818f24aca

data/CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [0.9.1] - 2019-05-07
+### Added
+- Added logic to `OodCore::Job::ArrayIds` to return an empty array when the array request is invalid
+
 ## [0.9.0] - 2019-05-04
 ### Added
 - Job array support for LSF and PBSPro
@@ -177,7 +181,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial release!
 
-[Unreleased]: https://github.com/OSC/ood_core/compare/v0.9.0...HEAD
+[Unreleased]: https://github.com/OSC/ood_core/compare/v0.9.1...HEAD
+[0.9.1]: https://github.com/OSC/ood_core/compare/v0.9.0...v0.9.1
 [0.9.0]: https://github.com/OSC/ood_core/compare/v0.8.0...v0.9.0
 [0.8.0]: https://github.com/OSC/ood_core/compare/v0.7.1...v0.8.0
 [0.7.1]: https://github.com/OSC/ood_core/compare/v0.7.0...v0.7.1

data/lib/ood_core/job/array_ids.rb

@@ -1,19 +1,24 @@
 # Builds a sorted array of job ids given a job array spec string
-# 
+#
 # Job array spec strings:
 #   1         Single id
 #   1-10      Range
 #   1-10:2    Range with step
 #   1-10,13   Compound (range with single id)
-#   
+#
 # Note that Ranges are expected to be inclusive
 module OodCore
   module Job
     class ArrayIds
+      class Error < StandardError ; end
+
       attr_reader :ids
       def initialize(spec_string)
         @ids = []
-        parse_spec_string(spec_string)
+        begin
+          parse_spec_string(spec_string) if spec_string
+        rescue Error
+        end
       end
 
       protected
@@ -24,7 +29,9 @@ module OodCore
       end
 
       def get_components(spec_string)
-        discard_percent_modifier(spec_string).split(',')
+        base = discard_percent_modifier(spec_string)
+        raise Error unless base
+        base.split(',')
       end
 
       # A few adapters use percent to define an arrays maximum number of
@@ -34,22 +41,37 @@ module OodCore
       end
 
       def process_component(component)
-        is_range?(component) ? get_range(component) : [ component.to_i ]
+        if is_range?(component)
+          get_range(component)
+        elsif numbers_valid?([component])
+          [ component.to_i ]
+        else
+          raise Error
+        end
       end
 
       def get_range(component)
         raw_range, raw_step = component.split(':')
-        start, stop = raw_range.split('-').map(&:to_i)
-        range = Range.new(start, stop)
+        start, stop = raw_range.split('-')
+        raise Error unless numbers_valid?(
+          # Only include Step if it is not nil
+          [start, stop].tap { |a| a << raw_step if raw_step }
+        )
+        range = Range.new(start.to_i, stop.to_i)
         step = raw_step.to_i
         step = 1 if step == 0
-        
+
         range.step(step).to_a
       end
 
       def is_range?(component)
         component.include?('-')
       end
+
+      # Protect against Ruby's String#to_i returning 0 for arbitrary strings
+      def numbers_valid?(numbers)
+        numbers.all? { |str| /^[0-9]+$/ =~ str }
+      end
     end
   end
-end
+end

data/lib/ood_core/version.rb

@@ -1,4 +1,4 @@
 module OodCore
   # The current version of {OodCore}
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Eric Franz
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2019-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support