Merge branch 'release/4'

Author: meanmail

.idea/codeStyleSettings.xml

@@ -3,12 +3,15 @@ plugins {
 }
 
 repositories {
+    maven { url 'http://dl.bintray.com/jetbrains/intellij-plugin-service' }
     mavenCentral()
 }
 
 dependencies {
     compile gradleApi()
     compile 'org.jetbrains:annotations:13.0'
+    compile 'org.jetbrains.intellij:plugin-repository-rest-client:0.3.21'
+    compile 'org.jetbrains.intellij.plugins:intellij-plugin-structure:2.2'
     compile 'org.jdom:jdom2:2.0.6'
     compile group: 'org.rauschig', name: 'jarchivelib', version: '0.7.1'
 

buildSrc/build.gradle

@@ -49,6 +49,7 @@ abstract class BasePlugin implements Plugin<Project> {
             plugin = this
             instrumentCode = extensionInstrumentCode
             repositoryType = this.repositoryType
+            publish = new ProductPluginExtensionPublish()
         }
 
         configureTasks(project, extension)
@@ -62,6 +63,7 @@ abstract class BasePlugin implements Plugin<Project> {
         configurePrepareSandboxTask(project, extension)
         configureRunTask(project, extension)
         configureBuildPluginTask(project)
+        configurePublishPluginTask(project, extension)
         configureProcessResources(project)
         project.afterEvaluate(new Action<Project>() {
             @Override
@@ -151,6 +153,17 @@ abstract class BasePlugin implements Plugin<Project> {
         }
     }
 
+    private void configurePublishPluginTask(@NotNull Project project, @NotNull ProductPluginExtension ext) {
+        logger.info("Configuring publishing {} plugin task", productName)
+        project.tasks.create("publish$productName", PublishTask).with {
+            group = tasksGroupName
+            description = "Publish plugin distribution on plugins.jetbrains.com."
+            extension = ext
+            plugin = this
+            dependsOn(buildPluginTaskName)
+        }
+    }
+
     private void configureProcessResources(@NotNull Project project) {
         logger.info("Configuring {} resources task", productName)
 
@@ -240,6 +253,10 @@ abstract class BasePlugin implements Plugin<Project> {
         return prepareTestSandboxTaskName
     }
 
+    String getBuildPluginTaskName() {
+        return buildPluginTaskName
+    }
+
     String getProductType() {
         return productType
     }

buildSrc/src/main/groovy/org/stepik/gradle/plugins/jetbrains/BasePlugin.groovy

@@ -34,6 +34,7 @@ class ProductPluginExtension {
     private Project project
     private BasePlugin plugin
     boolean instrumentCode
+    ProductPluginExtensionPublish publish
 
     RepositoryType repositoryType
 

buildSrc/src/main/groovy/org/stepik/gradle/plugins/jetbrains/ProductPluginExtension.groovy

@@ -0,0 +1,31 @@
+package org.stepik.gradle.plugins.jetbrains
+
+class ProductPluginExtensionPublish {
+    String username
+    String password
+    String[] channels
+
+    def username(String username) {
+        this.username = username
+    }
+
+    def password(String password) {
+        this.password = password
+    }
+
+    def setChannel(String channel) {
+        this.channels = [channel]
+    }
+
+    def channel(String channel) {
+        channels(channel)
+    }
+
+    def channels(String... channels) {
+        this.channels = channels
+    }
+
+    def setChannels(String... channels) {
+        this.channels = channels
+    }
+}

buildSrc/src/main/groovy/org/stepik/gradle/plugins/jetbrains/ProductPluginExtensionPublish.groovy

@@ -0,0 +1,91 @@
+package org.stepik.gradle.plugins.jetbrains
+
+import com.intellij.structure.plugin.PluginManager
+import org.gradle.api.internal.ConventionTask
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.TaskExecutionException
+import org.gradle.api.tasks.bundling.Zip
+import org.gradle.util.CollectionUtils
+import org.jetbrains.intellij.pluginRepository.PluginRepositoryInstance
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+class PublishTask extends ConventionTask {
+    private static final Logger logger = LoggerFactory.getLogger(BasePlugin)
+
+    private ProductPluginExtension extension
+    private BasePlugin plugin
+    private String host = "http://plugins.jetbrains.com"
+
+    PublishTask() {
+        enabled = !project.gradle.startParameter.offline
+    }
+
+    void setExtension(ProductPluginExtension extension) {
+        this.extension = extension
+    }
+
+    void setPlugin(BasePlugin plugin) {
+        this.plugin = plugin
+    }
+
+    @Input
+    String getHost() {
+        host
+    }
+
+    @InputFile
+    File getDistributionFile() {
+        def buildPluginTask = project.tasks.findByName(plugin.buildPluginTaskName) as Zip
+        def distributionFile = buildPluginTask?.archivePath
+        distributionFile?.exists() ? distributionFile : null
+    }
+
+    void setDistributionFile(Object distributionFile) {
+        this.distributionFile = distributionFile
+    }
+
+    @Input
+    String getUsername() {
+        Utils.toString(extension.publish.username)
+    }
+
+    @Input
+    String getPassword() {
+        Utils.toString(extension.publish.password)
+    }
+
+    @Input
+    @Optional
+    String[] getChannels() {
+        CollectionUtils.stringize(extension.publish.channels.collect {
+            it instanceof Closure ? (it as Closure).call() : it
+        }.flatten())
+    }
+
+    @SuppressWarnings("GroovyUnusedDeclaration")
+    @TaskAction
+    protected void publishPlugin() {
+        def channels = getChannels()
+        if (!channels || channels.length == 0) {
+            channels = ['default']
+        }
+
+        def host = getHost()
+        def distributionFile = getDistributionFile()
+        String pluginId = PluginManager.instance.createPlugin(distributionFile).plugin.pluginId
+        for (String channel : channels) {
+            logger.info("Uploading plugin ${pluginId} from $distributionFile.absolutePath to $host, channel: $channel")
+            try {
+                def repoClient = new PluginRepositoryInstance(host, getUsername(), getPassword())
+                repoClient.uploadPlugin(pluginId, distributionFile, channel && 'default' != channel ? channel : '')
+                logger.info("Uploaded successfully")
+            } catch (exception) {
+                throw new TaskExecutionException(this, new RuntimeException("Failed to upload plugin", exception))
+            }
+        }
+    }
+}

buildSrc/src/main/groovy/org/stepik/gradle/plugins/jetbrains/PublishTask.groovy

@@ -240,7 +240,8 @@ class Utils {
     }
 
     @NotNull
-    static File getArchivePath(@NotNull Project project,
+    static File getArchivePath(
+            @NotNull Project project,
             @NotNull BasePlugin plugin,
             @NotNull ProductPluginExtension extension) {
         def defaultIdePath = getDefaultIdePath(
@@ -440,4 +441,9 @@ class Utils {
     static void createOrRepairOptionsXml(File file) {
         createOrRepairXml(file, OPTIONS_XML)
     }
+
+    static String toString(input) {
+        input = input instanceof Closure ? (input as Closure).call() : input
+        return input?.toString()
+    }
 }

buildSrc/src/main/groovy/org/stepik/gradle/plugins/jetbrains/Utils.groovy

@@ -2,7 +2,7 @@
 ### General options ###
 javaVersion=1.8
 gradleVersion=3.5
-pluginVersion=3.1
+pluginVersion=4
 # if set the 'idePath' then the version ignoring
 # if 'sandboxDir' not set then use default sandbox directory (build/${product}-sandbox)
 # if 'ideVersion' not set then use LATEST-EAP-SNAPSHOT
@@ -12,7 +12,7 @@ ideaVersion=163.7743.44
 #ideaSandboxDir=build/idea-sandbox/
 #ideaPath=/path/to/idea
 ### PyCharm ###
-pyCharmVersion=163.8233.8
+pyCharmVersion=2016.3.3
 #pyCharmSandboxDir=build/pycharm-sandbox/
 #pyCharmPath=/path/to/pycharm
 ### CLion ###