ide fixed

Author: msciabarra

ide/deploy/__main__.py

@@ -6,6 +6,7 @@
 from .deploy import set_dry_run, deploy
 from .client import build
 
+
 def signal_handler(sig, frame):
     print('Termination requested.')
     os.remove(expanduser("~/.nuv/tmp/deploy.pid"))
@@ -24,6 +25,7 @@ def main():
     # Register the signal handler for SIGTERM
     os.setpgrp()
     signal.signal(signal.SIGTERM, signal_handler)
+        
     os.makedirs(expanduser("~/.nuv/tmp"), exist_ok=True)
     with open(expanduser("~/.nuv/tmp/deploy.pid"), "w") as f:
         f.write(str(os.getpid())+"\n")

ide/deploy/awatch.py

@@ -27,15 +27,16 @@ def get_nuvolaris_config(key):
         return info.get("nuvolaris", {}).get(key)
     except:
         return None
-    
+ 
 # serve web area
 def serve():
     devel = get_nuvolaris_config("devel")
     if devel is None:
         devel = "nuv ide serve"
     print(devel)
-    Popen(devel, shell=True, cwd=os.environ.get("NUV_PWD"), env=os.environ).communicate()
+    Popen(devel, shell=True, cwd=os.environ.get("NUV_PWD"), env=os.environ)
 
+# build
 def build():
     deploy = get_nuvolaris_config("deploy")
     if deploy is not None:

ide/deploy/client.py

@@ -68,9 +68,13 @@ def build_action(package, action):
     return f"packages/{package}/{action}.zip"
 
 def deploy_action(artifact):
-    sp = artifact.split("/")
-    [name, typ] = sp[-1].rsplit(".", 1)
-    package = sp[1]
+    try:
+        sp = artifact.split("/")
+        [name, typ] = sp[-1].rsplit(".", 1)
+        package = sp[1]
+    except:
+        print("! cannot deploy", artifact)
+        return
 
     deploy_package(package)
 

ide/deploy/deploy.py

@@ -1,66 +1,57 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
 SKIPDIR = ["virtualenv", "node_modules", "__pycache__"]
 
-import os, sys, signal, os.path
-from subprocess import Popen
-from watchdog.observers import Observer
-from watchdog.events import FileSystemEventHandler
+import watchfiles
+import asyncio
+import os.path
+import signal
 
 from .deploy import deploy
 from .client import serve
 
-class ChangeHandler(FileSystemEventHandler):
-    """Logs all the events captured."""
-    
-    last_modified = {}
-
-    def on_any_event(self, event):
-        ## filter what is needed
-        # only modified
-        if event.event_type != "modified": return
-        # no directories
-        if event.is_directory: return
-        src = event.src_path
-        # no missing files
-        if not os.path.exists(src): return
-        # no generated directories
-        for dir in src.split("/")[:-1]:
-            if dir in SKIPDIR: return
-        # no generated files
-        if src.endswith(".zip"): return
-
-        # cache last modified to do only once
-        cur = os.path.getmtime(src)
-        if self.last_modified.get(src, 0) == cur:
-            return
-        self.last_modified[src] = cur
-        deploy(src)
-
-def watch():
-    observer = Observer()
-    event_handler = ChangeHandler()
-    observer.schedule(event_handler, "packages", recursive=True)
-    #observer.schedule(event_handler, "web", recursive=True)
-    observer.start()
+def check_and_deploy(change):
+    cur_dir_len = len(os.getcwd())+1
+    change_type, path = change
+    src = path[cur_dir_len:]
+    print(f"{change_type}: {src}")
+    # only modified
+    if change_type != watchfiles.Change.modified: return
+    # no directories
+    if os.path.isdir(src): return
+    # no missing files
+    if not os.path.exists(src): return
+    # no generated directories
+    for dir in src.split("/")[:-1]:
+        if dir in SKIPDIR: return
+    # no generated files
+    if src.endswith(".zip"): return
+    # now you can deploy
+    deploy(src)
+
+async def redeploy():
+    print("redeploy")
+    iterator = watchfiles.awatch("packages", recursive=True)
     try:
-        serve()
+        async for changes in iterator:
+            for change in changes:
+                check_and_deploy(change)
     except KeyboardInterrupt:
-        observer.stop()
-    observer.join()
+        print("Keyboard Interrupt")
+    except:
+        print("Exception")
+
+def watch():
+    loop = asyncio.get_event_loop()
+    #task = loop.create_task(redeploy())
+    task = asyncio.ensure_future(redeploy())
+    def end_loop():
+        print("Ending task.")
+        task.cancel()
+    loop.add_signal_handler(signal.SIGTERM, end_loop)
 
+    try:
+        loop.run_until_complete(task)
+    except asyncio.CancelledError:
+        pass
+    finally:
+        loop.stop()
+        loop.close()

ide/deploy/watch.py

@@ -132,6 +132,7 @@ tasks:
             python3 -m deploy "$NUV_PWD" -s "{{._action_}}" $DRY
         fi
 
+ 
   devel:
     silent: true
     desc: start interactive development mode files
@@ -162,6 +163,9 @@ tasks:
         then DRY="--dry-run" ; ECHO='echo'
         else DRY="" ; ECHO=""
         fi
+        if ! pip list | grep watchfiles >/dev/null
+        then pip install watchfiles asyncio
+        fi
         python3 -m deploy "$NUV_PWD" -w $DRY
         true
 

ide/nuvfile.yml

@@ -62,3 +62,12 @@ tasks:
       then set -a ; source "$NUV_PWD/.env"
       fi
       ipython -i init.ipy
+
+
+  boh:
+    desc: boh
+    cmds:
+    - |
+      trap 'echo wakeup' EXIT
+      echo sleeping
+      sleep 100