mesa_test 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdee517026a8d0cca40ba51a9ad5418a5d5ac0e52977dcca9fdd9fcb32ead0b2
-  data.tar.gz: 7913ccaed137662943c1aa6ff06853c8641674c9fb822d5ee7391a2a12042ccd
+  metadata.gz: a826fba7ff75a9e70bc48f382a695dd97c901d4fb592b62c12efc71815228166
+  data.tar.gz: bcfcc756505119163a4a9fd26a33a6e7ec1f93a866b0fcda0fbe1e5d4d0b73cc
 SHA512:
-  metadata.gz: 6ffe69d78fb35653875ef3232e31c3f1cad46342281df3825a81ff364d113049658681140afadabfb7db2dcb85ea4a4046bc79117632b35fbc37f6b2dfc19251
-  data.tar.gz: e130047bbd95f236aec698240e0c9633d27185daf1c8cd4cdb8448773a675765187192386b81f91a7095ca6a71cbbe2ac3a30b6a3ff3669a3ab4b0efbfae5a46
+  metadata.gz: 8f08733e96c142a057741a888b7ff0db782c305e77596bee2bc8b888b42b9874f5905fb22c1a81bb7e2bed6e27afa60cf025107b9dc3805141769eff20e8527f
+  data.tar.gz: c58df66933472bef5f6849837272c599bc5480446119a946362e900c0b4e995409cd5b72db6bd56cd6b912c2480a0eb5746c2a12dad0c3ce89a075d24e7170bd

data/bin/mesa_test

@@ -1,7 +1,9 @@
 #! /usr/bin/env ruby
 
-# if true, submit cases to localhost:3000 and load local mesa_test library
-# rather than system version
+# if :development, submit cases to localhost:3000 and load local mesa_test library
+# rather than system version and run out of local lib, not installed
+# if :staging, submit to beta version and run out of local lib, not installed
+# anything else: trust rubygems to get lib and submit to real deal testhub
 MODE = :production
 
 case MODE
@@ -67,7 +69,6 @@ class MesaTest < Thor
       # submit results
       shell.say 'Submitting results to ' + s.base_uri + '... ', :blue
       s.submit_instance(m, t)
-      shell.say "Done.\n", :green
     else
       # run all tests
       m.each_test_run(mod: options[:module].downcase.to_sym)
@@ -77,8 +78,8 @@ class MesaTest < Thor
 
       shell.say 'Submitting results to ' + s.base_uri + '... ', :blue
       s.submit_commit(m)
-      shell.say "Done.\n", :green
     end
+    shell.say "Done.\n", :green
   end
 
   desc 'submit [TEST CASE]', 'submit a test case or commit'
@@ -146,18 +147,20 @@ class MesaTest < Thor
     end
   end
 
-  desc 'checkout SHA', 'checkout a commit'
+  desc 'checkout [SHA]', 'checkout a commit'
   long_desc <<-LONGDESC
   Checks out a particular commit to default mesa directory (mesa_work in 
   .mesa_test.yml). Uses git worktree magic to avoid re-downloading all of
   mesa history if a mirror repo is already set up. Does not affect the
   user's MESA_DIR or other environment variables.
+
+  If no sha is provided, defaults to main (if checkout is occuring).
   LONGDESC
 
   option :mesadir, desc: 'Location of mesa dir, if not relying on config data',
                    type: :string
 
-  def checkout(sha)
+  def checkout(sha = 'main')
     # assuming config wizard has already been set (perhaps a little reckless)
     # so that we can get at the work directory and mirror directory
     s = create_submitter(force: true)
@@ -177,7 +180,7 @@ class MesaTest < Thor
   set up prior. Does not affect the user's MESA_DIR or other environment
   variables outside of execution.
 
-  If no sha is provided, defaults to master (if checkout is occuring). SHA is
+  If no sha is provided, defaults to main (if checkout is occuring). SHA is
   ignored if using option --no-checkout
   LONGDESC
 
@@ -187,7 +190,7 @@ class MesaTest < Thor
   option :mesadir, desc: 'Location of mesa dir, if not relying on config data',
                    type: :string
 
-  def install(sha = 'master')
+  def install(sha = 'main')
     # assuming config wizard has already been set (perhaps a little reckless)
     # so that we can get at the work directory and mirror directory
     s = create_submitter(force: true)
@@ -226,6 +229,10 @@ class MesaTest < Thor
   followed by
 
     `mesa_test test`
+
+  If no sha is provided, defaults to main (if checkout is occuring). SHA is
+  ignored if using option --no-checkout
+
   LONGDESC
 
   option :checkout, desc: 'Whether a checkout needs to happen. Use '\
@@ -244,7 +251,7 @@ class MesaTest < Thor
   option :destroy, type: :boolean, desc: 'Delete mesa installation upon ' \
                    'submission of complete results.', default: false
 
-  def install_and_test(sha)
+  def install_and_test(sha='main')
     s = if options[:submit]
           create_and_check_submitter(force: options[:force])
         else

data/lib/mesa_test.rb

@@ -13,7 +13,6 @@ TestCaseDirError = Class.new(StandardError)
 InvalidDataType = Class.new(StandardError)
 GitHubError = Class.new(StandardError)
 
-DEFAULT_REVISION = 10_000
 GITHUB_HTTPS = 'https://github.com/MESAHub/mesa.git'.freeze
 GITHUB_SSH = 'git@github.com:MESAHub/mesa.git'.freeze
 
@@ -76,10 +75,12 @@ e-mail and password will be stored in plain text.'
         "Ubuntu 16.04)? (#{s.platform_version}):", :blue
       s.platform_version = response 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
-      s.config_file = response unless response.empty?
+      # we are powerless to do change the location for now, so stop asking
+      # about it
+      # # 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
+      # s.config_file = response unless response.empty?
     end
 
     # Confirm data. If not confirmed, restart whole wizard.
@@ -145,7 +146,6 @@ e-mail and password will be stored in plain text.'
     @config_file = config_file || File.join(ENV['HOME'], '.mesa_test',
                                             'config.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
@@ -170,7 +170,7 @@ e-mail and password will be stored in plain text.'
     puts "MESA Mirror Location    #{mesa_mirror}"
     puts "MESA Work Location      #{mesa_work}"
     puts "Platform                #{platform} #{platform_version}"
-    puts "Config location         #{config_file}"
+    # puts "Config location         #{config_file}"
     puts '-------------------------------------------------------'
     puts ''
     response = shell.ask 'Is this correct? (y/Y = Yes, anything else = No):'
@@ -289,7 +289,7 @@ e-mail and password will be stored in plain text.'
     https.use_ssl = base_uri.include? 'https'
 
     request = Net::HTTP::Post.new(
-      uri, initheader = { 'Content-Type' => 'application/json' }
+      uri, initheader = { 'Accept' => 'application/json', 'Content-Type' => 'application/json' }
     )
     request.body = {
       email: email,
@@ -302,13 +302,17 @@ e-mail and password will be stored in plain text.'
   # submit entire commit's worth of test cases, OR submit compilation status
   # and NO test cases
   def submit_commit(mesa, empty: false)
+    unless mesa.install_attempted?
+      raise MesaDirError, 'No testhub.yml file found in installation; '\
+                          'must attempt to install before subitting.'
+    end
     uri = URI.parse(base_uri + '/submissions/create.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' }
+      initheader = { 'Accept' => 'application/json', 'Content-Type' => 'application/json' }
     )
 
     # create the request body for submission to the submissions API
@@ -341,13 +345,18 @@ e-mail and password will be stored in plain text.'
   # submit results for a single test case instance. Does *not* report overall
   # compilation status to testhub. Use an empty commit submission for that
   def submit_instance(mesa, test_case)
+    unless mesa.install_attempted?
+      raise MesaDirError, 'No testhub.yml file found in installation; '\
+                          'must attempt to install before subitting.'
+    end
+
     uri = URI.parse(base_uri + '/submissions/create.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' }
+      initheader = { 'Accept' => 'application/json', 'Content-Type' => 'application/json' }
     )
 
     # create the request body for submission to the submissions API
@@ -443,7 +452,7 @@ class Mesa
           bash_execute(command)
 
           raise(GitHubError, 'Error while executing the following command:'\
-                             "#{command}. Perhaps you haven't set up ssh "\
+                             "#{command}. Perhaps you haven't set up "\
                              'ssh keys with your GitHub account?')
         end
       when :https
@@ -557,14 +566,17 @@ class Mesa
   # installation
   def compiler_hash
     data_file = File.join(mesa_dir, 'testhub.yml')
-    unless File.exist? data_file
-      raise(MesaDirError, "Could not find file testhub.yml in #{mesa_dir}.")
+    res = {
+            compiler: 'Unknown',
+            sdk_version: 'Unknown',
+            math_backend: 'Unknown'
+          }
+    if File.exist? data_file
+      res = res.merge(YAML.safe_load(File.read(data_file)) || {})
+      # currently version_number is reported, but we don't need that in Git land
+      res.delete('version_number') # returns the value, not the updated hash
+      res
     end
-
-    res = YAML.safe_load(File.read(data_file))
-    # currently version_number is reported, but we don't need that in Git land
-    res.delete('version_number') # returns the value, not the updated hash
-    res
   end
 
   ## TEST SUITE METHODS
@@ -602,12 +614,16 @@ class Mesa
           num, tc_name = line.strip.split
           @names_to_numbers[mod][tc_name.strip] = num.to_i
           @test_case_names[mod] << tc_name.strip
-          @test_cases[mod][tc_name.strip] = MesaTestCase.new(
-            test: tc_name.strip,
-            mod: mod,
-            position: num.to_i,
-            mesa: self
-          )
+          begin
+            @test_cases[mod][tc_name.strip] = MesaTestCase.new(
+              test: tc_name.strip,
+              mod: mod,
+              position: num.to_i,
+              mesa: self
+            )
+          rescue TestCaseDirError
+            shell.say "No such test case #{tc_name.strip}. Skipping loading it.", :red
+          end
         end
       end
     end
@@ -647,11 +663,16 @@ class Mesa
   def installed?
     # assume build log reflects installation status; does not account for
     # mucking with modules after the fact
-    downloaded? && File.read(File.join(mesa_dir, 'build.log')).include?(
+    build_log = File.join(mesa_dir, 'build.log')
+    downloaded? && File.exist?(build_log) && File.read(build_log).include?(
       'MESA installation was successful'
     )
   end
 
+  def install_attempted?
+    File.exist? File.join(mesa_dir, 'testhub.yml')
+  end
+
   private
 
   # verify that mesa_dir is valid by checking for existence of test_suite

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mesa_test
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.5
 platform: ruby
 authors:
 - William Wolf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.4
 signing_key:
 specification_version: 4
 summary: Command line tool for running and reporting the MESA test suites.