add new command

bibaijin · bibaijin · commit 866f47dbec83 · 2018-01-10T12:05:42.000+08:00
diff --git a/lain_cli/__init__.py b/lain_cli/__init__.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-__version__ = '2.3.11'
+__version__ = '2.4.0'
diff --git a/lain_cli/auth.py b/lain_cli/auth.py
@@ -2,8 +2,7 @@
 
 import re
 import requests
-from urllib import urlencode
-from urlparse import urlparse, parse_qs
+from urllib.parse import urlencode, urlparse, parse_qs
 
 from lain_sdk.yaml.conf import user_config
 import lain_sdk.mydocker as docker
diff --git a/lain_cli/backup.py b/lain_cli/backup.py
@@ -34,7 +34,7 @@ def jobs(cls, phase):
         route = "api/v2/app/%s/cron/jobs" % appname
         data = cls._request('GET', phase, route, None)
         if data:
-            print json.dumps(data, indent=2)
+            print((json.dumps(data, indent=2)))
 
     @classmethod
     @arg('phase', nargs=1, help="lain cluster phase id, can be added by lain config save")
@@ -50,9 +50,9 @@ def list(cls, phase, proc, path):
         route = "api/v2/app/%s/proc/%s/backups/%s?open=true" % (appname, proc[0], path[0])
         data = cls._request('GET', phase[0], route, None)
         if data:
-            print "%-10sFILENAME" % "SIZE"
+            print(("%-10sFILENAME" % ("SIZE")))
             for item in data:
-                print "%-10s%s%s" % (item['size'], item['name'], '/' if item['dir'] else '')
+                print(("%-10s%s%s" % (item['size'], item['name'], '/' if item['dir'] else '')))
 
     @classmethod
     @arg('phase', nargs=1, help="lain cluster phase id, can be added by lain config save")
@@ -67,7 +67,7 @@ def get(cls, phase, proc, volume):
         route = "api/v2/app/%s/proc/%s/backups?volume=%s" % (appname, proc[0], volume[0])
         data = cls._request('GET', phase[0], route, None)
         if data:
-            print json.dumps(data, indent=2)
+            print((json.dumps(data, indent=2)))
 
     @classmethod
     @arg('phase', nargs=1, help="lain cluster phase id, can be added by lain config save")
@@ -82,7 +82,7 @@ def delete(cls, phase, proc, files):
         route = "api/v2/app/%s/proc/%s/backups/actions/delete" % (appname, proc[0])
         data = cls._request('POST', phase[0], route, {'files': files})
         if data:
-            print data
+            print(data)
 
     @classmethod
     @arg('phase', nargs=1, help="lain cluster phase id, can be added by lain config save")
@@ -143,7 +143,7 @@ def records(cls, phase, rid, num=10):
             route += "?total=%d" % num
         data = cls._request('GET', phase[0], route, None)
         if data:
-            print json.dumps(data, indent=2)
+            print((json.dumps(data, indent=2)))
 
     @classmethod
     @arg('phase', nargs=1, help="lain cluster phase id, can be added by lain config save")
@@ -157,7 +157,7 @@ def run(cls, phase, id):
         route = "api/v2/app/%s/cron/jobs/%s/actions/run" % (appname, id[0])
         data = cls._request('POST', phase[0], route, None)
         if data:
-            print data
+            print(data)
 
     @classmethod
     def _request(cls, method, phase, url, data):
diff --git a/lain_cli/clear.py b/lain_cli/clear.py
@@ -15,6 +15,6 @@ def clear(without=""):
 
     yml = lain_yaml(ignore_prepare=True)
     without_phases = without.split(',')
-    for name in yml.img_names.values():
+    for name in list(yml.img_names.values()):
         if docker.get_phase(name) not in without_phases:
             docker.remove_image(name)
diff --git a/lain_cli/config.py b/lain_cli/config.py
@@ -27,13 +27,13 @@ def show(cls):
         """
         configs = user_config.get_config()
         hide_keys = [SSO_TOKEN_KEY, SSO_REFRESH_TOKEN_KEY]
-        for k, v in configs.iteritems():
+        for k, v in configs.items():
             if not isinstance(v, dict):
                 continue
             for key in hide_keys:
-                if v.has_key(key):
+                if key in v:
                     v.pop(key)
-        print json.dumps(configs, sort_keys=True, indent=4)
+        print((json.dumps(configs, sort_keys=True, indent=4)))
 
     @classmethod
     @arg('prop', help="property for the special phase, e.g: domain, sso_url")
diff --git a/lain_cli/dashboard.py b/lain_cli/dashboard.py
@@ -57,14 +57,14 @@ def print_workflows():
 def render_repos(repos):
     repos.sort()
     for repo in repos:
-        print("{}  ".format(repo)),
+        print(("{}  ".format(repo)), end=' ')
 
 
 def render_apps(apps, sort_type):
     apps.sort(key=attrgetter(sort_type))
     for app in apps:
-        print("{:<30}  {:<20}  {:<60}  {:<10}".format(
-            app.appname, app.apptype, app.metaversion, app.state))
+        print(("{:<30}  {:<20}  {:<60}  {:<10}".format(
+            app.appname, app.apptype, app.metaversion, app.state)))
 
 
 def print_available_repos(console, auth_header):
@@ -83,8 +83,8 @@ def print_available_apps(console, auth_header, sort_type):
     apps_url = "http://%s/api/v1/apps/" % console
     apps_res = requests.get(apps_url, headers=auth_header)
     info('Available apps are :')
-    print("{:<30}  {:<20}  {:<60}  {:<10}".format(
-        "Appname", "AppType", "MetaVersion", "State"))
+    print(("{:<30}  {:<20}  {:<60}  {:<10}".format(
+        "Appname", "AppType", "MetaVersion", "State")))
     if apps_res.status_code == 200:
         apps = apps_res.json()["apps"]
         render_apps([AppInfo.new(app) for app in apps], sort_type)
diff --git a/lain_cli/deploy.py b/lain_cli/deploy.py
@@ -136,7 +136,7 @@ def deploy_proc(proc, appname, console, auth_header, output):
             result = deploy_r.json()
             msg = result.pop('msg', '')
             if msg:
-                print msg.decode('string_escape')
+                print((msg.decode('string_escape')))
             info("proc status: ")
             render_proc_status(result.get('proc'), output=output)
         except Exception:
diff --git a/lain_cli/lain.py b/lain_cli/lain.py
@@ -40,6 +40,8 @@
 from lain_cli.backup import BackupCommands
 from lain_cli.maintainer import MaintainerCommands
 
+from lain_cli.new import new
+
 from lain_cli.utils import exit_gracefully
 
 logging.getLogger("requests").setLevel(logging.WARNING)
@@ -49,7 +51,7 @@
 
 one_level_commands = [
     appversion, attach, build, check, clear, dashboard, debug,
-    deploy, enter, login, logout, meta, prepare, prepare_update,
+    deploy, enter, login, logout, meta, new, prepare, prepare_update,
     ps, push, refresh, reposit, rm, rmi, run, sync,
     scale, stop, tag, test, undeploy, update, validate, version
 ]
diff --git a/lain_cli/login.py b/lain_cli/login.py
@@ -32,7 +32,7 @@ def login(phase, cid=None, secret=None, redirect_uri=None):
     """
 
     check_phase(phase)
-    username = raw_input('SSO Username:')
+    username = input('SSO Username:')
     password = getpass.getpass('SSO Password:')
     sso_login_success = sso_login(phase, cid, secret, redirect_uri, username, password)
     if not sso_login_success:
diff --git a/lain_cli/logout.py b/lain_cli/logout.py
@@ -17,7 +17,7 @@ def logout(phase):
     domain = get_domain(phase)
     logout_success = SSOAccess.clear_token(phase)
     if logout_success:
-    	docker.logout('registry.%s'%domain)
+        docker.logout('registry.{}'.format(domain))
         info("Logout successfully!")
     else:
         warn('Logout failed!')
diff --git a/lain_cli/new.py b/lain_cli/new.py
@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+
+import os
+import subprocess
+import sys
+from argh.decorators import arg
+from jinja2 import Environment, PackageLoader
+from lain_sdk.util import error, info
+
+TEMPLATE_CHOICES = ["go", "java", "python"]
+env = Environment(loader=PackageLoader("lain_cli", "templates"))
+
+
+@arg("appname", help="the name of the new LAIN app")
+@arg("-t", "--template", choices=TEMPLATE_CHOICES, help="template to use")
+def new(appname, template="go"):
+    """
+    Create a LAIN project with template
+    """
+    if appname == "":
+        error("appname should not be \"\".")
+        sys.exit(1)
+
+    try:
+        if template == "go":
+            new_go_project(appname)
+        elif template == "java":
+            new_java_project(appname)
+        elif template == "python":
+            new_python_project(appname)
+        else:
+            error("template should in {}.".format(TEMPLATE_CHOICES))
+            sys.exit(1)
+    except Exception as e:
+        error("{}.".format(e))
+        sys.exit(1)
+
+
+def new_go_project(appname):
+    info("Creating {} with go template...".format(appname))
+    GOPATH = os.environ["GOPATH"]
+    GO_SRC_PATH = "{}/src/".format(GOPATH)
+    CWD = os.getcwd()
+    if not CWD.startswith(GO_SRC_PATH):
+        raise Exception("currenct working directory: {} is not in GOPATH: {}".
+                        format(CWD, GOPATH))
+
+    if os.path.exists(appname):
+        raise Exception("directory or file: {} already exists".format(appname))
+
+    info("`git init {}` ...".format(appname))
+    subprocess.run(["git", "init", appname], check=True)
+    info("`git init {}` done.".format(appname))
+
+    with open("{}/lain.yaml".format(appname), "w+") as f:
+        data = env.get_template("go/lain.yaml.j2").render(
+            appname=appname, package_path=CWD.replace(GO_SRC_PATH, ""))
+        f.write(data)
+
+    with open("{}/main.go".format(appname), "w+") as f:
+        data = env.get_template("go/main.go").render()
+        f.write(data)
+
+    with open("{}/Gopkg.lock".format(appname), "w+") as f:
+        data = env.get_template("go/Gopkg.lock").render()
+        f.write(data)
+
+    with open("{}/Gopkg.toml".format(appname), "w+") as f:
+        data = env.get_template("go/Gopkg.toml").render()
+        f.write(data)
+
+    info("`git commit` ...")
+    os.chdir(appname)
+    subprocess.run(["git", "add", "-A"], check=True)
+    subprocess.run([
+        "git", "-c", "user.name=LAIN", "-c", "user.email=\"\"", "commit", "-m",
+        "initial commit"
+    ],
+                   check=True)
+    os.chdir(CWD)
+    info("`git commit` done.")
+
+    info("{} has been created with go template.".format(appname))
+
+
+def new_java_project(appname):
+    info("Creating java project...")
+    info("Java project has been created.")
+
+
+def new_python_project(appname):
+    info("Creating python project...")
+    info("Python project has been created.")
diff --git a/lain_cli/run.py b/lain_cli/run.py
@@ -20,7 +20,7 @@ def gen_run_ctx(proc_name):
         exit(1)
     container_name = "{}.{}.{}".format(yml.appname, proc.type.name, proc.name)
     image = yml.img_names['release']
-    port = proc.port.keys()[0] if proc.port.keys() else None
+    port = list(proc.port.keys())[0] if list(proc.port.keys()) else None
     working_dir = proc.working_dir or DOCKER_APP_ROOT
     cmd = proc.cmd
     env = proc.env
diff --git a/lain_cli/scale.py b/lain_cli/scale.py
@@ -90,7 +90,7 @@ def scale(phase, proc, target=None, cpu=None, memory=None, numinstances=None, ou
         render_scale_result(scale_r, output)
 
     info("Outline of scale result: ")
-    for k, v in scale_results.iteritems():
+    for k, v in scale_results.items():
         success = v['success']
         output_func = None
         if success:
@@ -144,7 +144,7 @@ def render_scale_result(scale_result, output):
         result = scale_result.json()
         msg = result.pop('msg', '')
         if msg:
-            print msg.decode('string_escape')
+            print((msg.decode('string_escape')))
         info("proc status: ")
         render_proc_status(result.get('proc'), get_apptype(), output=output)
     except Exception:
diff --git a/lain_cli/secret.py b/lain_cli/secret.py
@@ -54,7 +54,7 @@ def show(cls, phase, procname, path=None):
         show_response = requests.get(lvault_url, headers=auth_header)
         if show_response.status_code < 300:
             info("secret file detail:")
-            print(json.dumps(show_response.json(), encoding="utf-8", ensure_ascii=False, indent=2))
+            print((json.dumps(show_response.json(), encoding="utf-8", ensure_ascii=False, indent=2)))
         else:
             error("shit happened : %s" % show_response.text)
 
@@ -78,7 +78,7 @@ def add(cls, phase, procname, path, content=None, file=None):
             try:
                 f = open(file)
                 content = f.read()
-            except Exception, e:
+            except Exception as e:
                 error("error read file %s : %s" % (file, str(e)))
                 exit(1)
 
diff --git a/lain_cli/templates/go/Gopkg.lock b/lain_cli/templates/go/Gopkg.lock
diff --git a/lain_cli/templates/go/Gopkg.toml b/lain_cli/templates/go/Gopkg.toml
@@ -0,0 +1,22 @@
+
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
+
diff --git a/lain_cli/templates/go/lain.yaml.j2 b/lain_cli/templates/go/lain.yaml.j2
@@ -0,0 +1,25 @@
+appname: {{ appname }}
+
+build:
+  base: golang:1.9  # Or ${private_registry}/library/golang:1.9
+  prepare:
+    version: 201801081549  # Please increase ${version} to update prepare image
+    script:
+      - go get -u github.com/golang/dep/cmd/dep  # Or any other package manager for golang
+      - mkdir -p $GOPATH/src/{{ package_path }}/{{ appname }}
+      - cp -rf . $GOPATH/src/{{ package_path }}/{{ appname }}  # Copy code to $GOPATH/src
+      - cd $GOPATH/src/{{ package_path }}/{{ appname }} && dep ensure  # Install dependencies by dep
+  script:
+    - cp -rf . $GOPATH/src/{{ package_path }}
+    - go install {{ package_path }}/{{ appname }}
+
+release:
+  dest_base: laincloud/debian:stretch  # Stdout/Stderr will be redirected to /lain/logs/default/currenct
+  copy:
+    - src: $GOPATH/bin/{{ appname }}
+      dest: /lain/app/{{ appname }}
+
+web:
+  cmd: /lain/app/{{ appname }}  # Please use absolute path
+  healthcheck: /ping
+
diff --git a/lain_cli/templates/go/main.go b/lain_cli/templates/go/main.go
diff --git a/lain_cli/templates/python/lain.yaml.j2 b/lain_cli/templates/python/lain.yaml.j2
diff --git a/lain_cli/undeploy.py b/lain_cli/undeploy.py
diff --git a/lain_cli/utils.py b/lain_cli/utils.py
diff --git a/lain_cli/validate.py b/lain_cli/validate.py
diff --git a/lain_cli/version.py b/lain_cli/version.py
diff --git a/setup.py b/setup.py
