Merge branch 'master' of github.com:ChillyCheesy/modulo-gradle-application

Author: AymericHenouille

README.md

@@ -21,7 +21,7 @@ To apply the plugin, please add this following part of code.
 
 ```groovy
 plugins {
-    id: 'com.chillycheesy.modulo-application' version '0.0.1'
+    id 'com.chillycheesy.modulo-application' version '0.0.1'
 }
 
 group 'your.group'
@@ -33,10 +33,10 @@ Add the below **module** closure with your module's information inside.
 
 ```groovy
 module {
-    moduleName 'MyAwesomeModule'
-    version '1.0.0'
-    authors ['Wicket', 'Nippet']
-    main 'com.your.module.MainClass'
+    moduleName = 'MyAwesomeModule'
+    version = '1.0.0'
+    authors = ['Wicket', 'Nippet']
+    main = 'com.your.module.MainClass'
 }
 ```
 
@@ -70,10 +70,10 @@ main: com.your.module.MainClass
 The above example part of code can be replaced by the below closure.
 ```groovy
 module {
-    moduleName 'MyAwesomeModule'
-    version '1.0.0'
-    authors ['Wicket', 'Nippet']
-    main 'com.your.module.MainClass'
+    moduleName = 'MyAwesomeModule'
+    version = '1.0.0'
+    authors = ['Wicket', 'Nippet']
+    main = 'com.your.module.MainClass'
 }
 ```
 

src/main/groovy/com/chillycheesy/modulo/tasks/GenerateModuleYmlTask.groovy

@@ -36,10 +36,11 @@ class GenerateModuleYmlTask implements ModuloTask {
             doLast {
                 final moduleConfig = getModuleConfigFile()
                 final Yaml yaml = new Yaml()
+                final moduleName = moduleExtension.moduleName ?: project.name
                 moduleConfig.text = yaml.dump([
-                        name: moduleExtension.moduleName,
-                        version: moduleExtension.version,
-                        authors: moduleExtension.authors,
+                        name: moduleName,
+                        version: moduleExtension.version ?: project.version,
+                        authors: moduleExtension.authors ?: "${project.group.toString()}.${moduleName}",
                         main: moduleExtension.main,
                         dependencies: moduleExtension.dependencies,
                         softDependencies: moduleExtension.softDependencies
@@ -53,7 +54,8 @@ class GenerateModuleYmlTask implements ModuloTask {
      * @return The file.
      */
     private def getModuleConfigFile() {
-        final resources = new File("${moduleExtension.target}")
+        final target = moduleExtension.target ?: "${project.projectDir.path}/src/main/resources"
+        final resources = new File(target)
         resources.mkdirs()
         final file = new File("${resources.getPath()}/module.yml")
         if (!file.exists()) file.createNewFile()