Merge pull request #852 from jpverde/main

refac(cross): #849 rename builtins

README.md

@@ -246,8 +246,6 @@ Real life projects that run entirely on [Makes][MAKES]:
         - [secretsForKubernetesConfigFromAws](#secretsforkubernetesconfigfromaws)
         - [secretsForTerraformFromEnv](#secretsforterraformfromenv)
     - [Utilities](#utilities)
-        - [makeNodeJsLockfile](#makenodejslockfile)
-        - [makePythonPypiEnvironmentSources](#makepythonpypienvironmentsources)
         - [makeSopsEncryptedFile](#makesopsencryptedfile)
     - [Framework Configuration](#framework-configuration)
         - [extendingMakesDirs](#extendingmakesdirs)
@@ -281,9 +279,11 @@ Real life projects that run entirely on [Makes][MAKES]:
             - [makeNodeJsVersion](#makenodejsversion)
             - [makeNodeJsModules](#makenodejsmodules)
             - [makeNodeJsEnvironment](#makenodejsenvironment)
+            - [makeNodeJsLock](#makenodejslock)
         - [Python](#python)
             - [makePythonVersion](#makepythonversion)
             - [makePythonPypiEnvironment](#makepythonpypienvironment)
+            - [makePythonLock](#makepythonlock)
         - [Ruby](#ruby)
             - [makeRubyVersion](#makerubyversion)
             - [makeRubyGemsInstall](#makerubygemsinstall)
@@ -2425,14 +2425,14 @@ Utilities provide an easy mechanism
 for calling functions from makes
 without having to specify them on any file.
 
-### makeNodeJsLockfile
+### makeNodeJsLock
 
 You can generate a `package-lock.json`
 for [makeNodeJsEnvironment](#makenodejsenvironment)
 like this:
 
 ```bash
-m github:fluidattacks/[email protected] /utils/makeNodeJsLockfile \
+m github:fluidattacks/[email protected] /utils/makeNodeJsLock \
   "${node_js_version}" \
   "${package_json}" \
   "${package_lock}"
@@ -2445,17 +2445,17 @@ m github:fluidattacks/[email protected] /utils/makeNodeJsLockfile \
   to the `package-lock.json` file in your project, this file can be an empty
   file.
 
-### makePythonPypiEnvironmentSources
+### makePythonLock
 
 You can generate a `sourcesYaml`
 for [makePythonPypiEnvironment](#makepythonpypienvironment)
 like this:
 
 ```bash
-m github:fluidattacks/[email protected] /utils/makePythonPypiEnvironmentSources \
+m github:fluidattacks/[email protected] /utils/makePythonLock \
   "${python_version}" \
   "${dependencies_yaml}" \
-  "${sources_yaml}
+  "${sources_yaml}"
 ```
 
 - Supported `python_version`s are: `3.7`, `3.8` and `3.9`.
@@ -3850,7 +3850,7 @@ It appends:
 - `node_modules/.bin` to `PATH`.
 - `node_modules` to [NODE_PATH][NODE_PATH].
 
-Pre-requisites: [Generating a package-lock.json](#makenodejslockfile)
+Pre-requisites: [Generating a package-lock.json](#makenodejslock)
 
 Types:
 
@@ -3975,7 +3975,7 @@ where the provided set of [Python][PYTHON] packages
 from the [Python Packaging Index (PyPI)][PYTHON_PYPI]
 are installed.
 
-Pre-requisites: [Generating a sourcesYaml](#makepythonpypienvironmentsources)
+Pre-requisites: [Generating a sourcesYaml](#makepythonlock)
 
 Types:
 
@@ -4055,7 +4055,7 @@ $ cat /path/to/my/project/makes/example/dependencies.yaml
 
   Django: "3.2.6"
 
-$ m github:fluidattacks/[email protected] /utils/makePythonPypiEnvironmentSources \
+$ m github:fluidattacks/[email protected] /utils/makePythonLock \
     3.8 \
     /path/to/my/project/makes/example/dependencies.yaml \
     /path/to/my/project/makes/example/sources.yaml

makes/utils/makeNodeJsLockfile/main.nix → makes/utils/makeNodeJsLock/main.nix

@@ -6,7 +6,7 @@
 }:
 makeScript {
   entrypoint = ./entrypoint.sh;
-  name = "make-node-js-lockfile";
+  name = "make-node-js-lock";
   replace = {
     __argNode14__ = makeNodeJsVersion "14";
     __argNode16__ = makeNodeJsVersion "16";

makes/utils/makePythonPypiEnvironmentSources/update.sh

@@ -1,7 +1,7 @@
 # shellcheck shell=bash
 
 function main {
-  local cmd=(just m . /utils/makePythonPypiEnvironmentSources)
+  local cmd=(just m . /utils/makePythonLock)
 
   : \
     && "${cmd[@]}" 3.7 \