Cleanup ipc fuzzer. Add flags to pick random prefix on launch.

tools/ipc_fuzzer/mutate/cf_package_builder.py

Index: tools/ipc_fuzzer/mutate/cf_package_builder.py
diff --git a/tools/ipc_fuzzer/mutate/cf_package_builder.py b/tools/ipc_fuzzer/mutate/cf_package_builder.py
index 608cea13d5110a314a304ee5c21bc68d6f2ee2a1..1fc98d186934c3c2f52aaa2107c2fb693ed39cde 100755
--- a/tools/ipc_fuzzer/mutate/cf_package_builder.py
+++ b/tools/ipc_fuzzer/mutate/cf_package_builder.py
@@ -24,7 +24,7 @@ class CFPackageBuilder:
   def __init__(self):
     self.fuzzer_list = FUZZER_LIST
 
-  def parse_args(self):
+  def parse_arguments(self):
     desc = 'Builder of IPC fuzzer packages for ClusterFuzz'
     parser = argparse.ArgumentParser(description=desc)
     parser.add_argument('--out-dir', dest='out_dir', default='out',
@@ -33,7 +33,7 @@ class CFPackageBuilder:
                         help='Debug vs. Release build')
     self.args = parser.parse_args()
 
-  def get_paths(self):
+  def set_application_paths(self):
     script_path = os.path.realpath(__file__)
     self.mutate_dir = os.path.dirname(script_path)
     src_dir = os.path.join(self.mutate_dir, os.pardir, os.pardir, os.pardir)
@@ -41,12 +41,12 @@ class CFPackageBuilder:
     out_dir = os.path.join(src_dir, self.args.out_dir)
     self.build_dir = os.path.join(out_dir, self.args.build_type)
 
-  def enter_tmp_workdir(self):
+  def switch_to_temp_work_directory(self):
     self.old_cwd = os.getcwd()
     self.work_dir = tempfile.mkdtemp()
     os.chdir(self.work_dir)
 
-  def rm_tmp_workdir(self):
+  def remove_temp_work_directory(self):
     os.chdir(self.old_cwd)
     shutil.rmtree(self.work_dir)
 
@@ -55,19 +55,23 @@ class CFPackageBuilder:
     fuzzer_src_path = os.path.join(self.mutate_dir, fuzzer + '.py')
     fuzzer_dst_path = os.path.join(fuzzer, 'run.py')
     shutil.copyfile(fuzzer_src_path, fuzzer_dst_path)
+    utils_src_path = os.path.join(self.mutate_dir, 'utils.py')
+    utils_dst_path = os.path.join(fuzzer, 'utils.py')
+    shutil.copyfile(utils_src_path, utils_dst_path)
     distutils.archive_util.make_zipfile(fuzzer, fuzzer)
     package_name = fuzzer + '.zip'
     shutil.copy(package_name, self.build_dir)
     final_package_path = os.path.join(self.build_dir, package_name)
-    print 'Built %s' % final_package_path
+    print 'Built %s.' % final_package_path
 
   def main(self):
-    self.parse_args()
-    self.get_paths()
-    self.enter_tmp_workdir()
+    self.parse_arguments()
+    self.set_application_paths()
+    self.switch_to_temp_work_directory()
     for fuzzer in self.fuzzer_list:
       self.build_package(fuzzer)
-    self.rm_tmp_workdir()
+    self.remove_temp_work_directory()
+
     return 0
 
 if __name__ == "__main__":