generator-reshow 0.17.72 → 0.17.74

package/generators/docker/templates/_circleci/config.yml

@@ -96,6 +96,7 @@ jobs:
               --platform linux/amd64,linux/arm64/v8 \
               -t $IMAGE_NAME:${BUILD_VERSION} ${LATEST_TAG} \
               ./${BUILD_FOLDER}
+            ./compile.sh updateDockerHubDesc
       - run:
           name: logout 
           command: docker logout

package/generators/docker/templates/compile.sh

@@ -43,6 +43,37 @@ login() {
   fi
 }
 
+getJSONField() {
+  text=$1
+  field=$2
+  echo $text | sed -n 's|.*"'${field}'"\s*:\s*"\([^"]*\)".*|\1|p'
+}
+
+getToken() {
+  RESULT=$(
+    curl -kX POST \
+      -H "Content-Type: application/json" \
+      -d '{"username": "'$DOCKER_LOGIN'", "password": "'$DOCKER_PASSWORD'"}' \
+      https://hub.docker.com/v2/users/login
+  )
+  echo $(getJSONField $RESULT token)
+}
+
+updateDockerHubDesc() {
+  token=$(getToken)
+  if [ -e "README.md" ]; then
+    full_description=$(jq -s -R . README.md)
+  fi
+  data="{\"full_description\": ${full_description:-""} }"
+  RESULT=$(
+    curl -kX PATCH https://hub.docker.com/v2/repositories/${remoteImage} \
+      -H "Content-Type: application/json" \
+      -H "Authorization: JWT $token" \
+      -d "$data"
+  )
+  echo $RESULT
+}
+
 push() {
   login
   PUSH_VERSION=${1:-$VERSION}
@@ -89,7 +120,7 @@ build() {
   if [ 'x' != "x$NO_CACHE" ]; then
     echo nocache: ${NO_CACHE}
   fi
-  docker build ${BUILD_ARG} ${NO_CACHE} -f ${DIR}/${DOCKER_FILE} -t $localImage ${DIR}
+  docker build --progress=plain ${BUILD_ARG} ${NO_CACHE} -f ${DIR}/${DOCKER_FILE} -t $localImage ${DIR}
   list
 }
 
@@ -113,6 +144,9 @@ case "$1" in
   login)
     login
     ;;
+  updateDockerHubDesc)
+    updateDockerHubDesc
+    ;;
   p)
     push $2 $3
     ;;

package/generators/docker/templates/tests/smoke_test.go

@@ -1,7 +1,11 @@
 package test
 
 import (
+	"bytes"
+	"fmt"
+	"os/exec"
 	"testing"
+
 	"github.com/gruntwork-io/terratest/modules/docker"
 	"github.com/stretchr/testify/assert"
 )
@@ -9,8 +13,12 @@ import (
 func TestSmoke(t *testing.T) {
 	// website::tag::1:: Configure the tag to use on the Docker image.
 	tag := "docker-smoke"
+	VERSION, err := exec.Command("../support/VERSION.sh").Output()
+	if err == nil {
+	}
 	buildOptions := &docker.BuildOptions{
-		Tags: []string{tag},
+		Tags:      []string{tag},
+		BuildArgs: []string{fmt.Sprintf("VERSION=%s", bytes.TrimRight(VERSION, "\n"))},
 	}
 
 	// website::tag::2:: Build the Docker image.

package/generators/npm/index.js

@@ -54,7 +54,7 @@ module.exports = class extends YoGenerator {
 
   writing() {
     this.env.options.nodePackageManager = "yarn";
-    const { cp, chMainName, syncJSON } = YoHelper(this);
+    const { cp, chMainName } = YoHelper(this);
     const { isUseBabel, isUseBabelUI } = this.payload || {};
 
     // handle change to new folder

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.17.72",
+  "version": "0.17.74",
   "name": "generator-reshow",
   "repository": {
     "type": "git",

package/generators/library/README.md

@@ -1,9 +0,0 @@
-# `library`
-
-> TODO: description 
-
-## Usage
-
-```
-npx yonpx reshow:library
-```

package/generators/library/__tests__/Test.js

@@ -1,43 +0,0 @@
-/**
- * https://yeoman.io/authoring/testing.html
- * https://gilsondev.gitbooks.io/yeoman-authoring/content/authoring/unit_testing.html
- *
- * https://github.com/yeoman/yeoman-assert/blob/main/index.js
- * https://github.com/yeoman/yeoman-test/blob/main/lib/run-context.js
- */
-
-const { YoTest, assert } = require("yo-unit");
-
-describe("!! library !!", () => {
-  let runResult;
-
-  before(async () => {
-    runResult = await YoTest({
-      source: __dirname + "/../.",
-      params: {
-        isReady: true,
-        description: "foo-desc",
-        keyword: "foo-keyword",
-      },
-    });
-  });
-
-  after(() => {
-    if (runResult) {
-      runResult.restore();
-    }
-  });
-
-  it("should have folder", () => {
-    //    assert.file(["src", "ui"]);
-  });
-
-  it("should have file", () => {
-    //   assert.file(["compile.sh", "index.html"]);
-  });
-
-  it("should have content", () => {
-    //    assert.fileContent('composer.json', 'foo-desc');
-    //    assert.fileContent('.circleci/config.yml', 'foo');
-  });
-});

package/generators/library/index.js

@@ -1,70 +0,0 @@
-const { YoGenerator, YoHelper, commonPrompt } = require("yo-reshow");
-
-/**
- * Library Generator
- */
-
-module.exports = class extends YoGenerator {
-  /**
-   * Run loop (Life cycle)
-   * https://yeoman.io/authoring/running-context.html#the-run-loop
-   *
-   * 1. initializing
-   * 2. prompting
-   * 3. configuring
-   * 4. default
-   * 5. writing
-   * 6. conflicts
-   * 7. install
-   * 8. end
-   */
-
-  /**
-   * Questions.
-   *
-   * https://www.alwaystwisted.com/post.php?s=using-lists-in-a-yeoman-generator
-   * https://github.com/SBoudrias/Inquirer.js
-   */
-  async prompting() {
-    const {
-      handleAnswers,
-      mergePromptOrOption,
-      promptChainLocator,
-      promptChain,
-    } = YoHelper(this);
-
-    const prompts = [
-      ...commonPrompt.mainName(this),
-      ...commonPrompt.desc(this),
-      ...commonPrompt.author(this),
-    ];
-
-    const answers = await mergePromptOrOption(prompts, (nextPrompts) =>
-      promptChain(promptChainLocator(nextPrompts))
-    );
-    handleAnswers(answers);
-  }
-
-  writing() {
-    this.env.options.nodePackageManager = "yarn";
-    const { cp, chMainName } = YoHelper(this);
-
-    // handle change to new folder
-    chMainName(this.mainName);
-
-    // handle copy file
-    cp("README.md", null, this.payload);
-    cp("compile.sh", null, this.payload);
-    cp("package.json", null, this.payload);
-    cp("src", null, this.payload);
-    cp("Test.js", "src/__tests__/Test.js", this.payload);
-    // cp("yarn.lock");
-  }
-
-  end() {
-    if (!this.options.skipInstall) {
-      const { say, onExit } = YoHelper(this);
-      onExit(() => say('Next you could try "npm run build" or "npm run test"'));
-    }
-  }
-};

package/generators/library/templates/README.md

@@ -1,15 +0,0 @@
-# `<%= mainName %>`
-
-> <%= description %> 
-
-## Repositories
-* `GIT`
-   * <%= repositoryHomepage %>
-* `NPM`
-   * https://www.npmjs.com/package/<%= mainName %>
-
-## Usage
-
-```
-
-```

package/generators/library/templates/Test.js

@@ -1,10 +0,0 @@
-import { expect } from "chai";
-
-import YourFunc from "../index";
-
-describe("Test <%= mainName %>", () => {
-  it("basic testt", () => {
-    /*your test code*/
-    YourFunc();
-  });
-});

package/generators/library/templates/compile.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-npm run build

package/generators/library/templates/package.json

@@ -1,36 +0,0 @@
-{
-  "name": "<%= mainName %>",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/react-atomic/react-atomic-organism",
-    "directory": "packages/lib/<%= mainName %>"
-  },
-  "homepage": "https://github.com/react-atomic/react-atomic-organism/tree/main/packages/lib/<%= mainName %>",
-  "description": "<%= description %>",
-  "version": "0.0.0",
-  "main": "./build/cjs/src/index.js",
-  "module": "./build/es/src/index.js",
-  "keywords": [],
-  "author": "<%= authorName %> <<%= authorEmail %>>",
-  "license": "ISC",
-  "dependencies": {
-    "reshow-constant": "*"
-  },
-  "devDependencies": {
-    "@babel/cli": "^7.x",
-    "reshow-unit": "*"
-  },
-  "scripts": {
-    "build:cjs": "BABEL_ENV=cjs babel src -d build/cjs/src --ignore /**/__tests__ --root-mode upward",
-    "build:es": "BABEL_ENV=es babel src -d build/es/src --out-file-extension .mjs --root-mode upward",
-    "build:type": "npx -p typescript tsc src/*.js --declaration --allowJs --emitDeclarationOnly --skipLibCheck --declarationDir types",
-    "build": "npm run clean && npm run build:cjs && npm run build:es && npm run build:type",
-    "mochaFor": "mocha -r global-jsdom/register",
-    "mocha": "npm run mochaFor -- 'build/es/**/__tests__/*.mjs'",
-    "test:report": "npm run build && npm run mochaFor -- --reporter mocha-junit-reporter --reporter-options mochaFile=./test_output/mocha.xml 'build/es/**/__tests__/*.mjs'",
-    "test": "npm run build && npm run mocha",
-    "prepublishOnly": "npm run test"
-  },
-  "types": "./types/index.d.ts",
-  "files": ["types", "build", "package.json", "README.md"]
-}

package/generators/library/templates/src/index.js

@@ -1,3 +0,0 @@
-const YourFunc = (props) => {};
-
-export default YourFunc;