From 9aeacdc7b24ec8f0b1aa46bd7b6c3f17c761c913 Mon Sep 17 00:00:00 2001
From: David Francoeur <dfrancoeur04@gmail.com>
Date: Thu, 18 Apr 2019 21:07:23 -0400
Subject: [PATCH] Move getLogin from github to vcs package object

---
 .../scala/org/scalasteward/core/nurture/NurtureAlg.scala    | 6 +++---
 .../org/scalasteward/core/vcs/data/NewPullRequestData.scala | 4 ++--
 .../org/scalasteward/core/{github => vcs}/package.scala     | 4 ++--
 .../GithubPackageTest.scala => vcs/VCSPackageTest.scala}    | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename modules/core/src/main/scala/org/scalasteward/core/{github => vcs}/package.scala (97%)
 rename modules/core/src/test/scala/org/scalasteward/core/{github/GithubPackageTest.scala => vcs/VCSPackageTest.scala} (82%)

diff --git a/modules/core/src/main/scala/org/scalasteward/core/nurture/NurtureAlg.scala b/modules/core/src/main/scala/org/scalasteward/core/nurture/NurtureAlg.scala
index 19121bc155..14249dff2f 100644
--- a/modules/core/src/main/scala/org/scalasteward/core/nurture/NurtureAlg.scala
+++ b/modules/core/src/main/scala/org/scalasteward/core/nurture/NurtureAlg.scala
@@ -28,7 +28,7 @@ import org.scalasteward.core.sbt.SbtAlg
 import org.scalasteward.core.update.FilterAlg
 import org.scalasteward.core.util.{BracketThrowable, LogAlg}
 import org.scalasteward.core.vcs.VCSRepoAlg
-import org.scalasteward.core.{git, github, util}
+import org.scalasteward.core.{git, util, vcs}
 
 class NurtureAlg[F[_]](
     implicit
@@ -81,7 +81,7 @@ class NurtureAlg[F[_]](
   def processUpdate(data: UpdateData): F[Unit] =
     for {
       _ <- logger.info(s"Process update ${data.update.show}")
-      head = github.headFor(github.getLogin(config, data.repo), data.update)
+      head = vcs.headFor(vcs.getLogin(config, data.repo), data.update)
       repoConfig <- repoConfigAlg.getRepoConfig(data.repo)
       pullRequests <- gitHubApiAlg.listPullRequests(data.repo, head, data.baseBranch)
       _ <- pullRequests.headOption match {
@@ -121,7 +121,7 @@ class NurtureAlg[F[_]](
   def createPullRequest(data: UpdateData): F[Unit] =
     for {
       _ <- logger.info(s"Create PR ${data.updateBranch.name}")
-      headLogin = github.getLogin(config, data.repo)
+      headLogin = vcs.getLogin(config, data.repo)
       requestData = NewPullRequestData.from(data, headLogin, config.gitHubLogin)
       pr <- gitHubApiAlg.createPullRequest(data.repo, requestData)
       _ <- pullRequestRepo.createOrUpdate(
diff --git a/modules/core/src/main/scala/org/scalasteward/core/vcs/data/NewPullRequestData.scala b/modules/core/src/main/scala/org/scalasteward/core/vcs/data/NewPullRequestData.scala
index 367a2c7c82..0cb24bf275 100644
--- a/modules/core/src/main/scala/org/scalasteward/core/vcs/data/NewPullRequestData.scala
+++ b/modules/core/src/main/scala/org/scalasteward/core/vcs/data/NewPullRequestData.scala
@@ -23,7 +23,7 @@ import org.scalasteward.core.git.Branch
 import org.scalasteward.core.model.{SemVer, Update}
 import org.scalasteward.core.nurture.UpdateData
 import org.scalasteward.core.repoconfig.RepoConfigAlg
-import org.scalasteward.core.{git, github}
+import org.scalasteward.core.{git, vcs}
 
 final case class NewPullRequestData(
     title: String,
@@ -77,7 +77,7 @@ object NewPullRequestData {
     NewPullRequestData(
       title = git.commitMsgFor(data.update),
       body = bodyFor(data.update, authorLogin),
-      head = github.headFor(headLogin, data.update),
+      head = vcs.headFor(headLogin, data.update),
       base = data.baseBranch
     )
 }
diff --git a/modules/core/src/main/scala/org/scalasteward/core/github/package.scala b/modules/core/src/main/scala/org/scalasteward/core/vcs/package.scala
similarity index 97%
rename from modules/core/src/main/scala/org/scalasteward/core/github/package.scala
rename to modules/core/src/main/scala/org/scalasteward/core/vcs/package.scala
index bdddc76e8c..a3ea1594b3 100644
--- a/modules/core/src/main/scala/org/scalasteward/core/github/package.scala
+++ b/modules/core/src/main/scala/org/scalasteward/core/vcs/package.scala
@@ -17,10 +17,10 @@
 package org.scalasteward.core
 
 import org.scalasteward.core.application.Config
-import org.scalasteward.core.vcs.data.Repo
 import org.scalasteward.core.model.Update
+import org.scalasteward.core.vcs.data.Repo
 
-package object github {
+package object vcs {
 
   def getLogin(config: Config, repo: Repo): String =
     if (config.doNotFork) repo.owner else config.gitHubLogin
diff --git a/modules/core/src/test/scala/org/scalasteward/core/github/GithubPackageTest.scala b/modules/core/src/test/scala/org/scalasteward/core/vcs/VCSPackageTest.scala
similarity index 82%
rename from modules/core/src/test/scala/org/scalasteward/core/github/GithubPackageTest.scala
rename to modules/core/src/test/scala/org/scalasteward/core/vcs/VCSPackageTest.scala
index 83a90f8536..f07a931294 100644
--- a/modules/core/src/test/scala/org/scalasteward/core/github/GithubPackageTest.scala
+++ b/modules/core/src/test/scala/org/scalasteward/core/vcs/VCSPackageTest.scala
@@ -1,10 +1,10 @@
-package org.scalasteward.core.github
+package org.scalasteward.core.vcs
 
-import org.scalasteward.core.vcs.data.Repo
 import org.scalasteward.core.mock.MockContext.config
+import org.scalasteward.core.vcs.data.Repo
 import org.scalatest.{FunSuite, Matchers}
 
-class GithubPackageTest extends FunSuite with Matchers {
+class VCSPackageTest extends FunSuite with Matchers {
   val repo = Repo("fthomas", "datapackage")
 
   test("github login for fork enabled configuration") {