Merge pull request #77 from launchableinc/touchup

One more round of touch-ups

launchable/commands/record/build.py

@@ -1,7 +1,6 @@
 import re
 import click
 import subprocess
-import urllib.request
 import json
 import os
 from ...utils.token import parse_token
@@ -13,33 +12,31 @@
 @click.command()
 @click.option(
     '--name',
-    'build_number',
-    help='build identifier',
+    'build_name',
+    help='build name',
     required=True,
     type=str,
-    metavar='BUILD_ID'
+    metavar='BUILD_NAME'
 )
 @click.option(
     '--source',
-    help='repository name and repository district. please specify'
-    'REPO_DIST like --source . '
-    'or REPO_NAME=REPO_DIST like --source main=./main --source lib=./main/lib',
+    help='path to local Git workspace, optionally prefixed by a label.  '
+    ' like --source path/to/ws or --source main=path/to/ws',
     default=["."],
     metavar="REPO_NAME",
     multiple=True
 )
-@click.option('--with-commit/--without-commit', help='', default=True)
 @click.pass_context
-def build(ctx, build_number, source, with_commit):
+def build(ctx, build_name, source):
     token, org, workspace = parse_token()
 
     # This command accepts REPO_NAME=REPO_DIST and REPO_DIST
     repos = [s.split('=') if re.match(r'[^=]+=[^=]+', s) else (s, s)
              for s in source]
+    # TODO: if repo_dist is absolute path, warn the user that that's probably not what they want to do
 
-    if with_commit:
-        for (name, repo_dist) in repos:
-            ctx.invoke(commit, source=repo_dist)
+    for (name, repo_dist) in repos:
+        ctx.invoke(commit, source=repo_dist)
 
     sources = [(
         name,
@@ -82,7 +79,7 @@ def build(ctx, build_number, source, with_commit):
             exit('Please specify --source as --source .')
 
         payload = {
-            "buildNumber": build_number,
+            "buildNumber": build_name,
             "commitHashes": commitHashes
         }
 

launchable/commands/record/commit.py

@@ -15,7 +15,7 @@
 @click.option('--source',
               help="repository path",
               default=os.getcwd(),
-              type=str
+              type=click.Path(exists=True, file_okay=False),
               )
 @click.option('--executable',
               help="collect commits with Jar or Docker",

launchable/commands/record/session.py

@@ -8,12 +8,12 @@
 
 @click.command()
 @click.option(
-    '--name',
+    '--build',
     'build_name',
-    help='build identifier',
+    help='build name',
     required=True,
     type=str,
-    metavar='BUILD_ID'
+    metavar='BUILD_NAME'
 )
 def session(build_name):
     token, org, workspace = parse_token()

launchable/commands/record/tests.py

@@ -13,11 +13,11 @@
 
 @click.group()
 @click.option(
-    '--source',
-    help='repository district'
-    'REPO_DIST like --source . ',
-    default=".",
-    metavar="REPO_NAME",
+    '--base',
+    'base_path',
+    help='(Advanced) base directory to make test names portable',
+    type=click.Path(exists=True, file_okay=False),
+    metavar="DIR",
 )
 @click.option(
     '--session',
@@ -28,7 +28,7 @@
     type=str,
 )
 @click.pass_context
-def tests(context, source, session_id: str):
+def tests(context, base_path, session_id: str):
     if not session_id:
         click.echo(
             "Session ID in --session is missing. It might be caused by Launchable API errors.", err=True)
@@ -52,7 +52,7 @@ def path_builder(self, v: CaseEvent.TestPathBuilder):
 
         def __init__(self):
             self.reports = []
-            self.path_builder = CaseEvent.default_path_builder(source)
+            self.path_builder = CaseEvent.default_path_builder(base_path)
 
         def report(self, junit_report_file: str):
             """Add one report file by its path name"""

launchable/commands/subset.py

@@ -20,7 +20,6 @@
     help='subsetting target from 0% to 100%',
     required=True,
     type=PERCENTAGE,
-    default='80%',
 )
 @click.option(
     '--session',
@@ -34,7 +33,8 @@
     '--base',
     'base_path',
     help='(Advanced) base directory to make test names portable',
-    metavar="PATH",
+    type=click.Path(exists=True, file_okay=False),
+    metavar="DIR",
 )
 @click.pass_context
 def subset(context, target, session_id, base_path):

launchable/test_runners/minitest.py

@@ -36,5 +36,9 @@ def parse(fname: str):
 @launchable.record.tests
 def record_tests(client, report_dirs):
     for root in report_dirs:
-        client.scan(root, "*.xml")
+        if os.path.isdir(root):
+            client.scan(root, "*.xml")
+        else:
+            client.report(root)
+
     client.run()