Updated script for definition generation and dependencies handling [skip ci]

The current commit has made necessary amendments in `generate-definitions.py` script for more accurate module file creation and dependency handling. Changes include renaming of `requires_found` to `lib_requires_found`, and check before appending a module to `lib_requires`. The 'requires' field in `resty/core.yml` was also split into 'lib_requires' and 'requires' for improved modularity.

Author: dvershinin

Diff for: generate-definitions.py

@@ -63,6 +63,7 @@ def setup_logging(level=logging.INFO):
         continue
     module_name = repo.name.replace('lua-resty-', '')
     filename = os.path.join(work_dir, f'resty/{module_name}.yml')
+    # If module file has been created during this launch (e.g. author1/repo1 and author2/repo1 have same name)
     if os.path.exists(filename):
         log.warning('Skipping. Definition already exists for this name. Likely a less popular fork')
         continue
@@ -129,15 +130,16 @@ def setup_logging(level=logging.INFO):
             requires = re.sub(r'0\.0(\d)', r"0.\1", requires)
             requires = requires.split(',')
             requires_found = []
+            lib_requires_found = []
             for r in requires:
                 parts = r.split('/')
                 r = parts[-1].strip()
                 if r.startswith('lua-resty-'):
-                    requires_found.append(r.replace('lua-', ''))
+                    lib_requires_found.append(r.replace('lua-', ''))
             print(requires)
-            print(requires_found)
-            if requires_found:
-                dict_file['requires'] = requires_found
+            print(lib_requires_found)
+            if lib_requires_found:
+                dict_file['lib_requires'] = lib_requires_found
 
     with open(filename, 'w', encoding='utf8') as file:
         documents = yaml.dump(dict_file, file)

Diff for: resty/core.yml

@@ -1,5 +1,6 @@
 repo: openresty/lua-resty-core
-requires:
+lib_requires:
   - resty-lrucache >= 0.8
+requires:
   - ngx_http_lua_module >= 0.10.25
 summary: New FFI-based API for lua-nginx-module

Diff for: spec.j2

@@ -13,7 +13,7 @@
 
 Name:           lua-%{luapkgname}
 Version:        {{ version }}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        {{ summary }}
 Group:          Development/Libraries
 License:        BSD
@@ -33,6 +33,12 @@ Requires:       lua(abi) = %{luacompatver}
 
 {% if requires is defined and requires is iterable %}
 {% for r in requires -%}
+Requires: {{ r }}
+{% endfor -%}
+{%- endif -%}
+
+{% if lib_requires is defined and lib_requires is iterable %}
+{% for r in lib_requires -%}
 Requires:       lua-{{ r }}
 {% endfor -%}
 {%- endif -%}
@@ -49,16 +55,23 @@ Provides:       {{ p }}
 {% endfor -%}
 {%- endif -%}
 
-BuildArch:      noarch
+BuildArch: noarch
 
 %description
 %{summary}.
 
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package -n lua%{luacompatver}-%{luapkgname}
 Summary:        {{ summary }} for Lua %{luacompatver}
-{% if requires is defined and requires is iterable -%}
+
+{% if requires is defined and requires is iterable %}
 {% for r in requires -%}
+Requires: {{ r }}
+{% endfor -%}
+{%- endif -%}
+
+{% if lib_requires is defined and lib_requires is iterable -%}
+{% for r in lib_requires -%}
 Requires:       lua%{luacompatver}-{{ r }}
 {% endfor -%}
 {%- endif -%}
@@ -118,4 +131,3 @@ cp -pr lib/* $RPM_BUILD_ROOT%{luacompatpkgdir}
 
 %changelog
 # not maintained
-