Merge pull request #46 from essentialkaos/develop

Version 2.0.1
essentialkaos · Feb 11, 2019 · e5b0ce2 · e5b0ce2
2 parents 5431684 + 3857c4f
commit e5b0ce2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/cli/cli.go b/cli/cli.go
@@ -29,7 +29,7 @@ import (
 
 const (
 	APP  = "SSLScan Client"
-	VER  = "2.0.0"
+	VER  = "2.0.1"
 	DESC = "Command-line client for the SSL Labs API"
 )
 
@@ -197,6 +197,7 @@ func process(args []string) {
 			checksInfo = append(checksInfo, checkInfo)
 		default:
 			grade = check(host)
+			fmtc.NewLine()
 		}
 
 		switch {
@@ -245,29 +246,25 @@ func check(host string) string {
 		IgnoreMismatch: options.GetB(OPT_IGNORE_MISMATCH),
 	}
 
-	fmtc.Printf("{*}%s{!} → ", host)
-
-	if !options.GetB(OPT_DETAILED) {
-		fmtc.TPrintf("{s}Preparing for tests…{!}")
-	}
+	fmtc.TPrintf("{*}%s{!} → {s}Preparing for tests…{!}", host)
 
 	ap, err := api.Analyze(host, params)
 
 	if err != nil {
-		fmtc.Printf("{r}%v{!}\n", err)
+		fmtc.TPrintf("{*}%s{!} → {r}%v{!}\n", host, err)
 		return "T"
 	}
 
 	for {
 		info, err = ap.Info(false)
 
 		if err != nil {
-			fmtc.TPrintf("{r}%v{!}\n", err)
+			fmtc.TPrintf("{*}%s{!} → {r}%v{!}\n", host, err)
 			return "Err"
 		}
 
 		if info.Status == sslscan.STATUS_ERROR {
-			fmtc.TPrintf("{r}%s{!}\n", info.StatusMessage)
+			fmtc.TPrintf("{*}%s{!} → {r}%s{!}\n", host, info.StatusMessage)
 			return "Err"
 		} else if info.Status == sslscan.STATUS_READY {
 			break
@@ -277,7 +274,7 @@ func check(host string) string {
 			message := getStatusInProgress(info.Endpoints)
 
 			if message != "" {
-				fmtc.TPrintf("{s}%s…{!}", message)
+				fmtc.TPrintf("{*}%s{!} → {s}%s…{!}", host, message)
 			}
 		}
 
@@ -289,9 +286,9 @@ func check(host string) string {
 	}
 
 	if len(info.Endpoints) == 1 {
-		fmtc.TPrintln(getColoredGrade(info.Endpoints[0].Grade))
+		fmtc.TPrintf("{*}%s{!} → "+getColoredGrade(info.Endpoints[0].Grade)+"\n", host)
 	} else {
-		fmtc.TPrintln(getColoredGrades(info.Endpoints))
+		fmtc.TPrintf("{*}%s{!} → "+getColoredGrades(info.Endpoints)+"\n", host)
 	}
 
 	if options.GetB(OPT_DETAILED) {

diff --git a/cli/details.go b/cli/details.go
@@ -76,8 +76,6 @@ func printDetailedInfo(ap *sslscan.AnalyzeProgress) {
 		fmtc.Printf("\n{c*} %s {!*}#%d (%s){!}\n", info.Host, index+1, endpoint.IPAdress)
 		printDetailedEndpointInfo(endpoint, info.Certs)
 	}
-
-	fmtc.NewLine()
 }
 
 // printCertificateInfo prints info about server certificate

diff --git a/common/sslcli.spec b/common/sslcli.spec
@@ -44,7 +44,7 @@
 
 Summary:         Pretty awesome command-line client for public SSLLabs API
 Name:            sslcli
-Version:         2.0.0
+Version:         2.0.1
 Release:         0%{?dist}
 Group:           Applications/System
 License:         EKOL
@@ -92,6 +92,9 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Sat Feb 09 2019 Anton Novojilov <[email protected]> - 2.0.1-0
+- Fixed compatibility with the latest version of ek package
+
 * Tue Jan 29 2019 Anton Novojilov <[email protected]> - 2.0.0-0
 - Improved UI
 - Info about HTTP transactions