Build init plugin improvements

subprojects/build-init/build-init.gradle.kts

@@ -65,6 +65,7 @@ tasks {
             findLatest("scala-xml", "org.scala-lang.modules:scala-xml_${versionProperties["scala"]}:latest.release", versionProperties)
             findLatest("groovy", "org.codehaus.groovy:groovy:(2.5,)", versionProperties)
             findLatest("junit", "junit:junit:(4.0,)", versionProperties)
+            findLatest("junit-jupiter", "org.junit.jupiter:junit-jupiter-api:(5,)", versionProperties)
             findLatest("testng", "org.testng:testng:(6.0,)", versionProperties)
             findLatest("slf4j", "org.slf4j:slf4j-api:(1.7,)", versionProperties)
 
@@ -112,6 +113,7 @@ val devSuffixes = arrayOf(
     "-beta-?\\d+",
     "-dev-?\\d+",
     "-rc-?\\d+",
+    "-RC-?\\d+",
     "-M\\d+",
     "-eap-?\\d+"
 )

subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/AbstractInitIntegrationSpec.groovy

@@ -39,6 +39,12 @@ class AbstractInitIntegrationSpec extends AbstractIntegrationSpec {
         result.testClass(className).assertTestPassed(name)
     }
 
+    void assertFunctionalTestPassed(String className, String name) {
+        def result = new DefaultTestExecutionResult(targetDir, 'build', '', '', 'functionalTest')
+        result.assertTestClassesExecuted(className)
+        result.testClass(className).assertTestPassed(name)
+    }
+
     protected void commonFilesGenerated(BuildInitDsl scriptDsl) {
         dslFixtureFor(scriptDsl).assertGradleFilesGenerated()
         targetDir.file(".gitignore").assertIsFile()

subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/BuildInitInteractiveIntegrationTest.groovy

@@ -39,13 +39,18 @@ class BuildInitInteractiveIntegrationTest extends AbstractInitIntegrationSpec {
         ConcurrentTestUtil.poll(60) {
             assert handle.standardOutput.contains(projectTypePrompt)
             assert handle.standardOutput.contains(basicType)
+            assert handle.standardOutput.contains("2: application")
+            assert handle.standardOutput.contains("3: library")
+            assert handle.standardOutput.contains("4: Gradle plugin")
             assert !handle.standardOutput.contains("pom")
         }
         handle.stdinPipe.write(("1" + TextUtil.platformLineSeparator).bytes)
 
         // Select 'kotlin'
         ConcurrentTestUtil.poll {
             assert handle.standardOutput.contains(dslPrompt)
+            assert handle.standardOutput.contains("1: Groovy")
+            assert handle.standardOutput.contains("2: Kotlin")
         }
         handle.stdinPipe.write(("2" + TextUtil.platformLineSeparator).bytes)
 
@@ -61,6 +66,62 @@ class BuildInitInteractiveIntegrationTest extends AbstractInitIntegrationSpec {
         dslFixtureFor(BuildInitDsl.KOTLIN).assertGradleFilesGenerated()
     }
 
+    def "user can provide details for JVM based build"() {
+        when:
+        executer.withForceInteractive(true)
+        executer.withStdinPipe()
+        executer.withTasks("init")
+        def handle = executer.start()
+
+        // Select 'library'
+        ConcurrentTestUtil.poll(60) {
+            assert handle.standardOutput.contains(projectTypePrompt)
+        }
+        handle.stdinPipe.write(("3" + TextUtil.platformLineSeparator).bytes)
+
+        // Select 'java'
+        ConcurrentTestUtil.poll {
+            assert handle.standardOutput.contains("Select implementation language:")
+            assert handle.standardOutput.contains("1: C++")
+            assert handle.standardOutput.contains("2: Groovy")
+            assert handle.standardOutput.contains("3: Java")
+            assert handle.standardOutput.contains("4: Kotlin")
+            assert handle.standardOutput.contains("5: Scala")
+        }
+        handle.stdinPipe.write(("3" + TextUtil.platformLineSeparator).bytes)
+
+        // Select 'kotlin' DSL
+        ConcurrentTestUtil.poll {
+            assert handle.standardOutput.contains(dslPrompt)
+        }
+        handle.stdinPipe.write(("2" + TextUtil.platformLineSeparator).bytes)
+
+        // Select 'junit'
+        ConcurrentTestUtil.poll {
+            assert handle.standardOutput.contains("Select test framework:")
+            assert handle.standardOutput.contains("1: JUnit 4")
+        }
+        handle.stdinPipe.write(("1" + TextUtil.platformLineSeparator).bytes)
+
+        // Select default project name
+        ConcurrentTestUtil.poll {
+            assert handle.standardOutput.contains(projectNamePrompt)
+        }
+        handle.stdinPipe.write(TextUtil.platformLineSeparator.bytes)
+
+        // Enter a package name
+        ConcurrentTestUtil.poll {
+            assert handle.standardOutput.contains("Source package (default: some.thing)")
+        }
+        handle.stdinPipe.write(("org.gradle.test" + TextUtil.platformLineSeparator).bytes)
+
+        handle.stdinPipe.close()
+        handle.waitForFinish()
+
+        then:
+        dslFixtureFor(BuildInitDsl.KOTLIN).assertGradleFilesGenerated()
+    }
+
     def "prompts user when run from an interactive session and pom.xml present"() {
         when:
         pom()

subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/BuildInitPluginIntegrationTest.groovy

@@ -198,15 +198,18 @@ include("child")
         fails('init', '--type', 'some-unknown-library')
 
         then:
-        failure.assertHasCause("""The requested build setup type 'some-unknown-library' is not supported. Supported types:
+        failure.assertHasCause("""The requested build type 'some-unknown-library' is not supported. Supported types:
   - 'basic'
   - 'cpp-application'
   - 'cpp-library'
   - 'groovy-application'
+  - 'groovy-gradle-plugin'
   - 'groovy-library'
   - 'java-application'
+  - 'java-gradle-plugin'
   - 'java-library'
   - 'kotlin-application'
+  - 'kotlin-gradle-plugin'
   - 'kotlin-library'
   - 'pom'
   - 'scala-library'""")
@@ -227,7 +230,7 @@ include("child")
         fails('init', '--type', 'basic', '--test-framework', 'fake')
 
         then:
-        failure.assertHasCause("""The requested test framework 'fake' is not supported for 'basic' setup type. Supported frameworks:
+        failure.assertHasCause("""The requested test framework 'fake' is not supported for 'basic' build type. Supported frameworks:
   - 'none'""")
     }
 
@@ -236,7 +239,7 @@ include("child")
         fails('init', '--type', 'basic', '--test-framework', 'spock')
 
         then:
-        failure.assertHasCause("""The requested test framework 'spock' is not supported for 'basic' setup type. Supported frameworks:
+        failure.assertHasCause("""The requested test framework 'spock' is not supported for 'basic' build type. Supported frameworks:
   - 'none'""")
     }
 
@@ -245,15 +248,15 @@ include("child")
         fails('init', '--type', 'pom', '--project-name', 'thing')
 
         then:
-        failure.assertHasCause("Project name is not supported for 'pom' setup type.")
+        failure.assertHasCause("Project name is not supported for 'pom' build type.")
     }
 
     def "gives decent error message when package name option is not supported by specific type"() {
         when:
         fails('init', '--type', 'basic', '--package', 'thing')
 
         then:
-        failure.assertHasCause("Package name is not supported for 'basic' setup type.")
+        failure.assertHasCause("Package name is not supported for 'basic' build type.")
     }
 
     def "displays all build types and modifiers in help command output"() {
@@ -274,7 +277,7 @@ include("child")
      --test-framework     Set the test framework to be used.
                           Available values are:
                                junit
-                               junitjupiter
+                               junit-jupiter
                                kotlintest
                                scalatest
                                spock
@@ -286,10 +289,13 @@ include("child")
                      cpp-application
                      cpp-library
                      groovy-application
+                     groovy-gradle-plugin
                      groovy-library
                      java-application
+                     java-gradle-plugin
                      java-library
                      kotlin-application
+                     kotlin-gradle-plugin
                      kotlin-library
                      pom
                      scala-library""")

subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/GroovyApplicationInitIntegrationTest.groovy

@@ -80,7 +80,7 @@ class GroovyApplicationInitIntegrationTest extends AbstractInitIntegrationSpec {
         fails('init', '--type', 'groovy-application', '--test-framework', 'testng', '--dsl', scriptDsl.id)
 
         then:
-        failure.assertHasCause("""The requested test framework 'testng' is not supported for 'groovy-application' setup type. Supported frameworks:
+        failure.assertHasCause("""The requested test framework 'testng' is not supported for 'groovy-application' build type. Supported frameworks:
   - 'spock'""")
 
         where:

subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/GroovyGradlePluginInitIntegrationTest.groovy

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.gradle.buildinit.plugins
+
+import org.gradle.buildinit.plugins.fixtures.ScriptDslFixture
+import spock.lang.Unroll
+
+
+class GroovyGradlePluginInitIntegrationTest extends AbstractInitIntegrationSpec {
+    @Unroll
+    def "creates sample source if no source present with #scriptDsl build scripts"() {
+        when:
+        run('init', '--type', 'groovy-gradle-plugin', '--dsl', scriptDsl.id)
+
+        then:
+        targetDir.file("src/main/groovy").assertHasDescendants("some/thing/SomeThingPlugin.groovy")
+        targetDir.file("src/test/groovy").assertHasDescendants("some/thing/SomeThingPluginTest.groovy")
+        targetDir.file("src/functionalTest/groovy").assertHasDescendants("some/thing/SomeThingPluginFunctionalTest.groovy")
+
+        and:
+        commonJvmFilesGenerated(scriptDsl)
+
+        when:
+        executer.requireGradleDistribution() // TestKit and Kotlin DSL both require a distribution
+        run("build")
+
+        then:
+        assertTestPassed("some.thing.SomeThingPluginTest", "plugin registers task")
+        assertFunctionalTestPassed("some.thing.SomeThingPluginFunctionalTest", "can run task")
+
+        where:
+        scriptDsl << ScriptDslFixture.SCRIPT_DSLS
+    }
+}

subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/JavaApplicationInitIntegrationTest.groovy

@@ -20,12 +20,22 @@ import org.gradle.buildinit.plugins.fixtures.ScriptDslFixture
 import org.gradle.buildinit.plugins.internal.modifiers.BuildInitTestFramework
 import spock.lang.Unroll
 
+import static org.gradle.buildinit.plugins.internal.modifiers.BuildInitDsl.GROOVY
+
 class JavaApplicationInitIntegrationTest extends AbstractInitIntegrationSpec {
 
     public static final String SAMPLE_APP_CLASS = "some/thing/App.java"
     public static final String SAMPLE_APP_TEST_CLASS = "some/thing/AppTest.java"
     public static final String SAMPLE_APP_SPOCK_TEST_CLASS = "some/thing/AppTest.groovy"
 
+    def "defaults to Groovy build scripts"() {
+        when:
+        run ('init', '--type', 'java-application')
+
+        then:
+        dslFixtureFor(GROOVY).assertGradleFilesGenerated()
+    }
+
     @Unroll
     def "creates sample source if no source present with #scriptDsl build scripts"() {
         when:
@@ -100,9 +110,9 @@ class JavaApplicationInitIntegrationTest extends AbstractInitIntegrationSpec {
     }
 
     @Unroll
-    def "creates sample source using junitjupiter instead of junit with #scriptDsl build scripts"() {
+    def "creates sample source using junit-jupiter instead of junit with #scriptDsl build scripts"() {
         when:
-        run('init', '--type', 'java-application', '--test-framework', 'junitjupiter', '--dsl', scriptDsl.id)
+        run('init', '--type', 'java-application', '--test-framework', 'junit-jupiter', '--dsl', scriptDsl.id)
 
         then:
         targetDir.file("src/main/java").assertHasDescendants(SAMPLE_APP_CLASS)

subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/JavaGradlePluginInitIntegrationTest.groovy

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.gradle.buildinit.plugins
+
+import org.gradle.buildinit.plugins.fixtures.ScriptDslFixture
+import spock.lang.Unroll
+
+
+class JavaGradlePluginInitIntegrationTest extends AbstractInitIntegrationSpec {
+    @Unroll
+    def "creates sample source if no source present with #scriptDsl build scripts"() {
+        when:
+        run('init', '--type', 'java-gradle-plugin', '--dsl', scriptDsl.id)
+
+        then:
+        targetDir.file("src/main/java").assertHasDescendants("some/thing/SomeThingPlugin.java")
+        targetDir.file("src/test/java").assertHasDescendants("some/thing/SomeThingPluginTest.java")
+        targetDir.file("src/functionalTest/java").assertHasDescendants("some/thing/SomeThingPluginFunctionalTest.java")
+
+        and:
+        commonJvmFilesGenerated(scriptDsl)
+
+        when:
+        executer.requireGradleDistribution() // TestKit and Kotlin DSL both require a distribution
+        run("build")
+
+        then:
+        assertTestPassed("some.thing.SomeThingPluginTest", "pluginRegistersATask")
+        assertFunctionalTestPassed("some.thing.SomeThingPluginFunctionalTest", "canRunTask")
+
+        where:
+        scriptDsl << ScriptDslFixture.SCRIPT_DSLS
+    }
+}

subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/JavaLibraryInitIntegrationTest.groovy

@@ -20,6 +20,7 @@ import org.gradle.buildinit.plugins.fixtures.ScriptDslFixture
 import org.gradle.buildinit.plugins.internal.modifiers.BuildInitTestFramework
 import spock.lang.Unroll
 
+import static org.gradle.buildinit.plugins.internal.modifiers.BuildInitDsl.GROOVY
 import static org.hamcrest.Matchers.allOf
 
 class JavaLibraryInitIntegrationTest extends AbstractInitIntegrationSpec {
@@ -28,6 +29,14 @@ class JavaLibraryInitIntegrationTest extends AbstractInitIntegrationSpec {
     public static final String SAMPLE_LIBRARY_TEST_CLASS = "some/thing/LibraryTest.java"
     public static final String SAMPLE_SPOCK_LIBRARY_TEST_CLASS = "some/thing/LibraryTest.groovy"
 
+    def "defaults to Groovy build scripts"() {
+        when:
+        run ('init', '--type', 'java-library')
+
+        then:
+        dslFixtureFor(GROOVY).assertGradleFilesGenerated()
+    }
+
     @Unroll
     def "creates sample source if no source present with #scriptDsl build scripts"() {
         when:
@@ -102,9 +111,9 @@ class JavaLibraryInitIntegrationTest extends AbstractInitIntegrationSpec {
     }
 
     @Unroll
-    def "creates sample source using junitjupiter instead of junit with #scriptDsl build scripts"() {
+    def "creates sample source using junit-jupiter instead of junit with #scriptDsl build scripts"() {
         when:
-        run('init', '--type', 'java-library', '--test-framework', 'junitjupiter', '--dsl', scriptDsl.id)
+        run('init', '--type', 'java-library', '--test-framework', 'junit-jupiter', '--dsl', scriptDsl.id)
 
         then:
         targetDir.file("src/main/java").assertHasDescendants(SAMPLE_LIBRARY_CLASS)