mesa_test 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdf4d458ea3733da43762a06b695393c56a77fdbeaa3519becb67b4507940b59
-  data.tar.gz: 918b07c122c8ab69e036cb2e79b73c8bd375ee347575f8f9fd86474a9a58be87
+  metadata.gz: fe89bd48cc117d3f99a1e59878fde6ea14528a4e199d8d3bcf6c4af9fcc4937c
+  data.tar.gz: 98932d0fb73af742986ee25235a21c9f4b119ce01ee9dd03026cbd714dff85e9
 SHA512:
-  metadata.gz: 375a410fe0c4d17e39d1c4e5a13b4bccc390edeb1afe19e3b4ec8ae150f72ad3d352ac4cdcd7bc64bda9baf512eb0547e43cf4444b38a3492a441b7677005094
-  data.tar.gz: 99f875807d7828c2f1274600ed39877b18b4a37ff8d49b2fb88eb9db859183cc843b831fd6a6e738c0abd7c746b9d4b647872e32b1aa974d2f93c686547a1ec3
+  metadata.gz: c589f58abeec628b835557f5be281f496a81fbbbf0697005d8bc7fd0525b613cae8e9ba9175bdf21ec2fb05945a41d8ed38130cd56ba8528eb9bf1b13cda0cad
+  data.tar.gz: c524f613c87f04f4547285f0b9e804b1ac0edfc3a99618769aac67ade265dcd475baad5307f28474a4401fe876a4dc03d0c14cdf16b91b9b5d095112f349f116

data/bin/mesa_test

@@ -320,10 +320,145 @@ class MesaTest < Thor
       # directory
       m.destroy if successfully_submitted && options[:destroy] && m.installed?
     end
-  end  
+  end
+
+  desc 'search "SEARCH_QUERY" [EMAIL] [PASSWORD]', 'retrieve JSON array of ' \
+    'test instances matching SEARCH_QUERY'
+  long_desc <<-LONGDESC
+  Sends a JSON request to the Mesa TestHub API. All of your SEARCH_QUERY should
+  be in quotes. For details on how to form a proper search query, visit 
+  testhub.mesastar.org/test_instances/search, where you can also test out
+  the search capability in a browser interface. Result is a single line of
+  JSON printed to STDOUT.
+
+  To prevent abuse, the API requires authentication with email and password.
+  By default, these are pulled from ~/.mesa_test.yml, but you may override
+  these with optional arguments.
+  LONGDESC
+
+  def search(search_query, email=nil, password=nil)
+    # get/confirm email and password
+    yml_file = File.join(ENV['HOME'], '.mesa_test.yml')
+    email, password = get_email_and_password(yml_file, email, password)
+    # prep API request
+    base_uri = if DEVELOPMENT_MODE
+                 'http://localhost:3000'
+               else
+                 'https://testhub.mesastar.org'
+               end
+    uri_search = URI.parse(base_uri + '/test_instances/search.json')
+    params = {
+      email: email,
+      password: password,
+      query_text: search_query
+    }
+    uri_search.query = URI.encode_www_form(params)
+
+    # perform search query
+    search_response = nil
+    Net::HTTP.start(uri_search.host, uri_search.port, use_ssl: base_uri.include?('https')) do |https|
+      request = Net::HTTP::Get.new(
+        uri_search,
+        initheader = { 'Content-Type' => 'application/json' }
+      )
+      search_response = JSON.parse(https.request(request).body)
+    end
+
+    # parse results
+    if search_response['error']
+      STDERR.puts "Error: #{search_response['error']}"
+    else
+      # break into sections
+      results = search_response["results"]
+      failures = search_response["failures"]
+
+      unless failures.empty?
+        STDERR.puts "The folloiwng options were invalid and ignored:"
+        failures.each { |failure| STDERR.puts "- #{failure}"}
+      end
+
+      shell.say results.to_json
+    end
+  end
+
+  desc 'count "SEARCH_QUERY" [EMAIL] [PASSWORD]', 'count number of test ' \
+    'instances matching SEARCH_QUERY'
+  long_desc <<-LONGDESC
+  Sends a JSON request to the Mesa TestHub API. All of your SEARCH_QUERY should
+  be in quotes. For details on how to form a proper search query, visit 
+  testhub.mesastar.org/test_instances/search, where you can also test out
+  the search capability in a browser interface. Result is a single integer.
+
+  To prevent abuse, the API requires authentication with email and password.
+  By default, these are pulled from ~/.mesa_test.yml, but you may override
+  these with optional arguments.
+  LONGDESC
+
+  def count(search_query, email=nil, password=nil)
+    # get/confirm email and password
+    yml_file = File.join(ENV['HOME'], '.mesa_test.yml')
+    email, password = get_email_and_password(yml_file, email, password)
+    # prep API request
+    base_uri = if DEVELOPMENT_MODE
+                 'http://localhost:3000'
+               else
+                 'https://testhub.mesastar.org'
+               end
+    uri_count = URI.parse(base_uri + '/test_instances/search_count.json')
+    params = {
+      email: email,
+      password: password,
+      query_text: search_query
+    }
+    uri_count.query = URI.encode_www_form(params)
+
+    # perform count query
+    count_response = nil
+    Net::HTTP.start(uri_count.host, uri_count.port, use_ssl: base_uri.include?('https')) do |https|
+      request = Net::HTTP::Get.new(
+        uri_count,
+        initheader = { 'Content-Type' => 'application/json' }
+      )
+      count_response = JSON.parse(https.request(request).body)
+    end
+
+    # parse results
+    if count_response['error']
+      STDERR.puts "Error: #{count_response['error']}"
+    else
+      # break into sections
+      count = count_response["count"]
+      failures = count_response["failures"]
+
+      unless failures.empty?
+        STDERR.puts "The folloiwng options were invalid and ignored:"
+        failures.each { |failure| STDERR.puts "- #{failure}"}
+      end
+
+      shell.say count, :blue
+    end
+  end
 
   private
 
+  def get_email_and_password(file, email=nil, password=nil)
+    if email && password
+      return [email, password]
+    end
+    raise("File does not exist: #{file}.") unless File.exist?(file)
+    contents = File.read(file)
+    email_matcher = /^email\:\s*(?<email>.+@.+\..+)$/
+    password_matcher = /^password\:\s*(?<password>.+)$/
+
+    m = email_matcher.match(contents)
+    email ||= m[:email] if m
+
+    m = password_matcher.match(contents)
+    password ||= m[:password] if m
+
+    return [email, password]
+  end
+
   def check_user_and_computer(submitter)
     computer_check = submitter.confirm_computer
     if computer_check['valid']

data/lib/mesa_test.rb

@@ -1335,8 +1335,7 @@ class MesaTestCase
     run_start = Time.now
 
     # do the run
-    have_time = system('which time')
-    rn_command = if have_time
+    rn_command = if ENV['MESASDK_ROOT'] && File.exist?(File.join(ENV['MESASDK_ROOT'], 'bin', 'time'))
                    %q(command time -f '%M' -o mem-rn.txt ./rn > out.txt 2> ) +
                      'err.txt'
                  else
@@ -1416,8 +1415,7 @@ class MesaTestCase
 
     # do restart and consolidate output. Command depends on if we have access
     # to SDK version of gnu time.
-    have_time = system('which time')
-    re_command = if have_time
+    re_command = if ENV['MESASDK_ROOT'] && File.exist?(File.join(ENV['MESASDK_ROOT'], 'bin', 'time'))
                    %q(command time -f '%M' -o mem-re.txt ./re ) + "#{photo}" \
                      ' >> out.txt 2> err.txt'
                  else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mesa_test
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - William Wolf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -53,7 +53,8 @@ dependencies:
       - !ruby/object:Gem::Version
         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.
+  MESA and submitting them to the companion website MESATestHub. It also allows for
+  querying the database through a commandline interface.
 email: wmwolf@asu.edu
 executables:
 - mesa_test