Move get_python_files into DistCommand class; done with modular input code & examples!

Shakeel Mohamed · Shakeel Mohamed · commit 98afc11c1b2f · 2013-08-05T16:52:23.000-07:00
diff --git a/setup.py b/setup.py
@@ -66,15 +66,6 @@ def finalize_options(self):
     def run(self):
         run_test_suite()
 
-def get_python_files(files):
-    """Utility function to get .py files from a list"""
-    python_files = []
-    for file_name in files:
-        if file_name.endswith(".py"):
-            python_files.append(file_name)
-
-    return python_files
-
 class DistCommand(Command):
     """setup.py command to create .spl files for modular input examples"""
     description = "Build modular input example .spl files."
@@ -86,44 +77,53 @@ def initialize_options(self):
     def finalize_options(self):
         pass
 
+    @staticmethod
+    def get_python_files(files):
+        """Utility function to get .py files from a list"""
+        python_files = []
+        for file_name in files:
+            if file_name.endswith(".py"):
+                python_files.append(file_name)
+
+        return python_files
+
     def run(self):
         app_names = ["random_numbers", "github_forks"]
 
         splunklib_dir = "splunklib"
         modinput_dir = os.path.join(splunklib_dir, "modularinput")
 
         for app in app_names:
-            spl = tarfile.open(os.path.join("build", app + ".spl"), "w")
-
-            spl.add(
-                os.path.join("examples", app, app + ".py"),
-                arcname=os.path.join(app, "bin", app + ".py")
-            )
-
-            spl.add(
-                os.path.join("examples", app, "default", "app.conf"),
-                arcname=os.path.join(app, "default", "app.conf")
-            )
-            spl.add(
-                os.path.join("examples", app, "README", "inputs.conf.spec"),
-                arcname=os.path.join(app, "README", "inputs.conf.spec")
-            )
-
-            splunklib_files = get_python_files(os.listdir(splunklib_dir))
-            for file_name in splunklib_files:
+            with tarfile.open(os.path.join("build", app + ".spl"), "w") as spl:
                 spl.add(
-                    os.path.join(splunklib_dir, file_name),
-                    arcname=os.path.join(app, "bin", splunklib_dir, file_name)
+                    os.path.join("examples", app, app + ".py"),
+                    arcname=os.path.join(app, "bin", app + ".py")
                 )
 
-            modinput_files = get_python_files(os.listdir(modinput_dir))
-            for file_name in modinput_files:
                 spl.add(
-                    os.path.join(modinput_dir, file_name),
-                    arcname=os.path.join(app, "bin", modinput_dir, file_name)
+                    os.path.join("examples", app, "default", "app.conf"),
+                    arcname=os.path.join(app, "default", "app.conf")
+                )
+                spl.add(
+                    os.path.join("examples", app, "README", "inputs.conf.spec"),
+                    arcname=os.path.join(app, "README", "inputs.conf.spec")
                 )
 
-            spl.close()
+                splunklib_files = self.get_python_files(os.listdir(splunklib_dir))
+                for file_name in splunklib_files:
+                    spl.add(
+                        os.path.join(splunklib_dir, file_name),
+                        arcname=os.path.join(app, "bin", splunklib_dir, file_name)
+                    )
+
+                modinput_files = self.get_python_files(os.listdir(modinput_dir))
+                for file_name in modinput_files:
+                    spl.add(
+                        os.path.join(modinput_dir, file_name),
+                        arcname=os.path.join(app, "bin", modinput_dir, file_name)
+                    )
+
+                spl.close()
 
 setup(
     author="Splunk, Inc.",
