mesa_test 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8533c5c3c8af772964a99845cd8abd2817751ab3
-  data.tar.gz: 2f8feb258166635e7a81bca31416dd6cfb39cace
+  metadata.gz: c6bc6d6b90192e1bfd95d973de84b1ad786cbbe6
+  data.tar.gz: e5a9666a5fe7fd43f075e0b997f8d8896c202061
 SHA512:
-  metadata.gz: 0fa938f95c4f08ee751ecefa4676c218886a8d696174735efab051549eb3c85e8d63d668927d2b2666cec36ce361c263ea72c877f0585e033ebcc1efd5cffbde
-  data.tar.gz: 8eb82567379f5b4f038c4fed068601be5a5b6bed19ad23d8461dbb8a7cf921f5011ac51691096d70a5da99a650ec6c8a68b4018a83b3a2321ebd78daee5df01a
+  metadata.gz: 6aa98742c529c1ac14b2565083da3598f7a91173300a3b08b9e621ea0ef32f6dfc4918227dc5e25feeadfaaf8dc0b0b15180f99ccfa22592324731902a65869e
+  data.tar.gz: 7658a4c416bf42afb70ca55d70ed97b53d3379eec2557b6e9edd216ff99296e712ae21fe10014b8053debb9545e4d1a9c8f154aa063119b0e30e103e58ce7e7b

data/bin/mesa_test

@@ -1,10 +1,10 @@
 #! /usr/bin/env ruby
 
-require_relative '../lib/mesa_test'
+# require_relative '../lib/mesa_test'
+require 'mesa_test'
 require 'thor'
 
 class MesaTest < Thor
-
   desc "setup [CONFIG_FILE]", "Setup MesaTestHub config file."
   long_desc <<-LONGDESC
     If optional CONFIG_FILE is provided, search for that file and load it
@@ -16,8 +16,6 @@ class MesaTest < Thor
     MesaTestSubmitter.new_from_config(config_file: config_file).setup
   end
 
-
-
   desc "test_one MESA_DIR TEST_CASE", "run, check, and submit one test case"
   long_desc <<-LONGDESC
   Run and check TEST_CASE, which resides in MESA_DIR/star/test_suite. Then 
@@ -36,7 +34,6 @@ class MesaTest < Thor
   option :log, type: :boolean, default: true
   option :submit, type: :boolean, default: true
   def test_one(mesa_dir, test_case_name)
-
     if options[:submit]
       s = MesaTestSubmitter.new_from_config
       unless options[:force]
@@ -132,6 +129,86 @@ class MesaTest < Thor
     s.submit_all(m) if options[:submit]
   end
 
+  desc 'submit_one MESA_DIR TEST_CASE', 'submit one completed test case'
+  long_desc <<-LONGDESC
+  Load complete test case data from existing YAML file and submit to MESA
+
+  With --force option, skip confirmation of computer details, assuming values
+  in ~/.mesa_test.yml are correct.
+  LONGDESC
+  option :force, type: :boolean
+  def submit_one(mesa_dir, test_case_name)
+    s = MesaTestSubmitter.new_from_config
+    unless options[:force]
+      s.setup unless s.confirm_computer_data
+    end
+
+    check_user_and_computer s
+
+    # set up and check mesa directory (doesn't really check to see if it's
+    # installed, just to see if it has a version number and a test suite
+    # directory)
+    m = Mesa.new mesa_dir: mesa_dir
+    unless m.installed?
+      raise MesaDirError, "Invalid MESA_DIR: #{mesa_dir}. Please download " \
+      'and install a valid MESA version or provide the path to one.'
+    end
+    m.load_test_source_data
+
+    # make sure the test case is valid
+    t = m.find_test_case test_case_name: test_case_name
+    if t.nil?
+      msg = "No such test case, #{test_case_name} found in any of "
+      msg << MesaTestCase.modules.map do |mod|
+        File.join(m.test_suite_dir(mod: mod), 'do1_test_source')
+      end.join(' or ')
+      msg << '.'
+      raise TestCaseDirError, msg
+    end
+
+    # load test results
+    t.load_results
+
+    # submit results
+    print 'Submitting results to ' + s.base_uri + '... '
+    s.submit(t)
+    puts "Done.\n"
+  end
+
+  desc 'submit_all MESA_DIR', 'submit all [previously run] test cases'
+  long_desc <<-LONGDESC
+  Load results for all test cases residing in MESA_DIR/star/test_suite. Then
+  submit results to MesaTestHub. Specifically, loads and submits all tests
+  detailed in MESA_DIR/star/test_suite/do1_test_source.
+
+  With --force option, skip confirmation of computer details, assuming values
+  in ~/.mesa_test.yml are correct.
+  LONGDESC
+  option :force, type: :boolean
+  def submit_all(mesa_dir)
+    s = MesaTestSubmitter.new_from_config
+    unless options[:force]
+      s.setup unless s.confirm_computer_data
+    end
+    check_user_and_computer s
+
+    # set up and check mesa directory (doesn't really check to see if it's
+    # installed, just to see if it has a version number and a test suite
+    # directory)
+    m = Mesa.new mesa_dir: mesa_dir
+    unless m.installed?
+      raise MesaDirError, "Invalid MESA_DIR: #{mesa_dir}. Please download " \
+      'and install a valid MESA version or provide the path to one.'
+    end
+    m.load_test_source_data
+
+    # run all tests
+    m.each_test_load_results
+
+    # submit all tests
+    s.submit_all(m)
+  end
+
 
   desc "install VERSION_NUMBER MESA_DIR", 'download and install mesa release '+
     'VERSION_NUMBER to directory MESA_DIR'

data/lib/mesa_test.rb

@@ -13,12 +13,11 @@ class TestCaseDirError < StandardError; end
 class InvalidDataType < StandardError; end
 
 class MesaTestSubmitter
-
   # set up config file for computer
   def setup
     update do |s|
-      puts "This wizard will guide you through setting up a computer profile
-and default data for test case submissions to MESATestHub. You
+      shell.say 'This wizard will guide you through setting up a computer 
+profile and default data for test case submissions to MESATestHub. You
 will be able to confirm entries at the end. Default/current values are always
 shown in parentheses at the end of a prompt. Pressing enter will accept the
 default values.
@@ -26,8 +25,7 @@ default values.
 To submit to MESATestHub, a valid computer name, email address, and password
 are all required. All other data are useful, but optional. Any data
 transferred to MESATestHub will be encrypted via HTTPS, but be warned that your
-e-mail and password will be stored in plain text.
-"
+e-mail and password will be stored in plain text.'
       # Get computer name
       response = shell.ask("What is the name of this computer (required)? "+
         "(#{s.computer_name}):", color = :blue)
@@ -122,13 +120,14 @@ e-mail and password will be stored in plain text.
     @password = password || ''
     @platform = platform
     if @platform.nil?
-      @platform = if OS.osx?
-        'macOS'
-      elsif OS.linux?
-        'Linux'
-      else
-        ''
-      end
+      @platform =
+        if OS.osx?
+          'macOS'
+        elsif OS.linux?
+          'Linux'
+        else
+          ''
+        end
     end
     @platform_version = platform_version || ''
     @processor = processor || ''
@@ -182,7 +181,7 @@ e-mail and password will be stored in plain text.
   # if you try different compilers
   #
   # Note this is NOT checked! The server really only uses the test-by-test
-  # quantities (platform version, compiler, complier version) and the 
+  # quantities (platform version, compiler, compiler version) and the 
   # computer name. Once the computer is found (by the name) all the other
   # data is assumed to be fixed. The others... probably shouldn't be here, 
   # but remain so you can confirm that the computer on the web server is the
@@ -257,32 +256,33 @@ e-mail and password will be stored in plain text.
       computer_name: computer_name
     }.to_json
 
-    JSON.load(https.request(request).body).to_hash
+    JSON.parse(https.request(request).body).to_hash
   end
 
   # attempt to post to MesaTestHub with test_case parameters
   # returns true if the id is in the returned JSON (indicating success)
   # otherwise returns false (maybe failed in authorization or in finding
   # computer or test case) No error thrown for failure, though.
-  def submit(test_case, verbose=true)
+  def submit(test_case, verbose = false)
     uri = URI.parse(base_uri + '/test_instances/submit.json')
     https = Net::HTTP.new(uri.hostname, uri.port)
     https.use_ssl = true if base_uri.include? 'https'
 
-    request = Net::HTTP::Post.new(uri, 
-      initheader = {'Content-Type' => 'application/json'})
+    request = Net::HTTP::Post.new(
+      uri,
+      initheader = { 'Content-Type' => 'application/json' }
+    )
     request.body = submit_params(test_case).to_json
 
-    puts "\n" if verbose
-    puts JSON.load(request.body).to_hash if verbose
+    # puts "\n" if verbose
+    # puts JSON.parse(request.body).to_hash if verbose
 
     response = https.request request
-    puts JSON.load(response.body).to_hash if verbose
-    not response.kind_of? Net::HTTPUnprocessableEntity
+    # puts JSON.parse(response.body).to_hash if verbose
+    !response.is_a? Net::HTTPUnprocessableEntity
   end
 
   def submit_all(mesa)
-    uri=URI.parse(base_uri + '/test_instances/submit.json')
     submitted_cases = []
     unsubmitted_cases = []
     mesa.test_names.each do |mod, test_names|
@@ -317,10 +317,8 @@ e-mail and password will be stored in plain text.
     # return true if all cases were submitted
     submitted_cases.length == mesa.test_names.length
   end
-
 end
 
-
 class Mesa
   attr_reader :mesa_dir, :test_data, :test_names, :test_cases, :shell
 
@@ -329,7 +327,7 @@ class Mesa
     success = system("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 downlaod mesa " +
+      raise MesaDirError, "Encountered a problem in download mesa " +
                           "revision #{version_number}."
     end
     Mesa.new(mesa_dir: new_mesa_dir)
@@ -378,7 +376,6 @@ class Mesa
     FileUtils.rm_rf mesa_dir
   end
 
-
   ## TEST SUITE METHODS
 
   def check_mod(mod)
@@ -452,9 +449,9 @@ class Mesa
     if mod == :all
       # look through all loaded modules for desired test case name, return
       # FIRST found (assuming no name duplication across modules)
-      @test_names.each do |mod, names|
-        if names.include? test_case_name
-          return @test_cases[mod][test_case_name]
+      @test_names.each do |this_mod, mod_names|
+        if mod_names.include? test_case_name
+          return @test_cases[this_mod][test_case_name]
         end
       end
       # didn't find any matches, return nil
@@ -484,9 +481,8 @@ class Mesa
     each_test_clean(mod: mod)
 
     if mod == :all
-      MesaTestCase.modules.each do
-        |this_mod| each_test_run_and_diff(mod: this_mod,
-          log_results: log_results)
+      MesaTestCase.modules.each do |this_mod|
+        each_test_run_and_diff(mod: this_mod, log_results: log_results)
       end
     else
       test_names[mod].each do |test_name|
@@ -497,6 +493,18 @@ class Mesa
     end
   end
 
+  def each_test_load_results(mod: :all)
+    if mod == :all
+      MesaTestCase.modules.each do |this_mod|
+        each_test_load_results(mod: this_mod)
+      end
+    else
+      test_names[mod].each do |test_name|
+        test_cases[mod][test_name].load_results
+      end
+    end
+  end
+
   # note that this only changes MESA_DIR for subprocesses launched from ruby
   # the old value of MESA_DIR will persist after the ruby process ends
   def set_mesa_dir
@@ -547,7 +555,6 @@ class Mesa
   end
 end
 
-
 class MesaTestCase
   attr_reader :test_name, :mesa_dir, :mesa, :success_string, :final_model,
     :failure_msg, :success_msg, :photo, :runtime_seconds,
@@ -631,8 +638,10 @@ class MesaTestCase
   end
 
   def add_datum(datum_name, datum_type)
-    raise InvalidDataType, "Invalid data type: #{datum_type}. Must be one of "+
-      data_types.join(', ') + '.' unless data_types.include? datum_type.to_sym
+    unless data_types.include? datum_type.to_sym
+      raise InvalidDataType, "Invalid data type: #{datum_type}. Must be one "\
+        'of ' + data_types.join(', ') + '.' 
+    end
     @data[datum_name] = datum_type
     @data_names << datum_name
   end
@@ -667,8 +676,8 @@ class MesaTestCase
       FileUtils.rm_f 'binary_history.data'
       FileUtils.rm_f 'out.txt'
       if File.directory? File.join('star_history','history_out')
-        shell.say "Removing all files of the form history_out* from star_history",
-          color = :blue
+        shell.say 'Removing all files of the form history_out* from ' \
+          'star_history', :blue
         FileUtils.rm_f Dir.glob(File.join('star_history', 'history_out', '*'))
       end
       if File.directory? File.join('star_profile', 'profiles_out')
@@ -686,7 +695,7 @@ class MesaTestCase
     @test_omp_num_threads = omp_num_threads
     in_dir do
       FileUtils.touch '.running'
-      shell.say("building and running #{test_name}", color = :blue)
+      shell.say("building and running #{test_name}", :blue)
       puts ''
       build_and_run
       FileUtils.rm '.running'
@@ -772,13 +781,13 @@ class MesaTestCase
   def write_failure_message
     msg = "******************** #{failure_msg[@failure_type]} " +
       "********************" 
-    log_message(msg, color = :red)
+    log_message(msg, :red)
   end
 
   # write success message to log file
   def write_success_msg(success_type)
     msg = 'PASS ' + success_msg[success_type]
-    log_message(msg, color = :green)
+    log_message(msg, :green)
   end
 
   # used as return value for run or photo test. Logs failure to text file, and
@@ -810,8 +819,8 @@ class MesaTestCase
     # report runtime and clean up
     run_finish = Time.now
     @runtime_seconds = (run_finish - run_start).to_i
-    shell.say "Finished with ./rn; runtime = #{@runtime_seconds} seconds.",
-      color = :blue
+    shell.say("Finished with ./rn; runtime = #{@runtime_seconds} seconds.",
+      :blue)
     append_and_rm_err
 
 
@@ -855,7 +864,6 @@ class MesaTestCase
     else
       return succeed(:run_test_string)
     end
-
   end
 
   # prepare for and do restart, check results, and return pass/fail status
@@ -893,88 +901,98 @@ 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
+    simple_clean
+    mk
+
+    # remove old final model if it exists
+    remove_final_model
+
+    # only check restart/photo if we get through run successfully
+    check_restart if check_run
+  end
+
+  # append contents of err.txt to end of out.txt, then delete err.txt
+  def append_and_rm_err(outfile = 'out.txt', errfile = 'err.txt')
+    err_contents = File.read(errfile)
+    display_errors(err_contents)
+    log_errors(err_contents, outfile)
+    FileUtils.rm errfile
+  end
+
+  def display_errors(err_contents)
+    return unless err_contents.strip.empty?
+    shell.say("\nERRORS", :red)
+    puts err_contents
+    shell.say("END OF ERRORS", :red)
+  end
+
+  def log_errors(err_contents, outfile)
+    File.open(outfile, 'a') { |f_out| f_out.write(err_contents) }
+    shell.say("appended to #{outfile})\n", :red)
+  end
+
+  def simple_clean
     puts './clean'
     unless system('./clean')
-      raise TestCaseDirError, "Encountered an error when running `clean` in " +
+      raise TestCaseDirError, 'Encountered an error when running `clean` in ' +
         "#{Dir.getwd} for test case #{test_name}."
     end
+  end
 
+  def mk
     puts './mk > mk.txt'
     unless system('./mk > mk.txt')
-      raise TestCaseDirError, "Encountered an error when running `mk` in " +
+      raise TestCaseDirError, 'Encountered an error when running `mk` in ' +
         "#{Dir.getwd} for test case #{test_name}."
     end
     FileUtils.rm 'mk.txt'
-
-    # remove final model if it already exists
-    unless final_model.nil?
-      FileUtils.rm final_model if File.exist? final_model
-    end
-
-    if check_run
-      # only check restart/photo if we get through run successfully
-      check_restart
-    end
   end
 
-  # append contents of err.txt to end of out.txt, then delete err.txt
-  def append_and_rm_err(outfile='out.txt', errfile='err.txt')
-    File.open(outfile, 'a') do |f_out|
-      err_contents = File.read(errfile)
-      unless err_contents.strip.empty?
-        shell.say "\nERRORS", color = :red
-        puts err_contents
-        shell.say "END OF ERRORS (appended to #{outfile})", color = :red
-        puts ''
-        f_out.write(err_contents)
-      end
-    end
-    FileUtils.rm errfile
+  def remove_final_model
+    # remove final model if it already exists
+    return unless final_model
+    return unless File.exist?(final_model)
+    FileUtils.rm(final_model)
   end
-
 end
 
-
 ################################
 #       GENERAL METHODS        #
 ################################
 
-
 # cd into a new directory, execute a block whose return value is either
 # true or false. Either way, cd back to original directory. Raise an
 # exception if the block failed (returned false or nil)
 def visit_and_check(new_dir, exception, message)
   cwd = Dir.getwd
-  shell.say "Leaving  #{cwd}", color = :blue
-  puts ""
-  shell.say "Entering #{new_dir}.", color = :blue
+  shell.say "Leaving  #{cwd}", :blue
+  puts ''
+  shell.say "Entering #{new_dir}.", :blue
   Dir.chdir(new_dir)
   success = yield if block_given?
-  shell.say "Leaving  #{new_dir}", color = :blue
-  puts ""
-  shell.say "Entering #{cwd}.", color = :blue
+  shell.say "Leaving  #{new_dir}", :blue
+  puts ''
+  shell.say "Entering #{cwd}.", :blue
   Dir.chdir(cwd)
-  unless success
-    raise exception, message
-  end
+  return unless success
+  raise exception, message
 end
 
 # cd into a new directory, execute a block, then cd back into original
 # directory
 def visit_dir(new_dir)
   cwd = Dir.getwd
-  shell.say "Leaving  #{cwd}", color = :blue
+  shell.say "Leaving  #{cwd}", :blue
   puts ""
-  shell.say "Entering #{new_dir}.", color = :blue
+  shell.say "Entering #{new_dir}.", :blue
   Dir.chdir(new_dir)
   yield if block_given?
-  shell.say "Leaving  #{new_dir}", color = :blue
+  shell.say "Leaving  #{new_dir}", :blue
   puts ""
-  shell.say "Entering #{cwd}.", color = :blue
+  shell.say "Entering #{cwd}.", :blue
   Dir.chdir(cwd)
 end
 
@@ -991,12 +1009,13 @@ def generate_seeds_rb(mesa_dir, outfile)
       f.puts "      version_added: #{m.version_number},"
       # no comma on last one
       if test_case_name == m.test_names[-1]
-        f.puts "    }"
+        f.puts('    }')
       else
-        f.puts "    },"
+        f.puts('    }')
       end
     end
     f.puts '  ]'
     f.puts ')'
   end
 end
+

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: mesa_test
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - William Wolf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: os
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.19'
 description: mesa_test is a command-line interface for running the test suites in
   MESA and submitting them to the companion website MESATestHub.
 email: wmwolf@asu.edu