Merge pull request #1021 from gcotelli/self_hosted_gitlab

Self hosted gitlab support
pharo-vcs · Oct 9, 2018 · 07e3403 · 07e3403
2 parents f019b54 + 536aae2
commit 07e3403
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 4 deletions.
diff --git a/Iceberg-Pharo6.package/MCGitlabRepository.extension/instance/hostname.st b/Iceberg-Pharo6.package/MCGitlabRepository.extension/instance/hostname.st
@@ -0,0 +1,4 @@
+*Iceberg-Pharo6
+hostname
+
+	^ 'gitlab.com'
diff --git a/Iceberg-Pharo6.package/MCGitlabRepository.extension/properties.json b/Iceberg-Pharo6.package/MCGitlabRepository.extension/properties.json
@@ -0,0 +1,3 @@
+{
+	"name" : "MCGitlabRepository"
+}
diff --git a/Iceberg-Tests.package/MCGitlabRepositoryIcebergExtensionsTest.class/README.md b/Iceberg-Tests.package/MCGitlabRepositoryIcebergExtensionsTest.class/README.md
diff --git a/Iceberg-Tests.package/MCGitlabRepositoryIcebergExtensionsTest.class/instance/testHttpsUrl.st b/Iceberg-Tests.package/MCGitlabRepositoryIcebergExtensionsTest.class/instance/testHttpsUrl.st
@@ -0,0 +1,7 @@
+running
+testHttpsUrl
+
+	| repository |
+
+	repository := MCGitlabRepository location: 'gitlab://pharo-project/pharo:master'.
+	self assert: repository httpsUrl equals: 'https://gitlab.com/pharo-project/pharo.git'
diff --git a/...MCGitlabRepositoryIcebergExtensionsTest.class/instance/testHttpsUrlForSelfHostedGitlab.st b/...MCGitlabRepositoryIcebergExtensionsTest.class/instance/testHttpsUrlForSelfHostedGitlab.st
@@ -0,0 +1,8 @@
+running
+testHttpsUrlForSelfHostedGitlab
+
+	| repository |
+
+	(SystemVersion current major <= 6) ifTrue: [self skip].
+	repository := MCGitlabRepository location: 'gitlab://git.pharo.org:pharo-project/pharo:master'.
+	self assert: repository httpsUrl equals: 'https://git.pharo.org/pharo-project/pharo.git'
diff --git a/Iceberg-Tests.package/MCGitlabRepositoryIcebergExtensionsTest.class/instance/testScpUrl.st b/Iceberg-Tests.package/MCGitlabRepositoryIcebergExtensionsTest.class/instance/testScpUrl.st
@@ -0,0 +1,7 @@
+running
+testScpUrl
+
+	| repository |
+
+	repository := MCGitlabRepository location: 'gitlab://pharo-project/pharo:master'.
+	self assert: repository scpUrl equals: '[email protected]:pharo-project/pharo.git'
diff --git a/...e/MCGitlabRepositoryIcebergExtensionsTest.class/instance/testScpUrlForSelfHostedGitlab.st b/...e/MCGitlabRepositoryIcebergExtensionsTest.class/instance/testScpUrlForSelfHostedGitlab.st
@@ -0,0 +1,8 @@
+running
+testScpUrlForSelfHostedGitlab
+
+	| repository |
+
+	(SystemVersion current major <= 6) ifTrue: [self skip].
+	repository := MCGitlabRepository location: 'gitlab://git.pharo.org:pharo-project/pharo:master'.
+	self assert: repository scpUrl equals: '[email protected]:pharo-project/pharo.git'
diff --git a/Iceberg-Tests.package/MCGitlabRepositoryIcebergExtensionsTest.class/properties.json b/Iceberg-Tests.package/MCGitlabRepositoryIcebergExtensionsTest.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "TestCase",
+	"category" : "Iceberg-Tests-Core-Remotes",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "MCGitlabRepositoryIcebergExtensionsTest",
+	"type" : "normal"
+}
diff --git a/...vider.class/class/defaultForRemoteURL..st → ...vider.class/class/defaultForRemoteUrl..st b/...vider.class/class/defaultForRemoteURL..st → ...vider.class/class/defaultForRemoteUrl..st
diff --git a/Iceberg.package/MCGitlabRepository.extension/instance/httpsUrl.st b/Iceberg.package/MCGitlabRepository.extension/instance/httpsUrl.st
@@ -1,3 +1,3 @@
-*Iceberg-Adapters
+*Iceberg
 httpsUrl
-	^ 'https://gitlab.com/', projectPath, '.git'
+	^ 'https://<1s>/<2s>.git' expandMacrosWith: self hostname with: projectPath
diff --git a/Iceberg.package/MCGitlabRepository.extension/instance/scpUrl.st b/Iceberg.package/MCGitlabRepository.extension/instance/scpUrl.st
@@ -1,3 +1,3 @@
-*Iceberg-Adapters
+*Iceberg
 scpUrl
-	^ 'git@gitlab.com:', projectPath, '.git'
+	^ 'git@<1s>:<2s>.git' expandMacrosWith: self hostname with: projectPath