Updated setup; moved spl generation into dist command.

Shakeel Mohamed · Shakeel Mohamed · commit 370ca0cb0217 · 2013-08-05T15:52:23.000-07:00
diff --git a/setup.py b/setup.py
@@ -75,53 +75,64 @@ def get_python_files(files):
 
     return python_files
 
-def setup_examples():
-    """Function to create .spl files for modular input examples"""
-    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:
+class DistCommand(Command):
+    """setup.py command to create .spl files for modular input examples"""
+    description = "Build modular input example .spl files."
+    user_options = []
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    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(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 = 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 = 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.",
 
     author_email="devinfo@splunk.com",
 
     cmdclass={'coverage': CoverageCommand,
-              'test': TestCommand},
+              'test': TestCommand,
+              'dist': DistCommand},
 
     description="The Splunk Software Development Kit for Python.",
 
@@ -145,6 +156,4 @@ def setup_examples():
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Topic :: Software Development :: Libraries :: Application Frameworks",
     ],
-)
-
-setup_examples()
+)
