Merge pull request #86 from prezi/a-new-package

A new package

Author: lptr

.gitignore

@@ -9,7 +9,9 @@ temp
 *.iml
 *.ipr
 *.iws
-out
+out/
+gen/
+classes/
 
 .gradle/
 build/

README.md

@@ -60,8 +60,8 @@ You then implement the generated interfaces, and compile your code into a JavaSc
 ```haxe
 package com.example.module;
 
-// Spaghetti looks for a class called "<ModuleName>Impl"
-class MyModuleImpl implements MyModule {
+// Spaghetti looks for a class called "<ModuleName>" that implements the interface called "I<ModuleName>"
+class MyModule implements IMyModule {
 	public function createGreeter():Greeter {
 		return new DefaultGreeter();
 	}

build.gradle

@@ -16,6 +16,8 @@ allprojects {
 	group = 'com.prezi.spaghetti'
 	version = gitVersion
 	apply plugin: 'idea'
+
+	tasks.withType(Upload).all { dependsOn "check" }
 }
 
 subprojects { subproject ->
@@ -141,16 +143,22 @@ subprojects { subproject ->
 	}
 }
 
+project(":spaghetti-core") {
+	dependencies {
+		compile "com.google.javascript:closure-compiler:v20131014"
+	}
+}
+
 configure(subprojects.findAll { it.name ==~ /spaghetti-.*-support/ }) {
 	dependencies {
 		compile project(path: ":spaghetti-core")
+		testCompile project(path: ":spaghetti-core", configuration: "testCompile")
 	}
 }
 
 project(":gradle-spaghetti-plugin") {
 	dependencies {
 		compile gradleApi()
-		compile "com.google.javascript:closure-compiler:v20131014"
 		compile project(path: ":spaghetti-core")
 		// Add all support projects
 		rootProject.subprojects.findAll { it.name ==~ /spaghetti-.*-support/ }.each { supportProject ->
@@ -177,12 +185,12 @@ configure(subprojects.findAll { it.name ==~ /gradle-spaghetti-.*-plugin/}) {
 }
 project(":gradle-spaghetti-haxe-plugin") {
 	dependencies {
-		compile "com.prezi.haxe:gradle-haxe-plugin:3.0"
+		compile "com.prezi.haxe:gradle-haxe-plugin:3.1"
 		compile "org.webjars:requirejs:2.1.8"
 	}
 }
 project(":gradle-spaghetti-typescript-plugin") {
 	dependencies {
-		compile "com.prezi.typescript:gradle-typescript-plugin:1.1.1"
+		compile "com.prezi.typescript:gradle-typescript-plugin:1.1.2"
 	}
 }

gradle-spaghetti-haxe-plugin/src/main/groovy/com/prezi/spaghetti/haxe/gradle/DefaultHaxeCompiledSpaghettiCompatibleJavaScriptBinary.groovy

@@ -1,53 +1,28 @@
 package com.prezi.spaghetti.haxe.gradle
 
-import com.prezi.haxe.gradle.HaxeBinary
-import com.prezi.spaghetti.gradle.SpaghettiCompatibleBinaryNamingScheme
-import org.gradle.language.base.internal.AbstractBuildableModelElement
-import org.gradle.language.base.internal.BinaryInternal
-import org.gradle.language.base.internal.BinaryNamingScheme
+import com.prezi.haxe.gradle.HaxeBinaryBase
+import com.prezi.spaghetti.gradle.AbstractSpaghettiCompatibleJavaScriptBinary
 
 /**
  * Created by lptr on 09/02/14.
  */
 class DefaultHaxeCompiledSpaghettiCompatibleJavaScriptBinary
-		extends AbstractBuildableModelElement implements HaxeCompiledSpaghettiCompatibleJavaScriptBinary, BinaryInternal {
-	private final BinaryNamingScheme namingScheme
-	private final HaxeBinary binary
+		extends AbstractSpaghettiCompatibleJavaScriptBinary
+		implements HaxeCompiledSpaghettiCompatibleJavaScriptBinary {
+	private final HaxeBinaryBase original
 
-	public DefaultHaxeCompiledSpaghettiCompatibleJavaScriptBinary(HaxeBinary binary) {
-		this.namingScheme = new SpaghettiCompatibleBinaryNamingScheme(binary.name)
-		this.binary = binary
+	public DefaultHaxeCompiledSpaghettiCompatibleJavaScriptBinary(HaxeBinaryBase original, boolean testing) {
+		super(original.name, testing)
+		this.original = original
 	}
 
 	@Override
-	File getJavaScriptFile() {
-		return binary.getCompileTask().getOutputFile()
-	}
-
-	@Override
-	File getSourceMapFile() {
-		def outputFile = binary.getCompileTask().getOutputFile()
-		def sourceMapFile = new File(outputFile.parentFile, outputFile.name + ".map")
-		return sourceMapFile.exists() ? sourceMapFile : null
-	}
-
-	@Override
-	BinaryNamingScheme getNamingScheme() {
-		return namingScheme
+	HaxeBinaryBase getOriginal() {
+		return original
 	}
 
 	@Override
-	String getDisplayName() {
-		return namingScheme.description
-	}
-
-	@Override
-	String getName() {
-		return namingScheme.lifecycleTaskName
-	}
-
-	@Override
-	String toString() {
-		return "${name} JS binary"
+	File getJavaScriptFile() {
+		return original.getCompileTask().getOutputFile()
 	}
 }

gradle-spaghetti-haxe-plugin/src/main/groovy/com/prezi/spaghetti/haxe/gradle/HaxeCommandUtils.groovy

@@ -1,10 +1,12 @@
 package com.prezi.spaghetti.haxe.gradle
 
+import com.prezi.haxe.gradle.HaxeBinaryBase
 import com.prezi.spaghetti.gradle.SpaghettiCompatibleJavaScriptBinary
 
 /**
  * Created by lptr on 15/02/14.
  */
 public interface HaxeCompiledSpaghettiCompatibleJavaScriptBinary
 		extends SpaghettiCompatibleJavaScriptBinary {
+	HaxeBinaryBase getOriginal()
 }

gradle-spaghetti-haxe-plugin/src/main/groovy/com/prezi/spaghetti/haxe/gradle/HaxeCompileWithSpaghetti.groovy

@@ -0,0 +1,30 @@
+package com.prezi.spaghetti.haxe.gradle
+
+import com.prezi.haxe.gradle.HaxeCommandBuilder
+import com.prezi.haxe.gradle.HaxeTestCompile
+import com.prezi.spaghetti.ReservedWords
+import com.prezi.spaghetti.haxe.HaxeGenerator
+import groovy.text.SimpleTemplateEngine
+import org.gradle.api.DomainObjectSet
+import org.gradle.language.base.LanguageSourceSet
+
+/**
+ * Created by lptr on 20/05/14.
+ */
+class HaxeTestCompileWithSpaghetti extends HaxeTestCompile {
+	@Override
+	protected HaxeCommandBuilder configureHaxeCommandBuilder(File output, DomainObjectSet<LanguageSourceSet> sources) {
+		def builder = super.configureHaxeCommandBuilder(output, sources)
+
+		def engine = new SimpleTemplateEngine()
+		def template = engine.createTemplate(HaxeTestCompileWithSpaghetti.class.getResource("/SpaghettiTest.hx"))
+		new File(getTestsDirectory(), "SpaghettiTest.hx") << template.make(
+				config: ReservedWords.CONFIG,
+				haxeModule: HaxeGenerator.HAXE_MODULE_VAR,
+				module: ReservedWords.INSTANCE,
+				modules: ReservedWords.MODULES,
+		)
+
+		return builder
+	}
+}

gradle-spaghetti-haxe-plugin/src/main/groovy/com/prezi/spaghetti/haxe/gradle/HaxeCompiledSpaghettiCompatibleJavaScriptBinary.groovy

@@ -1,67 +1,46 @@
 package com.prezi.spaghetti.haxe.gradle
 
-import com.prezi.haxe.gradle.HaxeCommandBuilder
-import com.prezi.haxe.gradle.HaxeSourceSet
 import com.prezi.haxe.gradle.MUnit
-import com.prezi.spaghetti.ModuleBundle
-import org.gradle.api.DomainObjectSet
-import org.gradle.api.artifacts.Configuration
-import org.gradle.api.internal.DefaultDomainObjectSet
-import org.gradle.language.base.LanguageSourceSet
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.Optional
 
 /**
- * Created by lptr on 27/04/14.
+ * Created by lptr on 20/05/14.
  */
 class MUnitWithSpaghetti extends MUnit {
 
-	final LinkedHashSet<Object> spaghettiResources = []
-	public void spaghettiResources(Object... resources) {
-		this.spaghettiResources.addAll(resources)
-	}
-	protected DomainObjectSet<LanguageSourceSet> getSpaghettiResourceSets() {
-		def spaghettiResourceSets = spaghettiResources.collectMany { notationParser.parseNotation(it) }
-		return new DefaultDomainObjectSet<LanguageSourceSet>(LanguageSourceSet, spaghettiResourceSets)
-	}
-
 	@Override
-	protected HaxeCommandBuilder configureHaxeCommandLine(File output, File workDir, DomainObjectSet<LanguageSourceSet> sources, Set<LanguageSourceSet> testSources, Map<String, File> allResources) {
-		def builder = super.configureHaxeCommandLine(output, workDir, sources, testSources, allResources)
-
-		if (getTargetPlatform().name == "js") {
-			// Extract Require JS
-			def requireJsProps = new Properties()
-			requireJsProps.load(this.class.getResourceAsStream("/META-INF/maven/org.webjars/requirejs/pom.properties"))
-			def requireJsVersion = requireJsProps.getProperty("version")
-			def requireJsFile = new File(workDir, "require.js")
-			requireJsFile.delete()
-			requireJsFile << this.class.getResourceAsStream("/META-INF/resources/webjars/requirejs/${requireJsVersion}/require.js")
+	@Optional
+	File getInputFile() {
+		return super.getInputFile()
+	}
 
-			// Collect all classpath configurations
-			Set<Configuration> allClassPaths = []
-			[sources, testSources].collectMany(allClassPaths) { DomainObjectSet<LanguageSourceSet> sourceSet ->
-				def classPaths = sourceSet.withType(HaxeSourceSet).collect(new LinkedHashSet<Configuration>()) { HaxeSourceSet haxeSourceSet ->
-					haxeSourceSet.compileClassPath
-				}
-				return classPaths
-			}
+	@InputDirectory
+	File testApplication
 
-			// Copy current module's Spaghetti resources
-			logger.debug "Copying spaghetti resources: {} into {}", getSpaghettiResourceSets()*.source*.srcDirs, workDir
-			project.copy {
-				from getSpaghettiResourceSets()*.source*.srcDirs
-				into workDir
-			}
+	@Input
+	String testApplicationName
 
-			// Append module locations
-			def bundlerCommand = HaxeCommandUtils.spaghettiBundlerCommand("module", output, project.buildDir, allClassPaths, { ModuleBundle bundle ->
-				bundle.extract(new File(workDir, bundle.name))
-				return bundle.name + "/" + bundle.name
-			})
-			builder.append("-cmd", "haxe ${bundlerCommand.join(" ")}", )
+	@Override
+	protected String copyCompiledTest(File workDir) {
+		// Extract Require JS
+		def requireJsProps = new Properties()
+		requireJsProps.load(this.class.getResourceAsStream("/META-INF/maven/org.webjars/requirejs/pom.properties"))
+		def requireJsVersion = requireJsProps.getProperty("version")
+		def requireJsFile = new File(workDir, "require.js")
+		requireJsFile.delete()
+		requireJsFile << this.class.getResourceAsStream("/META-INF/resources/webjars/requirejs/${requireJsVersion}/require.js")
+
+		logger.debug "Copying test application from {} to {}", getTestApplication(), workDir
+		project.copy {
+			from getTestApplication()
+			into workDir
 		}
-		return builder
+		return getTestApplicationName()
 	}
 
+	@Override
 	protected InputStream getMUnitJsHtmlTemplate() {
 		return this.class.getResourceAsStream("/js_runner-html-with-require.mtt")
 	}