Merge pull request #28 from edx/juliasq/date_fix_annotation_num_return

Add prefixing of report filename. Change elapsed time to seconds.

Author: Julia Eskew

code_annotations/__init__.py

@@ -4,4 +4,4 @@
 
 from __future__ import absolute_import, unicode_literals
 
-__version__ = '0.2.3'
+__version__ = '0.2.4'

code_annotations/base.py

@@ -570,20 +570,23 @@ def _format_results_for_report(self, all_results):
 
         return formatted_results
 
-    def report(self, all_results):
+    def report(self, all_results, report_prefix=''):
         """
         Genrates the YAML report of all search results.
 
         Args:
             all_results: Dict of found annotations, indexed by filename
+            report_prefix: Prefix to add to report filename
 
         Returns:
             Filename of generated report
         """
         self.echo.echo_vv(yaml.dump(all_results, default_flow_style=False))
 
         now = datetime.datetime.now()
-        report_filename = os.path.join(self.config.report_path, '{}.yaml'.format(now.strftime('%Y-%d-%m-%H-%M-%S')))
+        report_filename = os.path.join(self.config.report_path, '{}{}.yaml'.format(
+            report_prefix, now.strftime('%Y-%d-%m-%H-%M-%S')
+        ))
 
         formatted_results = self._format_results_for_report(all_results)
 

code_annotations/cli.py

@@ -39,6 +39,7 @@ def entry_point():
     show_default=True,
     help='List all locally defined models (in the current repo) that require annotations.',
 )
+@click.option('--app_name', default='', help='(Optional) App name for which coverage is generated.')
 @click.option('--report_path', default=None, help='Location to write the report')
 @click.option('-v', '--verbosity', count=True, help='Verbosity level (-v through -vvv)')
 @click.option('--lint/--no_lint', help='Enable or disable linting checks', default=False, show_default=True)
@@ -48,6 +49,7 @@ def django_find_annotations(
         config_file,
         seed_safelist,
         list_local_models,
+        app_name,
         report_path,
         verbosity,
         lint,
@@ -96,15 +98,17 @@ def django_find_annotations(
                 click.echo("Coverage passed without errors.")
 
             if report:
-                searcher.report(annotated_models)
+                searcher.report(annotated_models, app_name)
 
             annotation_count = 0
 
             for filename in annotated_models:
                 annotation_count += len(annotated_models[filename])
 
             elapsed = datetime.datetime.now() - start_time
-            click.echo("Search found {} annotations in {}.".format(annotation_count, elapsed))
+            click.echo("Search found {} annotations in {} seconds.".format(
+                annotation_count, elapsed.total_seconds()
+            ))
 
     except Exception as exc:  # pylint: disable=broad-except
         click.echo(traceback.print_exc())