Merge pull request #843 from Lynn14m/genPublish

Publish Caliper benchmark generator
hyperledger-caliper · May 19, 2020 · 2b5ed72 · 2b5ed72
2 parents 756392f + 1a8d395
commit 2b5ed72
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -48,5 +48,4 @@ lerna-debug.log
 data/
 
 # Ignore temp test files
-test/
 temp/
diff --git a/.travis/benchmark-integration-test-direct.sh b/.travis/benchmark-integration-test-direct.sh
@@ -25,7 +25,7 @@ npm i && npm run repoclean -- --yes && npm run bootstrap
 export CALL_METHOD="node ../../caliper-cli/caliper.js"
 # Use explicit binding for
 export BIND_IN_PACKAGE_DIR=true
-export GENERATOR_METHOD="yo ../../../caliper-generator/generator-caliper/generators/benchmark/index.js"
+export GENERATOR_METHOD="yo ../../../generator-caliper/generators/benchmark/index.js"
 
 echo "---- Running Integration test for adaptor ${BENCHMARK}"
 cd ./packages/caliper-tests-integration/

diff --git a/lerna.json b/lerna.json
@@ -15,10 +15,10 @@
         "packages/caliper-cli",
         "packages/caliper-publish",
         "packages/caliper-tests-integration",
-		    "packages/caliper-gui-dashboard",
-		    "packages/caliper-gui-server",
-        "packages/caliper-generator/generator-caliper"
-	],
+        "packages/caliper-gui-dashboard",
+        "packages/caliper-gui-server",
+        "packages/generator-caliper"
+    ],
 	"version": "0.4.0-unstable",
 	"hoist": true
   }
diff --git a/packages/caliper-publish/lib/impl/npm.js b/packages/caliper-publish/lib/impl/npm.js
@@ -26,7 +26,8 @@ const packages = [
     'caliper-iroha',
     'caliper-sawtooth',
     'caliper-fisco-bcos',
-    'caliper-cli'
+    'caliper-cli',
+    'generator-caliper'
 ];
 
 // impl => lib => caliper-publish

diff --git a/...generator/generator-caliper/.editorconfig → packages/generator-caliper/.editorconfig b/...generator/generator-caliper/.editorconfig → packages/generator-caliper/.editorconfig
diff --git a/...generator/generator-caliper/.eslintignore → packages/generator-caliper/.eslintignore b/...generator/generator-caliper/.eslintignore → packages/generator-caliper/.eslintignore
diff --git a/...generator/generator-caliper/.eslintrc.yml → packages/generator-caliper/.eslintrc.yml b/...generator/generator-caliper/.eslintrc.yml → packages/generator-caliper/.eslintrc.yml
diff --git a/...er-generator/generator-caliper/.npmignore → packages/generator-caliper/.npmignore b/...er-generator/generator-caliper/.npmignore → packages/generator-caliper/.npmignore
diff --git a/...r-generator/generator-caliper/.yo-rc.json → packages/generator-caliper/.yo-rc.json b/...r-generator/generator-caliper/.yo-rc.json → packages/generator-caliper/.yo-rc.json
diff --git a/...per-generator/generator-caliper/README.md → packages/generator-caliper/README.md b/...per-generator/generator-caliper/README.md → packages/generator-caliper/README.md
diff --git a/...generator-caliper/generators/app/index.js → ...generator-caliper/generators/app/index.js b/...generator-caliper/generators/app/index.js → ...generator-caliper/generators/app/index.js
diff --git a/...tor-caliper/generators/benchmark/index.js → ...tor-caliper/generators/benchmark/index.js b/...tor-caliper/generators/benchmark/index.js → ...tor-caliper/generators/benchmark/index.js
diff --git a/...enerators/benchmark/templates/callback.js → ...enerators/benchmark/templates/callback.js b/...enerators/benchmark/templates/callback.js → ...enerators/benchmark/templates/callback.js
diff --git a/...enerators/benchmark/templates/config.yaml → ...enerators/benchmark/templates/config.yaml b/...enerators/benchmark/templates/config.yaml → ...enerators/benchmark/templates/config.yaml
diff --git a/...-generator/generator-caliper/package.json → packages/generator-caliper/package.json b/...-generator/generator-caliper/package.json → packages/generator-caliper/package.json
@@ -56,7 +56,7 @@
     ],
     "license-check-and-add-config": {
         "folder": ".",
-        "license": "../../../LICENSE.txt",
+        "license": "../../LICENSE.txt",
         "exact_paths_method": "EXCLUDE",
         "exact_paths": [
             "node_modules",

diff --git a/...erator-caliper/test/benchmark/callback.js → ...erator-caliper/test/benchmark/callback.js b/...erator-caliper/test/benchmark/callback.js → ...erator-caliper/test/benchmark/callback.js
diff --git a/...enerator-caliper/test/benchmark/config.js → ...enerator-caliper/test/benchmark/config.js b/...enerator-caliper/test/benchmark/config.js → ...enerator-caliper/test/benchmark/config.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,5 +48,4 @@ lerna-debug.log @@
     data/
     # Ignore temp test files
-    test/
     temp/