Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge topic/gitlab into master #645

Merged
merged 16 commits into from
Jul 4, 2019
Merged

Merge topic/gitlab into master #645

merged 16 commits into from
Jul 4, 2019

Conversation

fthomas
Copy link
Member

@fthomas fthomas commented Jul 1, 2019

I'm opening this so that people can see the diff between topic/gitlab and master and to track pending tasks before this can be merged.

daddykotex and others added 10 commits June 25, 2019 20:50
@daddykotex
Refactor GitHubApiAlg to VCSApiAlg
df34b6d 
This refactoring is breaking for users:
* args change from --github-api-host to --vcs-api-host
* args change from --github-login to --vcs-login
@daddykotex
Refactor extract the headFor in a VCSSpecifics trait
0c9861f
@daddykotex
Gitlab implementation
a883c19 
This is a work in progress. There are a lot of things to discuss:

* the custom encoder/decoder to convert between GitHub json responses
and Gitlab json responses
* the Monad/MonadThrowabled requirements added because some operations
in Gitlab are multi-step where as their original Github conterpart
are a single step
* the specific vcs thingy
@daddykotex
VCS selection from the Config
0a8872e
@daddykotex
Refactor gitHubUser to vcsUser
b8fbdf0
@daddykotex
Revert headFor changes in vcs package object
83e9755
@fthomas
Merge pull request #524 from daddykotex/refactor/vcsapialg
3024e0e 
Introduce Gitlab support
@fthomas
Merge branch 'master' into topic/merge-master-gitlab
3a07011
@fthomas
Update license headers
391b678
@fthomas
Merge pull request #643 from fthomas/topic/merge-master-gitlab
0e98ec0 
Merge latest master into topic/gitlab
@fthomas
Copy link
Member Author

fthomas commented Jul 1, 2019

One thing I'd also like to change is the vcs acronym which is usually used as generic term for Git, Mercurial, Subversion, CVS, etc. but we are using it as generic term for GitHub, GitLab, and BitBucket. I'm not aware of a common generic term for these services but would propose to use grm (for Git repository manager). Other suggestions welcome!

Since this is a purely stylistic change, it should be done after merging this so we don't obfuscate the diff of this PR with a simple rename.

@codecov
Copy link

codecov bot commented Jul 1, 2019 •
edited
Loading

Codecov Report

Merging #645 into master will decrease coverage by 1.54%.
The diff coverage is 25%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #645      +/-   ##
==========================================
- Coverage   60.15%   58.61%   -1.55%     
==========================================
  Files          66       71       +5     
  Lines         876      981     +105     
  Branches       17       28      +11     
==========================================
+ Hits          527      575      +48     
- Misses        349      406      +57
Impacted Files Coverage Δ
...teward/core/github/http4s/Http4sGitHubApiAlg.scala 66.66% <ø> (ø) ⬆️
...in/scala/org/scalasteward/core/vcs/VCSApiAlg.scala 100% <ø> (ø)
...calasteward/core/vcs/data/NewPullRequestData.scala 84.61% <ø> (-1.1%) ⬇️
.../scala/org/scalasteward/core/application/Cli.scala 100% <ø> (ø) ⬆️
...ala/org/scalasteward/core/application/Config.scala 0% <0%> (ø) ⬆️
...alasteward/core/dependency/DependencyService.scala 0% <0%> (ø) ⬆️
...la/org/scalasteward/core/application/Context.scala 0% <0%> (ø) ⬆️
.../main/scala/org/scalasteward/core/gitlab/Url.scala 0% <0%> (ø)
...ala/org/scalasteward/core/nurture/NurtureAlg.scala 0% <0%> (ø) ⬆️
...scala/org/scalasteward/core/vcs/VCSSelection.scala 0% <0%> (ø)
... and 15 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b9aa64b...fe73b0b. Read the comment docs.

@fthomas fthomas mentioned this pull request Jul 2, 2019
Merged
daddykotex and others added 2 commits July 2, 2019 23:37
@daddykotex
Fix branch name
13b3ac9 
During merge/rebase, I may have accidentally changed the
branch name used when creating the MR. On Gitlab, we need
`update/dependency-1.2.0` where as on GitHub we need:
`owner:update/dependency-1.2.0`.
@fthomas
Merge pull request #649 from daddykotex/branch-name-gitlab
2543d2a 
Fix branch name
@fthomas fthomas mentioned this pull request Jul 3, 2019
Merged
@fthomas
Copy link
Member Author

fthomas commented Jul 3, 2019

@daddykotex I've just verified that this branch still works with GitHub. So there is nothing left to do from my side before this can be merged.

@daddykotex
Copy link
Contributor

Sounds good to me!

All aboard the VCS diversity!

@fthomas fthomas merged commit 9d274cd into master Jul 4, 2019
@fthomas fthomas mentioned this pull request Jul 4, 2019
Closed
@fthomas fthomas deleted the topic/gitlab branch July 4, 2019 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@fthomas @daddykotex