move non-dependency parts of ioctl and correct readme (iotexproject#1806)

Author: Frankonly

.circleci/config.yml

@@ -114,22 +114,22 @@ jobs:
     working_directory: ~/iotex-core
     steps:
       - checkout
-      - run: cd ioctl/ && ./buildcli.sh
+      - run: cd tools/ioctl/ && ./buildcli.sh
       - run: cd tools/actioninjector.v2/ && ./build_injector.sh
-      - run: 
+      - run:
           name: build bin put s3 (unstable) or github (release)
           command: |
             if [ "${VERSION}" ]; then
                 echo "Put bin to github release ${VERSION}"
                 go get -u github.com/tcnksm/ghr
                 arg="-t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} ${VERSION}"
                 echo $arg
-                ghr $arg ioctl/release/
+                ghr $arg tools/ioctl/release/
                 ghr $arg tools/actioninjector.v2/release/
             else
                 sudo apt-get install python python-pip
                 sudo pip install awscli
-                aws s3 sync ioctl/release/ ${S3_BUCKET_DIR}
+                aws s3 sync tools/ioctl/release/ ${S3_BUCKET_DIR}
                 aws s3 sync tools/actioninjector.v2/release/ ${S3_BUCKET_DIR}
             fi
 
@@ -150,7 +150,7 @@ jobs:
       - restore_cache:
           keys:
             - go-mod-v1-{{ checksum "go.sum" }}
-      - run: 
+      - run:
           name: go mod
           command: |
             export PATH=$PATH:/usr/local/go/bin
@@ -166,8 +166,8 @@ jobs:
             export GOPATH=~/go
             export GOROOT="/usr/local/go"
             export PATH=$PATH:$GOPATH/bin:$PATH:$GOROOT/bin
-            cd ioctl/ && ./buildcli.sh
-            cd ../tools/actioninjector.v2/ && ./build_injector.sh
+            cd tools/ioctl/ && ./buildcli.sh
+            cd ../actioninjector.v2/ && ./build_injector.sh
       - run:
           name: build bin put s3 (unstable) or github (release)
           command: |
@@ -176,11 +176,11 @@ jobs:
                 go get -u github.com/tcnksm/ghr
                 arg="-t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} ${VERSION}"
                 echo $arg
-                ghr $arg ioctl/release/
+                ghr $arg tools/ioctl/release/
                 ghr $arg tools/actioninjector.v2/release/
             else
                 sudo pip install awscli
-                aws s3 sync ioctl/release/ ${S3_BUCKET_DIR}
+                aws s3 sync tools/ioctl/release/ ${S3_BUCKET_DIR}
                 aws s3 sync tools/actioninjector.v2/release/ ${S3_BUCKET_DIR}
             fi
 

ioctl/cmd/account/accountexport.go

@@ -30,7 +30,7 @@ var (
 
 // accountExportCmd represents the account export command
 var accountExportCmd = &cobra.Command{
-	Use:   config.TranslateInLang(exportCmdShorts, config.UILanguage),
+	Use:   config.TranslateInLang(exportCmdUses, config.UILanguage),
 	Short: config.TranslateInLang(exportCmdShorts, config.UILanguage),
 	Args:  cobra.ExactArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {

ioctl/cmd/action/actiondeposit.go

@@ -30,7 +30,7 @@ var (
 
 // actionDepositCmd represents the action deposit command
 var actionDepositCmd = &cobra.Command{
-	Use:   config.TranslateInLang(deployCmdUses, config.UILanguage),
+	Use:   config.TranslateInLang(depositCmdUses, config.UILanguage),
 	Short: config.TranslateInLang(depositCmdShorts, config.UILanguage),
 	Args:  cobra.RangeArgs(1, 2),
 	RunE: func(cmd *cobra.Command, args []string) error {

ioctl/cmd/action/stakeadd.go

@@ -28,7 +28,7 @@ var (
 // stakeAddCmd represents the stake add command
 var stakeAddCmd = &cobra.Command{
 	Use:   config.TranslateInLang(addCmdUses, config.UILanguage),
-	Short: config.TranslateInLang(actionCmdShorts, config.UILanguage),
+	Short: config.TranslateInLang(addCmdShorts, config.UILanguage),
 	Args:  cobra.RangeArgs(2, 3),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		cmd.SilenceUsage = true

ioctl/cmd/node/nodedelegate.go

@@ -143,7 +143,7 @@ func (m *nextDelegatesMessage) String() string {
 
 func init() {
 	nodeDelegateCmd.Flags().Uint64VarP(&epochNum, "epoch-num", "e", 0,
-		config.TranslateInLang(flagEndpointUsages, config.UILanguage))
+		config.TranslateInLang(flagEpochNumUsages, config.UILanguage))
 	nodeDelegateCmd.Flags().BoolVarP(&nextEpoch, "next-epoch", "n", false,
 		config.TranslateInLang(flagNextEpochUsages, config.UILanguage))
 	nodeStatus = map[bool]string{true: "active", false: ""}

ioctl/README.md renamed to tools/ioctl/README.md

@@ -46,4 +46,4 @@ ioctl is a command-line interface for interacting with IoTeX blockchain.
 * [ioctl version](readme/ioctl_version.md)	 - Print the version of ioctl and node
 * [ioctl xrc20](readme/ioctl_xrc20.md)	 - Support ERC20 standard command-line from ioctl
 
-###### Auto generated by ioctl on 27-Nov-2019
+###### Auto generated by ioctl on 17-Dec-2019

ioctl/buildcli.sh renamed to tools/ioctl/buildcli.sh

@@ -23,7 +23,7 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
-	ioctlPath = filepath.Join(corePath, "ioctl")
+	ioctlPath = filepath.Join(corePath, "tools", "ioctl")
 
 	preString := `# ioctl
 ioctl is a command-line interface for interacting with IoTeX blockchains.
@@ -62,7 +62,7 @@ specific release so install-cli.sh can download them.
 		return ""
 	}
 
-	path := os.Getenv("GOPATH") + "/src/github.com/iotexproject/iotex-core/ioctl/readme"
+	path := filepath.Join(ioctlPath, "readme")
 	err = GenMarkdownTreeCustom(cmd.RootCmd, path, filePrepender, linkHandler)
 	if err != nil {
 		log.Fatal(err)

ioctl/readme/docgen.go renamed to tools/ioctl/readme/docgen.go

@@ -9,7 +9,7 @@ Manage accounts of IoTeX blockchain
 ### Options
 
 ```
-      --endpoint string   set endpoint for once (default "api.iotex.one:443")
+      --endpoint string   set endpoint for once
   -h, --help              help for account
       --insecure          insecure connection for once
 ```
@@ -38,4 +38,4 @@ Manage accounts of IoTeX blockchain
 * [ioctl account update](ioctl_account_update.md)	 - Update password for IoTeX account
 * [ioctl account verify](ioctl_account_verify.md)	 - Verify IoTeX public key and address by private key
 
-###### Auto generated by ioctl on 27-Nov-2019
+###### Auto generated by ioctl on 17-Dec-2019

ioctl/readme/ioctl_account.md renamed to tools/ioctl/readme/ioctl_account.md

@@ -19,7 +19,7 @@ ioctl account balance [ALIAS|ADDRESS] [flags]
 ### Options inherited from parent commands
 
 ```
-      --endpoint string        set endpoint for once (default "api.iotex.one:443")
+      --endpoint string        set endpoint for once
       --insecure               insecure connection for once
   -o, --output-format string   output format
 ```
@@ -28,4 +28,4 @@ ioctl account balance [ALIAS|ADDRESS] [flags]
 
 * [ioctl account](ioctl_account.md)	 - Manage accounts of IoTeX blockchain
 
-###### Auto generated by ioctl on 27-Nov-2019
+###### Auto generated by ioctl on 17-Dec-2019