Merge pull request cloudfoundry#171 from scottfrederick/gradle

Renamed Gradle plugin tasks and properties to use camel-case.

Author: scottfrederick

cloudfoundry-gradle-plugin/src/main/groovy/org/cloudfoundry/gradle/CloudFoundryPlugin.groovy

@@ -15,6 +15,7 @@
 
 package org.cloudfoundry.gradle
 
+import org.gradle.api.DefaultTask
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 
@@ -58,37 +59,38 @@ class CloudFoundryPlugin implements Plugin<Project> {
     void apply(Project project) {
         project.extensions.create("cloudfoundry", CloudFoundryExtension, project)
         project.cloudfoundry.extensions.services = project.container(CloudFoundryServiceExtension)
-        // alias "services" to "serviceInfos" for backward compatibility
-        project.cloudfoundry.extensions.serviceInfos = project.cloudfoundry.extensions.services
 
         // register tasks
-        project.tasks.create('cf-target', InfoCloudFoundryTask)
-        project.tasks.create('cf-login', LoginCloudFoundryTask)
-        project.tasks.create('cf-logout', LogoutCloudFoundryTask)
-        project.tasks.create('cf-spaces', SpacesCloudFoundryTask)
-        project.tasks.create('cf-push', PushCloudFoundryTask)
-        project.tasks.create('cf-delete', DeleteApplicationCloudFoundryTask)
-        project.tasks.create('cf-start', StartApplicationCloudFoundryTask)
-        project.tasks.create('cf-restart', RestartApplicationCloudFoundryTask)
-        project.tasks.create('cf-stop', StopApplicationCloudFoundryTask)
-        project.tasks.create('cf-deploy', DeployCloudFoundryTask)
-        project.tasks.create('cf-undeploy', UndeployCloudFoundryTask)
-        project.tasks.create('cf-swap-deployed', SwapDeployedCloudFoundryTask)
-        project.tasks.create('cf-scale', ScaleCloudFoundryTask)
-        project.tasks.create('cf-apps', AppsCloudFoundryTask)
-        project.tasks.create('cf-app', AppCloudFoundryTask)
-        project.tasks.create('cf-logs', LogsCloudFoundryTask)
-        project.tasks.create('cf-services', ServicesCloudFoundryTask)
-        project.tasks.create('cf-service-plans', ServiceOfferingsCloudFoundryTask)
-        project.tasks.create('cf-create-service', CreateServiceCloudFoundryTask)
-        project.tasks.create('cf-delete-service', DeleteServiceCloudFoundryTask)
-        project.tasks.create('cf-bind', BindServiceCloudFoundryTask)
-        project.tasks.create('cf-unbind', UnbindServiceCloudFoundryTask)
-        project.tasks.create('cf-env', EnvCloudFoundryTask)
-        project.tasks.create('cf-set-env', SetEnvCloudFoundryTask)
-        project.tasks.create('cf-unset-env', UnsetEnvCloudFoundryTask)
-        project.tasks.create('cf-map', MapCloudFoundryTask)
-        project.tasks.create('cf-unmap', UnmapCloudFoundryTask)
+        createTask(project, 'Target', InfoCloudFoundryTask)
+        createTask(project, 'Login', LoginCloudFoundryTask)
+        createTask(project, 'Logout', LogoutCloudFoundryTask)
+        createTask(project, 'Spaces', SpacesCloudFoundryTask)
+        createTask(project, 'Push', PushCloudFoundryTask)
+        createTask(project, 'Delete', DeleteApplicationCloudFoundryTask)
+        createTask(project, 'Start', StartApplicationCloudFoundryTask)
+        createTask(project, 'Restart', RestartApplicationCloudFoundryTask)
+        createTask(project, 'Stop', StopApplicationCloudFoundryTask)
+        createTask(project, 'Deploy', DeployCloudFoundryTask)
+        createTask(project, 'Undeploy', UndeployCloudFoundryTask)
+        createTask(project, 'SwapDeployed', SwapDeployedCloudFoundryTask)
+        createTask(project, 'Scale', ScaleCloudFoundryTask)
+        createTask(project, 'Apps', AppsCloudFoundryTask)
+        createTask(project, 'App', AppCloudFoundryTask)
+        createTask(project, 'Logs', LogsCloudFoundryTask)
+        createTask(project, 'Services', ServicesCloudFoundryTask)
+        createTask(project, 'ServicePlans', ServiceOfferingsCloudFoundryTask)
+        createTask(project, 'CreateService', CreateServiceCloudFoundryTask)
+        createTask(project, 'DeleteService', DeleteServiceCloudFoundryTask)
+        createTask(project, 'Bind', BindServiceCloudFoundryTask)
+        createTask(project, 'Unbind', UnbindServiceCloudFoundryTask)
+        createTask(project, 'Env', EnvCloudFoundryTask)
+        createTask(project, 'SetEnv', SetEnvCloudFoundryTask)
+        createTask(project, 'UnsetEnv', UnsetEnvCloudFoundryTask)
+        createTask(project, 'Map', MapCloudFoundryTask)
+        createTask(project, 'Unmap', UnmapCloudFoundryTask)
     }
 
+    private void createTask(Project project, String name, Class<? extends DefaultTask> clazz) {
+        project.tasks.create("cf${name}", clazz)
+    }
 }

cloudfoundry-gradle-plugin/src/main/groovy/org/cloudfoundry/gradle/tasks/AbstractCloudFoundryTask.groovy

@@ -25,6 +25,7 @@ import org.cloudfoundry.client.lib.domain.CloudSpace
 import org.cloudfoundry.client.lib.tokens.TokensFile
 import org.gradle.api.DefaultTask
 import org.cloudfoundry.gradle.GradlePluginRestLogCallback
+import org.gradle.api.Task
 import org.springframework.http.HttpStatus
 import org.springframework.security.oauth2.common.OAuth2AccessToken
 import org.springframework.web.client.ResourceAccessException
@@ -337,10 +338,17 @@ abstract class AbstractCloudFoundryTask extends DefaultTask {
     }
 
     def propertyOrExtension(String name) {
-        if (project.hasProperty('cf.' + name)) {
-            project.property('cf.' + name)
-        } else {
-            project.cloudfoundry[name]
+        projectProperty(name) ?: project.cloudfoundry[name]
+    }
+
+    def projectProperty(String name) {
+        def propertyName = 'cf' + name.capitalize()
+        if (project.hasProperty(propertyName)) {
+            def propertyValue = project.property(propertyName)
+            if (!(propertyValue instanceof Task)) {
+                return propertyValue
+            }
         }
+        null
     }
 }