From 90770eaafb8bfccf76044f5e1fe758f2836a12eb Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Fri, 14 Jun 2019 20:21:58 +0100
Subject: [PATCH] [cli] Remove verbosity flag (#63)

---
 CHANGELOG.org                                             | 4 ++++
 README.org                                                | 1 -
 cli/src/main/scala/net/kemitix/s3thorp/cli/Main.scala     | 2 +-
 .../main/scala/net/kemitix/s3thorp/cli/ParseArgs.scala    | 8 +-------
 .../main/scala/net/kemitix/s3thorp/cli/PrintLogger.scala  | 2 +-
 cli/src/main/scala/net/kemitix/s3thorp/cli/Program.scala  | 2 +-
 .../main/scala/net/kemitix/s3thorp/domain/Config.scala    | 1 -
 7 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index 268836f..ca449fd 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -15,6 +15,10 @@ The format is based on [[https://keepachangelog.com/en/1.0.0/][Keep a Changelog]
 
    - Suppress Transfer event messages
 
+** Removed
+
+   - ~-v~ verbosity flag
+
 * [0.4.0] - 2019-06-11
 
 ** Added
diff --git a/README.org b/README.org
index f2dcb46..cc31d7a 100644
--- a/README.org
+++ b/README.org
@@ -22,7 +22,6 @@ hash of the file contents.
       -i, --include <value> Include matching paths
       -x, --exclude <value> Exclude matching paths
       -d, --debug           Enable debug logging
-      -v, --verbose <value> Verbosity level (1-5)
   #+end_example
 
 The ~--include~ and ~--exclude~ parameters can be used more than once.
diff --git a/cli/src/main/scala/net/kemitix/s3thorp/cli/Main.scala b/cli/src/main/scala/net/kemitix/s3thorp/cli/Main.scala
index 31a487f..3c300b8 100644
--- a/cli/src/main/scala/net/kemitix/s3thorp/cli/Main.scala
+++ b/cli/src/main/scala/net/kemitix/s3thorp/cli/Main.scala
@@ -12,7 +12,7 @@ object Main extends IOApp {
     Config(source = Paths.get(".").toFile)
 
   override def run(args: List[String]): IO[ExitCode] = {
-    val exitCaseLogger = new PrintLogger[IO](1, false)
+    val exitCaseLogger = new PrintLogger[IO](false)
     ParseArgs(args, defaultConfig)
       .map(Program[IO])
       .getOrElse(IO(ExitCode.Error))
diff --git a/cli/src/main/scala/net/kemitix/s3thorp/cli/ParseArgs.scala b/cli/src/main/scala/net/kemitix/s3thorp/cli/ParseArgs.scala
index b3405bb..f64a4e8 100644
--- a/cli/src/main/scala/net/kemitix/s3thorp/cli/ParseArgs.scala
+++ b/cli/src/main/scala/net/kemitix/s3thorp/cli/ParseArgs.scala
@@ -37,13 +37,7 @@ object ParseArgs {
         .text("Exclude matching paths"),
       opt[Unit]('d', "debug")
         .action((_, c) => c.copy(debug = true))
-        .text("Enable debug logging"),
-      opt[Int]('v', "verbose")
-        .validate(i =>
-          if (i >= 1 && i <= 5) Right(Unit)
-          else Left("Verbosity level must be between 1 and 5"))
-        .action((i, c) => c.copy(verbose = i))
-        .text("Verbosity level (1-5)")
+        .text("Enable debug logging")
     )
   }
 
diff --git a/cli/src/main/scala/net/kemitix/s3thorp/cli/PrintLogger.scala b/cli/src/main/scala/net/kemitix/s3thorp/cli/PrintLogger.scala
index 7d229c2..49179ba 100644
--- a/cli/src/main/scala/net/kemitix/s3thorp/cli/PrintLogger.scala
+++ b/cli/src/main/scala/net/kemitix/s3thorp/cli/PrintLogger.scala
@@ -3,7 +3,7 @@ package net.kemitix.s3thorp.cli
 import cats.Monad
 import net.kemitix.s3thorp.domain.Logger
 
-class PrintLogger[M[_]: Monad](verbosity: Int, isDebug: Boolean) extends Logger[M] {
+class PrintLogger[M[_]: Monad](isDebug: Boolean) extends Logger[M] {
 
   override def debug(message: => String): M[Unit] =
     if (isDebug) Monad[M].pure(println(s"[ DEBUG] $message"))
diff --git a/cli/src/main/scala/net/kemitix/s3thorp/cli/Program.scala b/cli/src/main/scala/net/kemitix/s3thorp/cli/Program.scala
index b5bf248..871bf84 100644
--- a/cli/src/main/scala/net/kemitix/s3thorp/cli/Program.scala
+++ b/cli/src/main/scala/net/kemitix/s3thorp/cli/Program.scala
@@ -10,7 +10,7 @@ import net.kemitix.s3thorp.domain.{Config, Logger}
 object Program {
 
   def apply[M[_]: Monad](config: Config): M[ExitCode] = {
-    implicit val logger: Logger[M] = new PrintLogger[M](config.verbose, config.debug)
+    implicit val logger: Logger[M] = new PrintLogger[M](config.debug)
     for {
       _ <- logger.info("S3Thorp - hashed sync for s3")
       _ <- Sync.run[M](config, S3ClientBuilder.defaultClient)
diff --git a/domain/src/main/scala/net/kemitix/s3thorp/domain/Config.scala b/domain/src/main/scala/net/kemitix/s3thorp/domain/Config.scala
index 3a86e4d..81ef071 100644
--- a/domain/src/main/scala/net/kemitix/s3thorp/domain/Config.scala
+++ b/domain/src/main/scala/net/kemitix/s3thorp/domain/Config.scala
@@ -5,7 +5,6 @@ import java.io.File
 final case class Config(
                          bucket: Bucket = Bucket(""),
                          prefix: RemoteKey = RemoteKey(""),
-                         verbose: Int = 1,
                          filters: List[Filter] = List(),
                          multiPartThreshold: Long = 1024 * 1024 * 5,
                          maxRetries: Int = 3,