mesa_test 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe89bd48cc117d3f99a1e59878fde6ea14528a4e199d8d3bcf6c4af9fcc4937c
-  data.tar.gz: 98932d0fb73af742986ee25235a21c9f4b119ce01ee9dd03026cbd714dff85e9
+  metadata.gz: 11bea3b43e4e86f33ee12905d9d5736561e3f5031a33bc86cb5543f60d631cab
+  data.tar.gz: fb30db8bcac929895e777ec38b1439ef997687390bfe4fb42fded7575df82a5b
 SHA512:
-  metadata.gz: c589f58abeec628b835557f5be281f496a81fbbbf0697005d8bc7fd0525b613cae8e9ba9175bdf21ec2fb05945a41d8ed38130cd56ba8528eb9bf1b13cda0cad
-  data.tar.gz: c524f613c87f04f4547285f0b9e804b1ac0edfc3a99618769aac67ade265dcd475baad5307f28474a4401fe876a4dc03d0c14cdf16b91b9b5d095112f349f116
+  metadata.gz: 5b348b93b928167ecb5508949d4039330fc1345319f535903aae79fda811d68187def5320915e95a608d8b54100db3fb661b991810b0f5973eb5993ca3e9554d
+  data.tar.gz: d470c137ac1d3b0c80d8b7219e4f9bdee2d749277e35211145723c1bd695c1bb6467ee86a850ee6ad9604b9353a09d622804fdbf1b5135e35f0a67ca778330e9

data/lib/mesa_test.rb

@@ -707,7 +707,7 @@ class Mesa
       # read through each line and find four data, name, success string, final
       # model name, and photo. Either of model name and photo can be "skip"
       source_lines.each do |line|
-        no_skip = /^do_one (.+)\s+"([^"]*)"\s+"([^"]+)"\s+(x?\d+)/
+        no_skip = /^do_one (.+)\s+"([^"]*)"\s+"([^"]+)"\s+(x?\d+|auto)/
         one_skip = /^do_one (.+)\s+"([^"]*)"\s+"([^"]+)"\s+skip/
         two_skip = /^do_one (.+)\s+"([^"]*)"\s+skip\s+skip/
         found_test = false
@@ -1403,10 +1403,22 @@ class MesaTestCase
     # abort if there is not photo specified
     return unless photo
 
+    # get penultimate photo
+    if photo == "auto" then
+      # get all photos [single-star (x100) or binary (b_x100); exclude binary stars (1_x100, 2_x100)]
+      photo_files = Dir["photos/*"].select{|p| p =~ /^photos\/(b_)?x?\d+$/}
+      # pull out 2nd most recent one
+      re_photo = File.basename(photo_files.sort_by { |file_name| File.stat(file_name).mtime } [-2])
+      # if binary, trim off prefix
+      re_photo.delete_prefix!("b_")
+    else
+      re_photo = photo
+    end
+
     # check that photo file actually exists
-    unless File.exist?(File.join('photos', photo)) ||
-           File.exist?(File.join('photos1', photo)) ||
-           File.exist?(File.join('photos', "b_#{photo}"))
+    unless File.exist?(File.join('photos', re_photo)) ||
+           File.exist?(File.join('photos1', re_photo)) ||
+           File.exist?(File.join('photos', "b_#{re_photo}"))
       return fail_test(:photo_file)
     end
 
@@ -1416,17 +1428,17 @@ class MesaTestCase
     # do restart and consolidate output. Command depends on if we have access
     # to SDK version of gnu time.
     re_command = if ENV['MESASDK_ROOT'] && File.exist?(File.join(ENV['MESASDK_ROOT'], 'bin', 'time'))
-                   %q(command time -f '%M' -o mem-re.txt ./re ) + "#{photo}" \
+                   %q(command time -f '%M' -o mem-re.txt ./re ) + "#{re_photo}" \
                      ' >> out.txt 2> err.txt'
                  else
-                   "./re #{photo} >> out.txt 2> err.txt"
+                   "./re #{re_photo} >> out.txt 2> err.txt"
                  end
 
     puts re_command
-    # puts "./re #{photo} >> out.txt 2> err.txt"
+    # puts "./re #{re_photo} >> out.txt 2> err.txt"
     re_start = Time.now
-    # bash_execute("./re #{photo} >> out.txt 2> err.txt")
-    # bash_execute(%Q{command time -f '%M' -o mem-re.txt ./re #{photo} >> out.txt 2> err.txt})
+    # bash_execute("./re #{re_photo} >> out.txt 2> err.txt")
+    # bash_execute(%Q{command time -f '%M' -o mem-re.txt ./re #{re_photo} >> out.txt 2> err.txt})
     bash_execute(re_command)
     re_finish = Time.now
     @re_time = (re_finish - re_start).to_i

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mesa_test
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - William Wolf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-17 00:00:00.000000000 Z
+date: 2020-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -55,7 +55,7 @@ dependencies:
 description: mesa_test is a command-line interface for running the test suites in
   MESA and submitting them to the companion website MESATestHub. It also allows for
   querying the database through a commandline interface.
-email: wmwolf@asu.edu
+email: wolfwm@uwec.edu
 executables:
 - mesa_test
 extensions: []
@@ -63,7 +63,7 @@ extra_rdoc_files: []
 files:
 - bin/mesa_test
 - lib/mesa_test.rb
-homepage: https://github.com/wmwolf/mesa_test
+homepage: https://github.com/MESAHub/mesa_test
 licenses:
 - MIT
 metadata: {}
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Command line tool for running and reporting the MESA test suites.