- packaging: restructuring all code into snafulib with adapted and so…

…rt of working setup.py

.gitignore

@@ -4,3 +4,7 @@ snafu.ini
 functions-local
 functions-tenants
 _*
+
+build/
+dist/
+snafu.egg-info/

setup.py

@@ -16,13 +16,14 @@
 		"Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware"
 	],
 	keywords="cloud faas serverless functions",
-	packages=["snafu"],
-	entry_points={
-		"console_scripts": [
-			"snafu=snafu:main",
-			"snafu-import=snafuimport:main",
-			"snafu-control=snafucontrol:main",
-			"snafu-accounts=snafuaccounts:main"
-		]
-	}
+	packages=["snafulib"],
+	scripts=["snafu", "snafu-import", "snafu-accounts", "snafu-control"]
+	#entry_points={
+	#	"console_scripts": [
+	#		"snafu=snafu:main",
+	#		"snafu-import=snafuimport:main",
+	#		"snafu-control=snafucontrol:main",
+	#		"snafu-accounts=snafuaccounts:main"
+	#	]
+	#}
 )

snafu

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 #
-# Snafu: Snake Functions - Command-Line Tool
+# Snafu: Snake Functions - Main Command-Line Tool
 
-import lib.snafu
+import snafulib.snafu
 
-sr = lib.snafu.SnafuRunner()
+snafulib.snafu.SnafuRunner()

snafu-accounts

@@ -1,51 +1,7 @@
 #!/usr/bin/env python3
 #
-# Snafu: Snake Functions - Account Management
+# Snafu: Snake Functions - Account Management Command-Line Tool
 
-import sys
-import os.path
-import argparse
-import configparser
+import snafulib.snafuaccounts
 
-class SnafuAccounts:
-	def __init__(self):
-		self.accounts = {}
-
-	def addaccount(self, key, secret, endpoint):
-		accdb = os.path.expanduser("~/.snafu-accounts")
-		if os.getenv("HOME") == "/":
-			accdb = "/root/.snafu-accounts"
-		c = configparser.ConfigParser()
-		try:
-			c.read(accdb)
-		except:
-			pass
-		acc = "account{}".format(len(c.sections()))
-		c.add_section(acc)
-		c.set(acc, "access_key_id", key)
-		c.set(acc, "secret_access_key", secret)
-		if endpoint:
-			c.set(acc, "endpoint", endpoint)
-		f = open(accdb, "w")
-		c.write(f)
-
-	def run(self):
-		parser = argparse.ArgumentParser(description="Snake Functions as a Service - Account Management")
-		parser.add_argument("-a", "--add", help="add an account", action="store_true")
-		parser.add_argument("-k", "--key-id", help="access key id")
-		parser.add_argument("-s", "--secret-access-key", help="secret access key")
-		parser.add_argument("-e", "--endpoint", help="tenant-specific static endpoint")
-		args = parser.parse_args()
-
-		if args.add:
-			if not args.key_id or not args.secret_access_key:
-				print("Error: Must specify both --key-id and --secret-access-key for --add.", file=sys.stderr)
-				return
-
-			self.addaccount(args.key_id, args.secret_access_key, args.endpoint)
-		else:
-			print("Error: Must specify --add.", file=sys.stderr)
-			return
-
-sa = SnafuAccounts()
-sa.run()
+snafulib.snafuaccounts.SnafuAccountsRunner()