Merge pull request #42 from sourceplusplus/dev

Dev

Author: BFergerson

README.md

@@ -49,55 +49,31 @@ Options:
   -h, --help               Show this message and exit
 
 Commands:
-  admin
-  add-breakpoint
-  add-log
-  add-meter
-  add-span
-  get-breakpoints
-  get-instruments
-  get-logs
-  get-meters
-  get-spans
-  remove-instrument
-  remove-instruments
-  clear-instruments
-  subscribe-events    Listens for and outputs live events. Subscribes to all events by default
-  get-self
-  version
+  admin      Administrator commands
+  developer  Developer commands
+  add        Add live instruments/views
+  get        Get live instruments/views
+  remove     Remove live instruments/views
+  subscribe  Subscribe to live instrument/view streams
+  version    Display version information
 ```
 
 To get information about a sub-command, try `spp-cli <command> --help`:
 
 ```
-Usage: spp-cli admin [OPTIONS] COMMAND [ARGS]...
+Usage: spp-cli add [OPTIONS] COMMAND [ARGS]...
+
+  Add live instruments/views
 
 Options:
   -h, --help  Show this message and exit
 
 Commands:
-  add-role
-  get-developer-roles
-  get-roles
-  remove-role
-  add-developer-role
-  remove-developer-role
-  add-role-permission
-  get-developer-permissions
-  get-role-permissions
-  remove-role-permission
-  add-developer
-  get-developers
-  remove-developer
-  refresh-developer-token
-  add-access-permission
-  add-role-access-permission
-  get-access-permissions
-  get-developer-access-permissions
-  get-role-access-permissions
-  remove-access-permission
-  remove-role-access-permission
-  reset
+  breakpoint  Add a live breakpoint instrument
+  log         Add a live log instrument
+  meter       Add a live meter instrument
+  span        Add a live span instrument
+  view        Add a live view subscription
 ```
 
 # Documentation

build.gradle.kts

@@ -33,7 +33,7 @@ dependencies {
     implementation("com.apollographql.apollo3:apollo-runtime:$apolloVersion")
     api("com.apollographql.apollo3:apollo-api:$apolloVersion")
 
-    implementation("com.github.sourceplusplus.protocol:protocol:2bd4bea9ad")
+    implementation("com.github.sourceplusplus.protocol:protocol:$projectVersion")
 
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")

gradle.properties

@@ -1,7 +1,7 @@
 kotlin.code.style=official
 
 cliGroup=com.sourceplusplus
-projectVersion=0.4.1
+projectVersion=0.4.2
 
 vertxVersion=4.2.4
 graalVersion = 21.3.0

src/main/kotlin/spp/cli/commands/developer/view/AddView.kt

@@ -32,7 +32,7 @@ import spp.cli.protocol.view.adapter.AddLiveViewSubscriptionMutation_ResponseAda
 import spp.cli.util.JsonCleaner
 import kotlin.system.exitProcess
 
-class AddView : CliktCommand(name = "view", help = "Add a live view") {
+class AddView : CliktCommand(name = "view", help = "Add a live view subscription") {
 
     val entityIds by argument(name = "Entity IDs").multiple(required = true)
 

src/main/kotlin/spp/cli/commands/developer/view/RemoveAllViews.kt

@@ -25,7 +25,7 @@ import spp.cli.PlatformCLI.echoError
 import spp.cli.protocol.view.ClearLiveViewSubscriptionsMutation
 import kotlin.system.exitProcess
 
-class RemoveAllViews : CliktCommand(name = "all-views", help = "Remove all live views") {
+class RemoveAllViews : CliktCommand(name = "all-views", help = "Remove all live view subscriptions") {
 
     override fun run() = runBlocking {
         val response = try {