Skip to content

Commit 11b74d2

Browse files
d4rkstarmsciabarra
authored andcommitted
nuvolaris config from package.json
1 parent 9d3cb50 commit 11b74d2

File tree

1 file changed

+35
-7
lines changed

1 file changed

+35
-7
lines changed

ide/deploy/scan.py

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
from glob import glob
1919
from .deploy import *
20+
from .client import get_nuvolaris_config
2021

2122

2223
def scan():
@@ -25,8 +26,20 @@ def scan():
2526
packages = set()
2627

2728
print("> Scan:")
28-
reqs = glob("packages/*/*/requirements.txt") + \
29-
glob("packages/*/*/package.json") + glob("packages/*/*/composer.json")
29+
30+
# => REQUIREMENTS
31+
default_reqs_globs = ["packages/*/*/requirements.txt",
32+
"packages/*/*/package.json",
33+
"packages/*/*/composer.json"
34+
]
35+
package_globs = get_nuvolaris_config("requirements", default_reqs_globs)
36+
reqs = list()
37+
38+
for pkg_glob in package_globs:
39+
items = glob(pkg_glob)
40+
# extend first list without duplicates
41+
reqs.extend(x for x in items if x not in reqs)
42+
3043
# req = reqs[0]
3144
# from util.deploy.deploy import *
3245
for req in reqs:
@@ -36,8 +49,17 @@ def scan():
3649
deployments.add(act)
3750
packages.add(sp[1])
3851

39-
mains = glob("packages/*/*/index.js") + \
40-
glob("packages/*/*/__main__.py") + glob("packages/*/*/index.php")
52+
# => MAINS
53+
default_mains_globs = ["packages/*/*/index.js",
54+
"packages/*/*/__main__.py",
55+
"packages/*/*/index.php"]
56+
mains_globs = get_nuvolaris_config("mains", default_mains_globs)
57+
mains = list()
58+
for main_glob in mains_globs:
59+
items = glob(main_glob)
60+
# extend first list without duplicates
61+
mains.extend(x for x in items if x not in mains)
62+
4163
# main = mains[2]
4264
for main in mains:
4365
print(">> Main:", main)
@@ -46,8 +68,15 @@ def scan():
4668
deployments.add(act)
4769
packages.add(sp[1])
4870

49-
singles = glob("packages/*/*.py") + \
50-
glob("packages/*/*.js") + glob("packages/*/*.php")
71+
# => SINGLES
72+
default_singles_globs = ["packages/*/*.py",
73+
"packages/*/*.js", "packages/*/*.php"]
74+
singles_globs = get_nuvolaris_config("singles", default_singles_globs)
75+
singles = list()
76+
for single_glob in singles_globs:
77+
items = glob(single_glob)
78+
singles.extend(x for x in items if x not in singles)
79+
5180
# single = singles[0]
5281
for single in singles:
5382
print(">> Action:", single)
@@ -56,7 +85,6 @@ def scan():
5685
packages.add(sp[1])
5786

5887
print("> Deploying:")
59-
6088
for package in packages:
6189
print(">> Package:", package)
6290
deploy_package(package)

0 commit comments

Comments
 (0)