cleanup code and fix errors

Author: vincetiu8

migration1/after/bug/bug.go

@@ -207,7 +207,7 @@ func read(repo repository.ClockedRepo, identityResolver identity.Resolver, ref s
 		err = json.Unmarshal(data, &opp)
 
 		if err != nil {
-			return nil, errors.Wrap(err, "failed to decode OperationPack json")
+			return nil, err
 		}
 
 		// tag the pack with the commit hash

migration1/after/bug/operation_pack.go

@@ -12,6 +12,8 @@ import (
 const oldFormatVersion = 1
 const newFormatVersion = 2
 
+var ErrInvalidFormatVersion = errors.New("unknown format version")
+
 // OperationPack represent an ordered set of operation to apply
 // to a Bug. These operations are stored in a single Git commit.
 //
@@ -47,7 +49,7 @@ func (opp *OperationPack) UnmarshalJSON(data []byte) error {
 	}
 
 	if aux.Version != oldFormatVersion {
-		return fmt.Errorf("unknown format version %v", aux.Version)
+		return ErrInvalidFormatVersion
 	}
 
 	opp.FormatVersion = aux.Version

migration1/migration1.go

@@ -31,7 +31,11 @@ func (m *Migration1) migrate(repo afterrepo.ClockedRepo) error {
 	// Iterating through all the bugs in the repo
 	for streamedBug := range afterbug.ReadAllLocal(repo) {
 		if streamedBug.Err != nil {
-			fmt.Printf("Got error when reading bug: %q\n", streamedBug.Err)
+			if streamedBug.Err != afterbug.ErrInvalidFormatVersion {
+				fmt.Printf("Got error when reading bug: %q\n", streamedBug.Err)
+			} else {
+				fmt.Printf("skipping bug, already updated")
+			}
 			continue
 		}
 

migration1/migration1_test.go

@@ -71,7 +71,6 @@ func TestMigrate01(t *testing.T) {
 
 	bugs1 := aftertestbug.ReadAllLocal(repo2)
 	bug1 := (<-bugs1).Bug
-	fmt.Printf("%+v", bug1)
 	operations := aftertestbug.NewOperationIterator(bug1)
 	require.Equal(t, true, operations.Next(), "unable to get first operation")
 

root.go

@@ -58,6 +58,7 @@ func runRootCmd(env *Env, migrations []Migration) error {
 			env.err.Printf("Error applying migration: %v\n", err)
 			os.Exit(1)
 		}
+		env.out.Println()
 	}
 	env.out.Println("\nDone!")
 	return nil