Permalink
Browse files

Replaced 'szczepiq' with 'mockitoguy'

I recently have changed my GitHub user name :)
  • Loading branch information...
mockitoguy committed Oct 14, 2017
1 parent 613f31c commit e850449323b5e3f50a1eadbe259970031529b176
@@ -59,7 +59,7 @@ shipkit {
gitHub.repository = 'mockito/shipkit-example'
gitHub.readOnlyAuthToken = 'e7fe8fcdd6ffed5c38498c4c79b2a68e6f6ed1bb'
gitHub.writeAuthToken = System.getenv('GH_WRITE_TOKEN')
team.developers = ['szczepiq:Szczepan Faber', 'mstachniuk:Marcin Stachniuk', 'wwilk:Wojtek Wilk']
team.developers = ['mockitoguy:Szczepan Faber', 'mstachniuk:Marcin Stachniuk', 'wwilk:Wojtek Wilk']
}
allprojects {
@@ -76,7 +76,7 @@ allprojects {
pkg {
repo = 'examples'
user = 'szczepiq'
user = 'mockitoguy'
userOrg = 'shipkit'
name = 'basic'
licenses = ['MIT']
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -2,7 +2,7 @@ shipkit {
gitHub.repository = "mockito/shipkit"
gitHub.readOnlyAuthToken = "e7fe8fcdd6ffed5c38498c4c79b2a68e6f6ed1bb"
team.developers = ['szczepiq:Szczepan Faber', 'mstachniuk:Marcin Stachniuk',
team.developers = ['mockitoguy:Szczepan Faber', 'mstachniuk:Marcin Stachniuk',
'wwilk:Wojtek Wilk', 'epeee:Erhard Pointl', 'NagRock:Maciej Kuster']
releaseNotes.publicationRepository = "https://plugins.gradle.org/plugin/org.shipkit.java"
@@ -367,7 +367,7 @@ public void setCommitMessagePostfix(String commitMessagePostfix) {
/**
* Developers to include in generated pom file.
* It should be a collection of elements like "GITHUB_USER:FULL_NAME", example:
* ['szczepiq:Szczepan Faber', 'mstachniuk:Marcin Stachniuk'].
* ['mockitoguy:Szczepan Faber', 'mstachniuk:Marcin Stachniuk'].
* <p>
* See POM reference for <a href="https://maven.apache.org/pom.html#Developers">Developers</a>.
*/
@@ -386,7 +386,7 @@ public void setDevelopers(Collection<String> developers) {
/**
* Contributors to include in generated pom file.
* It should be a collection of elements like "GITHUB_USER:FULL_NAME", example:
* ['szczepiq:Szczepan Faber', 'mstachniuk:Marcin Stachniuk']
* ['mockitoguy:Szczepan Faber', 'mstachniuk:Marcin Stachniuk']
* <p>
* See POM reference for <a href="https://maven.apache.org/pom.html#Contributors">Contributors</a>.
*/
@@ -53,7 +53,7 @@ public static TeamMember parsePerson(String notation) throws InvalidInput {
private static InvalidInput invalidInput(String notation) {
return new InvalidInput("Invalid value of team member: '" + notation + "'" +
"\nIt should be: 'GITHUB_USER:FULL_NAME'" +
"\nExample of correct notation: 'szczepiq:Szczepan Faber'" +
"\nExample of correct notation: 'mockitoguy:Szczepan Faber'" +
"\nSee Javadoc for ShipkitConfiguration.Team class.");
}
}
@@ -30,7 +30,7 @@ class PomCustomizerTest extends Specification {
def "pom contributors from settings"() {
conf.gitHub.repository = "repo"
conf.team.developers = ["szczepiq:Szczepan Faber", "wwilk:Wojtek Wilk"]
conf.team.developers = ["mockitoguy:Szczepan Faber", "wwilk:Wojtek Wilk"]
//wwilk will not be duplicated in developers/contributors
conf.team.contributors = ["mstachniuk:Marcin Stachniuk", "wwilk:Wojtek Wilk"]
@@ -62,12 +62,12 @@ class PomCustomizerTest extends Specification {
</ciManagement>
<developers>
<developer>
<id>szczepiq</id>
<id>mockitoguy</id>
<name>Szczepan Faber</name>
<roles>
<role>Core developer</role>
</roles>
<url>https://github.com/szczepiq</url>
<url>https://github.com/mockitoguy</url>
</developer>
<developer>
<id>wwilk</id>
@@ -90,7 +90,7 @@ class PomCustomizerTest extends Specification {
def "pom contributors from GitHub"() {
conf.gitHub.repository = "repo"
conf.team.developers = ["szczepiq:Szczepan Faber", "wwilk:Wojtek Wilk"]
conf.team.developers = ["mockitoguy:Szczepan Faber", "wwilk:Wojtek Wilk"]
conf.team.contributors = []
//wwilk will not be duplicated in developers/contributors
def contributorsSet = new DefaultProjectContributorsSet()
@@ -125,12 +125,12 @@ class PomCustomizerTest extends Specification {
</ciManagement>
<developers>
<developer>
<id>szczepiq</id>
<id>mockitoguy</id>
<name>Szczepan Faber</name>
<roles>
<role>Core developer</role>
</roles>
<url>https://github.com/szczepiq</url>
<url>https://github.com/mockitoguy</url>
</developer>
<developer>
<id>wwilk</id>
@@ -9,11 +9,11 @@ class TeamParserTest extends Specification {
def "parses person"() {
when:
def p = parsePerson("szczepiq:Szczepan Faber")
def p = parsePerson("mockitoguy:Szczepan Faber")
then:
p.name == 'Szczepan Faber'
p.gitHubUser == 'szczepiq'
p.gitHubUser == 'mockitoguy'
}
def "validates persons"() {
@@ -6,17 +6,17 @@ class DefaultProjectContributorTest extends Specification {
def "equals method"() {
def contributor = new DefaultProjectContributor(
"Szczepan Faber", "szczepiq", "http://github.com/szczepiq", 1)
"Szczepan Faber", "mockitoguy", "http://github.com/mockitoguy", 1)
def same = new DefaultProjectContributor(
"Szczepan Faber", "szczepiq", "http://github.com/szczepiq", 1)
"Szczepan Faber", "mockitoguy", "http://github.com/mockitoguy", 1)
def differentName = new DefaultProjectContributor(
"xxx", "szczepiq", "http://github.com/szczepiq", 1)
"xxx", "mockitoguy", "http://github.com/mockitoguy", 1)
def differentLogin = new DefaultProjectContributor(
"Szczepan Faber", "xxx", "http://github.com/szczepiq", 1)
"Szczepan Faber", "xxx", "http://github.com/mockitoguy", 1)
def differentUrl = new DefaultProjectContributor(
"Szczepan Faber", "szczepiq", "xxx", 1)
"Szczepan Faber", "mockitoguy", "xxx", 1)
def differentContributions = new DefaultProjectContributor(
"Szczepan Faber", "szczepiq", "http://github.com/szczepiq", 10)
"Szczepan Faber", "mockitoguy", "http://github.com/mockitoguy", 10)
expect:
contributor == same
@@ -35,9 +35,9 @@ class DefaultProjectContributorsSetTest extends Specification {
def "does not drop contributors with the same amount of contributions"() {
set.addContributor(new DefaultProjectContributor(
"Szczepan Faber 1", "szczepiq", "http://github.com/szczepiq", 2000))
"Szczepan Faber 1", "mockitoguy", "http://github.com/mockitoguy", 2000))
set.addContributor(new DefaultProjectContributor(
"Szczepan Faber 2", "szczepiq", "http://github.com/szczepiq", 2000))
"Szczepan Faber 2", "mockitoguy", "http://github.com/mockitoguy", 2000))
expect:
set.allContributors.size() == 2
@@ -6,21 +6,21 @@ import spock.lang.Specification
class GitHubAllContributorsJsonTest extends Specification {
def "parse regular contributors"() {
def contributorJson = new JsonObject(login: "szczepiq",
url: "https://api.github.com/users/szczepiq",
html_url: "https://github.com/szczepiq",
def contributorJson = new JsonObject(login: "mockitoguy",
url: "https://api.github.com/users/mockitoguy",
html_url: "https://github.com/mockitoguy",
"contributions": 2427)
def userJson = new JsonObject(login: "szczepiq",
url: "https://api.github.com/users/szczepiq",
def userJson = new JsonObject(login: "mockitoguy",
url: "https://api.github.com/users/mockitoguy",
name: "Szczepan Faber")
when:
def contributor = GitHubAllContributorsJson.toContributor(contributorJson, userJson)
then:
contributor.name == "Szczepan Faber"
contributor.login == "szczepiq"
contributor.profileUrl == "https://github.com/szczepiq"
contributor.login == "mockitoguy"
contributor.profileUrl == "https://github.com/mockitoguy"
contributor.numberOfContributions == 2427
}
@@ -18,7 +18,7 @@ class RecentContributorsFetcherTest extends Specification {
parseDate("2017-05-04 00:00:00 -0000"), parseDate("2017-05-06 00:00:00 -0000"))
then:
c.toString() == "[Roman Elizarov/elizarov, Szczepan Faber/szczepiq]"
c.toString() == "[Roman Elizarov/elizarov, Szczepan Faber/mockitoguy]"
}
def "no contributors for given dates"() {
@@ -118,8 +118,8 @@ Release notes:
expect:
DetailedFormatter.authorsSummary(c,
["Szczepan Faber": new DefaultContributor("Szczepan Faber", "szczepiq", "http://github.com/szczepiq") ]
, "link") == "[1 commit](link) by [Szczepan Faber](http://github.com/szczepiq)"
["Szczepan Faber": new DefaultContributor("Szczepan Faber", "mockitoguy", "http://github.com/mockitoguy") ]
, "link") == "[1 commit](link) by [Szczepan Faber](http://github.com/mockitoguy)"
}
def "authors summary with multiple authors"() {
@@ -8,10 +8,10 @@ class GitContributionsProviderTest extends Specification {
def logProvider = Mock(GitLogProvider)
@Subject provider = new GitContributionsProvider(logProvider, new IgnoredCommit(["[ci skip]"]))
def log = """a5797f9e6cfc06e2fa70ed12ee6c9571af8a7fc9@@info@@szczepiq@gmail.com@@info@@Szczepan Faber@@info@@Tidy-up in buildSrc
def log = """a5797f9e6cfc06e2fa70ed12ee6c9571af8a7fc9@@info@@mockitoguy@gmail.com@@info@@Szczepan Faber@@info@@Tidy-up in buildSrc
next line
@@commit@@
b9d694f4c25880d9dda21ac216053f2bd0f5673c@@info@@szczepiq@gmail.com@@info@@Szczepan Faber@@info@@Tidy-up in buildSrc - started using an interface where possible
b9d694f4c25880d9dda21ac216053f2bd0f5673c@@info@@mockitoguy@gmail.com@@info@@Szczepan Faber@@info@@Tidy-up in buildSrc - started using an interface where possible
@@commit@@
c76924d41c219f3b71b50a28d80c23c9c81b7a8c@@info@@john@doe@@info@@John R. Doe@@info@@dummy commit
@@commit@@"""
@@ -26,7 +26,7 @@ c76924d41c219f3b71b50a28d80c23c9c81b7a8c@@info@@john@doe@@info@@John R. Doe@@inf
def commits = c.allCommits as List
commits[0].commitId == "a5797f9e6cfc06e2fa70ed12ee6c9571af8a7fc9"
commits[0].authorName == "Szczepan Faber"
commits[0].authorEmail == "szczepiq@gmail.com"
commits[0].authorEmail == "mockitoguy@gmail.com"
commits[0].message == "Tidy-up in buildSrc\nnext line"
}
@@ -51,7 +51,7 @@ c76924d41c219f3b71b50a28d80c23c9c81b7a8c@@info@@john@doe@@info@@John R. Doe@@inf
}
def "should skip ci commits"() {
def logWithSkipCiCommits = log + """11197f9e6cfc06e2fa70ed12ee6c9571af8a7fc9@@info@@szczepiq@gmail.com@@info@@Szczepan Faber@@info@@[ci skip]sample message
def logWithSkipCiCommits = log + """11197f9e6cfc06e2fa70ed12ee6c9571af8a7fc9@@info@@mockitoguy@gmail.com@@info@@Szczepan Faber@@info@@[ci skip]sample message
second line
@@commit@@"""
logProvider.getLog(_, _, _) >> logWithSkipCiCommits

0 comments on commit e850449

Please sign in to comment.