Add message to clarify no updates when none to Dependency Manager (#1536

) * Add message to clarify no updates when none to Dependency Manager * Make emojis conditional based on runtime os * Update internal/util/emoji.go Co-authored-by: Jordan Ribbink <[email protected]> * Fix go error * Add license to file --------- Co-authored-by: Chase Fleming <[email protected]> Co-authored-by: Jordan Ribbink <[email protected]>
onflow · Apr 24, 2024 · b2b91c7 · b2b91c7
1 parent a42acab
commit b2b91c7
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 6 deletions.
diff --git a/internal/dependencymanager/add.go b/internal/dependencymanager/add.go
@@ -20,6 +20,7 @@ package dependencymanager
 
 import (
 	"fmt"
+	"github.com/onflow/flow-cli/internal/util"
 
 	"github.com/spf13/cobra"
 
@@ -62,7 +63,7 @@ func add(
 	flow flowkit.Services,
 	state *flowkit.State,
 ) (result command.Result, err error) {
-	logger.Info(fmt.Sprintf("🔄 Installing dependencies for %s...", args[0]))
+	logger.Info(fmt.Sprintf("%s Installing dependencies for %s...", util.PrintEmoji("🔄"), args[0]))
 
 	dep := args[0]
 

diff --git a/internal/dependencymanager/dependencyinstaller.go b/internal/dependencymanager/dependencyinstaller.go
@@ -53,24 +53,28 @@ type categorizedLogs struct {
 }
 
 func (cl *categorizedLogs) LogAll(logger output.Logger) {
-	logger.Info("📝 Dependency Manager Actions Summary")
+	logger.Info(util.MessageWithEmojiPrefix("📝", "Dependency Manager Actions Summary"))
 	logger.Info("") // Add a line break after the section
 
 	if len(cl.fileSystemActions) > 0 {
 		logger.Info("🗃️  File System Actions:")
 		for _, msg := range cl.fileSystemActions {
-			logger.Info(fmt.Sprintf("✅ %s", msg))
+			logger.Info(util.MessageWithEmojiPrefix("✅", msg))
 		}
 		logger.Info("") // Add a line break after the section
 	}
 
 	if len(cl.stateUpdates) > 0 {
 		logger.Info("💾 State Updates:")
 		for _, msg := range cl.stateUpdates {
-			logger.Info(fmt.Sprintf("✅ %s", msg))
+			logger.Info(util.MessageWithEmojiPrefix("✅", msg))
 		}
 		logger.Info("") // Add a line break after the section
 	}
+
+	if len(cl.fileSystemActions) == 0 && len(cl.stateUpdates) == 0 {
+		logger.Info(util.MessageWithEmojiPrefix("👍", "Zero changes were made. Everything looks good."))
+	}
 }
 
 type dependencyManagerFlagsCollection struct {
@@ -305,7 +309,7 @@ func (di *DependencyInstaller) handleFoundContract(networkName, contractAddr, as
 
 	// If a dependency by this name already exists and its remote source network or address does not match, then give option to stop or continue
 	if dependency != nil && (dependency.Source.NetworkName != networkName || dependency.Source.Address.String() != contractAddr) {
-		di.Logger.Info(fmt.Sprintf("🚫 A dependency named %s already exists with a different remote source. Please fix the conflict and retry.", assignedName))
+		di.Logger.Info(fmt.Sprintf("%s A dependency named %s already exists with a different remote source. Please fix the conflict and retry.", util.PrintEmoji("🚫"), assignedName))
 		os.Exit(0)
 		return nil
 	}

diff --git a/internal/dependencymanager/install.go b/internal/dependencymanager/install.go
@@ -20,6 +20,7 @@ package dependencymanager
 
 import (
 	"fmt"
+	"github.com/onflow/flow-cli/internal/util"
 
 	"github.com/spf13/cobra"
 
@@ -48,7 +49,7 @@ func install(
 	flow flowkit.Services,
 	state *flowkit.State,
 ) (result command.Result, err error) {
-	logger.Info("🔄 Installing dependencies from flow.json...")
+	logger.Info(util.MessageWithEmojiPrefix("🔄", "Installing dependencies from flow.json..."))
 
 	installer, err := NewDependencyInstaller(logger, state, installFlags)
 	if err != nil {

diff --git a/internal/util/emoji.go b/internal/util/emoji.go
@@ -0,0 +1,36 @@
+/*
+ * Flow CLI
+ *
+ * Copyright 2019 Dapper Labs, Inc.
+ *
+ * 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 util
+
+import (
+	"fmt"
+	"runtime"
+)
+
+func PrintEmoji(emoji string) string {
+	if runtime.GOOS == "windows" {
+		return ""
+	}
+
+	return emoji
+}
+
+func MessageWithEmojiPrefix(emoji string, message string) string {
+	return fmt.Sprintf("%s%s", PrintEmoji(emoji+" "), message)
+}