Polish .gitignore generation

See gh-131

initializr-generator/src/main/groovy/io/spring/initializr/generator/ProjectGenerator.groovy

@@ -220,8 +220,6 @@ class ProjectGenerator {
 	 */
 	protected void generateGitIgnore(File dir, ProjectRequest request) {
 		def model = [:]
-		def agent = extractAgent(request)
-		model['agent'] = agent ? agent.id.id : null
 		model['build'] = isGradleBuild(request) ? 'gradle' : 'maven'
 		write(new File(dir, '.gitignore'), 'gitignore.tmpl', model)
 	}
@@ -321,16 +319,6 @@ class ProjectGenerator {
 		"import $type$end"
 	}
 
-	private static Agent extractAgent(ProjectRequest request) {
-		if (request.parameters['user-agent']) {
-			Agent agent = Agent.fromUserAgent(request.parameters['user-agent'])
-			if (agent) {
-				return agent
-			}
-		}
-		null
-	}
-
 	private static isGradleBuild(ProjectRequest request) {
 		return 'gradle'.equals(request.build)
 	}

initializr-generator/src/main/resources/templates/gitignore.tmpl

@@ -1,18 +1,20 @@
 <% if (build=='maven') {  %>target/
 !.mvn/wrapper/maven-wrapper.jar<% } else { %>.gradle
 /build/
-!gradle/wrapper/gradle-wrapper.jar<% } %><% if ('sts'==agent) { %>
+!gradle/wrapper/gradle-wrapper.jar<% } %>
 
 ### STS ###
 .classpath
+.factorypath
 .project
-.settings<% } %><% if ('intellijidea'==agent) { %>
+.settings
+.springBeans
 
 ### IntelliJ IDEA ###
 .idea
 *.iws
 *.iml
-*.ipr<% } %><% if ('netbeans'==agent) { %>
+*.ipr
 
 ### NetBeans ###
 nbproject/private/
@@ -20,4 +22,4 @@ build/
 nbbuild/
 dist/
 nbdist/
-.nb-gradle/<% } %>
+.nb-gradle/

initializr-generator/src/test/groovy/io/spring/initializr/generator/ProjectGeneratorGitIgnoreTests.groovy

@@ -1,84 +0,0 @@
-/*
- * Copyright 2012-2016 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 io.spring.initializr.generator
-
-import io.spring.initializr.util.Agent
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.Parameterized
-
-import org.springframework.core.io.ClassPathResource
-import org.springframework.core.io.Resource
-
-/**
- * Project generator tests for {@code .gitignore}.
- *
- * @author Stephane Nicoll
- */
-@RunWith(Parameterized.class)
-class ProjectGeneratorGitIgnoreTests extends AbstractProjectGeneratorTests {
-
-	@Parameterized.Parameters(name = "{0}")
-	static Object[] parameters() {
-		def list = []
-		list << 'STS 3.7.2'
-		list << 'IntelliJ IDEA'
-		list << 'nb-springboot-plugin/0.1'
-		list << 'HTTPie/0.8.0'
-		list << 'Googlebot-Mobile'
-		list
-	}
-
-	private final String userAgent
-	private final Agent agent
-
-	ProjectGeneratorGitIgnoreTests(String userAgent) {
-		this.userAgent = userAgent
-		this.agent = Agent.fromUserAgent(userAgent)
-	}
-
-	@Test
-	void gitIgnoreMaven() {
-		def request = createProjectRequest()
-		request.type = 'maven-project'
-		def project = generateProject(request)
-		project.sourceCodeAssert(".gitignore")
-				.equalsTo(getResourceFor('maven'))
-	}
-
-	@Test
-	void gitIgnoreGradle() {
-		def request = createProjectRequest()
-		request.type = 'gradle-project'
-		def project = generateProject(request)
-		project.sourceCodeAssert(".gitignore")
-				.equalsTo(getResourceFor('gradle'))
-	}
-
-	private Resource getResourceFor(String build) {
-		String id = agent ? agent.id.id : 'none'
-		return new ClassPathResource("project/$build/gitignore-${id}.gen")
-	}
-
-	@Override
-	ProjectRequest createProjectRequest(String... styles) {
-		def request = super.createProjectRequest(styles)
-		request.parameters['user-agent'] = this.userAgent
-		request
-	}
-
-}

initializr-generator/src/test/groovy/io/spring/initializr/generator/ProjectGeneratorTests.groovy

@@ -28,6 +28,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.context.annotation.ComponentScan
 import org.springframework.context.annotation.Configuration
+import org.springframework.core.io.ClassPathResource
 
 import static org.hamcrest.CoreMatchers.containsString
 import static org.junit.Assert.assertThat
@@ -671,6 +672,24 @@ class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
 				new Dependency(id: 'foo', groupId: 'org.acme', artifactId: 'foo', version: '1.2.0'))
 	}
 
+	@Test
+	void gitIgnoreMaven() {
+		def request = createProjectRequest()
+		request.type = 'maven-project'
+		def project = generateProject(request)
+		project.sourceCodeAssert(".gitignore")
+				.equalsTo(new ClassPathResource("project/maven/gitignore.gen"))
+	}
+
+	@Test
+	void gitIgnoreGradle() {
+		def request = createProjectRequest()
+		request.type = 'gradle-project'
+		def project = generateProject(request)
+		project.sourceCodeAssert(".gitignore")
+				.equalsTo(new ClassPathResource("project/gradle/gitignore.gen"))
+	}
+
 	@Test
 	void invalidProjectTypeMavenPom() {
 		def request = createProjectRequest('web')

initializr-generator/src/test/resources/project/gradle/gitignore-httpie.gen

@@ -1,3 +0,0 @@
-.gradle
-/build/
-!gradle/wrapper/gradle-wrapper.jar

initializr-generator/src/test/resources/project/gradle/gitignore-intellijidea.gen

@@ -1,9 +0,0 @@
-.gradle
-/build/
-!gradle/wrapper/gradle-wrapper.jar
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr

initializr-generator/src/test/resources/project/gradle/gitignore-none.gen

@@ -1,3 +0,0 @@
-.gradle
-/build/
-!gradle/wrapper/gradle-wrapper.jar

initializr-generator/src/test/resources/project/gradle/gitignore-sts.gen

@@ -1,8 +0,0 @@
-.gradle
-/build/
-!gradle/wrapper/gradle-wrapper.jar
-
-### STS ###
-.classpath
-.project
-.settings

initializr-generator/src/test/resources/project/gradle/gitignore.gen

@@ -2,6 +2,19 @@
 /build/
 !gradle/wrapper/gradle-wrapper.jar
 
+### STS ###
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
 ### NetBeans ###
 nbproject/private/
 build/

initializr-generator/src/test/resources/project/maven/gitignore-httpie.gen

@@ -1,2 +0,0 @@
-target/
-!.mvn/wrapper/maven-wrapper.jar

initializr-generator/src/test/resources/project/maven/gitignore-intellijidea.gen

@@ -1,8 +0,0 @@
-target/
-!.mvn/wrapper/maven-wrapper.jar
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr

initializr-generator/src/test/resources/project/maven/gitignore-none.gen

@@ -1,2 +0,0 @@
-target/
-!.mvn/wrapper/maven-wrapper.jar

initializr-generator/src/test/resources/project/maven/gitignore-sts.gen

@@ -1,7 +0,0 @@
-target/
-!.mvn/wrapper/maven-wrapper.jar
-
-### STS ###
-.classpath
-.project
-.settings

initializr-generator/src/test/resources/project/maven/gitignore.gen

@@ -1,6 +1,19 @@
 target/
 !.mvn/wrapper/maven-wrapper.jar
 
+### STS ###
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
 ### NetBeans ###
 nbproject/private/
 build/