generator-reshow 0.17.5 → 0.17.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/generators/docker/README.md +1 -2
  2. package/generators/docker/index.js +17 -7
  3. package/generators/docker/templates/.env.build +2 -2
  4. package/generators/docker/templates/Dockerfile +2 -0
  5. package/generators/docker/templates/_circleci/config.yml +0 -1
  6. package/generators/docker/templates/bin/test.sh +11 -0
  7. package/generators/docker/templates/build.sh +10 -5
  8. package/generators/npm/__tests__/Test.js +2 -0
  9. package/package.json +1 -1
package/generators/docker/README.md CHANGED
@@ -1,9 +1,8 @@
1
1
  # `docker`
2
2
 
3
- > TODO: description
3
+ > Docker generator
4
4
 
5
5
  ## Usage
6
6
 
7
7
  ```
8
- npx yonpx docker
9
8
  ```
package/generators/docker/index.js CHANGED
@@ -35,7 +35,7 @@ module.exports = class extends YoGenerator {
35
35
 
36
36
  const prompts = [
37
37
  ...commonPrompt.mainName(this),
38
- ...commonPrompt.desc(this, {keyword: false}),
38
+ ...commonPrompt.desc(this, { keyword: false }),
39
39
  ...commonPrompt.repository(this, {
40
40
  defaultRepositoryName: "[REPOSITORY_NAME]",
41
41
  defaultRepositoryOrgName: "[REPOSITORY_ORG_NAME]",
@@ -71,15 +71,24 @@ module.exports = class extends YoGenerator {
71
71
  const answers = await mergePromptOrOption(prompts, (nextPrompts) =>
72
72
  promptChain(promptChainLocator(nextPrompts))
73
73
  );
74
- handleAnswers(answers);
74
+ handleAnswers(answers, (payload) => {
75
+ // add more payload
76
+ payload.folderPrefixGitIgnore = payload.folderPrefix
77
+ ? payload.folderPrefix + "*"
78
+ : "";
79
+ let imgName = payload.mainName;
80
+ if (payload.dockerImageName) {
81
+ imgName = payload.dockerImageName;
82
+ if (payload.dockerOrgName) {
83
+ imgName = `${payload.dockerOrgName}/${payload.dockerImageName}`;
84
+ }
85
+ }
86
+ payload.sourceImage = imgName;
87
+ payload.targetImage = imgName;
88
+ });
75
89
  }
76
90
 
77
91
  writing() {
78
- this.payload.folderPrefixGitIgnore = this.payload.folderPrefix
79
- ? this.payload.folderPrefix + "*"
80
- : "";
81
-
82
- this.env.options.nodePackageManager = "yarn";
83
92
  const { cp, chMainName } = YoHelper(this);
84
93
 
85
94
  // handle change to new folder
@@ -95,5 +104,6 @@ module.exports = class extends YoGenerator {
95
104
  cp("compile.sh", null, this.payload);
96
105
  cp("install-packages.sh", null, this.payload);
97
106
  cp("support", null, this.payload);
107
+ cp("bin", null, this.payload);
98
108
  }
99
109
  };
package/generators/docker/templates/.env.build CHANGED
@@ -1,4 +1,4 @@
1
- sourceImage=<%= mainName %>
2
- targetImage=<%= mainName %>
1
+ sourceImage=<%= sourceImage %>
2
+ targetImage=<%= targetImage %>
3
3
  VERSION=0.0
4
4
  FOLDER_PREFIX=<%= folderPrefix %>
package/generators/docker/templates/Dockerfile CHANGED
@@ -2,6 +2,8 @@ ARG VERSION=${VERSION:-[VERSION]}
2
2
 
3
3
  FROM alpine:3.15
4
4
 
5
+ ARG VERSION
6
+
5
7
  # apk
6
8
  COPY ./install-packages.sh /usr/local/bin/
7
9
  RUN apk update && apk add bash bc \
package/generators/docker/templates/_circleci/config.yml CHANGED
@@ -31,7 +31,6 @@ jobs:
31
31
  - run:
32
32
  name: build Docker image
33
33
  command: |
34
- VERSION=$(support/VERSION.sh)
35
34
  IMAGE_NAME=$(support/targetImage.sh)
36
35
  BUILD_VERSION=<< parameters.docker-tag >>
37
36
  BUILD_FOLDER=<< parameters.folder-prefix >><< parameters.docker-tag >>
package/generators/docker/templates/bin/test.sh ADDED
@@ -0,0 +1,11 @@
1
+ #!/usr/bin/env bash
2
+ DIR="$(
3
+ cd "$(dirname "$0")"
4
+ pwd -P
5
+ )"
6
+ sourceImage=$(${DIR}/../support/sourceImage.sh)
7
+ pid=$$
8
+
9
+ cli='env docker run --rm -it';
10
+ cli+=" --name ${sourceImage}-${pid} ${sourceImage}";
11
+ bash -c "$cli";
package/generators/docker/templates/build.sh CHANGED
@@ -6,17 +6,22 @@ DIR="$(
6
6
  )"
7
7
 
8
8
  FOLDER_PREFIX=$(${DIR}/support/FOLDER_PREFIX.sh)
9
+ BUILD_VERSION=$1
10
+
11
+ if [ -z "$BUILD_VERSION" ]; then
12
+ echo "Not set build version."
13
+ exit 1;
14
+ fi
9
15
 
10
16
  do_build() {
11
- SED_REPLACE_VER=$1
12
- DEST_FOLDER=${DIR}/${FOLDER_PREFIX}${SED_REPLACE_VER}
17
+ DEST_FOLDER=${DIR}/${FOLDER_PREFIX}${BUILD_VERSION}
13
18
  mkdir -p ${DEST_FOLDER}
14
- echo "building --- Version: " $SED_REPLACE_VER "-->"
19
+ echo 'building --- Version: ' $BUILD_VERSION '-->'
15
20
  DEST_FILE=${DEST_FOLDER}/Dockerfile
16
21
  cp Dockerfile ${DEST_FILE}
17
22
  cp install-packages.sh ${DEST_FOLDER}
18
- sed -i -e "s|\[VERSION\]|$SED_REPLACE_VER|g" ${DEST_FILE}
23
+ sed -i -e "s|\[VERSION\]|$BUILD_VERSION|g" ${DEST_FILE}
19
24
  if [ -e "${DEST_FILE}-e" ]; then rm ${DEST_FILE}-e; fi
20
25
  }
21
26
 
22
- do_build $1
27
+ do_build
package/generators/npm/__tests__/Test.js CHANGED
@@ -19,6 +19,8 @@ describe("!! npm !!", () => {
19
19
  appNamee: "foo",
20
20
  description: "foo-desc",
21
21
  keyword: "foo-keyword",
22
+ repositoryName: "foo-repository-name",
23
+ repositoryOrgName: "foo-repository-org-name",
22
24
  },
23
25
  });
24
26
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "generator-reshow",
3
- "version": "0.17.5",
3
+ "version": "0.17.8",
4
4
  "description": "Yeoman generator for reshow. (app, generator, ...etc)",
5
5
  "author": "Hill <hill@kimo.com>",
6
6
  "repository": {