decompose gitversioncontext

distantcam · distantcam · commit 3293a6638a9f · 2014-06-10T12:06:38.000+08:00
diff --git a/AcceptanceTests/RepositoryFixtureBase.cs b/AcceptanceTests/RepositoryFixtureBase.cs
@@ -26,11 +26,7 @@ public ExecutionResults ExecuteGitVersion(bool inProcess = true)
             }
 
             var vf = new GitVersionFinder();
-            var sv = vf.FindVersion(new GitVersionContext
-            {
-                Repository = Repository,
-                CurrentBranch = Repository.Head
-            });
+            var sv = vf.FindVersion(new GitVersionContext(Repository));
 
             var vars = VariableProvider.GetVariablesFor(sv);
 
@@ -51,4 +47,4 @@ public void Dispose()
             }
         }
     }
-}
+}
diff --git a/GitVersionCore/GitVersionContext.cs b/GitVersionCore/GitVersionContext.cs
@@ -7,8 +7,18 @@
     /// </summary>
     public class GitVersionContext
     {
-        public IRepository Repository;
-        public Branch CurrentBranch;
-    }
+        public GitVersionContext(IRepository repository)
+            : this(repository, repository.Head)
+        {
+        }
+
+        public GitVersionContext(IRepository repository, Branch currentBranch)
+        {
+            Repository = repository;
+            CurrentBranch = currentBranch;
+        }
 
+        public IRepository Repository { get; private set; }
+        public Branch CurrentBranch { get; private set; }
+    }
 }
diff --git a/GitVersionCore/VersionCache.cs b/GitVersionCore/VersionCache.cs
@@ -53,11 +53,7 @@ public static SemanticVersion GetVersion(string gitDirectory)
         static SemanticVersion GetSemanticVersion(Repository repository)
         {
             var versionForRepositoryFinder = new GitVersionFinder();
-            var gitVersionContext = new GitVersionContext
-            {
-                CurrentBranch = repository.Head,
-                Repository = repository
-            };
+            var gitVersionContext = new GitVersionContext(repository);
             Logger.WriteInfo("Running against branch: " + gitVersionContext.CurrentBranch.Name);
             return versionForRepositoryFinder.FindVersion(gitVersionContext);
         }
diff --git a/Tests/BranchFinders/DevelopTests.cs b/Tests/BranchFinders/DevelopTests.cs
@@ -20,11 +20,9 @@ public void Commit_on_develop_and_previous_commit_on_master_is_a_hotfix()
         {
             commitOnDevelop
         };
-        var version = finder.FindVersion(new GitVersionContext
+        var repository = new MockRepository
         {
-            Repository = new MockRepository
-            {
-                Branches = new MockBranchCollection
+            Branches = new MockBranchCollection
                 {
                     new MockBranch("master")
                     {
@@ -36,12 +34,10 @@ public void Commit_on_develop_and_previous_commit_on_master_is_a_hotfix()
                     },
                     mockBranch
                 },
-            },
-            CurrentBranch = mockBranch
-        });
+        };
+        var version = finder.FindVersion(new GitVersionContext(repository, mockBranch));
         Assert.AreEqual(2, version.Minor, "Minor should be master.Minor+1");
         ObjectApprover.VerifyWithJson(version, Scrubbers.GuidAndDateScrubber);
-
     }
 
     [Test]
@@ -61,33 +57,29 @@ public void Commit_on_develop_and_previous_commit_on_master_has_a_tag()
         {
             commitOnDevelop
         };
-        var context = new GitVersionContext
+        var repository = new MockRepository
         {
-            Repository = new MockRepository
-            {
-                Branches = new MockBranchCollection
+            Branches = new MockBranchCollection
                 {
                     new MockBranch("master")
                     {
                         commitOnMaster
                     },
                     develop
                 },
-                Tags = new MockTagCollection
+            Tags = new MockTagCollection
                 {
                     new MockTag
                     {
                         TargetEx = commitOnMaster,
                         NameEx = "0.1.0"
                     }
                 }
-            },
-            CurrentBranch = develop
         };
+        var context = new GitVersionContext(repository, develop);
 
         var version = finder.FindVersion(context);
         Assert.AreEqual(2, version.Minor, "Minor should be master.Minor+1");
         ObjectApprover.VerifyWithJson(version, Scrubbers.GuidAndDateScrubber);
     }
-
 }
diff --git a/Tests/BranchFinders/FeatureBranchTests.cs b/Tests/BranchFinders/FeatureBranchTests.cs
@@ -20,11 +20,7 @@ public void Feature_branch_with_no_commit()
 
             var finder = new FeatureVersionFinder();
 
-            var version = finder.FindVersion(new GitVersionContext
-            {
-                Repository = repo,
-                CurrentBranch = featureBranch
-            });
+            var version = finder.FindVersion(new GitVersionContext(repo, featureBranch));
 
             var masterVersion = FindersHelper.RetrieveMasterVersion(repo);
 
@@ -49,11 +45,7 @@ public void Feature_branch_with_1_commit()
 
             var finder = new FeatureVersionFinder();
 
-            var version = finder.FindVersion(new GitVersionContext
-            {
-                Repository = repo,
-                CurrentBranch = featureBranch
-            });
+            var version = finder.FindVersion(new GitVersionContext(repo, featureBranch));
 
             var masterVersion = FindersHelper.RetrieveMasterVersion(repo);
 
@@ -81,11 +73,7 @@ public void Feature_branch_with_2_commits()
 
             var finder = new FeatureVersionFinder();
 
-            var version = finder.FindVersion(new GitVersionContext
-            {
-                Repository = repo,
-                CurrentBranch = featureBranch
-            });
+            var version = finder.FindVersion(new GitVersionContext(repo, featureBranch));
 
             var masterVersion = FindersHelper.RetrieveMasterVersion(repo);
 
@@ -112,11 +100,7 @@ public void Feature_branch_with_2_commits_but_building_an_commit()
 
             var finder = new FeatureVersionFinder();
 
-            var version = finder.FindVersion(new GitVersionContext
-            {
-                Repository = repo,
-                CurrentBranch = featureBranch,
-            });
+            var version = finder.FindVersion(new GitVersionContext(repo, featureBranch));
 
             var masterVersion = FindersHelper.RetrieveMasterVersion(repo);
 
@@ -125,4 +109,4 @@ public void Feature_branch_with_2_commits_but_building_an_commit()
             ObjectApprover.VerifyWithJson(version, Scrubbers.GuidAndDateScrubber);
         }
     }
-}
+}
diff --git a/Tests/BranchFinders/PullBranchTests.cs b/Tests/BranchFinders/PullBranchTests.cs
@@ -6,14 +6,11 @@
 [TestFixture]
 public class PullBranchTests : Lg2sHelperBase
 {
-
     [Test, Ignore("Not valid since Github wont allow empty pulls")]
     public void Pull_request_with_no_commit()
     {
-
     }
 
-
     [Test]
     public void Invalid_pull_branch_name()
     {
@@ -38,11 +35,7 @@ void AssertInvalidPullBranchName(string invalidFakePullBranchName)
 
             var finder = new PullVersionFinder();
 
-            Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext
-            {
-                Repository = repo,
-                CurrentBranch = pullBranch,
-            }));
+            Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext(repo, pullBranch)));
         }
     }
 
@@ -61,11 +54,7 @@ public void Pull_branch_with_1_commit()
 
             var finder = new PullVersionFinder();
 
-            var version = finder.FindVersion(new GitVersionContext
-            {
-                Repository = repo,
-                CurrentBranch = pullBranch,
-            });
+            var version = finder.FindVersion(new GitVersionContext(repo, pullBranch));
 
             var masterVersion = FindersHelper.RetrieveMasterVersion(repo);
 
@@ -91,11 +80,7 @@ public void Pull_branch_with_2_commits()
 
             var finder = new PullVersionFinder();
 
-            var version = finder.FindVersion(new GitVersionContext
-            {
-                Repository = repo,
-                CurrentBranch = pullBranch,
-            });
+            var version = finder.FindVersion(new GitVersionContext(repo, pullBranch));
 
             var masterVersion = FindersHelper.RetrieveMasterVersion(repo);
 
@@ -104,4 +89,4 @@ public void Pull_branch_with_2_commits()
             ObjectApprover.VerifyWithJson(version, Scrubbers.GuidAndDateScrubber);
         }
     }
-}
+}
diff --git a/Tests/BranchFinders/ReleaseTests.cs b/Tests/BranchFinders/ReleaseTests.cs
@@ -18,11 +18,7 @@ public void EnsureAReleaseBranchNameDoesNotExposeAPatchSegment()
 
             var finder = new ReleaseVersionFinder();
 
-            Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext
-            {
-                Repository = repo,
-                CurrentBranch = releaseBranch,
-            }));
+            Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext(repo, releaseBranch)));
         }
     }
 
@@ -39,13 +35,10 @@ public void EnsureAReleaseBranchNameDoesNotExposeAStability()
 
             var finder = new ReleaseVersionFinder();
 
-            Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext
-            {
-                Repository = repo,
-                CurrentBranch = releaseBranch,
-            }));
+            Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext(repo, releaseBranch)));
         }
     }
+
     //TODO:
     //[Test]
     //[ExpectedException]
@@ -60,5 +53,4 @@ public void After_merge_to_master()
         //TODO
         //Assert.Throws<Exception>(() => FinderWrapper.FindVersionForCommit("TODO", "release-0.5.0"));
     }
-
 }
diff --git a/Tests/GitFlow/GitFlowVersionFinderTests.cs b/Tests/GitFlow/GitFlowVersionFinderTests.cs
@@ -1,7 +1,7 @@
-﻿using GitVersion;
+﻿using System.IO;
+using GitVersion;
 using LibGit2Sharp;
 using NUnit.Framework;
-using System.IO;
 using ObjectApproval;
 
 [TestFixture]
@@ -19,11 +19,7 @@ public void RequiresALocalMasterBranch()
 
             var finder = new GitVersionFinder();
 
-            Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext
-            {
-                Repository = repo,
-                CurrentBranch = repo.Head,
-            }));
+            Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext(repo)));
         }
     }
 
@@ -39,11 +35,7 @@ public void RequiresALocalDevelopBranch()
 
             var finder = new GitVersionFinder();
 
-            Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext
-            {
-                Repository = repo,
-                CurrentBranch = repo.Head,
-            }));
+            Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext(repo)));
         }
     }
 
@@ -64,11 +56,7 @@ public void AFeatureBranchIsRequiredToBranchOffOfDevelopBranch()
 
             var finder = new GitVersionFinder();
 
-            Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext
-            {
-                Repository = repo,
-                CurrentBranch = feature,
-            }));
+            Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext(repo, feature)));
         }
     }
 
@@ -89,11 +77,7 @@ public void AHotfixBranchIsRequiredToBranchOffOfMasterBranch()
 
             var finder = new GitVersionFinder();
 
-            Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext
-            {
-                Repository = repo,
-                CurrentBranch = feature,
-            }));
+            Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext(repo, feature)));
         }
     }
 
@@ -114,11 +98,7 @@ public void APullRequestBranchIsRequiredToBranchOffOfDevelopBranch()
 
             var finder = new GitVersionFinder();
 
-            Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext
-            {
-                Repository = repo,
-                CurrentBranch = pull,
-            }));
+            Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext(repo, pull)));
         }
     }
 
@@ -137,11 +117,7 @@ public void AFeatureBranchDoesNotRequireASpecificPrefix()
 
             var finder = new GitVersionFinder();
 
-            var versionAndBranch = finder.FindVersion(new GitVersionContext
-            {
-                Repository = repo,
-                CurrentBranch = repo.Head,
-            });
+            var versionAndBranch = finder.FindVersion(new GitVersionContext(repo));
 
             ObjectApprover.VerifyWithJson(versionAndBranch, Scrubbers.GuidAndDateScrubber);
         }
@@ -162,11 +138,7 @@ public void AFeatureBranchPrefixIsNotIncludedInTag()
 
             var finder = new GitVersionFinder();
 
-            var versionAndBranch = finder.FindVersion(new GitVersionContext
-            {
-                Repository = repo,
-                CurrentBranch = repo.Head,
-            });
+            var versionAndBranch = finder.FindVersion(new GitVersionContext(repo));
 
             ObjectApprover.VerifyWithJson(versionAndBranch, Scrubbers.GuidAndDateScrubber);
         }
@@ -194,11 +166,7 @@ public void AReleaseBranchIsRequiredToBranchOffOfDevelopBranch()
 
             var finder = new GitVersionFinder();
 
-            Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext
-            {
-                Repository = repo,
-                CurrentBranch = feature,
-            }));
+            Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext(repo, feature)));
         }
     }
-}
+}
diff --git a/Tests/GitHelperTests.cs b/Tests/GitHelperTests.cs
diff --git a/Tests/GitHubFlow/MergedBranchesWithVersionFinderTests.cs b/Tests/GitHubFlow/MergedBranchesWithVersionFinderTests.cs
diff --git a/Tests/IntegrationTests.cs b/Tests/IntegrationTests.cs
diff --git a/Tests/VersionOnMasterFinderTests.cs b/Tests/VersionOnMasterFinderTests.cs

Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,7 @@ public ExecutionResults ExecuteGitVersion(bool inProcess = true)`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`var vf = new GitVersionFinder();`
`29`		`- var sv = vf.FindVersion(new GitVersionContext`
`30`		`- {`
`31`		`- Repository = Repository,`
`32`		`- CurrentBranch = Repository.Head`
`33`		`- });`
	`29`	`+ var sv = vf.FindVersion(new GitVersionContext(Repository));`
`34`	`30`
`35`	`31`	`var vars = VariableProvider.GetVariablesFor(sv);`
`36`	`32`
`@@ -51,4 +47,4 @@ public void Dispose()`
`51`	`47`	`}`
`52`	`48`	`}`
`53`	`49`	`}`
`54`		`-}`
	`50`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -53,11 +53,7 @@ public static SemanticVersion GetVersion(string gitDirectory)`
`53`	`53`	`static SemanticVersion GetSemanticVersion(Repository repository)`
`54`	`54`	`{`
`55`	`55`	`var versionForRepositoryFinder = new GitVersionFinder();`
`56`		`- var gitVersionContext = new GitVersionContext`
`57`		`- {`
`58`		`- CurrentBranch = repository.Head,`
`59`		`- Repository = repository`
`60`		`- };`
	`56`	`+ var gitVersionContext = new GitVersionContext(repository);`
`61`	`57`	`Logger.WriteInfo("Running against branch: " + gitVersionContext.CurrentBranch.Name);`
`62`	`58`	`return versionForRepositoryFinder.FindVersion(gitVersionContext);`
`63`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,9 @@ public void Commit_on_develop_and_previous_commit_on_master_is_a_hotfix()`
`20`	`20`	`{`
`21`	`21`	`commitOnDevelop`
`22`	`22`	`};`
`23`		`- var version = finder.FindVersion(new GitVersionContext`
	`23`	`+ var repository = new MockRepository`
`24`	`24`	`{`
`25`		`- Repository = new MockRepository`
`26`		`- {`
`27`		`- Branches = new MockBranchCollection`
	`25`	`+ Branches = new MockBranchCollection`
`28`	`26`	`{`
`29`	`27`	`new MockBranch("master")`
`30`	`28`	`{`
`@@ -36,12 +34,10 @@ public void Commit_on_develop_and_previous_commit_on_master_is_a_hotfix()`
`36`	`34`	`},`
`37`	`35`	`mockBranch`
`38`	`36`	`},`
`39`		`- },`
`40`		`- CurrentBranch = mockBranch`
`41`		`- });`
	`37`	`+ };`
	`38`	`+ var version = finder.FindVersion(new GitVersionContext(repository, mockBranch));`
`42`	`39`	`Assert.AreEqual(2, version.Minor, "Minor should be master.Minor+1");`
`43`	`40`	`ObjectApprover.VerifyWithJson(version, Scrubbers.GuidAndDateScrubber);`
`44`		`-`
`45`	`41`	`}`
`46`	`42`
`47`	`43`	`[Test]`
`@@ -61,33 +57,29 @@ public void Commit_on_develop_and_previous_commit_on_master_has_a_tag()`
`61`	`57`	`{`
`62`	`58`	`commitOnDevelop`
`63`	`59`	`};`
`64`		`- var context = new GitVersionContext`
	`60`	`+ var repository = new MockRepository`
`65`	`61`	`{`
`66`		`- Repository = new MockRepository`
`67`		`- {`
`68`		`- Branches = new MockBranchCollection`
	`62`	`+ Branches = new MockBranchCollection`
`69`	`63`	`{`
`70`	`64`	`new MockBranch("master")`
`71`	`65`	`{`
`72`	`66`	`commitOnMaster`
`73`	`67`	`},`
`74`	`68`	`develop`
`75`	`69`	`},`
`76`		`- Tags = new MockTagCollection`
	`70`	`+ Tags = new MockTagCollection`
`77`	`71`	`{`
`78`	`72`	`new MockTag`
`79`	`73`	`{`
`80`	`74`	`TargetEx = commitOnMaster,`
`81`	`75`	`NameEx = "0.1.0"`
`82`	`76`	`}`
`83`	`77`	`}`
`84`		`- },`
`85`		`- CurrentBranch = develop`
`86`	`78`	`};`
	`79`	`+ var context = new GitVersionContext(repository, develop);`
`87`	`80`
`88`	`81`	`var version = finder.FindVersion(context);`
`89`	`82`	`Assert.AreEqual(2, version.Minor, "Minor should be master.Minor+1");`
`90`	`83`	`ObjectApprover.VerifyWithJson(version, Scrubbers.GuidAndDateScrubber);`
`91`	`84`	`}`
`92`		`-`
`93`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,11 @@`
`6`	`6`	`[TestFixture]`
`7`	`7`	`public class PullBranchTests : Lg2sHelperBase`
`8`	`8`	`{`
`9`		`-`
`10`	`9`	`[Test, Ignore("Not valid since Github wont allow empty pulls")]`
`11`	`10`	`public void Pull_request_with_no_commit()`
`12`	`11`	`{`
`13`		`-`
`14`	`12`	`}`
`15`	`13`
`16`		`-`
`17`	`14`	`[Test]`
`18`	`15`	`public void Invalid_pull_branch_name()`
`19`	`16`	`{`
`@@ -38,11 +35,7 @@ void AssertInvalidPullBranchName(string invalidFakePullBranchName)`
`38`	`35`
`39`	`36`	`var finder = new PullVersionFinder();`
`40`	`37`
`41`		`- Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext`
`42`		`- {`
`43`		`- Repository = repo,`
`44`		`- CurrentBranch = pullBranch,`
`45`		`- }));`
	`38`	`+ Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext(repo, pullBranch)));`
`46`	`39`	`}`
`47`	`40`	`}`
`48`	`41`
`@@ -61,11 +54,7 @@ public void Pull_branch_with_1_commit()`
`61`	`54`
`62`	`55`	`var finder = new PullVersionFinder();`
`63`	`56`
`64`		`- var version = finder.FindVersion(new GitVersionContext`
`65`		`- {`
`66`		`- Repository = repo,`
`67`		`- CurrentBranch = pullBranch,`
`68`		`- });`
	`57`	`+ var version = finder.FindVersion(new GitVersionContext(repo, pullBranch));`
`69`	`58`
`70`	`59`	`var masterVersion = FindersHelper.RetrieveMasterVersion(repo);`
`71`	`60`
`@@ -91,11 +80,7 @@ public void Pull_branch_with_2_commits()`
`91`	`80`
`92`	`81`	`var finder = new PullVersionFinder();`
`93`	`82`
`94`		`- var version = finder.FindVersion(new GitVersionContext`
`95`		`- {`
`96`		`- Repository = repo,`
`97`		`- CurrentBranch = pullBranch,`
`98`		`- });`
	`83`	`+ var version = finder.FindVersion(new GitVersionContext(repo, pullBranch));`
`99`	`84`
`100`	`85`	`var masterVersion = FindersHelper.RetrieveMasterVersion(repo);`
`101`	`86`
`@@ -104,4 +89,4 @@ public void Pull_branch_with_2_commits()`
`104`	`89`	`ObjectApprover.VerifyWithJson(version, Scrubbers.GuidAndDateScrubber);`
`105`	`90`	`}`
`106`	`91`	`}`
`107`		`-}`
	`92`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,7 @@ public void EnsureAReleaseBranchNameDoesNotExposeAPatchSegment()`
`18`	`18`
`19`	`19`	`var finder = new ReleaseVersionFinder();`
`20`	`20`
`21`		`- Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext`
`22`		`- {`
`23`		`- Repository = repo,`
`24`		`- CurrentBranch = releaseBranch,`
`25`		`- }));`
	`21`	`+ Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext(repo, releaseBranch)));`
`26`	`22`	`}`
`27`	`23`	`}`
`28`	`24`
`@@ -39,13 +35,10 @@ public void EnsureAReleaseBranchNameDoesNotExposeAStability()`
`39`	`35`
`40`	`36`	`var finder = new ReleaseVersionFinder();`
`41`	`37`
`42`		`- Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext`
`43`		`- {`
`44`		`- Repository = repo,`
`45`		`- CurrentBranch = releaseBranch,`
`46`		`- }));`
	`38`	`+ Assert.Throws<ErrorException>(() => finder.FindVersion(new GitVersionContext(repo, releaseBranch)));`
`47`	`39`	`}`
`48`	`40`	`}`
	`41`	`+`
`49`	`42`	`//TODO:`
`50`	`43`	`//[Test]`
`51`	`44`	`//[ExpectedException]`
`@@ -60,5 +53,4 @@ public void After_merge_to_master()`
`60`	`53`	`//TODO`
`61`	`54`	`//Assert.Throws<Exception>(() => FinderWrapper.FindVersionForCommit("TODO", "release-0.5.0"));`
`62`	`55`	`}`
`63`		`-`
`64`	`56`	`}`