mesa_test 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '09c46538653cda8c85d7220ff6e0d497b64ad844'
-  data.tar.gz: 6552eb58501b0332208d950853d9d1044ef8b02d
+  metadata.gz: a2c7d57fcb8bd7da9aaff752053c555b18412065
+  data.tar.gz: c43742504753ae1a46d5cf692165d430799ef208
 SHA512:
-  metadata.gz: df3e1da87539e138ad83208e2a7368350296ca4ab9c079914f57a6391336a95c3ba429c78f44451580167f54d60dee525e5d84fe8b9d82ba60cf995c285c31d0
-  data.tar.gz: '05479705c0aa5900e125a1c1afad33ec141fcf4e1c9e11b5426aebfb1950346b54f06a0b497be37eaaf9c4fe4f373cbbee72d90400b92a4644e42a395ca1ba75'
+  metadata.gz: 31ce61fb6f5273bf07724327a1f1fc819f0b83feb4958948cf4295f89c28af31a9357abe5b412dce483d749d28436f591cc169ecb75cfc822cf20a26eaad195c
+  data.tar.gz: 4635bbd0192f920da02015064a6e6f852326741c964a2d8752e4f94c00195774e8d2ff9e9bbaff14c7838c8093a8af07f4acc6b06ee2a40e9947fa52bf93d091

data/lib/mesa_test.rb

@@ -361,8 +361,10 @@ class Mesa
 
   def self.download(version_number: nil, new_mesa_dir: nil)
     new_mesa_dir ||= File.join(ENV['HOME'], 'mesa-test-r' + version_number.to_s)
-    success = system("svn co -r #{version_number} " \
-                     "svn://svn.code.sf.net/p/mesa/code/trunk #{new_mesa_dir}")
+    success = bash_execute(
+      "svn co -r #{version_number} " \
+      "svn://svn.code.sf.net/p/mesa/code/trunk #{new_mesa_dir}"
+    )
     unless success
       raise MesaDirError, 'Encountered a problem in download mesa ' \
                           "revision #{version_number}."
@@ -459,7 +461,7 @@ class Mesa
                                 "running `clean` in #{mesa_dir}." do
         puts 'MESA_DIR = ' + ENV['MESA_DIR']
         puts './clean'
-        system('./clean')
+        bash_execute('./clean')
       end
     end
     self
@@ -471,7 +473,7 @@ class Mesa
                                 "running `install` in #{mesa_dir}." do
         puts 'MESA_DIR = ' + ENV['MESA_DIR']
         puts './install'
-        system('./install')
+        bash_execute('./install')
       end
     end
     self
@@ -825,7 +827,7 @@ class MesaTestCase
     check_test_case
     in_dir do
       puts './clean'
-      unless system('./clean')
+      unless bash_execute('./clean')
         raise TestCaseDirError, 'Encountered an error while running ./clean ' \
         "in #{Dir.getwd}."
       end
@@ -990,7 +992,7 @@ class MesaTestCase
 
     # do the run
     puts './rn >> out.txt 2> err.txt'
-    system('./rn >> out.txt 2> err.txt')
+    bash_execute('./rn >> out.txt 2> err.txt')
 
     # report runtime and clean up
     run_finish = Time.now
@@ -1021,7 +1023,7 @@ class MesaTestCase
     # if this is false, behave like each_test_run_and_diff.  assume
     # the checksum is up-to-date and check it matches after rn and re.
     if @mesa.update_checksums
-      system("md5sum \"#{final_model}\" > checks.md5")
+      bash_execute("md5sum \"#{final_model}\" > checks.md5")
       puts "md5sum \"#{final_model}\" > checks.md5"
       FileUtils.cp final_model, 'final_check.mod'
 
@@ -1034,7 +1036,7 @@ class MesaTestCase
     # check that final model matches
     puts './ck >& final_check_diff.txt'
     return fail_test(:run_checksum) unless
-      system('./ck >& final_check_diff.txt')
+      bash_execute('./ck >& final_check_diff.txt')
     return fail_test(:run_diff) if File.exist?('final_check_diff.txt') &&
                                    !File.read('final_check_diff.txt').empty?
     return succeed(:run_checksum) if File.exist? final_model
@@ -1056,13 +1058,13 @@ class MesaTestCase
 
     # do restart and consolidate output
     puts "./re #{photo} >> out.txt 2> err.txt"
-    system("./re #{photo} >> out.txt 2> err.txt")
+    bash_execute("./re #{photo} >> out.txt 2> err.txt")
     append_and_rm_err
 
     # check that final model matches
     puts './ck >& final_check_diff.txt'
     return fail_test(:photo_checksum) unless
-      system('./ck >& final_check_diff.txt')
+      bash_execute('./ck >& final_check_diff.txt')
     return fail_test(:photo_diff) if
       File.exist?('final_check_diff.txt') &&
       !File.read('final_check_diff.txt').empty?
@@ -1073,9 +1075,8 @@ class MesaTestCase
     # assumes we are in the test case directory. Should only be called
     # in the context of an `in_dir` block.
 
-    # first clean and make... worried about shell compatibility since we
-    # aren't forcing bash. Hopefully '>' for redirecting output is pretty
-    # universal
+    # first clean and make... Should be compatible with any shell since
+    # redirection is always wrapped in 'bash -c "{STUFF}"'
     simple_clean
     mk
 
@@ -1109,14 +1110,14 @@ class MesaTestCase
 
   def simple_clean
     puts './clean'
-    return if system('./clean')
+    return if bash_execute('./clean')
     raise TestCaseDirError, 'Encountered an error when running `clean` in ' \
       "#{Dir.getwd} for test case #{test_name}."
   end
 
   def mk
     puts './mk > mk.txt'
-    unless system('./mk > mk.txt')
+    unless bash_execute('./mk > mk.txt')
       raise TestCaseDirError, 'Encountered an error when running `mk` in ' \
         "#{Dir.getwd} for test case #{test_name}."
     end
@@ -1129,6 +1130,11 @@ class MesaTestCase
     return unless File.exist?(final_model)
     FileUtils.rm(final_model)
   end
+
+  # force the execution to happen with bash
+  def bash_execute(command)
+    system('bash -c "' + command + '"')
+  end
 end
 
 ################################

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mesa_test
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - William Wolf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json