Merge pull request #22 from hackmdio/develop

Release 1.1.1

Author: Yukaii

README.md

@@ -18,7 +18,7 @@ $ npm install -g @hackmd/hackmd-cli
 $ hackmd-cli COMMAND
 running command...
 $ hackmd-cli (-v|--version|version)
-@hackmd/hackmd-cli/1.1.0 linux-x64 node-v12.16.2
+@hackmd/hackmd-cli/1.1.1 darwin-x64 node-v12.16.2
 $ hackmd-cli --help [COMMAND]
 USAGE
   $ hackmd-cli COMMAND
@@ -86,6 +86,7 @@ _Don't commit your login credentials!_
 * [`hackmd-cli import [FILE]`](#hackmd-cli-import-file)
 * [`hackmd-cli login`](#hackmd-cli-login)
 * [`hackmd-cli logout`](#hackmd-cli-logout)
+* [`hackmd-cli teams`](#hackmd-cli-teams)
 * [`hackmd-cli whoami`](#hackmd-cli-whoami)
 
 ## `hackmd-cli export [NOTEID] [OUTPUT]`
@@ -106,7 +107,7 @@ EXAMPLE
   $ hackmd-cli export [--pdf|--md|--html] <note_id> <output_file>
 ```
 
-_See code: [src/commands/export.ts](https://github.com/hackmdio/hackmd-cli/blob/v1.1.0/src/commands/export.ts)_
+_See code: [src/commands/export.ts](https://github.com/hackmdio/hackmd-cli/blob/v1.1.1/src/commands/export.ts)_
 
 ## `hackmd-cli help [COMMAND]`
 
@@ -152,7 +153,7 @@ EXAMPLE
   EeNHDGocSTi70ytMMGQaaQ Note2
 ```
 
-_See code: [src/commands/history.ts](https://github.com/hackmdio/hackmd-cli/blob/v1.1.0/src/commands/history.ts)_
+_See code: [src/commands/history.ts](https://github.com/hackmdio/hackmd-cli/blob/v1.1.1/src/commands/history.ts)_
 
 ## `hackmd-cli import [FILE]`
 
@@ -163,19 +164,20 @@ USAGE
   $ hackmd-cli import [FILE]
 
 OPTIONS
-  -h, --help  show CLI help
+  -h, --help       show CLI help
+  -t, --team=team  team to use
 
 EXAMPLE
-  $ hackmd-cli import /path/to/markdown/file.md
+  $ hackmd-cli import /path/to/markdown/file.md --team=xxx
 
-  Your note is available at https://codimd.domain/note-url
+  Your note is available at https://hackmd.io/note-url
 ```
 
-_See code: [src/commands/import.ts](https://github.com/hackmdio/hackmd-cli/blob/v1.1.0/src/commands/import.ts)_
+_See code: [src/commands/import.ts](https://github.com/hackmdio/hackmd-cli/blob/v1.1.1/src/commands/import.ts)_
 
 ## `hackmd-cli login`
 
-Login HackMD instance from CLI
+Login to HackMD/CodiMD server from CLI
 
 ```
 USAGE
@@ -189,13 +191,13 @@ OPTIONS
 EXAMPLE
   $ hackmd-cli login
 
-  Enter your email: hello@codimd.domain
+  Enter your email: hello@hackmd.io
   Enter your password: *******
 
   Login as HMD successfully!
 ```
 
-_See code: [src/commands/login.ts](https://github.com/hackmdio/hackmd-cli/blob/v1.1.0/src/commands/login.ts)_
+_See code: [src/commands/login.ts](https://github.com/hackmdio/hackmd-cli/blob/v1.1.1/src/commands/login.ts)_
 
 ## `hackmd-cli logout`
 
@@ -214,7 +216,36 @@ EXAMPLE
   You've logged out successfully
 ```
 
-_See code: [src/commands/logout.ts](https://github.com/hackmdio/hackmd-cli/blob/v1.1.0/src/commands/logout.ts)_
+_See code: [src/commands/logout.ts](https://github.com/hackmdio/hackmd-cli/blob/v1.1.1/src/commands/logout.ts)_
+
+## `hackmd-cli teams`
+
+HackMD Teams Command
+
+```
+USAGE
+  $ hackmd-cli teams
+
+OPTIONS
+  -h, --help              show CLI help
+  -x, --extended          show extra columns
+  --columns=columns       only show provided columns (comma-separated)
+  --csv                   output is csv format [alias: --output=csv]
+  --filter=filter         filter property by partial string matching, ex: name=foo
+  --no-header             hide table header from output
+  --no-truncate           do not truncate output to fit screen
+  --output=csv|json|yaml  output in a more machine friendly format
+  --sort=sort             property to sort by (prepend '-' for descending)
+
+EXAMPLE
+  $ hackmd-cli teams
+
+  Path            Name
+  team1           Team 1
+  my-awesome-team My Awesome Team
+```
+
+_See code: [src/commands/teams.ts](https://github.com/hackmdio/hackmd-cli/blob/v1.1.1/src/commands/teams.ts)_
 
 ## `hackmd-cli whoami`
 
@@ -233,7 +264,7 @@ EXAMPLE
   You are logged in hackmd.io as {YOUR NAME} [user-id]
 ```
 
-_See code: [src/commands/whoami.ts](https://github.com/hackmdio/hackmd-cli/blob/v1.1.0/src/commands/whoami.ts)_
+_See code: [src/commands/whoami.ts](https://github.com/hackmdio/hackmd-cli/blob/v1.1.1/src/commands/whoami.ts)_
 <!-- commandsstop -->
 
 ## `hackmd-cli` piping mode

oclif.manifest.json

@@ -1,13 +1,13 @@
 {
   "name": "@hackmd/hackmd-cli",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "author": "HackMD Team",
   "bin": {
     "hackmd-cli": "./bin/run"
   },
   "bugs": "https://github.com/hackmdio/hackmd-cli/issues",
   "dependencies": {
-    "@hackmd/api": "^1.1.0",
+    "@hackmd/api": "1.1.1",
     "@oclif/command": "^1.5.19",
     "@oclif/config": "^1.13.3",
     "@oclif/plugin-help": "^2.2.3",

package-lock.json

@@ -8,7 +8,7 @@ export default class Import extends Command {
   static description = 'Create a note from markdown file'
 
   static examples = [
-    `$ hackmd-cli import /path/to/markdown/file.md
+    `$ hackmd-cli import /path/to/markdown/file.md --team=xxx
 
 Your note is available at https://hackmd.io/note-url
 `,
@@ -20,14 +20,24 @@ Your note is available at https://hackmd.io/note-url
 
   static flags = {
     help: flags.help({char: 'h'}),
+    team: flags.string({
+      char: 't',
+      default: '',
+      description: 'team to use',
+      required: false
+    })
   }
 
   async run() {
-    const {args} = this.parse(Import)
+    const {args, flags} = this.parse(Import)
+
+    if (!args.file) {
+      return this.log('No file path specified.')
+    }
 
     const content = fs.readFileSync(path.resolve(process.cwd(), args.file), 'utf-8')
     try {
-      const url = await APIClient.newNote(content)
+      const url = await APIClient.newNote(content, {team: flags.team})
       this.log(`Your note is available at ${url}`)
     } catch (err) {
       this.error(err)

package.json

@@ -63,13 +63,14 @@ Login as HMD successfully!
     }
 
     try {
-      let success = false
       if (flags.ldap) {
-        success = await APIClient.loginLdap(id, password)
+        await APIClient.loginLdap(id, password)
       } else {
-        success = await APIClient.login(id, password)
+        await APIClient.login(id, password)
       }
-      if (success) {
+
+      const login = await APIClient.isLogin()
+      if (login) {
         return this.log('Login successfully')
       } else {
         this.log('Login failed, please ensure your credentials are set')

src/commands/import.ts

@@ -0,0 +1,44 @@
+import {Command, flags} from '@oclif/command'
+import cli from 'cli-ux'
+
+import {APIClient} from '../api'
+
+export default class Teams extends Command {
+  static description = 'HackMD Teams Command'
+
+  static examples = [
+    `$ hackmd-cli teams
+
+Path            Name
+team1           Team 1
+my-awesome-team My Awesome Team`,
+  ]
+
+  static flags = {
+    help: flags.help({char: 'h'}),
+    ...cli.table.flags()
+  }
+
+  async run() {
+    if (!APIClient.enterprise) {
+      return this.log('Teams command only works on HackMD EE instance')
+    }
+
+    try {
+      const teams = await APIClient.getTeams()
+
+      cli.table(teams, {
+        path: {
+          header: 'Path',
+        },
+        name: {}
+      }, {
+        printLine: this.log,
+        ...flags
+      })
+    } catch (err) {
+      this.log('Fetch teams failed')
+      this.error(err)
+    }
+  }
+}