Change order creation require.js modules, last is now initial groovy …

…file
chiquitinxx · May 22, 2015 · 955592a · 955592a
1 parent 3cfc444
commit 955592a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -97,7 +97,7 @@ task generateGrooscriptToolsFile(type: JavaExec) {
     description 'Generate grooscript-tools.js'
 
     // Set main property to name of Groovy script class.
-    main = 'org.grooscript.GenerateGrooscripToolsFile'
+    main = 'org.grooscript.GenerateGrooscripTools'
 
     // Set classpath for running the Groovy script.
     classpath = sourceSets.main.runtimeClasspath

diff --git a/...oscript/generateGrooscripToolsFile.groovy → .../grooscript/GenerateGrooscripTools.groovy b/...oscript/generateGrooscripToolsFile.groovy → .../grooscript/GenerateGrooscripTools.groovy
diff --git a/src/main/groovy/org/grooscript/convert/util/RequireJsModulesConversion.groovy b/src/main/groovy/org/grooscript/convert/util/RequireJsModulesConversion.groovy
@@ -31,15 +31,17 @@ class RequireJsModulesConversion {
         if (fileSolver.exists(sourceFilePath)) {
             def dependencies = dependenciesSolver.processFile(sourceFilePath)
             def classPath = classPathFolder(conversionOptions)
-            convertedFiles << generateTemplate(sourceFilePath, destinationFolder,
-                    destinationFromFilePath(sourceFilePath, classPath), conversionOptions)
+            //Generate dependencies
             dependencies.each {
                 def filePath = fileSolver.filePathFromClassName(it, classPath)
-                if (!convertedFiles.any { it.sourceFilePath == filePath}) {
+                if (filePath != sourceFilePath && !convertedFiles.any { it.sourceFilePath == filePath }) {
                     convertedFiles << generateTemplate(filePath, destinationFolder,
                             destinationFromDependency(it), conversionOptions)
                 }
             }
+            //Generate initial file last one
+            convertedFiles << generateTemplate(sourceFilePath, destinationFolder,
+                    destinationFromFilePath(sourceFilePath, classPath), conversionOptions)
         } else {
             error("File ${sourceFilePath} doesn't exists.")
         }

diff --git a/src/test/groovy/org/grooscript/convert/TestFiles.groovy b/src/test/groovy/org/grooscript/convert/TestFiles.groovy
@@ -96,9 +96,9 @@ class TestFiles extends Specification {
         def result = GrooScript.convertRequireJs("${sourceFolder}files${SEP}Car.groovy", destinationFolder)
 
         then:
-        result == [new ConvertedFile("${sourceFolder}files${SEP}Car.groovy", "files${SEP}Car.js"),
-                   new ConvertedFile("${sourceFolder}files${SEP}Vehicle.groovy", "files${SEP}Vehicle.js"),
-                   new ConvertedFile("${sourceFolder}files${SEP}Garage.groovy", "files${SEP}Garage.js")]
+        result == [new ConvertedFile("${sourceFolder}files${SEP}Vehicle.groovy", "files${SEP}Vehicle.js"),
+                   new ConvertedFile("${sourceFolder}files${SEP}Garage.groovy", "files${SEP}Garage.js"),
+                   new ConvertedFile("${sourceFolder}files${SEP}Car.groovy", "files${SEP}Car.js")]
 
         folderContainsFiles("${destinationFolder}${SEP}files", ['Car.js', 'Garage.js', 'Vehicle.js'])
         new File("${destinationFolder}${SEP}files${SEP}Car.js").text.