Merge pull request #733 from Shopify/andyw8/minor-ux-tweaks

Minor UX tweaks
Shopify · Jul 21, 2020 · 37f3cce · 37f3cce
2 parents 4b3cb01 + 0cf157c
commit 37f3cce
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/cmd/deploy_test.go b/cmd/deploy_test.go
@@ -72,7 +72,7 @@ func TestUploadForSkipFileWhenChecksumsMatch(t *testing.T) {
 	client.On("UpdateAsset", shopify.Asset{Key: "assets/app.js", Checksum: "d41d8cd98f00b204e9800998ecf8427e"}).Return(nil)
 	err := deploy(ctx)
 	assert.Nil(t, err)
-	assert.Contains(t, stdOut.String(), "Skipping config/settings_data.json")
+	assert.Contains(t, stdOut.String(), "Skipped config/settings_data.json")
 	assert.Contains(t, stdOut.String(), "Updated assets/app.js")
 }
 

diff --git a/cmd/download.go b/cmd/download.go
@@ -57,9 +57,9 @@ func download(ctx *cmdutil.Ctx) error {
 			} else if ctx.Flags.Verbose {
 				var checksumOutput = ""
 				if asset.Checksum != "" {
-					checksumOutput = "Remote Checksum: " + requestAsset.Checksum + ", Local Checksum: " + localAsset.Checksum
+					checksumOutput = "Remote: " + requestAsset.Checksum + ", Local: " + localAsset.Checksum
 				} else {
-					checksumOutput = "No Checksum, Local Checksum " + localAsset.Checksum
+					checksumOutput = "Local: " + localAsset.Checksum
 				}
 				ctx.Log.Printf("[%s] Successfully wrote %s to disk (%s)", colors.Green(ctx.Env.Name), colors.Blue(asset.Key), checksumOutput)
 			}

diff --git a/cmd/watch.go b/cmd/watch.go
@@ -85,7 +85,7 @@ func perform(ctx *cmdutil.Ctx, path string, op file.Op) {
 
 		if ctx.Flags.Verbose {
 			checksumOutput := "Checksum: " + localAsset.Checksum
-			ctx.Log.Printf("[%s] Skipping %s (%s)", colors.Green(ctx.Env.Name), colors.Blue(path), checksumOutput)
+			ctx.Log.Printf("[%s] %s %s (%s)", colors.Green(ctx.Env.Name), colors.BrightBlack("Skipped"), colors.Blue(path), checksumOutput)
 		}
 	case file.Remove:
 		if err := ctx.Client.DeleteAsset(shopify.Asset{Key: path}); err != nil {

diff --git a/src/colors/colors.go b/src/colors/colors.go
@@ -20,4 +20,6 @@ var (
 	ColorStdOut = log.New(colorable.NewColorableStdout(), "", 0)
 	// ColorStdErr is a wrapped std err that allows colors
 	ColorStdErr = log.New(colorable.NewColorableStderr(), "", 0)
+	// BrightBlack is the color Black
+	BrightBlack = color.New(color.FgBlack).SprintFunc()
 )