Merge pull request #121 from scm-manager/develop

[pull] develop from scm-manager:develop

Author: pull[bot]

Jenkinsfile

@@ -116,7 +116,7 @@ pipeline {
         expression { return isBuildSuccess() }
       }
       steps {
-        withPublishEnivronment {
+        withPublishEnvironment {
           gradle "-PenablePackaging publish"
         }
       }
@@ -286,7 +286,7 @@ void withCheckEnvironment(Closure<Void> closure) {
   closure.call()
 }
 
-void withPublishEnivronment(Closure<Void> closure) {
+void withPublishEnvironment(Closure<Void> closure) {
   withCredentials([
     usernamePassword(credentialsId: 'packages-scm-manager-org', usernameVariable: 'ORG_GRADLE_PROJECT_packagesScmManagerUsername', passwordVariable: 'ORG_GRADLE_PROJECT_packagesScmManagerPassword'),
     usernamePassword(credentialsId: 'cesmarvin', usernameVariable: 'ORG_GRADLE_PROJECT_gitHubUsername', passwordVariable: 'ORG_GRADLE_PROJECT_gitHubApiToken'),

build-plugins/src/main/groovy/com/cloudogu/scm/PackagingPlugin.groovy

@@ -35,6 +35,7 @@ class PackagingPlugin implements Plugin<Project> {
     project.ext.ReleaseYaml = ReleaseYamlTask
     project.ext.HttpUploadTask = HttpUploadTask
     project.ext.GitHubUploadTask = GitHubUploadTask
+    project.ext.ScmManagerUploadTask = ScmManagerUploadTask
   }
 
 }

build-plugins/src/main/groovy/com/cloudogu/scm/ScmManagerUploadTask.groovy

@@ -0,0 +1,85 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020-present Cloudogu GmbH and Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.cloudogu.scm
+
+import com.google.common.base.Strings
+import groovy.json.JsonOutput
+import org.eclipse.jetty.client.HttpClient
+import org.eclipse.jetty.client.api.Request
+import org.eclipse.jetty.client.util.StringContentProvider
+import org.eclipse.jetty.http.HttpMethod
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.Optional
+
+import java.nio.charset.StandardCharsets
+
+class ScmManagerUploadTask extends UploadTask {
+
+  @Input
+  @Optional
+  String apiToken
+
+  @Input
+  String server
+
+  @Input
+  String namespace
+
+  @Input
+  String repo
+
+  @Input
+  String path
+
+  @Input
+  String branch = "master"
+
+  @Input
+  String message
+
+  @Override
+  Request createRequest(HttpClient client) {
+    String[] pathComponents = path.split("/")
+    String filename = pathComponents[pathComponents.length - 1]
+    String directory = path.substring(0, path.length() - filename.length() - 1)
+    Request request = client.newRequest("${server}/api/v2/edit/${namespace}/${repo}/create/${directory}")
+    request.method(HttpMethod.POST)
+    request.header("Accept", "application/json")
+    request.header("Content-Type", "application/json")
+    if (!Strings.isNullOrEmpty(apiToken)) {
+      request.header("Authorization","Bearer ${apiToken}")
+    }
+
+    def body = [
+      commitMessage: message,
+      branch: branch,
+      fileName: filename,
+      fileContent: artifact.text
+    ]
+    request.content(new StringContentProvider(JsonOutput.toJson(body), StandardCharsets.UTF_8))
+    return request
+  }
+}

scm-packaging/release-yaml/build.gradle

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import com.cloudogu.scm.GitHubUploadTask
+import com.cloudogu.scm.ScmManagerUploadTask
 
 plugins {
   id 'org.scm-manager.packaging'
@@ -48,16 +48,13 @@ task distribution(type: ReleaseYaml) {
   configuration = configurations.packageYaml
 }
 
-task publish(type: GitHubUploadTask) {
-  owner = "scm-manager"
+task publish(type: ScmManagerUploadTask) {
+  server = "https://ecosystem.cloudogu.com/scm"
+  namespace = "scm-manager"
   repo = "website"
   path = "content/releases/${project.version.replace('.', '-')}.yml"
   branch = "master"
   message = "Add release descriptor for ${project.version}"
-  author {
-    name = "CES Marvin"
-    email = "cesmarvin@cloudogu.com"
-  }
   artifact = file('build/libs/release.yml')
   if (project.hasProperty("gitHubApiToken")) {
     apiToken = project.property("gitHubApiToken")