added the necessary changes to CLI

Author: pratik0316

src/deltacode/__init__.py

@@ -359,7 +359,7 @@ def __str__(self):
 
         return ("  {\n"+
                 "    status: " + str(self.status) + "\n"
-                "    factors: [" + " ".join(self.factors) + "]\n" +
+                "    factors: [" + ", ".join(self.factors) + "]\n" +
                 "    score: " + str(self.score) + "\n"+
                 "    new_file: " + new_file_path + "\n"+
                 "    old_file: " + old_file_path + "\n" +

src/deltacode/cli.py

@@ -32,7 +32,7 @@
 
 from deltacode import DeltaCode
 from deltacode import __version__
-from deltacode.utils import deltas, get_notice, collect_errors,get_notice_for_cli
+from deltacode.utils import deltas, get_notice, collect_errors
 
 
 def write_json(deltacode, outfile, all_delta_types=False):
@@ -57,8 +57,7 @@ def write_json(deltacode, outfile, all_delta_types=False):
         simplejson.dump(results, outfile, iterable_as_array=True, indent=2)
         outfile.write('\n')    
         if outfile.name != '<stdout>' : 
-            "This condition arises when we are required to print in the json file and the value of -j in not the console terminal"
-            click.secho(get_notice_for_cli(),fg="green")  
+            "This condition arises when we are required to print in the json file and the value of -j in not the console terminal" 
             click.echo('deltas_count: {}'.format(len([d for d in deltas(deltacode, all_delta_types)])))
             click.echo('delta_stats: ')
             for stat in deltacode.stats.to_dict():
@@ -68,13 +67,9 @@ def write_json(deltacode, outfile, all_delta_types=False):
             delta_count = 1
             for delta in deltacode.deltas :
                 if delta.status != "unmodified":
-                        click.echo("\n")
-                        click.secho("delta {}".format(delta_count))
+                        click.echo("delta {}".format(delta_count))
                         click.echo(delta)
                         delta_count += 1
-            click.secho("#" * 211 + "\n",fg="yellow")
-            click.secho(" "*70 + "All deltas are generated, view the json file for details" + "\n" , fg="green")
-            click.secho("#" * 211,fg="yellow")
 
     except Exception as e:
         "This exception arises when outfile has no name attribute"

src/deltacode/utils.py

@@ -264,25 +264,6 @@ def check_moved(added_sha1, added_deltas, removed_sha1, removed_deltas):
     if added_deltas[0].new_file.name == removed_deltas[0].old_file.name:
         return True
 
-def get_notice_for_cli():
-    """
-    Retrieve the notice text from the NOTICE file for display in the Command Line .
-    """
-    notice_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'NOTICE')
-    notice_text = open(notice_path).read()
-
-    delimiter = '\n\n\n'
-    [notice_text, extra_notice_text] = notice_text.split(delimiter, 1)
-    extra_notice_text = delimiter + extra_notice_text
-    
-    delimiter = '\n\n '
-    [notice_text, acknowledgment_text] = notice_text.split(delimiter, 1)
-    acknowledgment_text = delimiter + acknowledgment_text
-
-    notice = acknowledgment_text.strip().replace('\n', '')
-
-    return notice
-
 def get_notice():
     """
     Retrieve the notice text from the NOTICE file for display in the JSON output.