Move getLogin from github to vcs package object

scala-steward-org · May 20, 2019 · 9aeacdc · 9aeacdc
1 parent 9a7c65f
commit 9aeacdc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
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
@@ -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
@@ -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/...rg/scalasteward/core/github/package.scala → ...a/org/scalasteward/core/vcs/package.scala b/...rg/scalasteward/core/github/package.scala → ...a/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/...eward/core/github/GithubPackageTest.scala → ...calasteward/core/vcs/VCSPackageTest.scala b/...eward/core/github/GithubPackageTest.scala → ...calasteward/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") {