mesa_test 0.0.14 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52edc717f3e8c1322b3448c01cb323857d86a1a2
-  data.tar.gz: 7287c330978661cd7a4a265c24f57cb09807a340
+  metadata.gz: a8cc4cbf769460ee63c65aaff5c1e61d5d762fe7
+  data.tar.gz: '096c818d3a7f9f0e86cc2a2fe1dc59d03476cc51'
 SHA512:
-  metadata.gz: 9424e51b29121151ad2abc2b4d8ea5969263e0785a68111755b4b9318c722fb610f790d94a948b565c528d9b12fb76bc3c904a919a3dbaa5244207d8742a7146
-  data.tar.gz: aa31face553ef21a787e8a0540ac67a965e670f1009093390b5f02755c080b98bc6f56eda7b75c745ac0f6476306b9975238ceda3dbc3421f35a78e1593ffbc2
+  metadata.gz: 92f2cfd3aa55cb4bcc396499d993bc994f112c8f192a938966120f05c174cd125308d922889848a78aef4f78aae329f1157794344d43be3486036c75ab26a1dd
+  data.tar.gz: 73550ea45adde5b962ef00bea03efaadab4b378601286239c78b4ccf62cf1bccd2478c3d365bbfc32d5d3239e131df78f3f59bc37d6011c03120f86a7fc027f8

data/bin/mesa_test

@@ -5,6 +5,8 @@ require 'mesa_test'
 require 'thor'
 
 class MesaTest < Thor
+  DEVLOPMENT_URI = 'http://localhost:3000'.freeze
+
   desc 'setup [CONFIG_FILE]', 'Setup MesaTestHub config file.'
   long_desc <<-LONGDESC
     If optional CONFIG_FILE is provided, search for that file and load it
@@ -17,11 +19,11 @@ class MesaTest < Thor
                                       force_setup: true)
   end
 
-  desc 'test_one MESA_DIR TEST_CASE', "run, check, and submit one test case"
+  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
   report results to MesaTestHub. TEST_CASE can also be an integer corresponding
-  to the line number of the test name in its do1_test_source file (or a 
+  to the line number of the test name in its do1_test_source file (or a
   concatenated version of that file if no module is specified). Modules are
   searched/concatenated in this order:
 
@@ -49,38 +51,11 @@ class MesaTest < Thor
   option :module, type: :string, default: :all
   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]
-        s.setup unless s.confirm_computer_data
-      end
-
-      check_user_and_computer s
-    end
-
-    # 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
-    raise MesaDirError, "Invalid MESA_DIR: #{mesa_dir}. Please download and " +
-      "install a valid MESA version or provide the path to one." unless
-      m.installed?
-    m.load_test_source_data
-
-    # choose whether to update checksums
-    m.update_checksums = !options[:diff]
-
-    # make sure the test case is valid
-    t = m.find_test_case(test_case_name: test_case_name,
-                         mod: options[:module].downcase.to_sym)
-    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
+    s = create_and_check_submitter(force: options[:force]) if options[:submit]
+    m = create_and_check_mesa(mesa_dir: mesa_dir, diff: options[:diff],
+                              mod: options[:module].downcase.to_sym)
+    t = create_and_check_test_case(mesa: m, test_case_name: test_case_name,
+                                   mod: options[:module].downcase.to_sym)
 
     # clean and run test
     t.clean
@@ -89,17 +64,16 @@ class MesaTest < Thor
     # log results
     t.log_results if options[:log]
 
+    # bail out if not submitting
+    return unless options[:submit]
+
     # submit results
-    if options[:submit]
-      print 'Submitting results to ' + s.base_uri + '... '
-      s.submit(t)
-      puts "Done."
-      puts ""
-    end
+    print 'Submitting results to ' + s.base_uri + '... '
+    s.submit(t)
+    puts "Done.\n"
   end
 
-
-  desc "test_all MESA_DIR", "run, check, and submit all test cases"
+  desc 'test_all MESA_DIR', 'run, check, and submit all test cases'
   long_desc <<-LONGDESC
   Run and check all test cases residing in MESA_DIR/star/test_suite. Then
   report results to MesaTestHub. Specifically, runs and checks all tests
@@ -113,6 +87,9 @@ class MesaTest < Thor
   in ~/.mesa_test.yml are correct. Only relevant if --submit option is on
   (by default it is).
 
+  With --module option, select which module to search through, with the default
+  being "all" (search all modules in order). Example: --module=star.
+
   With --log option, save yml file of test results in test directory and a
   summary in the test suite directory. On by default. Shut off with --no-log.
 
@@ -122,34 +99,19 @@ class MesaTest < Thor
   option :diff, type: :boolean, default: true
   option :force, type: :boolean, aliases: '-f'
   option :log, type: :boolean, default: true
+  option :module, type: :string, default: :all
   option :submit, type: :boolean, default: true
   def test_all(mesa_dir)
-
-    if options[:submit]
-      s = MesaTestSubmitter.new_from_config
-      unless options[:force]
-        unless s.confirm_computer_data
-          s.setup
-        end
-      end
-      check_user_and_computer s
-    end
-    
-    # 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
-    raise MesaDirError, "Invalid MESA_DIR: #{mesa_dir}. Please download and " +
-      "install a valid MESA version or provide the path to one." unless
-      m.installed?
-    m.load_test_source_data
+    s = create_and_check_submitter(force: options[:force]) if options[:submit]
+    m = create_and_check_mesa(mesa_dir: mesa_dir, diff: options[:diff],
+                              mod: options[:module].downcase.to_sym)
 
     # run all tests
-    m.update_checksums = !options[:diff]
-    m.each_test_run_and_diff(log_results: options[:log])
+    m.each_test_run_and_diff(log_results: options[:log],
+                             mod: options[:module].downcase.to_sym)
 
     # submit all tests
-    s.submit_all(m) if options[:submit]
+    s.submit_all(m, options[:module].downcase.to_sym) if options[:submit]
   end
 
   desc 'submit_one MESA_DIR TEST_CASE', 'submit one completed test case'
@@ -159,7 +121,7 @@ class MesaTest < Thor
   name in its do1_test_source file (or a concatenated version of that file if
   no module is specified). Modules are searched/concatenated in this order:
 
-  #{MesaTestCase.modules.map { |mod| '    ' + mod.to_s }.join(", ") }
+  #{MesaTestCase.modules.map { |mod| '    ' + mod.to_s }.join(', ')}
 
   With --force option, skip confirmation of computer details, assuming values
   in ~/.mesa_test.yml are correct.
@@ -170,35 +132,11 @@ class MesaTest < Thor
   option :force, type: :boolean, aliases: '-f'
   option :module, type: :string, aliases: '-m', default: 'all'
   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,
-                         mod: options[:module].downcase.to_sym)
-    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
-
+    s = create_and_check_submitter(force: options[:force])
+    m = create_and_check_mesa(mesa_dir: mesa_dir,
+                              mod: options[:module].downcase.to_sym)
+    t = create_and_check_test_case(mesa: m, test_case_name: test_case_name,
+                                   mod: options[:module].downcase.to_sym)
     # load test results
     t.load_results
 
@@ -216,103 +154,105 @@ class MesaTest < Thor
 
   With --force option, skip confirmation of computer details, assuming values
   in ~/.mesa_test.yml are correct.
+
+  With --module option, select which module to search through, with the default
+  being "all" (search all modules in order). Example: --module=star.
   LONGDESC
   option :force, type: :boolean, aliases: '-f'
+  option :module, type: :string, aliases: '-m', default: 'all'
   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
+    s = create_and_check_submitter(force: options[:force])
+    m = create_and_check_mesa(mesa_dir: mesa_dir,
+                              mod: options[:module].downcase.to_sym)
 
-    # 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
+    # load all test data
+    m.each_test_load_results(mod: options[:module].downcase.to_sym)
 
     # submit all tests
-    s.submit_all(m)
+    s.submit_all(m, options[:module].downcase.to_sym)
   end
 
-
-  desc "install VERSION_NUMBER MESA_DIR", 'download and install mesa release '+
+  desc 'install VERSION_NUMBER MESA_DIR', 'download and install mesa release '\
     'VERSION_NUMBER to directory MESA_DIR'
   long_desc <<-LONGDESC
-  Calls to svn to install mesa release VERSION_NUMBER into the directory 
+  Calls to svn to install mesa release VERSION_NUMBER into the directory
   MESA_DIR. Basically just an svn checkout followed by going into the directory
   and running ./clean and ./install. SDK or compilers must be set up prior.
   Does not affect the user's MESA_DIR or other environment variables.
   LONGDESC
   def install(version, mesa_dir)
-    m = Mesa.download(version_number:version, new_mesa_dir: mesa_dir)
+    m = Mesa.download(version_number: version, new_mesa_dir: mesa_dir)
     m.clean
     m.install
   end
 
-
-  desc "install_and_test_all VERSION_NUMBER MESA_DIR", 'download and install ' +
+  desc 'install_and_test_all VERSION_NUMBER MESA_DIR', 'download and install '\
   'mesa release VERSION_NUMBER to directory MESA_DIR and run/submit all tests'
   long_desc <<-LONGDESC
-  Calls to svn to install mesa release VERSION_NUMBER into the directory 
+  Calls to svn to install mesa release VERSION_NUMBER into the directory
   MESA_DIR. Basically just an svn checkout followed by going into the directory
   and running ./clean and ./install. SDK or compilers must be set up prior.
-  Once installation is complete, run the test suite, and report results to 
+  Once installation is complete, run the test suite, and report results to
   MesaTestHub. Does not affect the user's MESA_DIR or other environment
-  variables. This is basically a shortcut for running 
+  variables. This is basically a shortcut for running
 
     `mesa_test install SOME_VERSION SOME_DIR`
 
-  followed by 
+  followed by
 
     `mesa_test test_all SOME_DIR`
 
+  If VERSION_NUMBER is 'non-paxton', then the most recent commit by anyone
+  other than Bill Paxton ('bill_paxton') is tested and the --diff flag is
+  ignored and set to false. Note that using 'HEAD' for version number will
+  automatically select the most recent release, regardless of the author.
+
+  With --diff option, assume the checksums are up-to-date (behave like
+  each_test_run_and_diff), on by default.  To update checksums after ./rn
+  (behave like each_test_run), use --no-diff.
+
   Use flag --destroy to self destruct MESA_DIR after successful test
   submission. Essentially does rm -rf MESA_DIR after the test suite. Useful
   for automated testing without piling up disk space.
 
   Use flag --force to skip confirmation of computer details if they can be
   read from ~/.mesa_test.yml.
+
+  With --log option, save yml file of test results in test directory and a
+  summary in the test suite directory. On by default. Shut off with --no-log.  
+
+  With --module option, select which module to search through, with the default
+  being "all". Example: --module=star.
   LONGDESC
+  option :diff, type: :boolean, default: true
   option :destroy, type: :boolean
+  option :log, type: :boolean, default: true
   option :force, type: :boolean, aliases: '-f'
+  option :module, type: :string, aliases: '-m', default: 'all'
   def install_and_test_all(version, mesa_dir)
-    s = MesaTestSubmitter.new_from_config
-    unless options[:force]
-      unless s.confirm_computer_data
-        s.setup
-      end
-    end
-
-    m = Mesa.download(version_number:version, new_mesa_dir: mesa_dir)
+    s = create_and_check_submitter(force: options[:force])
+    mesa_version, diff = filter_version_and_diff(version, s)
+    m = Mesa.download(version_number: mesa_version, new_mesa_dir: mesa_dir)
     m.clean
     m.install
 
-    raise MesaDirError, "Invalid MESA_DIR: #{mesa_dir}. Please download and " +
-      "install a valid MESA version or provide the path to one." unless
-      m.installed?
-    m.load_test_source_data
+    m = create_and_check_mesa(mesa_dir: mesa_dir, diff: diff,
+                              mod: options[:module].downcase.to_sym)
 
-    # run all tests
-    m.each_test_run_and_diff
+    # run all tests. Don't be fooled, whether or not a diff happens is set
+    # by the diff attribute of the mesa object, set above.
+    m.each_test_run_and_diff(mod: options[:module].downcase.to_sym,
+                             log_results: options[:log])
 
     # submit all tests
-    successfully_submitted = s.submit_all(m)
+    successfully_submitted = s.submit_all(m, options[:module].downcase.to_sym)
 
     # if requested, and if submission successful, destroy the directory
-    if successfully_submitted and options[:destroy]
-      m.destroy
-    end
+    m.destroy if successfully_submitted && options[:destroy]
   end
 
   private
+
   def check_user_and_computer(submitter)
     computer_check = submitter.confirm_computer
     if computer_check['valid']
@@ -323,9 +263,52 @@ class MesaTest < Thor
     end
   end
 
+  def create_and_check_submitter(force: false)
+    s = MesaTestSubmitter.new_from_config
+    # s = MesaTestSubmitter.new_from_config(base_uri: DEFAULT_URI)
+    unless force
+      s.setup unless s.confirm_computer_data
+    end
+    check_user_and_computer s
+    s
+  end
 
-end
+  def create_and_check_mesa(mesa_dir:, diff: true, mod: :all)
+    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(mod: mod)
+
+    # choose whether to update checksums
+    m.update_checksums = !diff
+    m
+  end
 
+  def create_and_check_test_case(mesa:, test_case_name:, mod: :all)
+    t = mesa.find_test_case(test_case_name: test_case_name, mod: mod)
+    # return test case if it was found
+    return t unless t.nil?
+    # test case was not found. Throw an error.
+    msg = "No such test case, #{test_case_name} found in any of "
+    # this should care about the value in `mod`. Current behavior is only
+    # appropriate if `mod` is :all.
+    msg << MesaTestCase.modules.map do |this_mod|
+      File.join(m.test_suite_dir(mod: this_mod), 'do1_test_source')
+    end.join(' or ')
+    msg << '.'
+    raise TestCaseDirError, msg
+  end
+
+  def filter_version_and_diff(version, submitter)
+    if version.downcase == 'non-paxton'
+      [Mesa.last_non_paxton_revision(submitter.last_tested), false]
+    else
+      [version, options[:diff]]
+    end
+  end
+end
 
 # actually start the CLI
 MesaTest.start(ARGV)

data/lib/mesa_test.rb

@@ -12,11 +12,16 @@ MesaDirError = Class.new(StandardError)
 TestCaseDirError = Class.new(StandardError)
 InvalidDataType = Class.new(StandardError)
 
+Commit = Struct.new(:revision, :author, :datetime, :message)
+DEFAULT_REVISION = 10_000
+
 class MesaTestSubmitter
+  DEFAULT_URI = 'https://mesa-test-hub.herokuapp.com'.freeze
+
   # set up config file for computer
   def setup
     update do |s|
-      shell.say 'This wizard will guide you through setting up a computer 
+      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
@@ -74,6 +79,12 @@ e-mail and password will be stored in plain text.'
         "7.2.0)? (#{s.compiler_version}): ", :blue
       s.compiler_version = response unless response.empty?
 
+      # Get earliest revision to check
+      response = shell.ask "What's the earliest revision to search back to " \
+        'when finding the latest testable revision (eg. 10000)? ' \
+        "(#{s.last_tested}): ", :blue
+      s.last_tested = response.to_i unless response.empty?
+
       # Confirm save location
       response = shell.ask "This will be saved in #{s.config_file}. Press " \
         'enter to accept or enter a new location:', :blue, path: true
@@ -91,7 +102,7 @@ e-mail and password will be stored in plain text.'
 
   def self.new_from_config(
     config_file: File.join(ENV['HOME'], '.mesa_test.yml'), force_setup: false,
-    base_uri: 'https://mesa-test-hub.herokuapp.com'
+    base_uri: DEFAULT_URI
     # base_uri: 'http://localhost:3000'
   )
     new_submitter = new(config_file: config_file, base_uri: base_uri)
@@ -107,7 +118,7 @@ e-mail and password will be stored in plain text.'
 
   attr_accessor :computer_name, :user_name, :email, :password, :platform,
                 :platform_version, :processor, :ram_gb, :compiler,
-                :compiler_version, :config_file, :base_uri
+                :compiler_version, :config_file, :base_uri, :last_tested
 
   attr_reader :shell
 
@@ -115,7 +126,7 @@ e-mail and password will be stored in plain text.'
   def initialize(
       computer_name: nil, user_name: nil, email: nil, platform: nil,
       platform_version: nil, processor: nil, ram_gb: nil, compiler: nil,
-      compiler_version: nil, config_file: nil, base_uri: nil
+      compiler_version: nil, config_file: nil, base_uri: nil, last_tested: nil
   )
     @computer_name = computer_name || Socket.gethostname.scan(/^[^\.]+\.?/)[0]
     @computer_name.chomp!('.') if @computer_name
@@ -140,6 +151,7 @@ e-mail and password will be stored in plain text.'
     @compiler_version = compiler_version || ''
     @config_file = config_file || File.join(ENV['HOME'], '.mesa_test.yml')
     @base_uri = base_uri
+    @last_tested = last_tested || DEFAULT_REVISION
 
     # set up thor-proof way to get responses from user. Thor hijacks the
     # gets command, so we have to use its built-in "ask" method, which is
@@ -164,11 +176,12 @@ e-mail and password will be stored in plain text.'
     puts "Processor               #{processor}"
     puts "RAM                     #{ram_gb} GB"
     puts "Compiler                #{compiler} #{compiler_version}"
+    puts "Last tested revision    #{last_tested}"
     puts "Config location         #{config_file}"
     puts '-------------------------------------------------------'
     puts ''
     response = shell.ask 'Is this correct? (y/Y = Yes, anything else = No):'
-    response.strip.casecmp('y') == 0
+    response.strip.casecmp('y').zero?
   end
 
   # For one "computer" on the web server, and for [subjective] consistency
@@ -196,7 +209,8 @@ e-mail and password will be stored in plain text.'
       'ram_gb' => ram_gb,
       'platform_version' => platform_version,
       'compiler' => compiler,
-      'compiler_version' => compiler_version
+      'compiler_version' => compiler_version,
+      'last_tested' => last_tested
     }
     File.open(config_file, 'w') { |f| f.write(YAML.dump(data_hash)) }
   end
@@ -213,6 +227,7 @@ e-mail and password will be stored in plain text.'
     @platform_version = data_hash['platform_version']
     @compiler = data_hash['compiler']
     @compiler_version = data_hash['compiler_version']
+    @last_tested = data_hash['last_tested'] || @last_tested
   end
 
   # create and return hash of parameters for a TestInstance submission
@@ -290,58 +305,117 @@ e-mail and password will be stored in plain text.'
     response.is_a? Net::HTTPCreated
   end
 
-  def submit_all(mesa)
+  def submit_all(mesa, mod = :all)
     submitted_cases = []
     unsubmitted_cases = []
-    mesa.test_names.each do |mod, test_names|
-      test_names.each do |test_name|
+    if mod == :all
+      success = true
+      mesa.test_names.each_key do |this_mod|
+        success &&= submit_all(mesa, mod = this_mod)
+      end
+    else
+      mesa.test_names[mod].each do |test_name|
         # get at test case
         test_case = mesa.test_cases[mod][test_name]
         # try to submit and note if it does or doesn't successfully submit
         submitted = false
-        unless test_case.outcome == :not_tested
-          submitted = submit(test_case)
-        end
-
+        submitted = submit(test_case) unless test_case.outcome == :not_tested
         if submitted
           submitted_cases << test_name
         else
           unsubmitted_cases << test_name
         end
       end
+      puts "\n Submission results for #{mod} module:"
+      puts '#####################################'
+      if !submitted_cases.empty?
+        shell.say 'Submitted the following cases:', :green
+        puts submitted_cases.join("\n")
+      else
+        shell.say 'Did not successfully submit any cases.', :red
+      end
+      unless unsubmitted_cases.empty?
+        puts "\n\n\n"
+        shell.say 'Failed to submit the following cases:', :red
+        puts unsubmitted_cases.join("\n")
+      end
+      # return true and update last tested if all cases were submitted
+      success = submitted_cases.length == mesa.test_names.length
+      if success
+        last_tested = mesa.version
+        shell.say "\n\nUpdating last tested revision to #{last_tested}."
+        save_computer_data
+      end
     end
-    puts ''
-    if not submitted_cases.empty?
-      shell.say 'Submitted the following cases:', :green
-      puts submitted_cases.join("\n")
-    else
-      shell.say 'Did not successfully submit any cases.', :red
-    end
-    if not unsubmitted_cases.empty?
-      puts "\n\n\n"
-      shell.say 'Failed to submit the following cases:', :red
-      puts unsubmitted_cases.join("\n")
-    end
-    # return true if all cases were submitted
-    submitted_cases.length == mesa.test_names.length
+    # return boolean indicating whether or not all cases successfully
+    # SUBMITTED (irrespective of passing status)
+    success
   end
 end
 
 class Mesa
+  SVN_URI = 'svn://svn.code.sf.net/p/mesa/code/trunk'.freeze    
+
   attr_reader :mesa_dir, :test_data, :test_names, :test_cases, :shell
   attr_accessor :update_checksums
 
   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} "+
+    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 download mesa " +
+      raise MesaDirError, 'Encountered a problem in download mesa ' \
                           "revision #{version_number}."
     end
     Mesa.new(mesa_dir: new_mesa_dir)
   end
 
+  def self.log_since(last_tested = DEFAULT_REVISION)
+    # svn commit log back to, but excluding, the last revision tested
+    `svn log #{SVN_URI} -r #{last_tested + 1}:HEAD`
+  end
+
+  def self.log_lines_since(last_tested = DEFAULT_REVISION)
+    log_since(last_tested).split("\n").reject(&:empty?)
+  end
+
+  def self.add_commit(commits, revision, author)
+    commits << Commit.new
+    commits.last.revision = revision.to_i
+    commits.last.author = author
+    commits.last.message = []
+  end
+
+  def self.process_line(commits, line)
+    last = commits.last
+    if line =~ /^-+$/
+      # dashed lines separate commits
+      # Done with last commit (if it exists), so clean up message
+      last.message = last.message.join("\n") unless last.nil?
+    elsif line =~ /^r(\d+) \| (\w+) \| .* \| \d+ lines?$/
+      # first line of a commit, scrape data and make new commit
+      add_commit(commits, $1, $2)
+    else
+      # add lines to the message (will concatenate later to single String)
+      last.message << line.strip
+    end
+  end
+
+  # all commits since the given version number
+  def self.commits_since(last_tested = DEFAULT_REVISION)
+    commits = []
+    log_lines_since(last_tested).each { |line| process_line(commits, line) }
+    commits.sort_by(&:revision).reverse
+  end
+
+  def self.last_non_paxton_revision(last_tested = DEFAULT_REVISION)
+    commits_since(last_tested).each do |commit|
+      return commit.revision unless commit.author == 'bill_paxton'
+    end
+    # give out garbage if no valid commit is found
+    nil
+  end
+
   def initialize(mesa_dir: ENV['MESA_DIR'])
     @mesa_dir = mesa_dir
     @update_checksums = false
@@ -355,8 +429,23 @@ class Mesa
     @shell = Thor::Shell::Color.new
   end
 
-  # read version number from $MESA_DIR/data/version_number
   def version_number
+    # prefer svn's reported version number
+    version = svn_version_number
+    # fall back to MESA_DIR/data's version number svn didn't work
+    version = data_version_number unless version > 0
+    version
+  end
+
+  # get version number from svn (preferred method)
+  def svn_version_number
+    return `svnversion #{mesa_dir}`.strip.to_i
+  rescue Errno::ENOENT
+    return 0
+  end
+
+  # read version number from $MESA_DIR/data/version_number
+  def data_version_number
     contents = ''
     File.open(File.join(mesa_dir, 'data', 'version_number'), 'r') do |f|
       contents = f.read
@@ -365,8 +454,8 @@ class Mesa
   end
 
   def clean
-    with_MESA_DIR do
-      visit_and_check mesa_dir, MesaDirError, "Encountered a problem in " +
+    with_mesa_dir do
+      visit_and_check mesa_dir, MesaDirError, 'E\countered a problem in ' \
                                 "running `clean` in #{mesa_dir}." do
         puts 'MESA_DIR = ' + ENV['MESA_DIR']
         puts './clean'
@@ -377,8 +466,8 @@ class Mesa
   end
 
   def install
-    with_MESA_DIR do
-      visit_and_check mesa_dir, MesaDirError, "Encountered a problem in " +
+    with_mesa_dir do
+      visit_and_check mesa_dir, MesaDirError, 'Encountered a problem in ' \
                                 "running `install` in #{mesa_dir}." do
         puts 'MESA_DIR = ' + ENV['MESA_DIR']
         puts './install'
@@ -397,7 +486,7 @@ class Mesa
   def check_mod(mod)
     return if MesaTestCase.modules.include? mod
     raise TestCaseDirError, "Invalid module: #{mod}. Must be one of: " +
-      MesaTestCase.modules.join(', ')
+                            MesaTestCase.modules.join(', ')
   end
 
   def test_suite_dir(mod: nil)
@@ -435,7 +524,7 @@ class Mesa
         if line =~ no_skip
           found_test = true
           @test_data[mod][$1] = { success_string: $2, final_model: $3,
-                                  photo: $4} 
+                                  photo: $4}
         elsif line =~ one_skip
           found_test = true
           @test_data[mod][$1] = { success_string: $2, final_model: $3,
@@ -447,16 +536,17 @@ class Mesa
         end
 
         if found_test
-          @test_names[mod] << $1 unless @test_names.include? $1
+          @test_names[mod] << $1 unless @test_names[mod].include? $1
         end
       end
 
       # make MesaTestCase objects accessible by name
       @test_names[mod].each do |test_name|
         data = @test_data[mod][test_name]
-        @test_cases[mod][test_name] = MesaTestCase.new(test: test_name,
-          mesa: self, success_string: data[:success_string], mod: mod,
-          final_model: data[:final_model], photo: data[:photo])
+        @test_cases[mod][test_name] = MesaTestCase.new(
+          test: test_name, mesa: self, success_string: data[:success_string],
+          mod: mod, final_model: data[:final_model], photo: data[:photo]
+        )
       end
     end
   end
@@ -470,7 +560,7 @@ class Mesa
     end
   end
 
-  # based off of `$MESA_DIR/star/test_suite/each_test_run_and_diff` from 
+  # based off of `$MESA_DIR/star/test_suite/each_test_run_and_diff` from
   # revision 10000
   def each_test_clean(mod: :all)
     if mod == :all
@@ -495,7 +585,7 @@ class Mesa
         test_cases[mod][test_name].do_one
         test_cases[mod][test_name].log_results if log_results
       end
-      log_summary if log_results
+      log_summary(mod: mod) if log_results
     end
   end
 
@@ -522,14 +612,14 @@ class Mesa
   def check_mesa_dir
     res = File.exist?(File.join(mesa_dir, 'data', 'version_number'))
     MesaTestCase.modules.each do |mod|
-      res = res and File.directory? test_suite_dir(mod: mod)
-    end 
+      res &&= File.directory?(test_suite_dir(mod: mod))
+    end
     res
   end
 
   # change MESA_DIR for the execution of the block and then revert to the
   # original value
-  def with_MESA_DIR
+  def with_mesa_dir
     # change MESA_DIR, holding on to old value
     orig_mesa_dir = ENV['MESA_DIR']
     ENV['MESA_DIR'] = mesa_dir
@@ -567,7 +657,7 @@ class Mesa
       end
       summary_file = File.join(test_suite_dir(mod: mod), 'test_summary.yml')
       File.open(summary_file, 'w') do |f|
-        f.write(YAML::dump(res))
+        f.write(YAML.dump(res))
       end
     end
   end
@@ -752,6 +842,7 @@ class MesaTestCase
         'test_results.yml', color = :blue
       FileUtils.rm_f 'binary_history.data'
       FileUtils.rm_f 'out.txt'
+      FileUtils.rm_f 'test_results.yml'
       if File.directory? File.join('star_history', 'history_out')
         shell.say 'Removing all files of the form history_out* from ' \
           'star_history', :blue
@@ -809,13 +900,19 @@ class MesaTestCase
       return
     end
     data = YAML.safe_load(File.read(load_file), [Symbol])
-    @runtime_seconds = data['runtime_seconds']
-    @mod = data['module']
-    @mesa_version = data['mesa_version']
-    @outcome = data['outcome'].to_sym
-    @test_omp_num_threads = data['omp_num_threads']
-    @success_type = data['success_type']
-    @failure_type = data['failure_type']
+    @runtime_seconds = data['runtime_seconds'] || @runtime_seconds
+    @mod = data['module'] || @mod
+    @mesa_version = data['mesa_version'] || @mesa_version
+    @outcome = data['outcome'] || @outcome
+    @test_omp_num_threads = data['omp_num_threads'] || @test_omp_num_threads
+    @success_type = data['success_type'] || @success_type
+    @failure_type = data['failure_type'] || @failure_type
+
+    # convert select data to symbols since that is how they are used
+    @outcome = @outcome.to_sym if @outcome
+    @success_type = @success_type.to_sym if @success_type
+    @failure_type = @failure_type.to_sym if @failure_type
+
     shell.say "Done loading data from #{load_file}.\n", :green
   end
 
@@ -928,13 +1025,10 @@ class MesaTestCase
       puts "md5sum \"#{final_model}\" > checks.md5"
       FileUtils.cp final_model, 'final_check.mod'
 
-      if not photo
-        # if there's no photo, we won't check the checksum, so we've succeeded
-        return succeed(:run_test_string)
-      else
-        # if there is a photo, we'll have to wait and see
-        return true
-      end
+      # if there's no photo, we won't check the checksum, so we've succeeded
+      return succeed(:run_test_string) unless photo
+      # if there is a photo, we'll have to wait and see
+      return true
     end
 
     # check that final model matches

metadata

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