mesa_test 1.1.12 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6197ab41eec170d06d29d19e2e66446c71a673434a316a100bd102e44a849d7d
-  data.tar.gz: f307cc7d5948121879fd4565ac90fbcf57b6e796ab47fdce4bca7c6f79b9092a
+  metadata.gz: 3c01327f74ca824acf8b7cb473561037281255de396cc623c6c636b9c21bb2ed
+  data.tar.gz: 52f1c9d09ece9a85bdfc3827249357ec1ada18da6b14d70793df9b082331bbe9
 SHA512:
-  metadata.gz: 856b3b1f1bc52c56aae8ca59916f0526306ebff35657b68b26ddcd96313b1f2b0ed051aa9b55c7c8d0378d01b7f433be89fcc035bb61d14cf7dc67fa95616be1
-  data.tar.gz: a9f230dd702be29a371b0442d8cdc6dc81a2774ddfae9105b7250b401881ca06b2db721728143b112d2e057027b456206d187e7298de0aef31bc5ba25d29a791
+  metadata.gz: 91a42fce1cf44a643b465edf60351448ea863ebd8ac4e5f962733928b9c620c1dafb251c38cbc4bd9267309ee6298d96fb05a12b35847a974025aa8a183f9037
+  data.tar.gz: 19aca1c41bc5519d8082f7ee5e85398a3652d9b7455f21b4ecf2b2b767084e3abfe5fd52a2630f4a17a8248879e84375549b954453f3c2c79a1acdf6590cd6cf

data/bin/mesa_test

@@ -328,8 +328,68 @@ class MesaTest < Thor
                                       force_setup: true)
   end
 
+  desc 'search "QUERY"', 'retrieve JSON test instances matching QUERY'
+  long_desc <<-LONGDESC
+  Sends a GET request to the MesaTestHub search API. QUERY should be
+  quoted. Credentials are read from your mesa_test config file and sent as
+  URL query parameters (HTTPS is mandatory).
+
+  Query syntax is the same key-value form used by the in-browser search box
+  at testhub.mesastar.org/test_instances/search (see the "Query syntax"
+  panel on that page). Example:
+
+    mesa_test search "computer: Hercules; passed: false"
+
+  The raw JSON response body is written to STDOUT, suitable for piping to
+  jq or redirecting to a file. If the server reports any rejected query
+  clauses in a `failures` array, those are also echoed to STDERR so they
+  aren't silently dropped from downstream pipelines. On a non-success HTTP
+  status, an error is written to STDERR and the command exits non-zero.
+  LONGDESC
+
+  def search(query)
+    s = create_submitter(force: true)
+    emit_search_response(s.search(query))
+  end
+
+  desc 'count "QUERY"', 'count test instances matching QUERY'
+  long_desc <<-LONGDESC
+  Like `search`, but hits the count endpoint. The response is a small JSON
+  object containing the result-set size (and any `failures`). Use this
+  before `search` when you don't know how large a result set will be.
+  LONGDESC
+
+  def count(query)
+    s = create_submitter(force: true)
+    emit_search_response(s.search_count(query))
+  end
+
   private
 
+  def emit_search_response(response)
+    if response.is_a?(Net::HTTPSuccess)
+      puts response.body
+      warn_search_failures(response.body)
+    else
+      $stderr.puts "Search request failed: HTTP #{response.code} "\
+                   "#{response.message}"
+      $stderr.puts response.body unless response.body.nil? || response.body.empty?
+      exit 1
+    end
+  end
+
+  def warn_search_failures(body)
+    parsed = JSON.parse(body)
+    failures = parsed['failures']
+    return unless failures.is_a?(Array) && !failures.empty?
+
+    $stderr.puts 'Warning: the following query clauses were rejected by '\
+                 'the server and ignored:'
+    failures.each { |f| $stderr.puts "  - #{f}" }
+  rescue JSON::ParserError
+    # Body wasn't JSON; nothing to surface.
+  end
+
   def work_dir(given, default)
     if given
       File.expand_path('', given)

data/lib/mesa_test.rb

@@ -18,7 +18,6 @@ GITHUB_HTTPS = 'https://github.com/MESAHub/mesa.git'.freeze
 GITHUB_SSH = 'git@github.com:MESAHub/mesa.git'.freeze
 
 class MesaTestSubmitter
-  # DEFAULT_URI = 'https://mesa-test-hub.herokuapp.com'.freeze
   DEFAULT_URI = 'https://testhub.mesastar.org'.freeze
 
   # set up config file for computer
@@ -52,8 +51,9 @@ e-mail and password will be stored in plain text.'
 
       # Get API key for submitting failure logs
       response = shell.ask 'What is the logs submission API token associated '\
-        "with the email #{s.email} (required; contact Philip Mocz if you "\
-        "need a key)? (#{s.logs_token})", :blue
+        "with the email #{s.email} (required; if you don't have one, ask a "\
+        "MESA testing maintainer or a representative from Flatiron for a "\
+        "key)? (#{s.logs_token})", :blue
       s.logs_token = response unless response.empty?
 
       # Determine if we'll use ssh or https to access github
@@ -330,7 +330,12 @@ e-mail and password will be stored in plain text.'
       password: password,
       computer_name: computer_name
     }.to_json
-    JSON.parse(https.request(request).body).to_hash
+    response = testhub_request(https, request)
+    # if the hub was unreachable, behave as an unverified computer; the
+    # network error has already been reported by testhub_request
+    return {} if response.nil?
+
+    JSON.parse(response.body).to_hash
   end
 
   # submit entire commit's worth of test cases, OR submit compilation status
@@ -366,11 +371,15 @@ e-mail and password will be stored in plain text.'
     request.body = request_data.to_json
 
     # actually do the submission
-    response = https.request request
+    response = testhub_request(https, request)
 
-    if !response.is_a? Net::HTTPCreated
+    if response.nil?
+      # network failure; testhub_request already explained why
+      false
+    elsif !response.is_a? Net::HTTPCreated
       shell.say "\nFailed to submit some or all test case instances and/or "\
-                'commit data.', :red
+                "commit data (server responded #{response.code} "\
+                "#{response.message}).", :red
       false
     else
       shell.say "\nSuccessfully submitted commit #{mesa.sha}.", :green
@@ -427,12 +436,16 @@ e-mail and password will be stored in plain text.'
     request.body = request_data.to_json
 
     # actually do the submission
-    response = https.request request
+    response = testhub_request(https, request)
 
-    if !response.is_a? Net::HTTPCreated
+    if response.nil?
+      # network failure; testhub_request already explained why
+      return false
+    elsif !response.is_a? Net::HTTPCreated
       shell.say "\nFailed to submit #{test_case.test_name} for commit "\
-                "#{mesa.sha}", :red
-      false
+                "#{mesa.sha} (server responded #{response.code} "\
+                "#{response.message}).", :red
+      return false
     else
       shell.say "\nSuccessfully submitted instance of #{test_case.test_name} "\
                 "for commit #{mesa.sha}.", :green
@@ -444,17 +457,50 @@ e-mail and password will be stored in plain text.'
     end
   end
 
+  # Perform an HTTP request against the test hub with bounded connect/read
+  # timeouts, so a slow or unreachable server (e.g. while it is under heavy
+  # load) fails fast with a clear message instead of hanging on the default
+  # 60-second connect timeout and then dumping a raw Ruby backtrace. Returns
+  # the Net::HTTPResponse, or +nil+ if the request could not be completed
+  # because of a network problem.
+  def testhub_request(https, request)
+    https.open_timeout = 10
+    https.read_timeout = 60
+    https.request(request)
+  rescue StandardError => e
+    shell.say "\nCould not reach the test hub at #{https.address} "\
+              "(#{e.class}: #{e.message}).", :red
+    nil
+  end
+
   # make generic request to LOGS server
   # +params+ is a hash of data to be encoded as JSON and sent off
+  #
+  # Returns the Net::HTTPResponse on success, or +nil+ if the request could
+  # not be completed because of a network problem (the LOGS server being
+  # unreachable, slow, or refusing connections). The LOGS server only receives
+  # diagnostic build/test output, so a failure here must never crash the run or
+  # fail a CI build whose actual test results already reached the test hub. We
+  # cap the connect/read time so we fail fast instead of hanging on the default
+  # 60-second open timeout for every test case.
   def submit_logs(params)
     #uri = URI('https://logs.mesastar.org/uploads')
     uri = URI('https://mesa-logs.flatironinstitute.org/uploads')
     https = Net::HTTP.new(uri.host, uri.port)
     https.use_ssl = true
+    https.open_timeout = 10
+    https.read_timeout = 30
     req = Net::HTTP::Post.new(uri.path, 'Content-Type' => 'application/json',
                               'X-Api-Key' => logs_token)
     req.body = params.to_json
-    https.request(req)
+    begin
+      https.request(req)
+    rescue StandardError => e
+      shell.say "\nCould not reach the LOGS server at #{uri.host} "\
+                "(#{e.class}: #{e.message}). Skipping log upload; this does "\
+                'not affect test results already sent to the test hub.', :yellow
+      nil
+    end
   end
 
   # send build log to the logs server
@@ -473,9 +519,13 @@ e-mail and password will be stored in plain text.'
     res = submit_logs(build_log_params(mesa))
 
     # report out results
-    if !res.is_a? Net::HTTPOK
+    if res.nil?
+      # network failure; submit_logs already explained why. Don't fail the run.
+      false
+    elsif !res.is_a? Net::HTTPOK
       shell.say "\nFailed to submit build.log to the LOGS server for commit "\
-                "#{mesa.sha}.", :red
+                "#{mesa.sha} (server responded #{res.code} #{res.message}).",
+                :red
       false
     else
       shell.say "\nSuccessfully submitted build.log to the LOGS server for "\
@@ -503,9 +553,13 @@ e-mail and password will be stored in plain text.'
     res = submit_logs(test_log_params(test_case))
 
     # report out results
-    if !res.is_a? Net::HTTPOK
+    if res.nil?
+      # network failure; submit_logs already explained why. Don't fail the run.
+      false
+    elsif !res.is_a? Net::HTTPOK
       shell.say "Failed to submit logs for test case #{test_case.test_name} "\
-                "in commit #{test_case.mesa.sha}.", :red
+                "in commit #{test_case.mesa.sha} (server responded "\
+                "#{res.code} #{res.message}).", :red
       false
     else
       shell.say "Successfully submitted logs for test case "\
@@ -515,6 +569,40 @@ e-mail and password will be stored in plain text.'
     end
   end
 
+  # GET a search query from the testhub. Credentials and the query string
+  # ride in the URL's query parameters (per the testhub search API contract;
+  # the controller also accepts session auth, but a CLI sends them in-band).
+  # Returns the raw Net::HTTP response.
+  def search(query_text)
+    get_search('/test_instances/search.json', query_text)
+  end
+
+  # Like #search, but hits the count endpoint. Useful for sizing a result set
+  # before pulling the full payload.
+  def search_count(query_text)
+    get_search('/test_instances/search_count.json', query_text)
+  end
+
+  private
+
+  def get_search(path, query_text)
+    uri = URI.parse(base_uri + path)
+    uri.query = URI.encode_www_form(
+      email: email,
+      password: password,
+      query_text: query_text
+    )
+
+    https = Net::HTTP.new(uri.hostname, uri.port)
+    https.use_ssl = base_uri.include? 'https'
+
+    request = Net::HTTP::Get.new(
+      uri,
+      initheader = { 'Accept' => 'application/json' }
+    )
+
+    https.request(request)
+  end
 end
 
 class Mesa

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mesa_test
 version: !ruby/object:Gem::Version
-  version: 1.1.12
+  version: 1.2.1
 platform: ruby
 authors:
 - William Wolf
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-20 00:00:00.000000000 Z
+date: 2026-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -66,7 +65,6 @@ homepage: https://github.com/MESAHub/mesa_test
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -81,8 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.17
-signing_key:
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Command line tool for running and reporting the MESA test suites.
 test_files: []