work

kyclark · kyclark · commit dbbd113b1322 · 2019-12-04T20:27:01.000-07:00
diff --git a/abuse/test.py b/abuse/test.py
@@ -4,6 +4,7 @@
 import os
 import random
 import re
+import string
 from subprocess import getstatusoutput, getoutput
 
 prg = './abuse.py'
@@ -27,38 +28,68 @@ def test_usage():
 
 
 # --------------------------------------------------
-def test_bad_adjectives():
+def test_bad_adjective_str():
+    """bad_adjectives"""
+
+    bad = random_string()
+    rv, out = getstatusoutput(f'{prg} -a {bad}')
+    assert rv != 0
+    assert re.search(f"invalid int value: '{bad}'", out)
+
+
+# --------------------------------------------------
+def test_bad_adjective_num():
     """bad_adjectives"""
 
     n = random.choice(range(-10, 0))
-    rv, out = getstatusoutput('{} -a {}'.format(prg, n))
+    rv, out = getstatusoutput(f'{prg} -a {n}')
     assert rv != 0
-    assert re.search('--adjectives "{}" must be > 1'.format(n), out)
+    assert re.search(f'--adjectives "{n}" must be > 0', out)
 
 
 # --------------------------------------------------
-def test_bad_number():
+def test_bad_number_str():
+    """bad_number"""
+
+    bad = random_string()
+    rv, out = getstatusoutput(f'{prg} -n {bad}')
+    assert rv != 0
+    assert re.search(f"invalid int value: '{bad}'", out)
+
+
+# --------------------------------------------------
+def test_bad_number_int():
     """bad_number"""
 
     n = random.choice(range(-10, 0))
-    rv, out = getstatusoutput('{} -n {}'.format(prg, n))
+    rv, out = getstatusoutput(f'{prg} -n {n}')
+    assert rv != 0
+    assert re.search(f'--number "{n}" must be > 0', out)
+
+
+# --------------------------------------------------
+def test_bad_seed():
+    """bad seed"""
+
+    bad = random_string()
+    rv, out = getstatusoutput(f'{prg} -s {bad}')
     assert rv != 0
-    assert re.search('--number "{}" must be > 1'.format(n), out)
+    assert re.search(f"invalid int value: '{bad}'", out)
 
 
 # --------------------------------------------------
 def test_01():
     """test"""
 
-    out = getoutput('{} -s 1 -n 1'.format(prg))
+    out = getoutput(f'{prg} -s 1 -n 1')
     assert out.strip() == 'You filthsome, cullionly fiend!'
 
 
 # --------------------------------------------------
 def test_02():
     """test"""
 
-    out = getoutput('{} --seed 2'.format(prg))
+    out = getoutput(f'{prg} --seed 2')
     expected = """
 You corrupt, detestable beggar!
 You peevish, foolish gull!
@@ -71,7 +102,7 @@ def test_02():
 def test_03():
     """test"""
 
-    out = getoutput('{} -s 3 -n 5 -a 1'.format(prg))
+    out = getoutput(f'{prg} -s 3 -n 5 -a 1')
     expected = """
 You infected villain!
 You vile braggart!
@@ -86,9 +117,16 @@ def test_03():
 def test_04():
     """test"""
 
-    out = getoutput('{} --seed 4 --number 2 --adjectives 4'.format(prg))
+    out = getoutput(f'{prg} --seed 4 --number 2 --adjectives 4')
     expected = """
 You infected, lecherous, dishonest, rotten recreant!
 You filthy, detestable, cullionly, base lunatic!
 """.strip()
     assert out.strip() == expected
+
+
+# --------------------------------------------------
+def random_string():
+    """generate a random filename"""
+
+    return ''.join(random.choices(string.ascii_lowercase + string.digits, k=5))
diff --git a/hello/two_args.py b/hello/two_args.py
@@ -13,12 +13,12 @@ def get_args():
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
 
     parser.add_argument('color',
-                        metavar='COLOR',
+                        metavar='str',
                         type=str,
                         help='Color')
 
     parser.add_argument('size',
-                        metavar='SIZE',
+                        metavar='int',
                         type=int,
                         help='Size')
 
diff --git a/inputs/now.txt b/inputs/now.txt
@@ -1 +1 @@
-Now is the time for all good men to come to the aid of the party
+Now is the time for all good men to come to the aid of the party.
diff --git a/telephone/solution1.py b/telephone/solution1.py
@@ -20,8 +20,8 @@ def get_args():
     parser.add_argument('-s',
                         '--seed',
                         help='Random seed',
-                        metavar='str',
-                        type=str,
+                        metavar='int',
+                        type=int,
                         default=None)
 
     parser.add_argument('-m',
@@ -33,9 +33,8 @@ def get_args():
 
     args = parser.parse_args()
 
-    if not 0 < args.mutations <= 1:
-        msg = '--mutations "{}" must be b/w 0 and 1'.format(args.mutations)
-        parser.error(msg)
+    if not 0 <= args.mutations <= 1:
+        parser.error(f'--mutations "{args.mutations}" must be b/w 0 and 1')
 
     if os.path.isfile(args.text):
         args.text = open(args.text).read().rstrip()
@@ -50,14 +49,13 @@ def main():
     args = get_args()
     text = args.text
     random.seed(args.seed)
-    len_text = len(text)
-    num_mutations = int(args.mutations * len_text)
     alpha = string.ascii_letters + string.punctuation
+    len_text = len(text)
+    num_mutations = round(args.mutations * len_text)
 
-    for _ in range(num_mutations):
-        i = random.choice(range(len_text))
-        text = text[:i] + random.choice(alpha) + text[i + 1:]
-
+    for i in random.sample(range(len_text), num_mutations):
+        new_char = random.choice(alpha.replace(text[i], ''))
+        text = text[:i] + new_char + text[i + 1:]
     print(text)
 
 
diff --git a/telephone/solution2.py b/telephone/solution2.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python3
+"""Telephone"""
+
+import argparse
+import os
+import random
+import string
+
+
+# --------------------------------------------------
+def get_args():
+    """Get command-line arguments"""
+
+    parser = argparse.ArgumentParser(
+        description='Telephone',
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+
+    parser.add_argument('text', metavar='str', help='Input text or file')
+
+    parser.add_argument('-s',
+                        '--seed',
+                        help='Random seed',
+                        metavar='int',
+                        type=int,
+                        default=None)
+
+    parser.add_argument('-m',
+                        '--mutations',
+                        help='Percent mutations',
+                        metavar='float',
+                        type=float,
+                        default=0.1)
+
+    args = parser.parse_args()
+
+    if not 0 <= args.mutations <= 1:
+        parser.error(f'--mutations "{args.mutations}" must be b/w 0 and 1')
+
+    if os.path.isfile(args.text):
+        args.text = open(args.text).read().rstrip()
+
+    return args
+
+
+# --------------------------------------------------
+def main():
+    """Make a jazz noise here"""
+
+    args = get_args()
+    text = list(args.text)
+    random.seed(args.seed)
+    alpha = string.ascii_letters + string.punctuation
+    len_text = len(text)
+    num_mutations = round(args.mutations * len_text)
+
+    for i in random.sample(range(len_text), num_mutations):
+        text[i] = random.choice(alpha.replace(text[i], ''))
+    print(''.join(text))
+
+
+# --------------------------------------------------
+if __name__ == '__main__':
+    main()
diff --git a/telephone/test.py b/telephone/test.py
@@ -3,7 +3,9 @@
 
 from subprocess import getstatusoutput, getoutput
 import os
+import random
 import re
+import string
 
 prg = "./telephone.py"
 fox = '../inputs/fox.txt'
@@ -26,6 +28,26 @@ def test_usage():
         assert re.match('usage', out, re.IGNORECASE)
 
 
+# --------------------------------------------------
+def test_bad_seed_str():
+    """bad seed str value"""
+
+    bad = random_string()
+    rv, out = getstatusoutput('{} -s {} {}'.format(prg, bad, fox))
+    assert rv > 0
+    assert re.search(f"invalid int value: '{bad}'", out)
+
+
+# --------------------------------------------------
+def test_bad_mutation_str():
+    """bad mutation str value"""
+
+    bad = random_string()
+    rv, out = getstatusoutput('{} -m {} {}'.format(prg, bad, fox))
+    assert rv > 0
+    assert re.search(f"invalid float value: '{bad}'", out)
+
+
 # --------------------------------------------------
 def test_bad_mutation():
     """bad mutation values"""
@@ -38,44 +60,61 @@ def test_bad_mutation():
 
 
 # --------------------------------------------------
-def test_text01():
+def test_for_echo():
+    """test"""
+
+    txt = open(now).read().rstrip()
+    rv, out = getstatusoutput('{} -m 0 "{}"'.format(prg, txt))
+    assert rv == 0
+    assert out.rstrip() == txt
+
+
+# --------------------------------------------------
+def test_now_cmd_s1():
     """test"""
 
     txt = open(now).read().rstrip()
     rv, out = getstatusoutput('{} -s 1 "{}"'.format(prg, txt))
     assert rv == 0
     expected = """
-    Now ao the time for all good-men to came to the aid of Whe pa*ty
+    Now is B*e time X'r all good mem to come to the ,id of the party.
     """.strip()
     assert out.rstrip() == expected
 
 
 # --------------------------------------------------
-def test_text02():
+def test_now_cmd_s2_m4():
     """test"""
 
     txt = open(now).read().rstrip()
     rv, out = getstatusoutput('{} -s 2 -m .4 "{}"'.format(prg, txt))
     assert rv == 0
     expected = """
-    NUw iVKPqe time fErXal; gPod"'en to come`Do *Dl aFd of!the Yabta
+    Nod ie .he(JiFe ?orvalldg/osxmenUt? cxxe.t$PtheOaidWEV:the xa/ty.
     """.strip()
     assert out.rstrip() == expected
 
 
 # --------------------------------------------------
-def test_file01():
+def test_fox_file_s1():
     """test"""
 
     rv, out = getstatusoutput('{} --seed 1 {}'.format(prg, fox))
     assert rv == 0
-    assert out.rstrip() == 'Tho quick brown foa jumps oWer*the lazy dog.'
+    assert out.rstrip() == "The 'uicq brown *ox jumps over the l-zy dog."
 
 
 # --------------------------------------------------
-def test_file02():
+def test_fox_file_s2_m6():
     """test"""
 
     rv, out = getstatusoutput('{} --seed 2 --mutations .6 {}'.format(prg, fox))
     assert rv == 0
-    assert out.rstrip() == 'UheK+u*ckXbrPw~ fox Du*#FT{ver f~e}|Uzy (T?l'
+    assert out.rstrip() == "V;xvq?ic# E]'Qy x/xdjumFs.o/U? th!Ulv'yrVox."
+
+
+# --------------------------------------------------
+def random_string():
+    """generate a random filename"""
+
+    return ''.join(random.choices(string.ascii_lowercase + string.digits, k=5))

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Now is the time for all good men to come to the aid of the party`
	`1`	`+Now is the time for all good men to come to the aid of the party.`