Added features command. Closes #25

Author: bhermann

build.sbt

@@ -58,6 +58,9 @@ libraryDependencies += "au.com.bytecode" % "opencsv" % "2.4"
 libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.0" % "test"
 libraryDependencies += "joda-time" % "joda-time" % "2.10.5"
 
+libraryDependencies += "de.upb.cs.swt.delphi" %% "delphi-core" % "0.9.2"
+libraryDependencies += "de.upb.cs.swt.delphi" %% "delphi-client" % "0.9.2"
+
 libraryDependencies ++= Seq(
   "com.softwaremill.sttp" %% "core" % "1.7.2",
   "com.softwaremill.sttp" %% "spray-json" % "1.7.2"

src/main/scala/de/upb/cs/swt/delphi/cli/ConsoleOutput.scala

@@ -17,6 +17,7 @@
 package de.upb.cs.swt.delphi.cli
 
 import de.upb.cs.swt.delphi.cli.artifacts.{RetrieveResult, SearchResult}
+import de.upb.cs.swt.delphi.client.FieldDefinition
 
 class ConsoleOutput(config: Config) {
 
@@ -45,6 +46,7 @@ class ConsoleOutput(config: Config) {
               }
             }
             case retrieveResults : Seq[RetrieveResult] if retrieveResults.head.isInstanceOf[RetrieveResult]  => ResultBeautifier.beautifyRetrieveResults(retrieveResults)
+            case featureResults : Seq[FieldDefinition] if featureResults.head.isInstanceOf[FieldDefinition] => ResultBeautifier.beautifyFeatures(featureResults)
             case _ => value.toString
           }
         }

src/main/scala/de/upb/cs/swt/delphi/cli/DelphiCLI.scala

@@ -50,6 +50,7 @@ object DelphiCLI {
           case "test" => TestCommand.execute
           case "retrieve" => RetrieveCommand.execute
           case "search" => SearchCommand.execute
+          case "features" => FeaturesCommand.execute
           case "" => cliParser.showUsage()
           case x => config.consoleOutput.outputError(s"Unknown command: $x")
         }
@@ -79,6 +80,9 @@ object DelphiCLI {
 
         cmd("test").action((_, c) => c.copy(mode = "test"))
 
+        cmd("features").action((_, c) => c.copy(mode = "features"))
+            .text("Retrieve the current list of features.")
+
         cmd("retrieve").action((s, c) => c.copy(mode = "retrieve"))
           .text("Retrieve a project's description, specified by ID.")
           .children(

src/main/scala/de/upb/cs/swt/delphi/cli/ResultBeautifier.scala

@@ -17,6 +17,7 @@
 package de.upb.cs.swt.delphi.cli
 
 import de.upb.cs.swt.delphi.cli.artifacts.{RetrieveResult, SearchResult}
+import de.upb.cs.swt.delphi.client.FieldDefinition
 import de.vandermeer.asciitable.{AsciiTable, CWC_LongestLine}
 import de.vandermeer.asciithemes.{TA_Grid, TA_GridThemes}
 import de.vandermeer.skb.interfaces.transformers.textformat.TextAlignment
@@ -53,13 +54,13 @@ object ResultBeautifier {
       at.getRenderer.setCWC(new CWC_LongestLine)
       at.setPaddingLeft(1)
       at.setPaddingRight(1)
+
       at.getContext.setFrameTopMargin(1)
       at.getContext.setFrameBottomMargin(1)
       at.getContext().setGridTheme(TA_GridThemes.INSIDE)
 
 
       at.render()
-      //CustomAsciiTable.make(table)
     }
   }
 
@@ -112,4 +113,36 @@ object ResultBeautifier {
 
     }.fold("")(_ + _)
   }
+  def beautifyFeatures(results : Seq[FieldDefinition]) : String = {
+
+    if (results.size == 0) {
+      ""
+    } else {
+      val tableHeader = Seq ("Name", "Description")
+      val tableBody = results.sortBy(f => f.name).map(f => Seq(f.name, f.description))
+      val table = tableBody.+:(tableHeader)
+
+      val at = new AsciiTable()
+
+      at.setTextAlignment(TextAlignment.JUSTIFIED_LEFT)
+      at.getContext().setWidth(80)
+
+      // add header
+      at.addRule()
+      at.addRow(table.head.asJavaCollection)
+      at.addRule()
+
+      // add body
+      table.tail.foreach { row: Iterable[String] =>  at.addRow(row.asJavaCollection) }
+
+      at.setPaddingLeft(1)
+      at.setPaddingRight(1)
+      at.getContext.setFrameTopMargin(1)
+      at.getContext.setFrameBottomMargin(1)
+      //at.getContext().setGridTheme(TA_GridThemes.)
+      at.addRule()
+      at.render()
+    }
+  }
+
 }

src/main/scala/de/upb/cs/swt/delphi/cli/commands/Command.scala

@@ -45,7 +45,7 @@ trait Command {
     val oldPath = serverUrl.path
     val reqUrl = serverUrl.path(oldPath ++ paths).params(parameters)
     val request = sttp.get(reqUrl)
-    config.consoleOutput.outputInformation(s"Sending request ${request.uri}")
+    //config.consoleOutput.outputInformation(s"Sending request ${request.uri}")
     val response = request.send()
     response.body match {
       case Left(value) =>

src/main/scala/de/upb/cs/swt/delphi/cli/commands/FeaturesCommand.scala

@@ -0,0 +1,43 @@
+// Copyright (C) 2020 The Delphi Team.
+// See the LICENCE file distributed with this work for additional
+// information regarding copyright ownership.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package de.upb.cs.swt.delphi.cli.commands
+import com.softwaremill.sttp.{Id, SttpBackend}
+import de.upb.cs.swt.delphi.cli.Config
+import de.upb.cs.swt.delphi.client.FieldDefinition
+import de.upb.cs.swt.delphi.client.FieldDefinitionJson._
+import spray.json._
+
+object FeaturesCommand extends Command {
+  override def execute(implicit config: Config, backend: SttpBackend[Id, Nothing]): Unit = {
+    val result = executeGet(Seq("features"))
+
+    result.map(features => {
+      if (config.raw) {
+        reportResult.apply(features)
+      }
+      if (!config.raw || !config.csv.equals("")) {
+        val featureList = features.parseJson.convertTo[JsArray].elements.map(e => e.convertTo[FieldDefinition])
+        reportResult.apply(featureList)
+
+        if (!config.csv.equals("")) {
+          exportResult.apply(featureList)
+          information.apply("Results written to file '" + config.csv + "'")
+        }
+      }
+    })
+  }
+}