eitri-cli 1.11.0 → 1.12.0-beta.1

package/bitbucket-pipelines.yml

@@ -1,4 +1,8 @@
-image: node:18-buster
+image: 
+  name: 343482176926.dkr.ecr.us-east-1.amazonaws.com/eitri-base-cli-pipeline:latest
+  aws:
+    access-key: $EITRI_PROD_AWS_ACCESS_KEY_ID
+    secret-key: $EITRI_PROD_AWS_SECRET_ACCESS_KEY
 pipelines:
   custom:
     test-validation:
@@ -7,18 +11,6 @@ pipelines:
           caches:
             - node
           script:
-            - apt-get update
-            - apt-get install -y wget
-            - wget -q https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-            - apt-get install -y ./google-chrome-stable_current_amd64.deb
-            - export PUPPETEER_EXECUTABLE_PATH='/usr/bin/google-chrome-stable'
-            - apt-get install -y libssl-dev
-            - apt-get install -y pkg-config
-            - apt-get install -y git
-            - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-            - export PATH="/root/.cargo/bin:${PATH}"
-            - rustup --version
-            - rustup target add x86_64-unknown-linux-gnu
             - cd eitri-cli-v2
             - npm i
             - npm run build:debug
@@ -33,19 +25,6 @@ pipelines:
         caches:
           - node
         script:
-          - apt-get update
-          - curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs
-          - apt-get install -y wget
-          - wget -q https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-          - apt-get install -y ./google-chrome-stable_current_amd64.deb
-          - export PUPPETEER_EXECUTABLE_PATH='/usr/bin/google-chrome-stable'
-          - apt-get install -y libssl-dev
-          - apt-get install -y pkg-config
-          - apt-get install -y git
-          - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-          - export PATH="/root/.cargo/bin:${PATH}"
-          - rustup --version
-          - rustup target add x86_64-unknown-linux-gnu
           - cd eitri-cli-v2
           - npm i
           - npm run build:debug
@@ -59,35 +38,18 @@ pipelines:
         caches:
           - node
         script:
-        - apt-get update
-        - apt-get install -y libssl-dev
-        - apt-get install -y pkg-config
-        - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-        - export PATH="/root/.cargo/bin:${PATH}"
-        - rustup --version
-        - rustup target add x86_64-unknown-linux-gnu
         - cd eitri-cli-v2
         - cargo test
     - step: &macOSCrossCompile
-        image: joseluisq/rust-linux-darwin-builder:1.76.0
+        image: 
+          name: 343482176926.dkr.ecr.us-east-1.amazonaws.com/eitri-base-cli-pipeline:macos
+          aws:
+            access-key: $EITRI_PROD_AWS_ACCESS_KEY_ID
+            secret-key: $EITRI_PROD_AWS_SECRET_ACCESS_KEY
         name: "macOS cross compile"
         caches:
           - node
         script:
-          - apt-get update
-          - apt-get install -y git
-          - apt-get install -y libssl-dev
-          - apt-get install -y libudev-dev
-          - apt-get install -y pkg-config
-          - apt-get install -y cargo
-          - apt-get install -y gcc-mingw-w64
-          - apt-get install -y curl
-          - curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs
-          - rustup update
-          - export PATH="/root/.cargo/bin:${PATH}"
-          - rustup --version
-          - export CC=o64-clang
-          - export CXX=o64-clang++
           - cd eitri-cli-v2
           - cargo add openssl --features vendored
           - npm install
@@ -108,18 +70,6 @@ pipelines:
           - node
         name: 'Linux compile'
         script:
-          - apt-get update
-          - apt-get install -y git
-          - apt-get install -y libssl-dev
-          - apt-get install -y libudev-dev
-          - apt-get install -y pkg-config
-          - apt-get install -y cargo
-          - apt-get install -y gcc-mingw-w64
-          - apt-get install -y curl
-          - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-          - export PATH="/root/.cargo/bin:${PATH}"
-          - rustup --version
-          - curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs
           - rustup target add x86_64-unknown-linux-gnu
           - cd eitri-cli-v2
           - cargo add openssl --features vendored
@@ -133,18 +83,6 @@ pipelines:
           - node
         name: 'Windows cross compile'
         script:
-          - apt-get update
-          - apt-get install -y git
-          - apt-get install -y libssl-dev
-          - apt-get install -y libudev-dev
-          - apt-get install -y pkg-config
-          - apt-get install -y cargo
-          - apt-get install -y gcc-mingw-w64
-          - apt-get install -y curl
-          - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-          - export PATH="/root/.cargo/bin:${PATH}"
-          - rustup --version
-          - curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs
           - rustup target add x86_64-pc-windows-msvc
           - cargo install cargo-xwin
           - cd eitri-cli-v2
@@ -162,13 +100,10 @@ pipelines:
             - step: *runRustTests
     '{beta,master}':
       - parallel:
-          fail-fast: false 
+          fail-fast: true 
           steps:
             - step: *runTests
             - step: *runRustTests
-      - parallel:
-          fail-fast: true
-          steps:
             - step: *windowsCrossCompile
             - step: *linuxCrossCompile
             - step: *macOSCrossCompile
@@ -183,8 +118,6 @@ pipelines:
             - mv ./eitri-cli-v2.win32-x64-msvc.node ./eitri-cli-v2/eitri-cli-v2.win32-x64-msvc.node
             - mv ./index.d.ts ./eitri-cli-v2/index.d.ts
             - mv ./rust-index.js ./eitri-cli-v2/index.js
-            - apt-get update
-            - apt-get install -y git
             - echo 'Start release'
             - echo 'If there is a new version, it will be automatically published on NPM according to the channel/branch (beta or master (stable)).'
             - npm i

package/commitlint.config.js

@@ -1,6 +1,23 @@
 module.exports = {
     extends: ['@commitlint/config-conventional'],
     rules: {
-        "body-max-line-length": [0, "always", 10000]
+        "body-max-line-length": [0, "always", 10000],
+        'type-enum': [
+            2,
+            'always',
+            [
+                'build',
+                'chore',
+                'ci',
+                'docs',
+                'feat',
+                'fix',
+                'perf',
+                'refactor',
+                'revert',
+                'style',
+                'test'
+            ]
+        ],
     }
 };

package/docker/Dockerfile-BaseCLI

@@ -0,0 +1,15 @@
+FROM node:18-buster
+
+RUN apt-get update \
+    && apt-get install -y wget \
+    && wget -q https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
+    && apt-get install -y ./google-chrome-stable_current_amd64.deb \
+    && export PUPPETEER_EXECUTABLE_PATH='/usr/bin/google-chrome-stable' \
+    && apt-get install -y libssl-dev \
+    && apt-get install -y pkg-config \
+    && apt-get install -y git \
+    && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
+    && export PATH="/root/.cargo/bin:${PATH}" \
+    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs
+
+ENTRYPOINT ["/bin/bash"]

package/docker/Dockerfile-macos

@@ -0,0 +1,21 @@
+FROM joseluisq/rust-linux-darwin-builder:1.76.0
+
+RUN apt-get update \
+    && apt-get install -y wget \
+    && wget -q https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
+    && apt-get install -y ./google-chrome-stable_current_amd64.deb \
+    && export PUPPETEER_EXECUTABLE_PATH='/usr/bin/google-chrome-stable' \
+    && apt-get install -y libssl-dev \
+    && apt-get install -y libudev-dev \
+    && apt-get install -y pkg-config \
+    && apt-get install -y git \
+    && apt-get install -y gcc-mingw-w64 \
+    && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
+    && export PATH="/root/.cargo/bin:${PATH}" \
+    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs \
+    && rustup update
+
+ENV CC=o64-clang
+ENV CXX=o64-clang++
+
+ENTRYPOINT ["/bin/bash"]

package/docker/build.sh

@@ -0,0 +1,11 @@
+#/bin/bash
+
+# Build base image
+docker build -t eitri-base-cli-pipeline:latest -f Dockerfile-BaseCLI .
+docker tag eitri-base-cli-pipeline:latest 343482176926.dkr.ecr.us-east-1.amazonaws.com/eitri-base-cli-pipeline:latest      
+docker push 343482176926.dkr.ecr.us-east-1.amazonaws.com/eitri-base-cli-pipeline:latest                                                                                                                       ─╯
+
+# Build macos cross compile image
+docker build -t eitri-base-cli-pipeline:macos -f Dockerfile-macos .
+docker tag eitri-base-cli-pipeline:macos 343482176926.dkr.ecr.us-east-1.amazonaws.com/eitri-base-cli-pipeline:macos      
+docker push 343482176926.dkr.ecr.us-east-1.amazonaws.com/eitri-base-cli-pipeline:macos

package/eitri-cli-v2/Cargo.toml

@@ -38,6 +38,9 @@ features = [
     "macro-diagnostics", # Enable better diagnostics for compile-time UUIDs
 ]
 
+[dev-dependencies]
+serial_test = "*"
+
 [target.x86_64-unknown-linux-gnu]
 openssl = { version = "0.9", features = ["vendored"] }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eitri-cli",
-  "version": "1.11.0",
+  "version": "1.12.0-beta.1",
   "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
   "main": "index.js",
   "bin": {

package/src/cmd/create.js

@@ -200,6 +200,7 @@ async function askProjMetadata(clientApplication, cmdObj, projectName) {
                     ...conf,
                     organizationId: clientApplication.organization.id,
                 applicationId: clientApplication.id,
+                "type":"module",
             };
             
             await factory.writeEitriAppConf(templateProject, finalConf);

package/src/cmd/runTests.js

@@ -133,7 +133,7 @@ module.exports = async function runTests(args) {
                 args
             }
         })
-        process.exit(1)
+        process.exit(0)
     } catch (e) {
         debug(`Erro no processo de ${COMMAND_NAME}`, { message: e?.message, error: e })
         TrackingEitriAnalytics.sendEvent({

package/src/service/Workspace.js

@@ -31,6 +31,7 @@ const EitriAppType = require("../model/EitriAppType");
 const chalk = require("chalk");
 const LibsService = require("./LibsService");
 const { LogSuccess } = require("../util/LogUtil");
+const {extractSlug} = require("../util/LibUtil");
 const vegvisirService = new VegvisirService()
 const huginService = new HuginService()
 
@@ -240,6 +241,11 @@ class Workspace {
         const miniConf = this.getMiniConf();
         let libVersionsOutput = "";
         state.libs.forEach((lib) => {
+            let libraryDisplayName = lib.name
+            if(libraryDisplayName === "eitri-luminus"){
+                libraryDisplayName = extractSlug(miniConf[lib.name])
+            }
+
             let version = miniConf[lib.name];
             if (version) {
                 // Captura a versao da lib quando estamos usando uma url
@@ -248,7 +254,7 @@ class Workspace {
                 if (m) {
                     version = m[1];
                 }
-                libVersionsOutput += `      ${lib.name} [${version}]`;
+                libVersionsOutput += `      ${libraryDisplayName} [${version}]`;
             }
         });
         console.log(" ", libVersionsOutput, "\n");