Make the output of diff and push the same when no changes

VMitov · Feb 1, 2017 · cdc430f · cdc430f
1 parent 21f66fd
commit cdc430f
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 13 deletions.
diff --git a/cmd/diff.go b/cmd/diff.go
@@ -69,13 +69,16 @@ func diffRun(tmpl, format, key string, sourcesList []map[string]interface{}, sto
 		return err
 	}
 
-	fmt.Println(strChanges(changes, s, pretty))
+	fmt.Println(strChanges(changes, key, s, pretty))
 	return nil
 }
 
-func strChanges(cs changes, s storage, pretty bool) string {
+func strChanges(cs changes, key string, s storage, pretty bool) string {
 	if cs.Len() == 0 {
-		return fmt.Sprintf("There are no changes")
+		if key != "" {
+			return fmt.Sprintf("No changes for key %v", key)
+		}
+		return fmt.Sprintf("No changes")
 	}
 	return s.Diff(cs, pretty)
 }
diff --git a/cmd/diff_test.go b/cmd/diff_test.go
@@ -13,12 +13,14 @@ func TestDiffRun(t *testing.T) {
 	testCases := []struct {
 		storage string
 		tmpl    string
+		key     string
 		sources []map[string]interface{}
 		output  string
 	}{
 		{
 			`key: oldval`,
 			`key: {{.placeholder}}`,
+			"",
 			[]map[string]interface{}{
 				{
 					"type": "config",
@@ -34,6 +36,7 @@ func TestDiffRun(t *testing.T) {
 		{
 			`key: val`,
 			`key: {{.placeholder}}`,
+			"",
 			[]map[string]interface{}{
 				{
 					"type": "config",
@@ -42,7 +45,37 @@ func TestDiffRun(t *testing.T) {
 					},
 				},
 			},
-			"There are no changes\n",
+			"No changes\n",
+		},
+		{
+			`key: oldval`,
+			`key: {{.placeholder}}`,
+			"key",
+			[]map[string]interface{}{
+				{
+					"type": "config",
+					"vals": map[string]string{
+						"placeholder": "val",
+					},
+				},
+			},
+			"" +
+				"-key: oldval\n" +
+				"+key: val\n",
+		},
+		{
+			`key: val`,
+			`key: {{.placeholder}}`,
+			"key",
+			[]map[string]interface{}{
+				{
+					"type": "config",
+					"vals": map[string]string{
+						"placeholder": "val",
+					},
+				},
+			},
+			"No changes for key key\n",
 		},
 	}
 
@@ -63,7 +96,7 @@ func TestDiffRun(t *testing.T) {
 			defer os.Remove(configf.Name())
 
 			out := caspertest.GetStdout(t, func() {
-				err = diffRun(tmpf.Name(), "yaml", "", tc.sources, "file", map[string]interface{}{"path": configf.Name()}, false)
+				err = diffRun(tmpf.Name(), "yaml", tc.key, tc.sources, "file", map[string]interface{}{"path": configf.Name()}, false)
 				if err != nil {
 					t.Fatal(err)
 				}
@@ -109,7 +142,7 @@ func TestDiff(t *testing.T) {
 					},
 				},
 			},
-			"There are no changes\n",
+			"No changes\n",
 		},
 	}
 

diff --git a/cmd/push.go b/cmd/push.go
@@ -72,14 +72,11 @@ func pushRun(tmpl, format, key string, sourcesList []map[string]interface{}, sto
 		return err
 	}
 
+	fmt.Println(strChanges(changes, key, s, pretty))
 	if changes.Len() == 0 {
-		fmt.Println("No changes")
 		return nil
 	}
 
-	fmt.Println("Changes:")
-	fmt.Println(strChanges(changes, s, pretty))
-
 	if !force {
 		// prompt for agreement
 		fmt.Print("Continue[y/N]: ")

diff --git a/cmd/push_test.go b/cmd/push_test.go
@@ -31,7 +31,6 @@ func TestPushRun(t *testing.T) {
 			},
 			true,
 			"" +
-				"Changes:\n" +
 				"-\n" +
 				"+key: val\n" +
 				"Applying changes...\n",
@@ -49,7 +48,6 @@ func TestPushRun(t *testing.T) {
 			},
 			false,
 			"" +
-				"Changes:\n" +
 				"-\n" +
 				"+key: val\n" +
 				"Continue[y/N]: Canceled\n",
@@ -120,7 +118,6 @@ func TestPush(t *testing.T) {
 				},
 			},
 			"" +
-				"Changes:\n" +
 				"-\n" +
 				"+key: val\n" +
 				"Applying changes...\n",