Merge pull request #162 from d4rkstar/3.0.0-php

feat(deploy): Added tasks for php in nuv ide

Author: giusdp

ide/deploy/deploy.py

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-MAINS = ["__main__.py", "index.js"]
+MAINS = ["__main__.py", "index.js", "index.php"]
 
 import os
 from  os.path import exists, isdir
@@ -37,7 +37,7 @@ def extract_args(files):
     res = []
     for file in files:
         #if dry_run:
-        #    print(f": inspecting {file}")
+        #  print(f": inspecting {file}")
         if exists(file):
             with open(file, "r") as f:
                 for line in f.readlines():

ide/deploy/scan.py

@@ -18,32 +18,36 @@
 from glob import glob
 from .deploy import *
 
+
 def scan():
     # first look for requirements.txt and build the venv (add in set)
     deployments = set()
     packages = set()
 
     print("> Scan:")
-    reqs =  glob("packages/*/*/requirements.txt") + glob("packages/*/*/package.json")
+    reqs = glob("packages/*/*/requirements.txt") + \
+        glob("packages/*/*/package.json") + glob("packages/*/*/composer.json")
     # req = reqs[0]
     # from util.deploy.deploy import *
     for req in reqs:
         print(">> Requirements:", req)
         sp = req.split("/")
-        act = build_zip(sp[1],sp[2])
+        act = build_zip(sp[1], sp[2])
         deployments.add(act)
         packages.add(sp[1])
-        
-    mains = glob("packages/*/*/index.js") + glob("packages/*/*/__main__.py")
+
+    mains = glob("packages/*/*/index.js") + \
+        glob("packages/*/*/__main__.py") + glob("packages/*/*/index.php")
     # main = mains[2]
-    for main in mains: 
+    for main in mains:
         print(">> Main:", main)
         sp = main.split("/")
-        act = build_action(sp[1],sp[2])
+        act = build_action(sp[1], sp[2])
         deployments.add(act)
-        packages.add(sp[1])    
+        packages.add(sp[1])
 
-    singles = glob("packages/*/*.py") +  glob("packages/*/*.js")
+    singles = glob("packages/*/*.py") + \
+        glob("packages/*/*.js") + glob("packages/*/*.php")
     # single = singles[0]
     for single in singles:
         print(">> Action:", single)
@@ -56,7 +60,7 @@ def scan():
     for package in packages:
         print(">> Package:", package)
         deploy_package(package)
-    
+
     for action in deployments:
         print(">>> Action:", action)
         deploy_action(action)

ide/nuvfile.yml

@@ -37,7 +37,7 @@ tasks:
       echo "*** 'deploy' (alias for 'nuv ide deploy') to deploy your app to https://$NUVDEV_USERNAME.nuvolaris.dev"
       echo "*** 'devel'  (alias for 'nuv ide devel') to start incremental development mode"
       echo "*** 'login'  (alias for 'nuv ide login')  to login as a different user"
-      echo "*** 'nuv ide' for more informations
+      echo "*** 'nuv ide' for more informations"
       echo "*** https://nuvolaris.github.io for online documentation"
       echo "**************************************************************************************"
 
@@ -244,6 +244,8 @@ tasks:
           /bin/rm -rvf "$NUV_PWD"/packages/*/*/virtualenv/
           echo "*** removing node_modules"
           /bin/rm -rvf "$NUV_PWD"/packages/*/*/node_modules/
+          echo "*** removing vendor"
+          /bin/rm -rvf "$NUV_PWD"/packages/*/*/vendor/
           echo "*** removing .zip"
           /bin/rm -vf "$NUV_PWD"/packages/*/*.zip 
        else die "no packages in current directory"
@@ -261,3 +263,6 @@ tasks:
 
   nodejs:
     desc: nodejs subcommand
+  
+  php:
+    desc: php subcommand

ide/nuvopts.txt

@@ -13,6 +13,7 @@ Usage:
     ide kill
     ide python
     ide nodejs
+    ide php
 
 Commands:
     ide login               login in nuvolaris.dev
@@ -27,3 +28,4 @@ Commands:
     ide shell               start a shell with current env
     ide python              python subcommands
     ide nodejs              nodejs subcommands
+    ide php                 php subcommands

ide/php/build-php.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+# 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.
+
+DIR="${1:?directory}"
+ZIP="${2:?zip file}"
+cd "$DIR"
+composer install
+touch vendor/composer.lock
+if test -f "$ZIP"
+then rm "$ZIP"
+fi
+zip -r "$ZIP" vendor # >/dev/null
+ls -l $ZIP
+

ide/php/nuvfile.yml

@@ -0,0 +1,53 @@
+# 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.
+
+version: '3'
+
+tasks:
+
+  clean:
+    silent: true
+    desc: clean
+    requires: {var: [DIR]}
+    cmds:
+    - test -d "{{.DIR}}" || die "{{.DIR}} not found or not a directory"
+    - /usr/bin/rm -Rvf {{.DIR}}/vendor {{.DIR}}.zip
+
+  zip:
+    silent: true
+    desc: build a zip environment
+    requires: {var: [DIR]}
+    cmds:
+    - test -d "{{.DIR}}" || die "{{.DIR}} not found or not a directory"
+    - |
+      if test -f "{{.DIR}}/composer.json"
+      then bash build-php.sh "{{.DIR}}" "{{.DIR}}.zip"
+      fi
+    sources:
+    - "{{.DIR}}/composer.json"
+    generates:
+    - "{{.DIR}}/composer.lock"
+
+  action:
+    silent: true
+    desc: build the action updating the zip
+    requires: {var: [DIR]}
+    dir: "{{.DIR}}"
+    cmds:
+    - test -d "{{.DIR}}" || die "{{.DIR}} not found or not a directory"
+    - |
+      /usr/bin/zip -r {{.DIR}}.zip * -x "vendor/*" -x "*/vendor/*"

ide/util/nuvfile.yml

@@ -30,7 +30,9 @@ tasks:
       then nuv ide python zip DIR="$(realpath "packages/{{.A}}")"
       elif test -e "packages/{{.A}}/package.json"
       then nuv ide nodejs zip DIR="$(realpath "packages/{{.A}}")"
-      else echo "no zip environemnt"
+      elif test -e "packages/{{.A}}/composer.json"
+      then nuv ide php zip DIR="$(realpath "packages/{{.A}}")"
+      else echo "no zip environment"
       fi
 
   action:
@@ -44,6 +46,8 @@ tasks:
       then nuv ide python action DIR="$(realpath "packages/{{.A}}")"
       elif test -e "packages/{{.A}}/index.js"
       then nuv ide nodejs action DIR="$(realpath "packages/{{.A}}")"
+      elif test -e "packages/{{.A}}/index.php"
+      then nuv ide php action DIR="$(realpath "packages/{{.A}}")"
       else die "*** unknow action type"
       fi
 
@@ -58,6 +62,8 @@ tasks:
       then nuv ide python clean DIR="$(realpath "packages/{{.A}}")"
       elif test -d "packages/{{.A}}/node_modules"
       then nuv ide nodejs clean DIR="$(realpath "packages/{{.A}}")"
+      elif test -d "packages/{{.A}}/vendor"
+      then nuv ide php clean DIR="$(realpath "packages/{{.A}}")"
       else echo "nothing to clean"
       fi
       if test -e "packages/{{.A}}.zip"