buildr-hx 0.0.20.pre → 0.0.21.pre

data/VERSION

@@ -1 +1 @@
-0.0.20.pre
+0.0.21.pre

data/buildr-hx.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "buildr-hx"
-  s.version = "0.0.20.pre"
+  s.version = "0.0.21.pre"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dominic Graefen"]
-  s.date = "2012-04-11"
+  s.date = "2012-04-12"
   s.description = "Build like you code - now supporting haXe"
   s.email = "dominic @nospam@ devboy.org"
   s.extra_rdoc_files = [

data/buildr-hx.iml

@@ -11,7 +11,7 @@
     <orderEntry type="library" scope="PROVIDED" name="atoulme-Antwrap (v0.7.1, ruby-1.9.2-p290) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="builder (v2.1.2, ruby-1.9.2-p290) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="buildr (v1.4.6, ruby-1.9.2-p290) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="buildr-hx (v0.0.19.pre, ruby-1.9.2-p290) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="buildr-hx (v0.0.20.pre, ruby-1.9.2-p290) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bundler (v1.1.3, ruby-1.9.2-p290) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.1.2, ruby-1.9.2-p290) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="git (v1.2.5, ruby-1.9.2-p290) [gem]" level="application" />

data/lib/buildr/hx/compiler/haxe_compiler_base.rb

@@ -26,7 +26,8 @@ module Buildr
             create_hxml args, is_test
             appwd = Dir.pwd
             Dir.chdir @project.base_dir
-            fail("Compilation failed!") unless sh args.join " "
+            file = File.join(@project.base_dir, options[:hxml] || is_test ? "test.hxml" : "compile.hxml")
+            fail("Compilation failed!") unless system "haxe '#{file}'"
             Dir.chdir appwd
           end
         end
@@ -83,7 +84,7 @@ module Buildr
         end
 
         def install_haxelib_zip zip
-          system "haxelib test #{zip}"
+          system "haxelib test '#{zip}'"
         end
 
         def is_test?(sources, target, dependencies)

data/lib/buildr/hx/test/munit.rb

@@ -12,17 +12,7 @@ module Buildr
 
         def initialize(test_task, options)
           super
-          generate = Rake::Task.define_task(:generate_files) do
-            create_munit_config
-            appwd = Dir.pwd
-            Dir.chdir task.project.base_dir
-            cmd = "haxelib run munit gen"
-            fail "Problems...oh noes!" unless system cmd
-            Dir.chdir appwd
-          end
-          @task.compile.enhance [:generate_files] do
-            generate.reenable
-          end
+          @task.compile.from generate_test_suites
         end
 
         def tests(dependencies) #:nodoc:
@@ -43,7 +33,6 @@ module Buildr
         def run(tests, dependencies) #:nodoc:
 
           unless Buildr.application.options.dryrun
-            create_munit_config
             appwd = Dir.pwd
             Dir.chdir task.project.base_dir
 
@@ -52,7 +41,7 @@ module Buildr
             cmd << " -keep-browser-alive" if options[:keepbrowseralive]
             cmd << " -coverage" if options[:coverage]
 
-            fail "Problems...oh noes!" unless system cmd
+            fail "Failed to run MUnit TestRunner!" unless system cmd
 
             Dir.chdir appwd
 
@@ -68,16 +57,27 @@ module Buildr
           tests
         end
 
+        def generate_test_suites
+          @generate ||= file task.project.path_to(:source, :test, :hx) do
+            create_munit_config
+            appwd = Dir.pwd
+            Dir.chdir task.project.base_dir
+            cmd = "haxelib run munit gen"
+            fail "Failed to generate MUnit Test Suite" unless system cmd
+            Dir.chdir appwd
+          end
+        end
+
         def create_munit_config
           file = File.join(task.project.base_dir, ".munit")
           puts "Creating munit config '#{file}'"
           File.open(file, 'w') { |f| f.write(
               "version=#{options[:version].nil? ? DEFAULT_VERSION : options[:version]}\n" +
-                  "src=#{task.project.path_to(:source, :test, :hx)}\n" +
-                  "bin=#{task.project.test.compile.target}\n" +
-                  "report=#{task.project.path_to(:reports, :munit)}\n" +
-                  "hxml=#{get_hxml_file}\n" +
-                  "classPaths=#{task.project.compile.sources.map(&:to_s).join(',')}"
+              "src=#{task.project.path_to(:source, :test, :hx)}\n" +
+              "bin=#{task.project.test.compile.target}\n" +
+              "report=#{task.project.path_to(:reports, :munit)}\n" +
+              "hxml=#{get_hxml_file}\n" +
+              "classPaths=#{task.project.compile.sources.map(&:to_s).join(',')}"
           ) }
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildr-hx
 version: !ruby/object:Gem::Version
-  version: 0.0.20.pre
+  version: 0.0.21.pre
   prerelease: 7
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: buildr
@@ -213,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1754110536072122068
+      hash: 4044263023288197641
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: