merge into master branch changes for terminal support

.dockerignore

@@ -8,3 +8,4 @@ downloads
 logs
 var
 ssl
+wetty

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "rpc"]
 	path = rpc
 	url = git://github.com/LTD-Beget/sprutio-rpc.git
+[submodule "wetty"]
+	path = wetty
+	url = https://github.com/rndviktor/wetty.git

Makefile

@@ -1,10 +1,10 @@
 .PHONY: all build push \
-				build-python build-cron build-bower build-rpc build-app build-nginx build-frontend \
-				push-python push-cron push-bower push-rpc push-app push-nginx push-frontend
+				build-python build-cron build-bower build-rpc build-app build-nginx build-wetty build-frontend \
+				push-python push-cron push-bower push-rpc push-app push-nginx push-frontend push-wetty
 
 all: build
 
-build: build-python build-cron build-bower build-rpc build-app build-nginx build-frontend
+build: build-python build-cron build-bower build-rpc build-app build-nginx build-frontend build-wetty
 
 build-python:
 	docker build -t beget/sprutio-python -f Dockerfile ./
@@ -24,11 +24,14 @@ build-app:
 build-nginx:
 	docker build -t beget/sprutio-nginx -f Dockerfile.nginx ./
 
+build-wetty:
+	docker build -t rndviktor/wetty -f wetty/Dockerfile wetty/
+
 build-frontend:
 	docker run -v $(PWD)/app/public:/app -w /app beget/sprutio-bower bower install --allow-root
 	docker build -t beget/sprutio-frontend -f app/public/Dockerfile app/public/
 
-push: push-cron push-rpc push-app push-nginx push-frontend
+push: push-cron push-rpc push-app push-nginx push-frontend push-wetty
 
 push-cron:
 	docker push beget/sprutio-cron
@@ -42,6 +45,9 @@ push-app:
 push-nginx:
 	docker push beget/sprutio-nginx
 
+push-wetty:
+	docker push rndviktor/wetty
+
 push-frontend:
 	docker push beget/sprutio-frontend
 

app/classes/core/FM.py

@@ -115,6 +115,8 @@ class Actions(object):
     CREATE_ARCHIVE = 'actions.archive.create.CreateArchive'
     EXTRACT_ARCHIVE = 'actions.archive.extract.ExtractArchive'
 
+    OPEN_TERMINAL = 'actions.main.open_terminal.OpenTerminal'
+
 
 # Aliases for FM actions
 class Action(object):
@@ -173,6 +175,8 @@ class Action(object):
     HELP = 'FM.action.Help'
     LOGOUT = 'FM.action.Logout'
 
+    TERMINAL = 'FM.action.Terminal'
+
 
 class ActionsProvider:
     @staticmethod

app/config/routes.py

@@ -5,6 +5,7 @@
 from handlers.actions.main import CancelOperationHandler
 from handlers.actions.main import LoadSettingsHandler
 from handlers.actions.main import SaveSettingsHandler
+from handlers.actions.main import TerminalHandler
 # from handlers.actions.main import LogoutHandler
 from handlers.actions.files import ListFilesHandler
 from handlers.actions.files import RemoveFilesHandler
@@ -62,6 +63,7 @@
     (r"/actions/main/cancel_operation", CancelOperationHandler.CancelOperationHandler),
     (r"/actions/main/save_settings", SaveSettingsHandler.SaveSettingsHandler),
     (r"/actions/main/logout", LogoutHandler.LogoutHandler),
+    (r"/actions/main/terminal", TerminalHandler.TerminalHandler),
     (r"/actions/files/list", ListFilesHandler.ListFilesHandler),
     (r"/actions/files/remove", RemoveFilesHandler.RemoveFilesHandler),
     (r"/actions/files/chmod", ChmodFilesHandler.ChmodFilesHandler),

app/handlers/actions/main/TerminalHandler.py

@@ -0,0 +1,27 @@
+from tornado import web
+from handlers.BaseHandler import BaseHandler, wrap_async_rpc, wrap_catch
+
+from core import FM
+
+
+class TerminalHandler(BaseHandler):
+    @wrap_async_rpc
+    @wrap_catch
+    @web.authenticated
+    def post(self):
+
+        session = self.get_post('session')
+
+        if session is None:
+            self.json({
+                'error': True,
+                'message': 'no session provided'
+            })
+            self.finish()
+            return
+
+        action = self.get_action(name=FM.Actions.OPEN_TERMINAL, session=session)
+        answer = action.run()
+
+        self.json(answer)
+        self.finish()

app/modules/home/actions/main/open_terminal.py

@@ -0,0 +1,16 @@
+from core import FM
+
+
+class OpenTerminal(FM.BaseAction):
+    def __init__(self, session, **kwargs):
+        super(OpenTerminal, self).__init__(**kwargs)
+
+        self.session = session
+
+    def run(self):
+        request = self.get_rpc_request()
+        result = request.request('main/open_terminal', login=self.request.get_current_user(),
+                                 password=self.request.get_current_password(), session=self.session)
+        answer = self.process_result(result)
+
+        return answer

docker-compose.dev.yml

@@ -25,6 +25,10 @@ cron:
 redis:
   image: redis
 
+wetty:
+  build: wetty
+  net: "host"
+
 bower:
   build: .
   dockerfile: Dockerfile.bower

docker-compose.yml

@@ -49,4 +49,8 @@ cron:
 redis:
   image: redis:3.0
 
+wetty:
+  image: rndviktor/wetty
+  net: "host"
+
 # EOF

travis/docker-build.sh

@@ -22,6 +22,9 @@ docker build -t beget/sprutio-app -f app/Dockerfile app/
 # nginx image
 docker build -t beget/sprutio-nginx -f Dockerfile.nginx ./
 
+# wetty image
+docker build -t rndviktor/wetty -f wetty/Dockerfile wetty/
+
 # frontend
 docker build -t beget/sprutio-bower -f Dockerfile.bower ./
 docker run -v $PWD/app/public:/app -w /app beget/sprutio-bower bower install --allow-root